summaryrefslogtreecommitdiff
path: root/net-ftp
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-06-13 10:39:22 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-06-13 10:39:22 +0100
commit9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch)
tree8ac67e26b45f34d71c5aab3621813b100a0d5f00 /net-ftp
parentf516638b7fe9592837389826a6152a7e1b251c54 (diff)
gentoo resync : 13.06.2020
Diffstat (limited to 'net-ftp')
-rw-r--r--net-ftp/Manifest.gzbin3674 -> 3676 bytes
-rw-r--r--net-ftp/filezilla/Manifest2
-rw-r--r--net-ftp/filezilla/filezilla-3.47.2.1.ebuild2
-rw-r--r--net-ftp/ncftp/Manifest2
-rw-r--r--net-ftp/ncftp/ncftp-3.2.6-r2.ebuild4
-rw-r--r--net-ftp/proftpd/Manifest4
-rw-r--r--net-ftp/proftpd/files/proftpd-1.3.7_rc4-ldap_mod-SEGV.patch38
-rw-r--r--net-ftp/proftpd/files/proftpd-1.3.7_rc4-str-sentinel.patch43
-rw-r--r--net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild277
-rw-r--r--net-ftp/uftpd/Manifest4
-rw-r--r--net-ftp/uftpd/uftpd-2.12.ebuild (renamed from net-ftp/uftpd/uftpd-2.11.ebuild)0
11 files changed, 370 insertions, 6 deletions
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 77ca0e329c94..010d1940a8bc 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
Binary files differ
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index f75a98aedf81..daac71e86c82 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -4,7 +4,7 @@ AUX filezilla-3.47.0-metainfo.patch 309 BLAKE2B b36d7f3e5446c76cc9e20be01b3a5005
DIST FileZilla_3.47.2.1_src.tar.bz2 4733941 BLAKE2B 0517d43bfba8aa116ae4031d56e5070aadbcaf81ace2311f6cfddb47e7f67ec62396ae3690c139bcc1a8368be690776b3163dd6d53a6ebb27ee5e99300b3c67b SHA512 8919eab7762e0e30241637a8978fbf61f02ac4c52aac293191315b931d52b41ae228b753f4e3b7530835578836dfee7f91772841273e9fc2bdf75ff7ed48fafc
DIST FileZilla_3.48.0_src.tar.bz2 4765599 BLAKE2B 0ab391c0862a34dd5ede7a80290afc82b4d85b2deaf42d3bacd243bddf15505f05028522f73eeada07e91d91e0af87676ad77081c843448fda53c3b2ac18a70d SHA512 c9d4eb17dc31894468ca4b7c4c8fda0f307d3931bf1b3b8fb44afd084a1b2c9309d39e5745f9ba287a5566d44089af32350703e324a559afd6a015af469433fb
DIST FileZilla_3.48.1_src.tar.bz2 4774251 BLAKE2B a77b821640aae3deaad3350809f34dbac8ed63c336435f92393017301509b91ef5e613ea64cb934dd2385b55fe7ba711269f85b7523d43ef451ab0cf6634ab0a SHA512 58792f92bb4f6102166924abaf843c023faeca7f2979aaa47c26f2bb3f8449902b4a43c50a800d56584d39c9ddf64a6d3334558e46f56bda3b8515c7a3ff0a12
-EBUILD filezilla-3.47.2.1.ebuild 1992 BLAKE2B 550ba262153a4c5477d615a89823ad1147026ba20f1483b63648cded9b3b8f426fbf12553571de1f83c4cf48c18b698f3eb21bd197df5fab10969d104406b99f SHA512 5137b69c64017c9f955c5685461b2cd2563ca1e676863bce8664c531e6e282df9ccd5d2e0cb7e2528040762a78959b5155f15ff95207a9200e7777d15b707315
+EBUILD filezilla-3.47.2.1.ebuild 1991 BLAKE2B f3d922bc88cf3de4cb7c7b97713006d7699025cb9240f3602b2aebbda21e470a5b0f85980adfcc0c5548054e732bb4e0c2f56f4c515ceab73d0169dc5bacac9d SHA512 57275acd8ee50c2f5d4e42faf3e5b834d3d68267dac42c141f42a0d45da32be23f9b612c0ba54623b0b2ae672f45a060d2ec5245a02ed75bc5a5e22a63b21ee5
EBUILD filezilla-3.48.0.ebuild 1994 BLAKE2B 97aac6517d88b3495cd8456a3d049dc0e6104794970a103dc4873d957b0965df66102becb3288466aa0ed32fc26fd6d922e82456abd85d921d8291de202c10aa SHA512 d5a7647862bee21f4b4af00c163a2ea8e7d0edb892779a4b8158bdca29fb75504f26947f80bc41146e9c4337d584aa0f9f92782d245cc5be07032b2d5731ea7e
EBUILD filezilla-3.48.1.ebuild 1994 BLAKE2B 31e6def69a7904d2d8a3f3db5a5d555bb3cdee3944955cb1e1a03c9df512f83009c6fe2b2a16c97b5024d9501ff02cdf450d64285ff8a6600694ad05d26262f1 SHA512 253ae3736744b3b0e5181b3764275a9551ffd20b207688647920b8d80d2625d3222817e6eda96a7ae41334f5725f676b5e45d6b98c0efcad39f7f7d78205e3ae
MISC metadata.xml 562 BLAKE2B ef75eb5e07f57db7de0a8e90dc2ad86c84b65776c674a1e282443029101d05c3292bf0d5786ab97d846de984aedc6ed59640a256dcce29c65aef537adf18c348 SHA512 a69afbf6f03dec20a4ec61e39bcfbc964e09e0d74496b383a348764a61d83e54fea2cd715a4bcc239ca0f3ed0c2e1c5d46dcfeb99f7cc4feea488663a0931544
diff --git a/net-ftp/filezilla/filezilla-3.47.2.1.ebuild b/net-ftp/filezilla/filezilla-3.47.2.1.ebuild
index 155cc3b4eeff..25f124c1173c 100644
--- a/net-ftp/filezilla/filezilla-3.47.2.1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.47.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ppc64 x86"
IUSE="dbus nls test"
# pugixml 1.7 minimal dependency is for c++11 proper configuration
diff --git a/net-ftp/ncftp/Manifest b/net-ftp/ncftp/Manifest
index 6b924d08908d..bbaca8c14d30 100644
--- a/net-ftp/ncftp/Manifest
+++ b/net-ftp/ncftp/Manifest
@@ -2,6 +2,6 @@ AUX ncftp-3.2.6-fno-common.patch 1818 BLAKE2B 620e3fbc7e297d3186fe9eef8855e2a663
DIST ncftp-3.2.6-src.tar.xz 420564 BLAKE2B ce6d8d2bf06761f884e9edfe6d0bb0230f5d515078a787c4e6faf7716b760166acdd0accf3de1e1f5f3d892c8c86348cdbbefeac6be05e6806011a3e8f4c9b02 SHA512 8e6091ce2ea1eb463edea322d1b5dde813475fd22096d67f0bfd2f5101ae09747ff25d38816d0b9b1077e6a5a256078361691f816aa2eefa38638aa523b4b382
DIST ncftp-3.2.6.tar.xz 418836 BLAKE2B f0ffa0cc26617ee4007fe8589dbbc8d122edbfc8106a8618a66eab5d9def258d2ee9c2b709e1a637b9d833513ef87b652f4ab0ff518dc9d67d90a7dd43941d3c SHA512 040db7e2ca2ee78b79d682a951fd98c1e0ee2936b64462259992d70c51241fa50ae06c66b4f40933ad0ab7122f581bbb8ba7cda764dba5f70a1f8c7d3d751199
EBUILD ncftp-3.2.6-r1.ebuild 975 BLAKE2B 30ff54992100b50c7b9a55300f324b369b8a5d6bc4e6084a00c5982648595211839262463d4f44b0474cfc86b63dbebb6ac650b2c7a9ab32c2cdb59fee3dc73b SHA512 9cf1333cd5ab061dabbc252df65598d0411a7a254596b35601a41dace0c713d0b0f503956f0fe26f2acfddfda1b8bde1d1d7da4fd0345ba8066d1b23263555a9
-EBUILD ncftp-3.2.6-r2.ebuild 991 BLAKE2B 57b8f55f6dd2b3112594c84ce159f52272869cdea70ad355ec2f20fb6fc665c06e53a6d2f7bbd62ded160d9e96554acc7ccdcce04b61a2f0cf4bf18eb0d51350 SHA512 0111172e0ff570700b14635079ee4c94b2efaff4f2e29f2044ddad1eca93feeb367b7c69fc6eeddccdbf4fdbf44803b8e10aa9ad8c8d6144afbd0ecc93302206
+EBUILD ncftp-3.2.6-r2.ebuild 1049 BLAKE2B 535236ffde13913cc12d4f9e150a42bb925ef4bdc33ab86c59897a840fd275d06f939ee1c0d6f6664ba3e2fb15deee038e5d97588f4059d5e02a19ab7d18dbde SHA512 19e6fe97256d71a2ec6b0560c7c2da9c1bca3fdab0ce6d54f29af39802590351cef99adef918531fe3ebc93aa6af994403f39b4eea6e21735a2f6766a8bb2f80
EBUILD ncftp-3.2.6.ebuild 1043 BLAKE2B b5b30ecd0d33201c30a5ccfa13ddddbc9134b2176f4097be558659182538d5604d4ba9adf9ceb69a1c596695b4aad38e24e5184c9b389dfafb24f887cccbaa89 SHA512 e9912f780ccd6f0658a227d451934ba95ac0b29f27098300af44abaf8375a893992ef1aed4e13db43d59dadcbcb2dab3f60512383fcc4ece14d72eed612e0dfd
MISC metadata.xml 738 BLAKE2B 98d564b3063dd25384758125efec702f385768f3f0c4066ef5b0e6748f9c27d0ef838c4a669e7113bbb70ff74882b1d4c3b0e09011f3ff5f01dad3eea56c6b16 SHA512 e792a9cbbc371515f5137c4c00faad6936b4c6cc27bcfd5bfab151b00002ae8159cb9b76777a4bdd59dd87ea951ea62898ac74f6afd8a4ec0a1e5dcec12210b3
diff --git a/net-ftp/ncftp/ncftp-3.2.6-r2.ebuild b/net-ftp/ncftp/ncftp-3.2.6-r2.ebuild
index 30b5c3cc3f0b..d08daf98db4c 100644
--- a/net-ftp/ncftp/ncftp-3.2.6-r2.ebuild
+++ b/net-ftp/ncftp/ncftp-3.2.6-r2.ebuild
@@ -28,11 +28,13 @@ PATCHES=(
src_prepare() {
default
+ sed -i -e '/^AR=/d' autoconf_local/aclocal.m4 || die
+
AT_M4DIR=autoconf_local/ eautoreconf
}
src_configure() {
- tc-export CC
+ tc-export AR CC
LC_ALL="C" \
LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses)" \
econf \
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 83882c83ba19..f9f49f3adea1 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -5,6 +5,8 @@ AUX proftpd-1.3.6_rc4-msg-refresh-api.patch 903 BLAKE2B e335f81685552b0b9a05af37
AUX proftpd-1.3.6_rc4-vroot-refresh-api.patch 736 BLAKE2B 9f3c4a1f80a27ce7e6f9348153584bc1134e63ad4c839927b7680439966003c76c7a25821be0f3431c472092ef5c8386166b372645f498fb655559fd683c3e6e SHA512 9cd98e2fb8c17d2ca38f5f7a20f5c6ffb03da7f51e53542237992bd2b98b2ef5b5fc0634cd7f5eef24fba8a601703b70ff7d0404e1c5103394e9fda260b815cd
AUX proftpd-1.3.6a-fix-libcheck.patch 726 BLAKE2B e971ccfd5d5cd708054096eef3d8b4910d380933b79d7616225194f71213a07c14139cc7bc76b9fcb4f86f0a97672288837d5a1e7ce68673665db65e75328252 SHA512 8e4aface4c7ca010808e0531b896f8554107ad66c7e1019f25168e71e5f8d2df3673511dd4717eb8bdeedb2ca07bd6a587caca4955c4903991bcfb020ed72636
AUX proftpd-1.3.6c-gcc-10.patch 653 BLAKE2B c756979c01e40b9bb83da39a05e5b8cf49db3e6954df7e31645357411b053b21a3dbc073429e9156ab40d9137286ef5c5469d35781eb3ca56ff4b3e7d09fc382 SHA512 0b735b97b2ccc849d12754323de97b72e049a5a5bca869e76c167ec2527e7e773cf53d4b41645d2a8532385edd23b905f38fe3ab0ad3c44923c1d5ff61557c3a
+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
@@ -16,10 +18,12 @@ AUX proftpd.xinetd 295 BLAKE2B 4863cea66df5c32efba61647bbc854953dff28e154fab284c
DIST mod_gss-1.3.9.tar.gz 117158 BLAKE2B f957fa465f9a9b06ceb9c190ab60c7f67fdeeef79dce7f51bcfed8dc726cb01a231232c65821ca3a240b77a5019fa22f31b45496c128a06627bd24dc960b566f SHA512 44615983b0f67939b110e54c4a83b3056263bad72ba78de1b16f9f8590f5504c60e679f55484708d49e694c528d4715d9abd0cb75cfe439982ea9e02e0c18891
DIST mod_vroot-0.9.4.tar.gz 29461 BLAKE2B eb4d3f6425ab0a1a61ca607e4655b5f8ff6ea342ca49d49598e7a4c5596382aa2c1d4e8228a1cdcfff324feb92dac80fcc58e35bbb77155069749afdd7cc41fb SHA512 f5de392c9fe39f0a03b0783a7092bbfe17ea6db991f4b4e4a2d8f092f073d27ef2c64dd6484d5665b5abc808c0caba016d4fc3fab3da3810f5ebe5249bb4cbce
DIST proftpd-1.3.7rc3.tar.gz 20359920 BLAKE2B 96d2e26c815cd2c461580a2af642ac332bd848418d3d829f2795c610eead00a290a9633088809a5cd56899e3510dc3e608f1688052e1ca5121c78fcc80017523 SHA512 cab3ffee0ce6b921596cafc5fd2e0059c59a03f790791973b502e6384d45f0880b94e0d0961c3b230541a1785e9b0afa3d80276c82f4720696a46ea6594d744f
+DIST proftpd-1.3.7rc4.tar.gz 20407496 BLAKE2B fd98b2ca3f4b6448b8739ff39db72d06f508e2507c156043a022ef5275d21775bdecc50c4434173f40fe1e40f439aebc58c9efaa6a5e6946dd15d5b52a36bda0 SHA512 8a782c27fae757b940396a9dd74a7336cac982f0fb3b28afd6a0b3837c8e93fc74c329ac520dd69f051740303ab776da2d9368d0b46814d264cad5ac0ac7003b
DIST proftpd-mod-case-0.7.tar.gz 13184 BLAKE2B bf2118d9b8ed97a5b192b92b515d17ac7a0d75e154288e5afb3a1c3d686e635093df9501cc1c9b077f87c14326e31e8b9f751803dfca1eae9643f12333eb633f SHA512 c08d13ef82fec36ae75aa3213dd02e0ce4045904849f422e152f039a9da66a45e4423751074b8bcf8ce347a40ce0e7bde798a85cbadc962fd872aeaa898261fc
DIST proftpd-mod-diskuse-0.9.tar.gz 18596 BLAKE2B 38c704c8607f0f93b080e77fe793cfe0125c88acc6f818ecb059c6c21a983e040ff5f2c1b91e34ef4ba2666a808d896018c364d1f12ea38f0c477e79bdaa2120 SHA512 d41976bf2810e4b783e775e8c767ca2030c3b5df116219fd31cbbac7feaf9922c315bf4ea092881b0d6cf43f2f4c5dbcae61be3c3a833058d12f962a3024b975
DIST proftpd-mod-msg-0.4.1.tar.gz 8082 BLAKE2B 970b46b19d25bac22ecb01495270a523997a0b7d5b53b9470b4744b919adcf03d5bcee2df85ba88c4a4c20a9fc30dc01459ffb58c5dae8e78a52a7379bf36f11 SHA512 38ea63b1d355e1e10a6a4477596bf3fa28529a871c9fb8dbf093b5317f0743ef9cb59b986d0b8c1c7ed932dad5d5d571883d596fad2d3b793431824db4487012
DIST proftpd-mod_clamav-0.14rc2.tar.gz 19710 BLAKE2B 3435e198cf029337904d4666910414124a3b7e1529d4b12f7acd8a9be563009fff4d9a30eb132a2d7361d2c830e5601c4a00a8814282585b6915e991cc29bc13 SHA512 b8e56880fadf36513215fa4c20be6db7cdf1274337072a9b29c3c3477b3de4743ebcdb1179572ec4cb1501fac0064330c855b1f818bf0cc52f0e91170f059772
EBUILD proftpd-1.3.7_rc3-r1.ebuild 8675 BLAKE2B 6ce2a7b7970b01312b2e5c9569175de4524d7a9f1a9cd2ab36aa5a9badf3f54138f6307eb77b6f2b5e592ba9a4e699eb65f615c02980a7ec26f7be6fbf7ead9a SHA512 0b75e779db47f3c7b7849e5f97bdbb4e1c4c402c8bddeaffe87dce0ab00d480fb0632c7035bd21867b840788ff4f48a6b9372c9de4e47c5dd1218905c9f87d90
EBUILD proftpd-1.3.7_rc3.ebuild 8624 BLAKE2B 68fd4a55032025659ddbba3c1b556e2c33c6b08fdd4422c240636cc1f96423215dcd3cfd9664632f2b5b6a6c72dce7683750cd7a2569b044a45be04a0651ce13 SHA512 5fa038ade54fe40f8da2bd1e3177eb627a8e74a88118b13a01f2ce0d7fe2b78d3d7709b5dbdcada1bcc70c78b51d5910c7285d85a78d99f2d5220d8266b35483
+EBUILD proftpd-1.3.7_rc4-r1.ebuild 8735 BLAKE2B fcb36858ff0b43e3354331658581355c86b5cef7804422dc1b9fe2b467f5344fd6e3c5fc209dbf5d6b115112294fdf259373bba6cb24ef843aba5ab38857b387 SHA512 d99ef4935c72797068d8cfd134496710529f94edc0e04c513cf174df42019b9bd4a80ba594c58382971febd680d74effc6dd260854ac9a02f1cc8d4fd5203c85
MISC metadata.xml 2930 BLAKE2B f3f8218a737f50599ff687030bd8c84f1818b290d6d89bd6627ab8eb02598d196f1bae03d7b15e4eb02967fb7e0d826cdda10588c8bfe4f8a387a49d70d9cab0 SHA512 c90941671532512e4d085f3c6b4f56f3c2a252a613bf5c978d763fb0f8f9190431a41816f4fddde47e28eaeddcd17a7aef52064e5825499801bcdfbd72745be8
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
new file mode 100644
index 000000000000..2f50a28b87fd
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.7_rc4-ldap_mod-SEGV.patch
@@ -0,0 +1,38 @@
+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
new file mode 100644
index 000000000000..cf1e4e91d415
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.7_rc4-str-sentinel.patch
@@ -0,0 +1,43 @@
+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
+
diff --git a/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild
new file mode 100644
index 000000000000..9f1b1ca53ed5
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib systemd tmpfiles toolchain-funcs
+
+MOD_CASE="0.7"
+MOD_CLAMAV="0.14rc2"
+MOD_DISKUSE="0.9"
+MOD_GSS="1.3.9"
+MOD_MSG="0.4.1"
+MOD_VROOT="0.9.4"
+
+DESCRIPTION="An advanced and very configurable FTP server"
+HOMEPAGE="http://www.proftpd.org/
+ http://www.castaglia.org/proftpd/
+ https://github.com/jbenden/mod_clamav
+ http://gssmod.sourceforge.net/"
+SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
+ case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz )
+ clamav? ( https://github.com/jbenden/mod_clamav/archive/v${MOD_CLAMAV}.tar.gz -> ${PN}-mod_clamav-${MOD_CLAMAV}.tar.gz )
+ diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz )
+ kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz )
+ msg? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-msg-${MOD_MSG}.tar.gz )
+ vroot? ( https://github.com/Castaglia/${PN}-mod_vroot/archive/v${MOD_VROOT}.tar.gz -> mod_vroot-${MOD_VROOT}.tar.gz )"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
+ kerberos ldap libressl log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
+ ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot"
+# TODO: geoip
+REQUIRED_USE="ban? ( ctrls )
+ msg? ( ctrls )
+ sftp? ( ssl )
+ shaper? ( ctrls )
+
+ mysql? ( ssl )
+ postgres? ( ssl )
+ sqlite? ( ssl )
+"
+
+CDEPEND="acl? ( virtual/acl )
+ caps? ( sys-libs/libcap )
+ clamav? ( app-antivirus/clamav )
+ kerberos? ( virtual/krb5 )
+ ldap? ( net-nds/openldap )
+ memcache? ( >=dev-libs/libmemcached-0.41 )
+ mysql? ( dev-db/mysql-connector-c:0= )
+ nls? ( virtual/libiconv )
+ ncurses? ( sys-libs/ncurses:0= )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ pam? ( sys-libs/pam )
+ pcre? ( dev-libs/libpcre )
+ postgres? ( dev-db/postgresql:= )
+ sodium? ( dev-libs/libsodium:0= )
+ sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${CDEPEND}
+ test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+ net-ftp/ftpbase
+ selinux? ( sec-policy/selinux-ftp )"
+
+S="${WORKDIR}/${P/_/}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.3.6-use-trace.patch
+ "${FILESDIR}"/${PN}-1.3.7_rc4-ldap_mod-SEGV.patch
+ "${FILESDIR}"/${PN}-1.3.7_rc4-str-sentinel.patch
+)
+
+RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
+
+in_dir() {
+ pushd "${WORKDIR}/${1}" || die
+ shift
+ "$@"
+ popd
+}
+
+src_prepare() {
+ # Skip 'install-conf' / Support LINGUAS
+ sed -i -e "/install-all/s/ install-conf//" Makefile.in || die
+ sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in || die
+
+ # Prepare external modules
+ if use case; then
+ cp -v "${WORKDIR}"/mod_case/mod_case.c contrib || die
+ cp -v "${WORKDIR}"/mod_case/mod_case.html doc/contrib || die
+ fi
+
+ if use clamav ; then
+ cp -v "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib || die
+ eapply -p0 "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/001-add-mod_clamav-to-tests.patch
+ fi
+
+ if use diskuse; then
+ in_dir mod_diskuse eapply "${FILESDIR}"/${PN}-1.3.6_rc4-diskuse-refresh-api.patch
+
+ # ./configure will modify files. Symlink them instead of copying
+ ln -sv "${WORKDIR}"/mod_diskuse/mod_diskuse.h "${S}"/contrib || die
+
+ cp -v "${WORKDIR}"/mod_diskuse/mod_diskuse.c "${S}"/contrib || die
+ cp -v "${WORKDIR}"/mod_diskuse/mod_diskuse.html "${S}"/doc/contrib || die
+ fi
+
+ if use msg; then
+ in_dir mod_msg eapply "${FILESDIR}"/${PN}-1.3.6_rc4-msg-refresh-api.patch
+
+ cp -v "${WORKDIR}"/mod_msg/mod_msg.c contrib || die
+ cp -v "${WORKDIR}"/mod_msg/mod_msg.html doc/contrib || die
+ fi
+
+ if use vroot; then
+ in_dir ${PN}-mod_vroot-${MOD_VROOT} eapply "${FILESDIR}"/${PN}-1.3.6_rc4-vroot-refresh-api.patch
+
+ cp -v "${WORKDIR}"/${PN}-mod_vroot-${MOD_VROOT}/mod_vroot.c contrib || die
+ cp -v "${WORKDIR}"/${PN}-mod_vroot-${MOD_VROOT}/mod_vroot.html doc/contrib || die
+ fi
+
+ if use kerberos ; then
+ # in_dir mod_gss-${MOD_GSS} eapply "${FILESDIR}"/${PN}-1.3.6_rc4-gss-refresh-api.patch
+
+ # Support app-crypt/heimdal / Gentoo Bug #284853
+ sed -i -e "s/krb5_principal2principalname/_\0/" "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_auth_gss.c.in || die
+
+ # Remove obsolete DES / Gentoo Bug #324903
+ # Replace 'rpm' lookups / Gentoo Bug #391021
+ sed -i -e "/ac_gss_libs/s/ -ldes425//" \
+ -e "s/ac_libdir=\`rpm -q -l.*$/ac_libdir=\/usr\/$(get_libdir)\//" \
+ -e "s/ac_includedir=\`rpm -q -l.*$/ac_includedir=\/usr\/include\//" "${WORKDIR}"/mod_gss-${MOD_GSS}/configure{,.ac} || die
+
+ # ./configure will modify files. Symlink them instead of copying
+ ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_auth_gss.c "${S}"/contrib || die
+ ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.c "${S}"/contrib || die
+ ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.h "${S}"/include || die
+
+ cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/README.mod_{auth_gss,gss} "${S}" || die
+ cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.html "${S}"/doc/contrib || die
+ cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/rfc{1509,2228}.txt "${S}"/doc/rfc || die
+ fi
+
+ default
+
+ tc-export CC
+}
+
+src_configure() {
+ local c m
+
+ use acl && m="${m}:mod_facl"
+ use ban && m="${m}:mod_ban"
+ use case && m="${m}:mod_case"
+ use clamav && m="${m}:mod_clamav"
+ use copy && m="${m}:mod_copy"
+ use ctrls && m="${m}:mod_ctrls_admin"
+ use deflate && m="${m}:mod_deflate"
+ if use diskuse ; then
+ in_dir mod_diskuse econf
+ m="${m}:mod_diskuse"
+ fi
+ use dynmasq && m="${m}:mod_dynmasq"
+ use exec && m="${m}:mod_exec"
+ use ifsession && m="${m}:mod_ifsession"
+ use ifversion && m="${m}:mod_ifversion"
+ if use kerberos ; then
+ in_dir mod_gss-${MOD_GSS} econf
+ m="${m}:mod_gss:mod_auth_gss"
+ fi
+ use ldap && m="${m}:mod_ldap"
+ use log-forensic && m="${m}:mod_log_forensic"
+ use msg && m="${m}:mod_msg"
+ if use mysql || use postgres || use sqlite ; then
+ m="${m}:mod_sql:mod_sql_passwd"
+ use mysql && m="${m}:mod_sql_mysql"
+ use postgres && m="${m}:mod_sql_postgres"
+ use sqlite && m="${m}:mod_sql_sqlite"
+ fi
+ use qos && m="${m}:mod_qos"
+ use radius && m="${m}:mod_radius"
+ use ratio && m="${m}:mod_ratio"
+ use readme && m="${m}:mod_readme"
+ use rewrite && m="${m}:mod_rewrite"
+ if use sftp ; then
+ m="${m}:mod_sftp"
+ use pam && m="${m}:mod_sftp_pam"
+ use mysql || use postgres || use sqlite && m="${m}:mod_sftp_sql"
+ fi
+ use shaper && m="${m}:mod_shaper"
+ use sitemisc && m="${m}:mod_site_misc"
+ use snmp && m="${m}:mod_snmp"
+ if use softquota ; then
+ m="${m}:mod_quotatab:mod_quotatab_file"
+ use ldap && m="${m}:mod_quotatab_ldap"
+ use radius && m="${m}:mod_quotatab_radius"
+ use mysql || use postgres || use sqlite && m="${m}:mod_quotatab_sql"
+ fi
+ if use ssl ; then
+ m="${m}:mod_tls:mod_tls_shmcache"
+ use memcache && m="${m}:mod_tls_memcache"
+ fi
+ if use tcpd ; then
+ m="${m}:mod_wrap2:mod_wrap2_file"
+ use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
+ fi
+ use unique-id && m="${m}:mod_unique_id"
+ use vroot && m="${m}:mod_vroot"
+
+ if [[ -n ${PROFTP_CUSTOM_MODULES} ]]; then
+ einfo "Adding user-specified extra modules: '${PROFTP_CUSTOM_MODULES}'"
+ m="${m}:${PROFTP_CUSTOM_MODULES}"
+ fi
+
+ [[ -z ${m} ]] || c="${c} --with-modules=${m:1}"
+
+ econf --localstatedir=/run/proftpd --sysconfdir=/etc/proftpd --disable-strip \
+ $(use_enable acl facl) \
+ $(use_enable authfile auth-file) \
+ $(use_enable caps cap) \
+ $(use_enable ctrls) \
+ $(use_enable dso) \
+ $(use_enable ident) \
+ $(use_enable ipv6) \
+ $(use_enable memcache) \
+ $(use_enable ncurses) \
+ $(use_enable nls) \
+ $(use_enable ssl openssl) \
+ $(use_enable pam auth-pam) \
+ $(use_enable pcre) \
+ $(use_enable sodium) \
+ $(use_enable test tests) \
+ --enable-trace \
+ $(use_enable userland_GNU shadow) \
+ $(use_enable userland_GNU autoshadow) \
+ ${c:1}
+}
+
+src_test() {
+ emake api-tests -C tests
+}
+
+src_install() {
+ default
+ [[ -z ${LINGUAS-set} ]] && rm -r "${ED}"/usr/share/locale
+ rm -rf "${ED}"/run "${ED}"/var/run
+
+ newinitd "${FILESDIR}"/proftpd.initd-r1 proftpd
+ insinto /etc/proftpd
+ doins "${FILESDIR}"/proftpd.conf.sample
+
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}"/proftpd.xinetd proftpd
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/${PN}.logrotate ${PN}
+
+ dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES
+
+ docinto html
+ dodoc doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html
+
+ docinto rfc
+ dodoc doc/rfc/*.txt
+
+ systemd_dounit "${FILESDIR}"/${PN}.service
+ systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf-r1 ${PN}.conf
+}
+
+pkg_postinst() {
+ # Create /var/run files at package merge time: bug #650000
+ tmpfiles_process ${PN}.conf
+}
diff --git a/net-ftp/uftpd/Manifest b/net-ftp/uftpd/Manifest
index b82fc38c3b36..62de4ffae055 100644
--- a/net-ftp/uftpd/Manifest
+++ b/net-ftp/uftpd/Manifest
@@ -1,3 +1,3 @@
-DIST uftpd-2.11.tar.xz 182000 BLAKE2B 75c9a564a90b10f2efdbfaaab67572adefda160d7b5df8fd303cfd970153ee24bdfbfb25dca1764d7b747a27779a2863a1b32a0ec489fbc2e4f3f991bc3436ee SHA512 bce9fe3d763d61030e883bba7988d206630f2124991ce0c11613744813f66ed8bf215a555e0061d0083d32b90ac5c9b583adf08520fb691617adeac759d50546
-EBUILD uftpd-2.11.ebuild 454 BLAKE2B c72336d1ad331c59c67f40167cb966dc9d9ffe4bf51b58bc567c0ae775c650df75b55cc6926744515f73918422c0489bd7b7c32180a2e951472d587c80bcecd7 SHA512 bc3c6f1b80b80e975f659ea52514c3485f1103d1ebdea2e868ba88e7f6388643072985bf96eb06e92abd9003fe48fe90668df8b61c8f87d7ce5692fb6edebc3c
+DIST uftpd-2.12.tar.xz 182384 BLAKE2B 1bf25bc4d443ec61d03be3d24c1c78b573dce78f17275db4fcaf2969e7bf01bbd20c3b6ff677f5b1c806b98fa34325cd5e39e671d8fd2c31f21220e5ca9a8c8d SHA512 4d9398a0c4f19eac3f2a4f694b683e5bc6a436a7ef50d030f3f71303d3212ac51e9e54844ed247988a9c69df8b0e52642a6da946c75ece25875ecee6cf04d520
+EBUILD uftpd-2.12.ebuild 454 BLAKE2B c72336d1ad331c59c67f40167cb966dc9d9ffe4bf51b58bc567c0ae775c650df75b55cc6926744515f73918422c0489bd7b7c32180a2e951472d587c80bcecd7 SHA512 bc3c6f1b80b80e975f659ea52514c3485f1103d1ebdea2e868ba88e7f6388643072985bf96eb06e92abd9003fe48fe90668df8b61c8f87d7ce5692fb6edebc3c
MISC metadata.xml 919 BLAKE2B b8bb2ddc64dc727547cf908e62df335d5cdf71132a2292e14a7e995d48364de64adde5d0035af3ddbdbdd8b64640b929cd3de0cdd62f49e2480154b1e5d543e4 SHA512 fec60605c1a67eee40734f15395129e76cfd0d0fbde24e977a61973e960704cd5be83e68094d45b0b2ce9b688c5d27cf41c4fb540094b7be532e1563ab622d31
diff --git a/net-ftp/uftpd/uftpd-2.11.ebuild b/net-ftp/uftpd/uftpd-2.12.ebuild
index fc8503685308..fc8503685308 100644
--- a/net-ftp/uftpd/uftpd-2.11.ebuild
+++ b/net-ftp/uftpd/uftpd-2.12.ebuild