gentoo resync : 05.12.2021

10 files changed, 23 insertions, 83 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index e62e97858cb7..670b2644bac3 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 2e2fa52d9ba1..89f8e72a2bc3 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -10,6 +10,6 @@ AUX lftp-4.8.2-libdir-zlib.patch 714 BLAKE2B a770bc7a3f974ece766883e644403691de8
 AUX lftp-4.9.1-libdir-readline.patch 404 BLAKE2B 88746dbfd082202950e54270519fa25c8a2042d3479342443394918722a8f0b7b2cde1580c7ac07c0c3408f86c12a83fa1973391ef25a9b3f348b7ad1afa68ac SHA512 e6ab456b237613f31c3e7e450a5127b5fac74a9d24d4bd5ca95f9b28d6c810ad0253d71d710e1daf15c43d0b2d5d2ecdb2b1fb7bbdaa4c3bc0b610d6cc6caf3b
 AUX lftp-4.9.2-ac-270.patch 1298 BLAKE2B 3431c649aa1f772a94640c1d1508b584eff0892098400eea5390c754ece5f23a877aa2eccb814bf1ece93e329980a29190aa784f4cc2b41efccc58c2921409d8 SHA512 efabe7cd6b3467b9212d47669842bf3b1b981ad6c8615bdfda4122d1a217e10fc0fda167903172502a13c63341ddab8e5bba91e5f39721c6fd304e29e6647a08
 DIST lftp-4.9.2.tar.xz 1654960 BLAKE2B 04f168576ae6e001e0ffffb2e93e36d5bffa5ed1e2e671edb6210a54aa0ecedc280885450dcee890d05b64464eb641e7e63c8d4dd170100317dec3fe734ec483 SHA512 cda8698e7e34d748715a6fe5dc06c758240302621c7957402f0cc67577acf1a96b436fda4282408dee8171dc84a31e0be432df99a30f0a10057a8e7ea9ec64ad
-EBUILD lftp-4.9.2.ebuild 2575 BLAKE2B 0b9a80e99149172fc5fb8f5fe5da36b55c93dd920ab0c876b896b82be66963b4c0bf10319055cb135aba79a9a9cb720ba1a9d784397ea1b1dafe4c0ea96a59d7 SHA512 3a5ff603d1a3fdc342eb15e456af1c363a2358867e460bab04343f08025b9f9c32f8603de746997a6650563db7b1843bf9c93d6b3b4eec4a294d9a74277bbd6d
-EBUILD lftp-9999.ebuild 2371 BLAKE2B 24a9bb29753bae1cfc704ba0708932f04f46ce543e90da7107f19eeca0efd76a1de5d25a050808f2ef659f95b64e66068c8f95dd1750dc1394c8721be7346fc0 SHA512 945ca3ae74adb6837d63f5bc4df57dff88a27bbefeb4f6e1fe8ccf3c06309c1d0b2c42f752dd56f4a4561055d9c5daef1d47507423c8f6a27c08b834153d7068
+EBUILD lftp-4.9.2.ebuild 2577 BLAKE2B 94dcc9876ae14b7d351f1df5edbf25aa65531b7f76e977002f1e736146958e803753941877041a70548cef5dcc81f4e382e7776cc74d5d5dda7889d7b8b5e070 SHA512 b69e5c0c7786de2ee4adb7d43fac3766c7378c04fe1a13c610a3188080cec122306ac84c36612a72c10f8b0b44c01feb7f5873551fdd51683be78427679986c3
+EBUILD lftp-9999.ebuild 2372 BLAKE2B bba2c782aa65d11736ff859793425c38f4d3cc9c2130db3755e99a0e5af3f68ef9cc21076219913182d8c351c7807a79e6f94853e2671a6ad91a77bfac0e6989 SHA512 34c37decd8a2de8965ee521aacd34a505c9a36f5369f48a13f9980497e199e2ac331c98c590dc7b5cd63f3f97d774b97c8f069ccc4110535492b58fa7526ccd6
 MISC metadata.xml 481 BLAKE2B 7a61be735ad5538cf472fa7bdd22a17449c02584804d2711b626433945dc62db58746302cd0ae83ce35350627720e2bce8297757858deb2d66bb30f0c9981e33 SHA512 4977624bcad3dce392d8e42d28071918a50c1850c6ad139c56aaa59195869f517c1654dbd2c18a0ea6335a984299c2472b22f139fcd67808f55e92f0e6a5ecb0
