gentoo resync : 09.07.2022

4 files changed, 24 insertions, 183 deletions

diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index 06ca553b0aa6..8067a70d46e1 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -6,9 +6,7 @@ AUX pure-ftpd.initd-r12 519 BLAKE2B 6271067b195de1b662ffe1577aaf3e6e2badd44494e1
 AUX pure-ftpd.xinetd 247 BLAKE2B aa2b0f8b4b6ff45e9b8dd632af5ff680ddd5abe51647dda91ca78bf3cb9ba9a090b20433f460213e95b8e57958d711f4bd7fa594b3d33fae818b853ec5aaee5d SHA512 e8ac0527daf1e182e7514d17f04bd20e789231e627cc7228ac23a241a4c420204a61ef9438c57e63f402eb3608ae0acc15a72fe484c99bb4e172bbd5ece2b72d
 AUX pure-uploadscript.confd 368 BLAKE2B 675e5349b2f808dd2a3cbaf2536a0541f40d42d300b7411163bc8232470c6f63a1d92cef393271693a02bcb5129624d38de77a99ca030a77bab00cc1fbe797c4 SHA512 2632be874a5afb25b8c8c1acbdfef929542d80dc9a8f280b4a9b0b6878be63f901ccd2c29c2ae0f9f74f45e41df1b7e69d1cef6f77e93c9b235709a7094480af
 AUX pure-uploadscript.initd-r1 776 BLAKE2B 1e382300a92fabb5308aa2636de2f427418d8595859fa2d7e6ee0a62297a0a17386f2f4c55de03ad282ed0545cc97ea6c0df67fe5fe6af736789d01e18c69f97 SHA512 3bb735bf0dc12434bc283ea9948c5b7feeaf72a26382a65a3c8eaec87a13f82239699e4687e5b36be5478bcab801974633b17771d9a583b6be508503118899e4
-DIST pure-ftpd-1.0.50.tar.bz2 520167 BLAKE2B 0c694ed48e896be13d907a71a24357f8676daf2c66bdaac41d31b162741164fe5ab1560499acc08b11e4fdb2a678c81c81c03e65a8181fcfd960ffbfe4b731d4 SHA512 8fbd24fb0450b9ed8e47335c97c3bc1cbcd0ee2ac7ebea95721b9dbddb7f61d8bedaa1710ba94213d96c79e12ec9b2b555ddb5f494c8961ca2339b176a52fe12
 DIST pure-ftpd-1.0.51.tar.bz2 520648 BLAKE2B 0b82fee114986140eb74d2669b7d91582a48f1b366936895acda913afb7d3bca1578295a930f7857f8674e593bd1bf8094c36f2ae8db6cf1a62cacfd4234cf13 SHA512 3615ac1ec42813855f3328dde200f60025e1f2ca7d1e17ea042967fd4164079260d058f3e2586acd778334660f387a280b35850a9e2091dd913fb84ef929bdca
-EBUILD pure-ftpd-1.0.50-r3.ebuild 4363 BLAKE2B 48e2aa70ff578e49bd35d21e4ff002a63399b9c18e1466946b171a1e5fce5f226ba1bdd42df6164ab04005ca685d9c90c902a59a00c7b356ee6a7aad292d5212 SHA512 f29ce9b3262c80f75b8ea722763def4e52441fb735d0ebc1a564b43f018b05e1203de04ec2b344cd7a7aff9ca34cceca2377ac3736c1ee127bd67962baf676b2
-EBUILD pure-ftpd-1.0.51.ebuild 4369 BLAKE2B b44d87e95f8a73dfec5819b89fc69666809158a61fc4a3e5b31bec0abc299ab788735d3fa414a20f7835c15c610370eabebbd53cd2a56aed11089e8e4bb4b145 SHA512 f4ec59f90bce535f39d135cb07f3ecaa40c16c17d9bfb5b5bfbf25f244ce70445621e5b0a937363970875ba64ed5317242400e949b383476d48f72891f3569f7
+EBUILD pure-ftpd-1.0.51.ebuild 4363 BLAKE2B 48e2aa70ff578e49bd35d21e4ff002a63399b9c18e1466946b171a1e5fce5f226ba1bdd42df6164ab04005ca685d9c90c902a59a00c7b356ee6a7aad292d5212 SHA512 f29ce9b3262c80f75b8ea722763def4e52441fb735d0ebc1a564b43f018b05e1203de04ec2b344cd7a7aff9ca34cceca2377ac3736c1ee127bd67962baf676b2
 EBUILD pure-ftpd-9999.ebuild 4369 BLAKE2B b44d87e95f8a73dfec5819b89fc69666809158a61fc4a3e5b31bec0abc299ab788735d3fa414a20f7835c15c610370eabebbd53cd2a56aed11089e8e4bb4b145 SHA512 f4ec59f90bce535f39d135cb07f3ecaa40c16c17d9bfb5b5bfbf25f244ce70445621e5b0a937363970875ba64ed5317242400e949b383476d48f72891f3569f7
