gentoo resync : 14.08.2021

7 files changed, 179 insertions, 3 deletions

diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index cac6a85c320d..70a917e5b902 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -7,17 +7,23 @@ AUX vsftpd-3.0.2-alpha.patch 525 BLAKE2B 8d3e0ce8a6cd79862ae0071ab61f1bd9db5a694
 AUX vsftpd-3.0.2-remove-legacy-cap.patch 1739 BLAKE2B ee1d4461ec1ca783a2f704797f504f40f6fbde93707e27044031d03a67e105ecf02be524b1c60bc3ee5ec1624403adab4362637c120de6336aab76a3bf4397a8 SHA512 b0c2b91f0ba3b73706c352ac391e35b048b544fbab1ab3cd223be7f5ca33516143a775456871ded354a05bf74f0403436f4659d06ae9345e8d6a6d1b21addd42
 AUX vsftpd-3.0.3-sparc.patch 462 BLAKE2B bb63dab9f38ba46aa622a1cbacd4d42c1e24a6e413b57e2c47d98235f4fc99684b42ee2a729d12b4e11c14ca063aa51afae25fcbfa9c01b8ab8733801470d397 SHA512 6bbee5674969d6ea356722196cb54c4b8f5da5802b05af560595b0cc48b63af6666ecb58cff085f5a77a95eb8c03590e7406fadf5e38cbce8354e6df66c989cf
 AUX vsftpd-3.0.4-dont-link-caps.patch 592 BLAKE2B 2ffb1c375c4869acdb24a89d245104d5b8407f143dd7a4820776b583e914e99891305c03904f6dfee7dd88941940065864d104a17ae3038a713092726c636d62 SHA512 2cb131c8879462047d7ec9348424fbdb0536c783e9047d2a43b8c011b82aa54c57c0aa20caf4aeb50862bfdce31930c79beb5afc1bb0ffa6f47abf7027795ac1
+AUX vsftpd-3.0.5-fix-link-command.patch 659 BLAKE2B 27879a3c2c319b70d1e261fdfaf2db83e55cea718db3f98e66b1d1d390ef8e041b7aafb91c2791ac85283b653059ddda16a7a2949e5643e5e8988858371cb86e SHA512 afd40e7fdb344e08be2f4256700c29d51ca388166bc524bb4331d3aef4d721b74b98d20c8a7f8cf72ba0ff867a6d9ab4f7785b6fc810468f623332a33e57d34e
 AUX vsftpd-checkconfig.sh 785 BLAKE2B c856a268dbfbcda6bbae38fcf444b1c64986c32d426c890bd67da15c65ecb9082b76f4f8382534f519d6d1c34d50cd5d9bd917f41e5e393af68483b666eb4ebf SHA512 541702557231c79413ae77cf26c28398fea3cb332375f8d22e0c0a45706b04db954d268addd76fecbb8b0ab3109f1009c18b0599394ed33c4a6fc8dc647d889e
 AUX vsftpd-disable-seccomp-sandbox.patch 362 BLAKE2B 47aeb759113e6c6c401c6e135d742f06435490a51bad1a3b72778c60ed5a6ccbb4ea6ab3eeb87948b7658bcf539c277bc75674284474f05d0c4b76e9690c5cb7 SHA512 efa4529a30dc306c190840f47b0e7c4f99321e6d83254015a98018d287c7e624a2472effdd7e7fa1e11a25ca00e876539fd4bc63dc6b0d859c065a7c48e2b0ac
 AUX vsftpd.conf 3733 BLAKE2B 17b92df3ffebd556a9a8e6b7d5ee819528e29615c270afbac82694c31dc8ebb86e844780e49f84fdedfe84a70c6ace998969c026b9ff8aa1ddac27ecd60cd665 SHA512 417b2ebdffe41073d7ee8a1f414ba5bfe4b15411e37b99444443c240fa540c97b0c247f9151ef306f84775dd78370f5985121417267bf25a76f87d259d843719
 AUX vsftpd.init 1319 BLAKE2B 8fd753979e553aa88aefb80e20e65602c8d96fbfdd727a4b375e873315aa24da204900786966846105dc17166aff70f7a8a1b2f4dae8a9cb82897db00a1122c4 SHA512 b367c412f2aebdfa90fae912467ebf227b39be04b45f686c5ea5f66df6addc81a2f130dd616dae932a55108337169e19ef53012f27127eb1970852ed5ea697c0
