From e34dbaa3d772dc16b68aefcf73271be68221cd1b58548ab9e0e4502780d6cc54 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Fri, 24 Aug 2012 07:10:05 +0000 Subject: [PATCH 1/2] - make seccomp sandbox enabled by default * dropped vsftpd-3.0.0-turn-seccomp-sandbox-off.patch OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=42 --- vsftpd.changes | 6 ++++++ vsftpd.spec | 8 ++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/vsftpd.changes b/vsftpd.changes index c1ce1d8..88ef71c 100644 --- a/vsftpd.changes +++ b/vsftpd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 24 07:07:55 UTC 2012 - mvyskocil@suse.cz + +- make seccomp sandbox enabled by default + * dropped vsftpd-3.0.0-turn-seccomp-sandbox-off.patch + ------------------------------------------------------------------- Mon Apr 23 10:38:40 UTC 2012 - brian@aljex.com diff --git a/vsftpd.spec b/vsftpd.spec index 6efdecf..2e27125 100644 --- a/vsftpd.spec +++ b/vsftpd.spec @@ -49,11 +49,8 @@ Patch6: vsftpd-2.0.5-vuser.patch Patch7: vsftpd-2.0.5-enable-debuginfo.patch Patch8: vsftpd-2.0.5-utf8-log-names.patch Patch9: vsftpd-2.3.5-conf.patch -#PATCH-FIX-OPENSUSE: turn the seccomp_sanbox feature off by default -# revert it when seccomp feature will be in suse/vanilla kernel -Patch10: vsftpd-3.0.0-turn-seccomp-sandbox-off.patch -Patch11: vsftpd-3.0.0_gnu_source_defines.patch -Patch12: vsftpd-3.0.0-optional-seccomp.patch +Patch10: vsftpd-3.0.0_gnu_source_defines.patch +Patch11: vsftpd-3.0.0-optional-seccomp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: ftp-server PreReq: %insserv_prereq /usr/sbin/useradd @@ -83,7 +80,6 @@ tests. %patch9 %patch10 -p1 %patch11 -p1 -%patch12 -p1 %build %define seccomp_opts %{nil} From 6b7e1c71a7d66e1efb59173141683778a44db5ca12169c3ddaa5ff61e486c7e7 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Tue, 28 Aug 2012 13:15:01 +0000 Subject: [PATCH 2/2] remove unused sandbox patch OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=43 --- vsftpd-3.0.0-turn-seccomp-sandbox-off.patch | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 vsftpd-3.0.0-turn-seccomp-sandbox-off.patch diff --git a/vsftpd-3.0.0-turn-seccomp-sandbox-off.patch b/vsftpd-3.0.0-turn-seccomp-sandbox-off.patch deleted file mode 100644 index e9b9bb9..0000000 --- a/vsftpd-3.0.0-turn-seccomp-sandbox-off.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: vsftpd-3.0.0/tunables.c -=================================================================== ---- vsftpd-3.0.0.orig/tunables.c 2012-04-05 00:29:50.000000000 +0200 -+++ vsftpd-3.0.0/tunables.c 2012-04-11 13:50:39.538712522 +0200 -@@ -226,7 +226,7 @@ - tunable_isolate_network = 1; - tunable_ftp_enable = 1; - tunable_http_enable = 0; -- tunable_seccomp_sandbox = 1; -+ tunable_seccomp_sandbox = 0; - tunable_allow_writeable_chroot = 0; - - tunable_accept_timeout = 60;