-MISC metadata.xml 1096 BLAKE2B ac7d4d0c29ffeb695f308248cd1d456853a757aa4e2eb8bce4109e387b6a35f546b0acd9d8be2fd717ed19d3f0af118f2da38385348191e791ad7c260fd74d71 SHA512 fc79dda7f16b2a8ec8aafd4fc95bf31ef91f7e8ce3b6da12bfca1aed0fbf4e0ff4bef71305e6c788a67c2c4ae090c99ad280314240fdb47d4ed08de30b6367f5
+MISC metadata.xml 1195 BLAKE2B 397df723a57aee31d9941f1debc30777a8f825809458c3b3e35fc2238236f1ab027e3998e8c7446624767b05555a96bbb74cf874cd2a74b38c9cbe9ad01a65a0 SHA512 e2c85b7b3a357b2f9dd7e328e53db70485b39a1e2cb6032682b64d29cf70f3a8df92873b53e4efc3d7affac7ddfb809f9c800a6a7e52cfbc54fd1877c27fd7f6
diff --git a/net-ftp/pure-ftpd/metadata.xml b/net-ftp/pure-ftpd/metadata.xml
index 95bb40b57c16..f48d6b975eb0 100644
--- a/net-ftp/pure-ftpd/metadata.xml
+++ b/net-ftp/pure-ftpd/metadata.xml
@@ -1,21 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>Free (BSD), secure, production-quality and standard-conformant FTP server based upon Troll-FTPd. It doesn't provide useless bells and whistles, but focuses on efficiency and ease of use.</longdescription>
-<use>
-	<flag name="anondel">Permit anonymous to delete files</flag>
-	<flag name="anonperm">Permit anonymous to change file permissions</flag>
-	<flag name="anonren">Permit anonymous to rename files</flag>
-	<flag name="anonres">Permit anonymous to resume file transfers</flag>
-	<flag name="implicittls">Enable TLS on Port 990</flag>
-	<flag name="noiplog">Disables logging of IP addresses</flag>
-	<flag name="paranoidmsg">Display paranoid messages instead of normal
-		ones</flag>
-	<flag name="resolveids">Resolve UIDs/GIDs</flag>
-	<flag name="sysquota">Enables system quota support (needs sys-fs/quota)
-		</flag>
-	<flag name="vchroot">Enable support for virtual chroot (possible security
-		risk)</flag>
-</use>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
+		Free (BSD), secure, production-quality and standard-conformant FTP server
+		based upon Troll-FTPd. It doesn't provide useless bells and whistles,
+		but focuses on efficiency and ease of use.
+	</longdescription>
+	<use>
+		<flag name="anondel">Permit anonymous to delete files</flag>
+		<flag name="anonperm">Permit anonymous to change file permissions</flag>
+		<flag name="anonren">Permit anonymous to rename files</flag>
+		<flag name="anonres">Permit anonymous to resume file transfers</flag>
+		<flag name="implicittls">Enable TLS on Port 990</flag>
+		<flag name="noiplog">Disables logging of IP addresses</flag>
+		<flag name="paranoidmsg">Display paranoid messages instead of normal ones</flag>
+		<flag name="resolveids">Resolve UIDs/GIDs</flag>
+		<flag name="sysquota">Enables system quota support (needs sys-fs/quota)</flag>
+		<flag name="vchroot">Enable support for virtual chroot (possible security risk)</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.50-r3.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.50-r3.ebuild
deleted file mode 100644
index a01e48fe71f1..000000000000
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.50-r3.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-DESCRIPTION="Fast, production-quality, standard-conformant FTP server"
-HOMEPAGE="https://www.pureftpd.org/project/pure-ftpd/"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/jedisct1/pure-ftpd.git"
-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 ~riscv sparc x86"
-fi
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-IUSE="anondel anonperm anonren anonres caps implicittls ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd"
-REQUIRED_USE="implicittls? ( ssl )"
-
-DEPEND="
-	dev-libs/libsodium:=
-	virtual/libcrypt:=
-	caps? ( sys-libs/libcap )
-	ldap? ( >=net-nds/openldap-2.0.25:= )
-	mysql? ( || (
-			dev-db/mariadb-connector-c
-			dev-db/mysql-connector-c
-		)
-	)
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:= )
-	ssl? ( dev-libs/openssl:0=[-bindist(-)]	)
-	sysquota? ( sys-fs/quota[-rpc] )
-	xinetd? ( virtual/inetd )
-"
-
-RDEPEND="
-	${DEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )
-"
-
-BDEPEND="sys-devel/autoconf-archive"
-
-PATCHES=( "${FILESDIR}/${PN}-1.0.28-pam.patch" )
-
-src_prepare() {
-	default
-
-	[[ "${PV}" == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	# 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
-
-	# Do not auto-use SSP -- let the user select this.
-	export ax_cv_check_cflags___fstack_protector_all=no
-
-	local myeconfargs=(
-		--enable-largefile
-		# Required for correct pid file location.
-		# Pure-FTPd appends "/run/pure-ftpd.pid" to the localstatedir
-		# path, and tries to write to that file even when being
-		# started in foreground. So we need to pin this to /
-		--localstatedir="${EPREFIX}"/
-		--with-altlog
-		--with-cookie
-		--with-diraliases
-		--with-extauth
-		--with-ftpwho
-		--with-language=${PUREFTPD_LANG:=english}
-		--with-peruserlimits
-		--with-privsep
-		--with-puredb
-		--with-quotas
-		--with-ratios
-		--with-throttling
-		--with-uploadscript
-		--with-virtualhosts
-		$(use_with implicittls)
-		$(use_with ldap)
-		$(use_with mysql)
-		$(use_with pam)
-		$(use_with paranoidmsg)
-		$(use_with postgres pgsql)
-		$(use_with ssl tls)
-		$(use_with sysquota sysquotas)
-		$(use_with vchroot virtualchroot)
-		$(usex caps '' '--without-capabilities')
-		$(usex noiplog '--without-iplogging' '')
-		$(usex xinetd '' '--without-inetd')
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/pure-ftpd.initd-r12" pure-ftpd
-	newconfd "${FILESDIR}/pure-ftpd.confd-r4" pure-ftpd
-
-	newinitd "${FILESDIR}/pure-uploadscript.initd-r1" pure-uploadscript
-	newconfd "${FILESDIR}/pure-uploadscript.confd" pure-uploadscript
-
-	if use implicittls ; then
-		sed -e '/^# Bind/s@21@990@' -i "${ED}"/etc/pure-ftpd.conf || die
-	fi
-
-	if use ssl ; then
-		newinitd "${FILESDIR}/pure-certd.initd" pure-certd
-
-		exeinto /etc
-		newexe "${FILESDIR}/pure-certd.script" pure-certd.sh
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins pureftpd.schema
-		insinto /etc/openldap
-		insopts -m 0600
-		doins pureftpd-ldap.conf
-	fi
-
-	if use xinetd  ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/pure-ftpd.xinetd" pure-ftpd
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# This is a new installation
-		elog
-		elog "Before starting Pure-FTPd, you have to edit the /etc/pure-ftpd.conf file!"
-		elog
-		ewarn "It's *really* important to read the README provided with Pure-FTPd!"
-		ewarn "Check out http://download.pureftpd.org/pub/pure-ftpd/doc/README for general info"
-		ewarn "and http://download.pureftpd.org/pub/pure-ftpd/doc/README.TLS for SSL/TLS info."
-		ewarn
-	else
-		for v in ${REPLACING_VERSIONS} ; do
-			if ver_test "${v}" -le "1.0.50" ; then
-				einfo "Configuration through /etc/conf.d/pure-ftpd is now deprecated!"
-				einfo "Please migrate your settings to the new configuration file."
-				einfo "Use /etc/pure-ftpd.conf to adjust your settings."
-			fi
-		done
-	fi
-}
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.51.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.51.ebuild
index 712fefda22b2..a01e48fe71f1 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.51.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.51.ebuild
@@ -15,7 +15,7 @@ else
 		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 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 fi
 
 LICENSE="BSD GPL-2"