commit: 9fc8c26fc287389eebef240d4c3418ea67821dc8 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Wed Sep 16 17:19:48 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Thu Sep 17 06:58:46 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fc8c26f
net-ftp/proftpd: remove unused patches Package-Manager: Portage-3.0.6, Repoman-3.0.1 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/17568 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> .../files/proftpd-1.3.7_rc4-ldap_mod-SEGV.patch | 38 ------------------- .../files/proftpd-1.3.7_rc4-str-sentinel.patch | 43 ---------------------- 2 files changed, 81 deletions(-) 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 deleted file mode 100644 index 2f50a28b87f..00000000000 --- a/net-ftp/proftpd/files/proftpd-1.3.7_rc4-ldap_mod-SEGV.patch +++ /dev/null @@ -1,38 +0,0 @@ -https://github.com/proftpd/proftpd/issues/1027 -https://bugs.gentoo.org/726460 - -From 6ac1c727ddfd70080b38097e5484390ec84ef9be Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <sly...@gentoo.org> -Date: Sun, 31 May 2020 17:55:08 +0100 -Subject: [PATCH 1/2] contrib/mod_ldap.c: fix SIGSEGV in mod_ldap:ldap_mod_init - () - -The crash happens due to missing sentinel value in `pstrcat()` - -```c - feats = pstrcat(tmp_pool, feats, i != 0 ? ", " : "", - api_info.ldapai_extensions[i]); -``` - -The change is to add sentinel to `pstrcat()` call. - -Bug: https://github.com/proftpd/proftpd/issues/1027 -Signed-off-by: Sergei Trofimovich <sly...@gentoo.org> ---- - contrib/mod_ldap.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/contrib/mod_ldap.c -+++ b/contrib/mod_ldap.c -@@ -3218,7 +3218,7 @@ static int ldap_mod_init(void) { - - for (i = 0; api_info.ldapai_extensions[i]; i++) { - feats = pstrcat(tmp_pool, feats, i != 0 ? ", " : "", -- api_info.ldapai_extensions[i]); -+ api_info.ldapai_extensions[i], NULL); - ldap_memfree(api_info.ldapai_extensions[i]); - } - --- -2.26.2 - 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 deleted file mode 100644 index cf1e4e91d41..00000000000 --- a/net-ftp/proftpd/files/proftpd-1.3.7_rc4-str-sentinel.patch +++ /dev/null @@ -1,43 +0,0 @@ -https://github.com/proftpd/proftpd/issues/1027 -https://bugs.gentoo.org/726460 - -From c5f98b6e047e0e5ca841372d78d06c05fe8770c6 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <sly...@gentoo.org> -Date: Sun, 31 May 2020 18:03:29 +0100 -Subject: [PATCH 2/2] include/str.h: add __attribute__((sentinel)) to variadic - concats - -`pstrcat()` needs to always have literal trailing `NULL`. - -Bug: https://github.com/proftpd/proftpd/issues/1027 -Signed-off-by: Sergei Trofimovich <sly...@gentoo.org> ---- - include/str.h | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - ---- a/include/str.h -+++ b/include/str.h -@@ -39,8 +39,18 @@ const char *quote_dir(pool *p, char *dir); - char *sstrcat(char *, const char *, size_t); - const char *sreplace(pool *, const char *, ...); - --char *pdircat(pool *, ...); --char *pstrcat(pool *, ...); -+char *pdircat(pool *, ...) -+#ifdef __GNUC__ -+ __attribute__ ((sentinel)); -+#else -+ ; -+#endif -+char *pstrcat(pool *, ...) -+#ifdef __GNUC__ -+ __attribute__ ((sentinel)); -+#else -+ ; -+#endif - char *pstrdup(pool *, const char *); - char *pstrndup(pool *, const char *, size_t); - --- -2.26.2 -
