summaryrefslogtreecommitdiff
path: root/net-ftp/vsftpd/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-08-17 11:36:49 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-08-17 11:36:49 +0100
commite2db47eaae00ec33f8971db44b68645c5d3b9590 (patch)
tree3ec0cf16ddb5854017e134fabebe14bf8cb94a34 /net-ftp/vsftpd/files
parent616579b5d773c50af31ee56f00105d96ce641ca2 (diff)
gentoo resync : 17.08.2021
Diffstat (limited to 'net-ftp/vsftpd/files')
-rw-r--r--net-ftp/vsftpd/files/vsftpd-3.0.5-fix-link-command.patch25
-rw-r--r--net-ftp/vsftpd/files/vsftpd-3.0.5-seccomp.patch25
2 files changed, 25 insertions, 25 deletions
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
+