+AUX vsftpd.init-3.0.5 409 BLAKE2B 021c15a42472c7ce055f95fe9d81dd28c7f551a10eb6d3f838fd29006502b9dbd236635800788a80f9a7fee4cca7448a9802437daa34c8c1bca4e4e84e98b540 SHA512 4ba1fce992886726a39e54f39de60837781201bcd171f7a1c7d62e4bbe68b0c6c4dc2a4176dcb069d67cec7bd1e209310bb75849b89144619ac652b81940ae3f
 AUX vsftpd.logrotate 54 BLAKE2B fcf5395a656ce427c48f806c01d967af06e9f1f795f2af85c51951db59b4fa30209c2211bc1dd44f2cc8a45911531c87d45ea277b722a0c036ed3a99494fd285 SHA512 cee63caaf5e3db620e57132dc1a531cfd39ce790ac64e22b649cf3fac8b825cf188425bdf19cd376aa3f31ea114c8889ee307b6e7f9a2cbd155324f64084d5fc
 AUX vsftpd.service 218 BLAKE2B 1e09f0e822616ee2ef01e1de6777907dfa6141ef6b09bb995b916d7ba51f77bd9cbfc261687165cbc2ce47e5f326200e8fd9684e40880b54ccdd37c202b242af SHA512 f032f64ed5fab15b1c9543579090cdca007d0a759073e7c4aa0f0ef0f852f6787610f776ce63d0d922ccfbadd480df81ed9a62e6e0f399327d770f9b70c34df9
+AUX vsftpd.service-3.0.5 151 BLAKE2B 7cec27497c121f57321322347109883d074548973b2e90a0f748082ffcab7b0c2da9682af36364b43923acc3b14ece7294e1bd2a9f924a5da39c8457b1d6091b SHA512 d00dda23f99c0eb18976cd5c2a3cd261721a7d4992f6558d6bc79ab22f4ebdfeb2b423761f106efd288d3b9db171479dda51d65b1c23b7f3a522c206f9e93329
 AUX vsftpd.socket 104 BLAKE2B 093a6265694c177e724fa2880e8de2e0477347bda315937dba9dc10100419855ca7b988d750764eecc5713e3f2af80030a7892712acbb0562d52809e706b7ff2 SHA512 4c56607dde0ccc4773edf905c1d52b66fff774e6aa8b20a23f9443a04838a9ad8a1df535a0bb27660e9a4528d1d7c90b53fd6dd1fa3d4862e87ed06a1a8a87b7
-AUX vsftpd.xinetd 321 BLAKE2B 3a91c0e65a511ed5ca0feed429550b0ce6e1bd2cc133460e2642fe37aa122b59c0a3fe509d00a5435eaf4c300962c9cb5712b083e7d7d927ffbc148d0bd6a5b8 SHA512 30fb4ae07f55011b9b29625db072062a0f1df4f1c7578041231f35febfb90ad2d2dfe1deb964e34fde5c660f0e3ffc3df3d77af1b2f3a1f724176f691a53a182
+AUX vsftpd.xinetd 284 BLAKE2B 4285c817a156dc01b846c9811f356ab892a24482dd441f2708f6bfb4316ba5af18f792ae6fed85da829a6f2b07d1faa29bfe7c338e615b11e471925c954294d9 SHA512 27d2be36587dd89507d734cc267bb60eb62f33aea7766d1034806d4d8d1f832fb498a213791d18a57ff43c7a9a56864c36640b5520cb07f59cac6d0146828f52
 AUX vsftpd_at.service 328 BLAKE2B 826daeaa5b388273c6cefcfcee7415353773db5b9937b3ee714bcf76dd8b061c0693bc9d4b60742fcf5cc946543e69dbb7caacc4ba07b5503d8b66c7db4174df SHA512 5a39e853405bd5028f2c52183eb91ad559fb8edbaacfff5d5146e686417c208bb894bd86d5830a61720a1aaa9ba901160c75ed2bf47eec459b2a49ed217b9cb1
