1 |
commit: 3153e9afab90ac5741c621bad7e6c39c72764181 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Mar 2 23:40:18 2020 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Mar 2 23:40:49 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3153e9af |
7 |
|
8 |
net-ftp/proftpd: tweak for gcc-10 |
9 |
|
10 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
11 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
12 |
|
13 |
net-ftp/proftpd/files/proftpd-1.3.6c-gcc-10.patch | 21 +++++++++++++++++++++ |
14 |
net-ftp/proftpd/proftpd-1.3.6c.ebuild | 1 + |
15 |
2 files changed, 22 insertions(+) |
16 |
|
17 |
diff --git a/net-ftp/proftpd/files/proftpd-1.3.6c-gcc-10.patch b/net-ftp/proftpd/files/proftpd-1.3.6c-gcc-10.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..c3ee704c085 |
20 |
--- /dev/null |
21 |
+++ b/net-ftp/proftpd/files/proftpd-1.3.6c-gcc-10.patch |
22 |
@@ -0,0 +1,21 @@ |
23 |
+--- a/contrib/mod_quotatab.c |
24 |
++++ b/contrib/mod_quotatab.c |
25 |
+@@ -50,6 +50,7 @@ typedef struct regtab_obj { |
26 |
+ module quotatab_module; |
27 |
+ |
28 |
+ /* Quota objects for the current session */ |
29 |
++quota_deltas_t quotatab_deltas; |
30 |
+ static quota_table_t *limit_tab = NULL; |
31 |
+ static quota_limit_t sess_limit; |
32 |
+ |
33 |
+--- a/contrib/mod_quotatab.h |
34 |
++++ b/contrib/mod_quotatab.h |
35 |
+@@ -188,7 +188,7 @@ typedef struct table_obj { |
36 |
+ #define QUOTATAB_TALLY_SRC 0x0002 |
37 |
+ |
38 |
+ /* Quota objects for the current session. */ |
39 |
+-quota_deltas_t quotatab_deltas; |
40 |
++extern quota_deltas_t quotatab_deltas; |
41 |
+ |
42 |
+ /* Function prototypes necessary for quotatab sub-modules */ |
43 |
+ int quotatab_log(const char *, ...) |
44 |
|
45 |
diff --git a/net-ftp/proftpd/proftpd-1.3.6c.ebuild b/net-ftp/proftpd/proftpd-1.3.6c.ebuild |
46 |
index 5c8f9eb610d..d2441f41e29 100644 |
47 |
--- a/net-ftp/proftpd/proftpd-1.3.6c.ebuild |
48 |
+++ b/net-ftp/proftpd/proftpd-1.3.6c.ebuild |
49 |
@@ -71,6 +71,7 @@ S="${WORKDIR}/${P/_/}" |
50 |
PATCHES=( |
51 |
"${FILESDIR}"/${PN}-1.3.6-use-trace.patch |
52 |
"${FILESDIR}"/${PN}-1.3.6a-fix-libcheck.patch |
53 |
+ "${FILESDIR}"/${PN}-1.3.6c-gcc-10.patch |
54 |
) |
55 |
|
56 |
RESTRICT=test # tests corrupt memory. need to be fixed upstream first |