gentoo resync : 17.08.2021

5 files changed, 41 insertions, 34 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 2ffa734a293d..a9f0719e6bf3 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 70a917e5b902..d9dd91920308 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -7,7 +7,7 @@ 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-3.0.5-seccomp.patch 657 BLAKE2B 087294e1693eae62bd652674ac40c656aff539d4586321c09670c9c6cd158ba791b831f87124156e18526f01bcbb90297e6f37f16d95107d6e58b2a6f58504e7 SHA512 f619653d0f764149ffffe6b6dc376b52b42c88fb18d168085b49986159e623dcaf20b51cacf3449db956e8e39414f908102b7451ea10ae02669601956ea93328
 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
@@ -25,5 +25,5 @@ DIST vsftpd-3.0.4.tar.gz 197637 BLAKE2B 3a2457bd74076de8ffba7ad2861009157c80dd9f
 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
+EBUILD vsftpd-3.0.5-r1.ebuild 2333 BLAKE2B 4ea1cf454c4b5d29d11f9bc74b144a881475ceee9b2df6d3fa7d76433b4bccc4802b36f00005667b8537c65e1a3917f8c391587f51613157c4b820ed0f1bce5b SHA512 f8261b69325536601bb6289ca22f585b417ff4b87e6f14864777edbe26ab03a158de475c20ba0af22a13b5592a2cc7ac63e7da9be9defda837f7025ae06fcc0b
 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
deleted file mode 100644
index a4560a8ef6b9..000000000000
--- a/net-ftp/vsftpd/files/vsftpd-3.0.5-fix-link-command.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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-3.0.5-seccomp.patch b/net-ftp/vsftpd/files/vsftpd-3.0.5-seccomp.patch
new file mode 100644
index 000000000000..cd23e6b35c6a
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-3.0.5-seccomp.patch
@@ -0,0 +1,25 @@
+From 8a0ec911c17b64747b7cb2ff6e912c7cbb87d39f Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sat, 14 Aug 2021 09:31:04 -0400
+Subject: [PATCH] Fix seccomp failures in the postlogin broker
+
+---
+ seccompsandbox.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/seccompsandbox.c b/seccompsandbox.c
+index bcd96a0..5411d69 100644
+--- a/seccompsandbox.c
++++ b/seccompsandbox.c
+@@ -515,6 +515,8 @@ seccomp_sandbox_setup_postlogin_broker()
+   seccomp_sandbox_setup_base();
+   seccomp_sandbox_setup_data_connections();
+   allow_nr_1_arg_match(__NR_sendmsg, 3, 0);
++  allow_nr(__NR_alarm);
++  allow_nr(__NR_wait4);
+ }
+ 
+ void
+-- 
+2.32.0
+
diff --git a/net-ftp/vsftpd/vsftpd-3.0.5.ebuild b/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
index e4ecfb256b89..707069d713d6 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.5.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+IUSE="elibc_musl pam ssl tcpd"
 
 DEPEND="
 	>=sys-libs/libcap-2
@@ -31,17 +31,17 @@ src_prepare() {
 		"${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
+		"${FILESDIR}"/vsftpd-3.0.5-seccomp.patch
 	)
 	default
 }
 
 define() {
-	sed -i -e "/#undef $1/c#define $1" "${S}"/builddefs.h || die
+	sed -i -e "/#undef $2/c#define $2${3:+ }$3" "$1" || die
 }
 
 undef() {
-	sed -i -e "/#define $1/c#undef $1" "${S}"/builddefs.h || die
+	sed -i -e "/#define $2/c#undef $2" "$1" || die
 }
 
 src_configure() {
@@ -50,19 +50,25 @@ src_configure() {
 	if use pam; then
 		libs+=( -lpam )
 	else
-		undef VSF_BUILD_PAM
+		undef builddefs.h VSF_BUILD_PAM
 		libs+=( -lcrypt )
 	fi
 
 	if use ssl; then
-		define VSF_BUILD_SSL
+		define builddefs.h VSF_BUILD_SSL
 		libs+=( -lcrypto -lssl )
 	fi
 
 	if use tcpd; then
-		define VSF_BUILD_TCPWRAPPERS
+		define builddefs.h VSF_BUILD_TCPWRAPPERS
 		libs+=( -lwrap )
 	fi
+
+	if use elibc_musl; then
+		# musl does not support utmp/wtmp
+		# https://bugs.gentoo.org/713952
+		undef sysdeputil.c VSF_SYSDEP_HAVE_UTMPX
+	fi
 }
 
 src_compile() {
@@ -71,6 +77,7 @@ src_compile() {
 		CFLAGS="${CFLAGS}"
 		LDFLAGS="${LDFLAGS}"
 		LIBS="${libs[*]}"
+		LINK=
 	)
 	emake "${args[@]}"
 }