+AUX vsftpd_at.service-3.0.5 125 BLAKE2B 6c4a3fca5f73d0df5df8d2b59af3c50226f8701f74cfc5ecc72b451e87798f446d64c97e4db58d7c154946501fa488407ef12cc471beb66c96e9a0ce9240b681 SHA512 f94fb5fef72d31015cd8e7d3625788a0f1a57544f851bbaa0377c5208a6d2b64140dea0f2c1c49594ca9965ac77ed6edefb538648c918d931b17303e4bbb4b48
 DIST vsftpd-3.0.3.tar.gz 196649 BLAKE2B dbf96e788494c29d78ca49fad6a03641c9725f9a5b01a4059ad009870fdc28520cd467cd8288a8a9a520c411c495a42c3fff57ee1069efc65840adb245792dca SHA512 5a4410a88e72ecf6f60a60a89771bcec300c9f63c2ea83b219bdf65fd9749b9853f9579f7257205b55659aefcd5dab243eba878dbbd4f0ff8532dd6e60884df7
 DIST vsftpd-3.0.4.tar.gz 197637 BLAKE2B 3a2457bd74076de8ffba7ad2861009157c80dd9f38cdb63033804c72d7482666f7e1a400777e2cff4170f0999d79f9d384339ade3ad48f2a7567b2e684e48817 SHA512 a4c3b28ef7bd762dcfe53f5c9b68fc1bb371d2eb61dc88038959cc9f5efba8cc2c45a15956a7fddbac3b1ce03d8555df8fb7b86300e273a78e632f3dac15c2e3
+DIST vsftpd-3.0.5.tar.gz 197778 BLAKE2B c197a070f7eef8c97ef0adc1ebb883520e7613d67ba0eabb1380b3adaae272f4ef79110e79ce4aad5ddebd6100fb059308d905203249c5445d3ea64c29dc5ec2 SHA512 9e9f9bde8c460fbc6b1d29ca531327fb2e40e336358f1cc19e1da205ef81b553719a148ad4613ceead25499d1ac3f03301a0ecd3776e5c228acccb7f9461a7ee
 EBUILD vsftpd-3.0.3-r4.ebuild 3700 BLAKE2B afd82fb42398d3ff80e3ac6caea0353be89742c79a419876d415c9eb2283ef2548fec791d945a78e2039cb66b39a7348b5e2d2b41422122032ef743c0fd1f8fb SHA512 29ee6f8547e35bad5861bc7ae2818b6f55aee69cdb909965931c698c3c05e40504b8b198869819531a223f03850d73350d03e7f7baaeccf3c2aaa74222bcc8f2
 EBUILD vsftpd-3.0.4-r1.ebuild 3691 BLAKE2B c59a4d4579e99b2e6137658b70d2f6341c4d907f6f492a0ec6e57a7090d072dde5cd0a9e5c333bad96f1fe025ff838c9f6c4f6ac737d85648bcf8480d5ba4973 SHA512 8c6b75ea2f16ed9f916194e3d2e9a266f455459c4effee22ec13c7a31324c722f3f4c7d439fead4cf507ec6860d10ade01a5e1f3c0bc8d5686dec337ca58eb3e