diff --git a/net-ftp/lftp/lftp-4.9.2.ebuild b/net-ftp/lftp/lftp-4.9.2.ebuild
index 4dc03770f601..de89ecd8c304 100644
--- a/net-ftp/lftp/lftp-4.9.2.ebuild
+++ b/net-ftp/lftp/lftp-4.9.2.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 inherit autotools libtool xdg-utils
 
 DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
-HOMEPAGE="https://lftp.tech/"
-SRC_URI="https://lftp.tech/ftp/${P}.tar.xz"
+HOMEPAGE="http://lftp.yar.ru/"
+SRC_URI="http://lftp.yar.ru/ftp/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-ftp/lftp/lftp-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild
index f31213a5b6cf..000bb5b4c9a1 100644
--- a/net-ftp/lftp/lftp-9999.ebuild
+++ b/net-ftp/lftp/lftp-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit autotools git-r3 libtool xdg-utils
 
 DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
-HOMEPAGE="https://lftp.tech/"
+HOMEPAGE="http://lftp.yar.ru/"
 EGIT_REPO_URI="https://github.com/lavv17/lftp"
 
 LICENSE="GPL-3"
diff --git a/net-ftp/profxp/Manifest b/net-ftp/profxp/Manifest
deleted file mode 100644
index 1527a2f3f351..000000000000
--- a/net-ftp/profxp/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST SOCKS.pm 17069 BLAKE2B 01830c151b33d2cb042f19f346d8a32fd8932743f99c0e6f42c195c5482fb22a85e4ec071c8a6bf4c75cddcf8c0fcb9fd7ed4afc97c88c4761c0e0a76c14a133 SHA512 87029d9fb58ba384499a2ac73d661dd4c91faa81636e41c1d3c3a1d1efab1d5e01804467428d1daf8dd2fcb231666e2986f6cc806f5f7d419e7d3280a95c497e
-DIST profxp-v3-pre2-src.tar.gz 16647 BLAKE2B 2208be3d5d9dc34b27d2d653f1d959902327df34f8d2a72b920a0107b95a57a25b8ada821c1a0e3ddd957feba4046e113ed29ed574b17256b602728a1cf88477 SHA512 5f48e15f0c6c43c8b20b7cb72bf642e12a99d469bea21372a7a602d5f8522c4097d18918a3a007961b3ea6177ec864d50a7bc24211194ac9d791c5190978e167
-EBUILD profxp-3_pre2-r2.ebuild 942 BLAKE2B a16974d4205e4b919ed1047e491dc93df6454ffca5209c2869daae607e4a41a4821afb4329410e4bf18c33f6f6a9b0bcbb6cabc4ea6d375a179439dd16c4de61 SHA512 6591668a3cc49bbbddae449a74089f283d80a171c4c46278e7a5894fa5a38c6bd51d4ba20461d4ce23d88f0e5918c5aeb09f972fab31aff9afbddfa9d73906a2
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-ftp/profxp/metadata.xml b/net-ftp/profxp/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/net-ftp/profxp/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-ftp/profxp/profxp-3_pre2-r2.ebuild b/net-ftp/profxp/profxp-3_pre2-r2.ebuild
deleted file mode 100644
index c78525fd1b9f..000000000000
--- a/net-ftp/profxp/profxp-3_pre2-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module
-
-DESCRIPTION="FXP (server-to-server FTP) commandline client written in Perl"
-HOMEPAGE="https://duncanthrax.net/profxp/"
-SRC_URI="https://duncanthrax.net/profxp/profxp-v${PV/_/-}-src.tar.gz
-	http://search.cpan.org/src/CLINTDW/SOCKS-0.03/lib/Net/SOCKS.pm"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="virtual/perl-Time-HiRes
-	dev-perl/TermReadKey
-	dev-perl/Term-ReadLine-Perl"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack profxp-v${PV/_/-}-src.tar.gz
-	cp "${DISTDIR}"/SOCKS.pm "${S}"/
-}
-
-src_prepare() {
-	sed -i 's:/home/tom/ActivePerl-5\.6:/usr:' "${S}"/profxpv3.pl || die
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	perl_set_version
-	newbin profxpv3.pl profxp.pl
-	dosym profxp.pl /usr/bin/profxp
-	insinto ${ARCH_LIB}/Net
-	doins SOCKS.pm
-	insinto ${ARCH_LIB}/${PN}
-	doins ${PN}/*.pm
-}
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index 2768c127f8a5..74e67151882b 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -7,7 +7,8 @@ AUX pure-ftpd.conf_d-3 3728 BLAKE2B a9bfa8208bdf7fcb053cd48e17638f787388804c5778
 AUX pure-ftpd.rc11 2018 BLAKE2B 1783228b5179b6d11fd6b06bc722e15f6f81e6c8443dd516f8fe1b7c7132ef4f8b92a67083354a4f78d41cee4b4a33b39d1940748bcd1056d336b5744069aac8 SHA512 920bb0c20a3a0a053977e999cf26a23a835155eca9c0224577b13623e002a07f52c30439e54f66c42dd89566b66cc5b8341a3d2e78a9bdc038f2a096153daaba
 AUX pure-ftpd.xinetd 247 BLAKE2B aa2b0f8b4b6ff45e9b8dd632af5ff680ddd5abe51647dda91ca78bf3cb9ba9a090b20433f460213e95b8e57958d711f4bd7fa594b3d33fae818b853ec5aaee5d SHA512 e8ac0527daf1e182e7514d17f04bd20e789231e627cc7228ac23a241a4c420204a61ef9438c57e63f402eb3608ae0acc15a72fe484c99bb4e172bbd5ece2b72d
 DIST pure-ftpd-1.0.49.tar.bz2 487958 BLAKE2B bd5f10a49b533eb6c257032659e97aa7ae16ec9402704d8ee06c92938e217b748b390ccf0e31b3640f41cb7a93f85b29c8ddcdc296f214391b1d92da9d701a7c SHA512 b44896d6fe2cda9169b1db93c5260bb892af14a173f2d25e60dd6530afe85d8e9156985609e35da7e5550dc123afb42bc5012beb9fca9011054cf0ed8b2eddef
-EBUILD pure-ftpd-1.0.49-r4.ebuild 4305 BLAKE2B 9d8789fdc25ef75df2c424498fb4a91967d37322f4613bf78f48082bbb58d691641f34ca5e751d852ac8339e36dddb6d96435441ead33b14138612c30477d653 SHA512 5a396221a666abefdca147103171ffca208f564f330d23f696d0d8e7f373cc638893bd5914fcc34e458c9822135cae4ca4a3ab891a00903d12115835444c2553
+DIST pure-ftpd-1.0.50.tar.bz2 520167 BLAKE2B 0c694ed48e896be13d907a71a24357f8676daf2c66bdaac41d31b162741164fe5ab1560499acc08b11e4fdb2a678c81c81c03e65a8181fcfd960ffbfe4b731d4 SHA512 8fbd24fb0450b9ed8e47335c97c3bc1cbcd0ee2ac7ebea95721b9dbddb7f61d8bedaa1710ba94213d96c79e12ec9b2b555ddb5f494c8961ca2339b176a52fe12
 EBUILD pure-ftpd-1.0.49-r5.ebuild 4391 BLAKE2B cdad0056b5e568fe0856b534b43d06519f3ab0b21ff1448eef8c6f24312d4588b1118c63c85256cbfd9890add9d3517a8909e2340db649fb66e4dbe40c919dc7 SHA512 0b5d673ddd4f41a46cc371130658037029c51378e35b602295f3ce1f09f22c2d526ea570d792b4b8f50ca82b5ccffb0b46e8472453a0db603ad683ec9a04924f
-EBUILD pure-ftpd-9999.ebuild 4100 BLAKE2B bfea3ea19aa899478581e2b024ee0e464d4732ab554f620f1a966d7afbe5bcc14df73e874c132434d9a69ff0cc5cfff8594aa66a7c16f28bd65d7a4426f0856d SHA512 8f10922e2fe91528a7736ad28bd6a9f1773f444fe024a98e989713bf3b4c5547b7fb307866155d051a1bd637b58c9eab47b9288a1aec2ca6b818b1eb77429b9e
+EBUILD pure-ftpd-1.0.50.ebuild 4105 BLAKE2B a01f721e6b2b5911b49536f980e12ecd8b0d9a9671c9abeba91ebebfd5e434b12436f4d5c38f3892332d2e7678ed74e0add06e0fb2e31318c8fd78f079d2df01 SHA512 4019d0e2b4cf0937cbbb6a5cc8c38ef16029757e53ffdc9dbf1db82c94f0717713131c6b2bbc2b9ca28ccc1e9c8c68fd8dc45c75db80c354bbb09a76500592e5
+EBUILD pure-ftpd-9999.ebuild 4105 BLAKE2B a01f721e6b2b5911b49536f980e12ecd8b0d9a9671c9abeba91ebebfd5e434b12436f4d5c38f3892332d2e7678ed74e0add06e0fb2e31318c8fd78f079d2df01 SHA512 4019d0e2b4cf0937cbbb6a5cc8c38ef16029757e53ffdc9dbf1db82c94f0717713131c6b2bbc2b9ca28ccc1e9c8c68fd8dc45c75db80c354bbb09a76500592e5
 MISC metadata.xml 1177 BLAKE2B 7662da71f87d60d342e0a304c73c02f95a1006a0e6614c40ee3f3333a01430cb0a50ebd7e190569fcac25f9cefdd48fef68649c97006846977a2596333d78c34 SHA512 6c79218bba944381fbf0bfc86e27adde1e95e5e2ac5e7e2c5d637820f8fb4bb1bbd5e91a53f6fbc4ef641d03be6490e1d137895176576f7e2da798662590fb0a
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r4.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.50.ebuild
index a4c219fdd5ae..1127842978af 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r4.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.50.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools flag-o-matic
+inherit flag-o-matic
 
 DESCRIPTION="Fast, production-quality, standard-conformant FTP server"
 HOMEPAGE="http://www.pureftpd.org/"
@@ -13,7 +13,7 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	SRC_URI="ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2
 		http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 LICENSE="BSD"
@@ -47,18 +47,11 @@ RDEPEND="${DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.0.28-pam.patch"
-
-	# https://bugs.gentoo.org/711124
-	"${FILESDIR}/${P}-diraliases_uninitialized_pointer.patch"
-	"${FILESDIR}/${P}-pure_strcmp_OOB_read.patch"
-
-	# https://bugs.gentoo.org/721242
-	"${FILESDIR}/${P}-do-not-call-ar-directly.patch"
 )
 
 src_prepare() {
 	default
-	eautoreconf
+	[[ "${PV}" == 9999 ]] && eautoreconf
 }
 
 src_configure() {
@@ -68,11 +61,11 @@ src_configure() {
 		-i "${S}/src/ftpd.h" || die "sed failed"
 
 	# Those features are only configurable like this, see bug #179375.
-	use anondel && append-cppflags -DANON_CAN_DELETE
-	use anonperm && append-cppflags -DANON_CAN_CHANGE_PERMS
-	use anonren && append-cppflags -DANON_CAN_RENAME
-	use anonres && append-cppflags -DANON_CAN_RESUME
-	use resolveids && append-cppflags -DALWAYS_RESOLVE_IDS
+	use anondel 	&& append-cppflags -DANON_CAN_DELETE
+	use anonperm 	&& append-cppflags -DANON_CAN_CHANGE_PERMS
+	use anonren 	&& append-cppflags -DANON_CAN_RENAME
+	use anonres 	&& append-cppflags -DANON_CAN_RESUME
+	use resolveids 	&& append-cppflags -DALWAYS_RESOLVE_IDS
 
 	# Do not auto-use SSP -- let the user select this.
 	export ax_cv_check_cflags___fstack_protector_all=no
diff --git a/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild b/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild
index e96ace757a52..1127842978af 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic
 
@@ -61,11 +61,11 @@ src_configure() {
 		-i "${S}/src/ftpd.h" || die "sed failed"
 
 	# Those features are only configurable like this, see bug #179375.
-	use anondel && append-cppflags -DANON_CAN_DELETE
-	use anonperm && append-cppflags -DANON_CAN_CHANGE_PERMS
-	use anonren && append-cppflags -DANON_CAN_RENAME
-	use anonres && append-cppflags -DANON_CAN_RESUME
-	use resolveids && append-cppflags -DALWAYS_RESOLVE_IDS
+	use anondel 	&& append-cppflags -DANON_CAN_DELETE
+	use anonperm 	&& append-cppflags -DANON_CAN_CHANGE_PERMS
+	use anonren 	&& append-cppflags -DANON_CAN_RENAME
+	use anonres 	&& append-cppflags -DANON_CAN_RESUME
+	use resolveids 	&& append-cppflags -DALWAYS_RESOLVE_IDS
 
 	# Do not auto-use SSP -- let the user select this.
 	export ax_cv_check_cflags___fstack_protector_all=no