gentoo resync : 23.09.2020

4 files changed, 0 insertions, 83 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 9aa71c788e1f..a284ee7c7bc7 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 8a9e1fcb86cb..9da0df36f67b 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -3,8 +3,6 @@ AUX proftpd-1.3.6_rc4-diskuse-refresh-api.patch 576 BLAKE2B ce4522896a81fed326ae
 AUX proftpd-1.3.6_rc4-gss-refresh-api.patch 1868 BLAKE2B ff50d3834d6cc0970256dcada8a14db6681440494abc24ccbf53ea5baef2362a9174de3bf7e3e07d562f30a55492735137efa91a9dd09676dbb95e624f3ae77f SHA512 4cc235bdb60ea4c84794d4347826b040057067d8283dcfcb795d5d25a156de480df7d897078ab8ab4faf12d4fc9e714a55f723ce27c9397bc2223550597df674
 AUX proftpd-1.3.6_rc4-msg-refresh-api.patch 903 BLAKE2B e335f81685552b0b9a05af3700ce4a09d7f31ca9b24c66e1a1306bbe26c243b553c1cb81c13cc9593ae36e93b03f28faeb64fe2ae2f834575e9dee402f73ee55 SHA512 d0dcc467289b4107aecee66edf122667b2fbb9b1f1a6a6ecea517f286090d22682200b9d11f503465cb9b5387e8fb749cc09c3033825282450fe1d6c0a4bb11d
 AUX proftpd-1.3.6_rc4-vroot-refresh-api.patch 736 BLAKE2B 9f3c4a1f80a27ce7e6f9348153584bc1134e63ad4c839927b7680439966003c76c7a25821be0f3431c472092ef5c8386166b372645f498fb655559fd683c3e6e SHA512 9cd98e2fb8c17d2ca38f5f7a20f5c6ffb03da7f51e53542237992bd2b98b2ef5b5fc0634cd7f5eef24fba8a601703b70ff7d0404e1c5103394e9fda260b815cd
-AUX proftpd-1.3.7_rc4-ldap_mod-SEGV.patch 1128 BLAKE2B 26e96179d112019b225a63517d986855b01f9e2439f965abb27c3ca250aef7721d37db571d3c8a065d6a4751db7b2738e8c243e6a77023f934dba340010ecfd8 SHA512 7891e0f391902fb3a94710c4bc2b67581785d9cb9f45c21be7f53b0a8318b3816dd061d022fc7b9fb69be4e55f4c902c9e69e41568f82ab9f7ed6ca5519b2c42
-AUX proftpd-1.3.7_rc4-str-sentinel.patch 1141 BLAKE2B af3624fb1bf415bbc07b2ddebb2b3ff827cb56d8409ba5bbd9fa9f968c4b529c58728780e8e82b49561720b71baaeb57d6d2012b11af05fcfbf1d2fd58628f8d SHA512 4570161fea4f79584a75312f796ba7a769df0a8237a937856956c7f293fcb1678499222ad2f0756d37d497f92fdb1306f41e537be6eab9f4e8bf193e649cf503
 AUX proftpd-tmpfiles.d.conf 34 BLAKE2B 03da2e04c7e0d4c6e889e4414a205942f0762a1ae856d16f95abb1d2e927d68f583ad5bbdbf142b32b141cd82e9288f2ef1faf459cbe8433e2e1127d3b30d686 SHA512 aa6ffbf15e4275941837306259fb426608e82e45a2da4b99c5d7778d11b8c9341e3a12ae9b751d0e173635239b6f1b20f0431be17296c005a83525a48327fa52
 AUX proftpd-tmpfiles.d.conf-r1 30 BLAKE2B 0eb931370872ef78732d23179f20a3fe1289f8e601478c1b4709755748416f9283cdadcb2c43765019a9f6b5407e7c9db1aba8b1c1524db1e702b52898aa7602 SHA512 c85a6bc1375ebb44d88114c5c6f46d9c2e207e9d9555d9dc599f69a6485e2d5b2a161ac151f8b9e76f8e385f9dc3b811128db68f5d45648d960c8e8fbeb0050b
 AUX proftpd.conf.sample 1275 BLAKE2B db10306f79544b344856e065946e9ae0fa37d43507185f7d2407f23a962750a05bb2682e7c97e3979ca42dfe35921c3db7e98c095431796d82144869df0e324e SHA512 1c26f3e98ed07d89192c640f7823af168c045abee6ab076791aee9d50be5446be870a189979df4b828e7ae907dd40a346f1b92998fa39195195bfada4061c5df
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 2f50a28b87fd..000000000000
--- 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 <slyfox@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 <slyfox@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 cf1e4e91d415..000000000000
--- 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 <slyfox@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 <slyfox@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
-