[gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/, net-ftp/vsftpd/files/

[Mike Gilbert]

commit:     1a75a25262b20b9213dac8b2ebdd0c4938323b4b
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 16 18:09:43 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Aug 16 18:09:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a75a252

net-ftp/vsftpd: fix seccomp failures

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 net-ftp/vsftpd/files/vsftpd-3.0.5-seccomp.patch    | 25 ++++++++++++++++++++++
 ...{vsftpd-3.0.5.ebuild => vsftpd-3.0.5-r1.ebuild} |  1 +
 2 files changed, 26 insertions(+)

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 00000000000..cd23e6b35c6
--- /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 <flop...@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
similarity index 98%
rename from net-ftp/vsftpd/vsftpd-3.0.5.ebuild
rename to net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
index b63d380bf32..707069d713d 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.5.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
@@ -31,6 +31,7 @@ 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-seccomp.patch
        )
        default
 }