1 |
commit: 9fc8c26fc287389eebef240d4c3418ea67821dc8 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Sep 16 17:19:48 2020 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 17 06:58:46 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fc8c26f |
7 |
|
8 |
net-ftp/proftpd: remove unused patches |
9 |
|
10 |
Package-Manager: Portage-3.0.6, Repoman-3.0.1 |
11 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/17568 |
13 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
14 |
|
15 |
.../files/proftpd-1.3.7_rc4-ldap_mod-SEGV.patch | 38 ------------------- |
16 |
.../files/proftpd-1.3.7_rc4-str-sentinel.patch | 43 ---------------------- |
17 |
2 files changed, 81 deletions(-) |
18 |
|
19 |
diff --git a/net-ftp/proftpd/files/proftpd-1.3.7_rc4-ldap_mod-SEGV.patch b/net-ftp/proftpd/files/proftpd-1.3.7_rc4-ldap_mod-SEGV.patch |
20 |
deleted file mode 100644 |
21 |
index 2f50a28b87f..00000000000 |
22 |
--- a/net-ftp/proftpd/files/proftpd-1.3.7_rc4-ldap_mod-SEGV.patch |
23 |
+++ /dev/null |
24 |
@@ -1,38 +0,0 @@ |
25 |
-https://github.com/proftpd/proftpd/issues/1027 |
26 |
-https://bugs.gentoo.org/726460 |
27 |
- |
28 |
-From 6ac1c727ddfd70080b38097e5484390ec84ef9be Mon Sep 17 00:00:00 2001 |
29 |
-From: Sergei Trofimovich <slyfox@g.o> |
30 |
-Date: Sun, 31 May 2020 17:55:08 +0100 |
31 |
-Subject: [PATCH 1/2] contrib/mod_ldap.c: fix SIGSEGV in mod_ldap:ldap_mod_init |
32 |
- () |
33 |
- |
34 |
-The crash happens due to missing sentinel value in `pstrcat()` |
35 |
- |
36 |
-```c |
37 |
- feats = pstrcat(tmp_pool, feats, i != 0 ? ", " : "", |
38 |
- api_info.ldapai_extensions[i]); |
39 |
-``` |
40 |
- |
41 |
-The change is to add sentinel to `pstrcat()` call. |
42 |
- |
43 |
-Bug: https://github.com/proftpd/proftpd/issues/1027 |
44 |
-Signed-off-by: Sergei Trofimovich <slyfox@g.o> |
45 |
---- |
46 |
- contrib/mod_ldap.c | 2 +- |
47 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
48 |
- |
49 |
---- a/contrib/mod_ldap.c |
50 |
-+++ b/contrib/mod_ldap.c |
51 |
-@@ -3218,7 +3218,7 @@ static int ldap_mod_init(void) { |
52 |
- |
53 |
- for (i = 0; api_info.ldapai_extensions[i]; i++) { |
54 |
- feats = pstrcat(tmp_pool, feats, i != 0 ? ", " : "", |
55 |
-- api_info.ldapai_extensions[i]); |
56 |
-+ api_info.ldapai_extensions[i], NULL); |
57 |
- ldap_memfree(api_info.ldapai_extensions[i]); |
58 |
- } |
59 |
- |
60 |
--- |
61 |
-2.26.2 |
62 |
- |
63 |
|
64 |
diff --git a/net-ftp/proftpd/files/proftpd-1.3.7_rc4-str-sentinel.patch b/net-ftp/proftpd/files/proftpd-1.3.7_rc4-str-sentinel.patch |
65 |
deleted file mode 100644 |
66 |
index cf1e4e91d41..00000000000 |
67 |
--- a/net-ftp/proftpd/files/proftpd-1.3.7_rc4-str-sentinel.patch |
68 |
+++ /dev/null |
69 |
@@ -1,43 +0,0 @@ |
70 |
-https://github.com/proftpd/proftpd/issues/1027 |
71 |
-https://bugs.gentoo.org/726460 |
72 |
- |
73 |
-From c5f98b6e047e0e5ca841372d78d06c05fe8770c6 Mon Sep 17 00:00:00 2001 |
74 |
-From: Sergei Trofimovich <slyfox@g.o> |
75 |
-Date: Sun, 31 May 2020 18:03:29 +0100 |
76 |
-Subject: [PATCH 2/2] include/str.h: add __attribute__((sentinel)) to variadic |
77 |
- concats |
78 |
- |
79 |
-`pstrcat()` needs to always have literal trailing `NULL`. |
80 |
- |
81 |
-Bug: https://github.com/proftpd/proftpd/issues/1027 |
82 |
-Signed-off-by: Sergei Trofimovich <slyfox@g.o> |
83 |
---- |
84 |
- include/str.h | 14 ++++++++++++-- |
85 |
- 1 file changed, 12 insertions(+), 2 deletions(-) |
86 |
- |
87 |
---- a/include/str.h |
88 |
-+++ b/include/str.h |
89 |
-@@ -39,8 +39,18 @@ const char *quote_dir(pool *p, char *dir); |
90 |
- char *sstrcat(char *, const char *, size_t); |
91 |
- const char *sreplace(pool *, const char *, ...); |
92 |
- |
93 |
--char *pdircat(pool *, ...); |
94 |
--char *pstrcat(pool *, ...); |
95 |
-+char *pdircat(pool *, ...) |
96 |
-+#ifdef __GNUC__ |
97 |
-+ __attribute__ ((sentinel)); |
98 |
-+#else |
99 |
-+ ; |
100 |
-+#endif |
101 |
-+char *pstrcat(pool *, ...) |
102 |
-+#ifdef __GNUC__ |
103 |
-+ __attribute__ ((sentinel)); |
104 |
-+#else |
105 |
-+ ; |
106 |
-+#endif |
107 |
- char *pstrdup(pool *, const char *); |
108 |
- char *pstrndup(pool *, const char *, size_t); |
109 |
- |
110 |
--- |
111 |
-2.26.2 |
112 |
- |