+EBUILD vsftpd-3.0.5.ebuild 2162 BLAKE2B ada550c18a5c47e2f022282e5f5bb9faa54246cbd56c7e24f4395695567fd7e4c8414c921296a796f0dc2064bfd05ffaffd0d85f6316503ee2ed116412d1bd84 SHA512 67e3568e25201eefabf1167c4836fd71b117535d626e952aff256af2f062da7badda7489bf7da60534d8b96423ea8a401fcd1c618717fb0a0d8fee3591f32180
 MISC metadata.xml 218 BLAKE2B aa65c9ff8920bcfbaafb2744343f4f32a9b33aaf3d0f7d4487354d5fa625e5a8c183791da4ce7ff237f7a490567a3c2a833470efd7231d5111c41704da93a668 SHA512 cfc42ad64ce3592cf7606ec9a7f04120b3f3667c0ca6c059ac6a0a8cf4158594a8814e03f8a3746ef0ea97382b6b078a8557b720000a7e5fb3cffca9f2977dd2
diff --git a/net-ftp/vsftpd/files/vsftpd-3.0.5-fix-link-command.patch b/net-ftp/vsftpd/files/vsftpd-3.0.5-fix-link-command.patch
new file mode 100644
index 000000000000..a4560a8ef6b9
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-3.0.5-fix-link-command.patch
@@ -0,0 +1,25 @@
+From 5c00346f72de5b966ebb0841c87a22c6b11c1b38 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 12 Aug 2021 16:51:55 -0400
+Subject: [PATCH] Fix link command
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index c63ed1b..c3454c3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -26,7 +26,7 @@ OBJS	=	main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \
+ 	$(CC) -c $*.c $(CFLAGS) $(IFLAGS)
+ 
+ vsftpd: $(OBJS) 
+-	$(CC) -o vsftpd $(OBJS) $(LINK) $(LDFLAGS) $(LIBS)
++	$(CC) -o vsftpd $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)
+ 
+ install:
+ 	if [ -x /usr/local/sbin ]; then \
+-- 
+2.32.0
+
diff --git a/net-ftp/vsftpd/files/vsftpd.init-3.0.5 b/net-ftp/vsftpd/files/vsftpd.init-3.0.5
new file mode 100644
index 000000000000..cc9ad7f4a803
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd.init-3.0.5
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2
+
+instance=${RC_SVCNAME#*.}
+
+: ${command=/usr/sbin/vsftpd}
+command_background=true
+
+if [ "${instance}" = "${RC_SVCNAME}" ]; then
+	: ${pidfile=/run/vsftpd.pid}
+else
+	: ${command_args=/etc/vsftpd/${instance}.conf}
+	: ${pidfile=/run/vsftpd.${instance}.pid}
+fi
+
+depend() {
+	use dns logger net
+}
diff --git a/net-ftp/vsftpd/files/vsftpd.service-3.0.5 b/net-ftp/vsftpd/files/vsftpd.service-3.0.5
new file mode 100644
index 000000000000..209b36636d55
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd.service-3.0.5
@@ -0,0 +1,10 @@
+[Unit]
+Description=Very Secure FTP Daemon
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/sbin/vsftpd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-ftp/vsftpd/files/vsftpd.xinetd b/net-ftp/vsftpd/files/vsftpd.xinetd
index efa4ff2feee8..a4ac0211d212 100644
--- a/net-ftp/vsftpd/files/vsftpd.xinetd
+++ b/net-ftp/vsftpd/files/vsftpd.xinetd
@@ -1,5 +1,5 @@
 # default: off
-# description: Vsftpd is an FTP server, designed to be secure.
+# description: Very Secure FTP Daemon
 
 service ftp
 {
@@ -7,7 +7,7 @@ service ftp
 	wait            = no
 	user            = root
 	server          = /usr/sbin/vsftpd
-	server_args     = /etc/vsftpd/vsftpd.conf
+	server_args     = -olisten=NO
 	log_on_success  += DURATION 
 	nice            = 10
 	disable         = yes
diff --git a/net-ftp/vsftpd/files/vsftpd_at.service-3.0.5 b/net-ftp/vsftpd/files/vsftpd_at.service-3.0.5
new file mode 100644
index 000000000000..d06c92f4e9fa
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd_at.service-3.0.5
@@ -0,0 +1,7 @@
+[Unit]
+Description=Very Secure FTP Daemon
+
+[Service]
+Type=simple
+ExecStart=/usr/sbin/vsftpd -olisten=NO
+StandardInput=socket
diff --git a/net-ftp/vsftpd/vsftpd-3.0.5.ebuild b/net-ftp/vsftpd/vsftpd-3.0.5.ebuild
new file mode 100644
index 000000000000..e4ecfb256b89
--- /dev/null
+++ b/net-ftp/vsftpd/vsftpd-3.0.5.ebuild
@@ -0,0 +1,109 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="Very Secure FTP Daemon"
+HOMEPAGE="https://security.appspot.com/vsftpd.html"
+SRC_URI="https://security.appspot.com/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="pam ssl tcpd"
+
+DEPEND="
+	>=sys-libs/libcap-2
+	pam? ( sys-libs/pam )
+	!pam? ( virtual/libcrypt:= )
+	ssl? ( dev-libs/openssl:0= )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+"
+
+RDEPEND="${DEPEND}
+	net-ftp/ftpbase
+"
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/vsftpd-2.3.2-kerberos.patch
+		"${FILESDIR}"/vsftpd-3.0.2-alpha.patch
+		"${FILESDIR}"/vsftpd-3.0.3-sparc.patch
+		"${FILESDIR}"/vsftpd-3.0.5-fix-link-command.patch
+	)
+	default
+}
+
+define() {
+	sed -i -e "/#undef $1/c#define $1" "${S}"/builddefs.h || die
+}
+
+undef() {
+	sed -i -e "/#define $1/c#undef $1" "${S}"/builddefs.h || die
+}
+
+src_configure() {
+	libs=( -lcap )
+
+	if use pam; then
+		libs+=( -lpam )
+	else
+		undef VSF_BUILD_PAM
+		libs+=( -lcrypt )
+	fi
+
+	if use ssl; then
+		define VSF_BUILD_SSL
+		libs+=( -lcrypto -lssl )
+	fi
+
+	if use tcpd; then
+		define VSF_BUILD_TCPWRAPPERS
+		libs+=( -lwrap )
+	fi
+}
+
+src_compile() {
+	local args=(
+		CC="$(tc-getCC)"
+		CFLAGS="${CFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+		LIBS="${libs[*]}"
+	)
+	emake "${args[@]}"
+}
+
+src_install() {
+	into /usr
+	dosbin vsftpd
+
+	doman vsftpd.conf.5 vsftpd.8
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/vsftpd.logrotate vsftpd
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/vsftpd.xinetd vsftpd
+
+	newinitd "${FILESDIR}"/vsftpd.init-3.0.5 vsftpd
+
+	systemd_newunit "${FILESDIR}"/vsftpd.service-3.0.5 vsftpd.service
+	systemd_newunit "${FILESDIR}"/vsftpd_at.service-3.0.5 vsftpd@.service
+	systemd_dounit "${FILESDIR}"/vsftpd.socket
+
+	keepdir /usr/share/empty
+
+	dodoc vsftpd.conf
+	dodoc -r EXAMPLE SECURITY
+
+	einstalldocs
+}
+
+pkg_preinst() {
+	if [[ ! -e ${EROOT}/etc/vsftpd.conf && -e ${EROOT}/etc/vsftpd/vsftpd.conf ]]; then
+		elog "Moving ${EROOT}/etc/vsftpd/vsftpd.conf to ${EROOT}/etc/vsftpd.conf"
+		mv "${EROOT}"/etc/{vsftpd/,}vsftpd.conf || die
+	fi
+}