From e2db47eaae00ec33f8971db44b68645c5d3b9590 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 17 Aug 2021 11:36:49 +0100 Subject: gentoo resync : 17.08.2021 --- .../files/vsftpd-3.0.5-fix-link-command.patch | 25 ---------------------- net-ftp/vsftpd/files/vsftpd-3.0.5-seccomp.patch | 25 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 net-ftp/vsftpd/files/vsftpd-3.0.5-fix-link-command.patch create mode 100644 net-ftp/vsftpd/files/vsftpd-3.0.5-seccomp.patch (limited to 'net-ftp/vsftpd/files') 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 -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 +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 + -- cgit v1.2.3