gentoo resync : 26.08.2021

4 files changed, 2 insertions, 57 deletions

diff --git a/net-ftp/ftpbase/Manifest b/net-ftp/ftpbase/Manifest
index 564be75b3280..dcc6e7f0b9ee 100644
--- a/net-ftp/ftpbase/Manifest
+++ b/net-ftp/ftpbase/Manifest
@@ -1,7 +1,5 @@
-AUX ftp-pamd 700 BLAKE2B c867c659cac367c51021504dd4da0a9dc90609564613f580a0a01a94d2a87d0df903f22486561f23722901df4df06a33d7d7b643ffa4562cf426f2058391d887 SHA512 61aceee28610cb7a6989fca0ee82702df1118dd2e964bb26fe5cfcb508250599e9e1cdb9aa5dfb61df9c5fef25af4334a87d5f1f4065f693193912dfe172bb68
 AUX ftp-pamd-include 632 BLAKE2B 28aa913499698f136e784e8ed420748fe1415d0ddeb64761b8ed71b869e4b9afb6b86df4b8a8a748ec3a740d99c000fcc4789ee45c3a302f81ffbaab07c7e106 SHA512 adc59c544b815bd88b7e91a43cb5620008d1f83d15a08620f56242d74991ba413e56b31bcca8e5fcfe71f05362bbad89b02d5289260f08649d38965c8951ec76
 AUX ftp.service 278 BLAKE2B 8c0c636297d60c3d9fb8baaf9e3a9d545fbe56a6a6031c50fa202292fcf747a4c14621a8e34529617c5b3f0d1a89d5c151f1c90cc8e5f1af5d85b9c85194f3e3 SHA512 fcba0f31adf681bc67ce206dcabcd94486ecafdf96c348ec9ef3597f6f040a99e20a00db9757d5f077105e5fcb9183291585568b7edb0676ef9d522be56f6d6e
 AUX ftpusers 300 BLAKE2B 02489b8eed29bfd4cea148b1b4214ac5ba798faa44da1be68cea06c18680e44f0054c952107810e4a199398b6ba382c649a481cf9d7388cd5caa10ace50e06d3 SHA512 29a8bdca1a6bb516c5189e6c69969cba3c220ea878e352e78bb6ea5cb2ac7476306736240155dc6d3f7512aac48164354db68721ea952d1010639e8ae14635e0
-EBUILD ftpbase-0.01-r4.ebuild 738 BLAKE2B 270a30abcd61bd75664da4a1ead38bff0eb60d0ecf23b6e7cbca43858cfb531709e7fa2f8224faaa8cf4522c534d293b90642266debfcb66cd72608f2b771afa SHA512 02ea902cc72ca5cad4d110f4e7027b495e5f5fa40ac6c4845c76fb04995975f82b20fcc55569f1b5d4976c85c0f08c12c0d18d90fa04b11854540ca717651f3b
-EBUILD ftpbase-0.01-r5.ebuild 792 BLAKE2B b6dd31b522adb103ff5c96a5b352de8c0f3a1ca5727dd900a2f763672dbbac84a1378309daad5faf208b1bdb0b3300ce83044078aafcfbdd483bb8dcb15eb860 SHA512 a14d90e70852ef606a189324dc568fd32da09393b4ecc0aa6a289d973053cc7f7d6c38330df47af796b02c629b46a79c092d7a2e3564fab5877d078c44adaf29
+EBUILD ftpbase-0.01-r5.ebuild 786 BLAKE2B 3208bcdf8bc46159e0bec215cc6704d1787e53d38b6d45bf2382d66d46afdc7c4c1088fbfa039fc57ab41423db86a0391284e907e0db7d8dd56adc4d85128ab9 SHA512 2ac80f73e0c40e5c3945a1c8c9c5ded69f59a93bdd16871dc499a841c9e02e9e3859092fb2c668ad7e22ffa41b09239b83b76e97fca4a0d44128485a555528d0
 MISC metadata.xml 380 BLAKE2B 277dc1c8940d7a57eeec5466fb008bc1833f97e5446b46012d3d3c2727711e019ce96bf374cdafb9507e3f8d1a0d3dcdad897400c2e39f5deab1c4ac03440af7 SHA512 f563d7650ab3cca05eb8d855105b300961dc4e8af03b29598d4b14986b9729eeefdf54cd56a4175966ec4e362ce8d45532d28fad63c1e03d9df9dca139b1bcd5
diff --git a/net-ftp/ftpbase/files/ftp-pamd b/net-ftp/ftpbase/files/ftp-pamd
deleted file mode 100644
index 34b7912a0b48..000000000000
--- a/net-ftp/ftpbase/files/ftp-pamd
+++ /dev/null
@@ -1,17 +0,0 @@
-# Provided by ftpbase (dont remove this line!)
-# Standard pam.d file for ftp service packages.
-
-auth     required   pam_listfile.so item=user sense=deny file=/etc/ftpusers onerr=succeed
-auth     required   pam_stack.so service=system-auth
-
-# If this is enabled, anonymous logins will fail because the 'ftp' user does
-# not have a "valid" shell, as listed in /etc/shells.
-#
-# If you enable this, it is recommended that you do *not* give the 'ftp'
-# user a real shell. Instead, give the 'ftp' user /bin/false for a shell and
-# add /bin/false to /etc/shells.
-# auth     required   pam_shells.so
-
-account  required   pam_stack.so service=system-auth
-
-session  required   pam_stack.so service=system-auth
diff --git a/net-ftp/ftpbase/ftpbase-0.01-r4.ebuild b/net-ftp/ftpbase/ftpbase-0.01-r4.ebuild
deleted file mode 100644
index dc3a2253a339..000000000000
--- a/net-ftp/ftpbase/ftpbase-0.01-r4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pam
-
-DESCRIPTION="FTP layout package"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="pam"
-
-DEPEND="pam? ( sys-libs/pam )
-	!<net-ftp/proftpd-1.2.10-r6
-	!<net-ftp/pure-ftpd-1.0.20-r2
-	!<net-ftp/vsftpd-2.0.3-r1"
-RDEPEND="
-	acct-group/ftp
-	acct-user/ftp"
-
-S=${WORKDIR}
-
-src_install() {
-	# The ftpusers file is a list of people who are NOT allowed
-	# to use the ftp service.
-	insinto /etc
-	doins "${FILESDIR}/ftpusers"
-
-	if use pam; then
-		newpamd "${FILESDIR}"/ftp-pamd-include ftp
-	fi
-}
diff --git a/net-ftp/ftpbase/ftpbase-0.01-r5.ebuild b/net-ftp/ftpbase/ftpbase-0.01-r5.ebuild
index 526756b0ee02..4f85c63eb8e2 100644
--- a/net-ftp/ftpbase/ftpbase-0.01-r5.ebuild
+++ b/net-ftp/ftpbase/ftpbase-0.01-r5.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="pam zeroconf"
 
 DEPEND="