rpm/vsftpd
SHA256
1
0
Fork 0
forked from pool/vsftpd
Code Pull Requests Activity

Accepting request 116233 from network

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/116233
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vsftpd?expand=0&rev=30
This commit is contained in:
Stephan Kulow 2012-05-08 04:49:05 +00:00 committed by Git OBS Bridge
commit 1f1a63d012
4 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vsftpd-3.0.0-optional-seccomp.patch Normal file
View File

@ -0,0 +1,11 @@
--- vsftpd-3.0.0/seccompsandbox.c 2012-04-04 18:41:51.000000000 -0400
+++ vsftpd-3.0.0+/seccompsandbox.c 2012-04-23 06:06:00.000000000 -0400
@@ -10,7 +10,7 @@
#include "seccompsandbox.h"
-#if defined(__linux__) && defined(__x86_64__)
+#if defined(__linux__) && defined(__x86_64__) && defined(USE_SECCOMP)
#include "session.h"
#include "sysutil.h"

13
vsftpd-3.0.0_gnu_source_defines.patch Normal file
View File

@ -0,0 +1,13 @@
diff -aur vsftpd-3.0.0/sysdeputil.c vsftpd-3.0.0+/sysdeputil.c
--- vsftpd-3.0.0/sysdeputil.c 2010-03-25 23:25:33.000000000 -0400
+++ vsftpd-3.0.0+/sysdeputil.c 2012-04-23 04:39:39.000000000 -0400
@@ -60,7 +60,9 @@
#define VSF_SYSDEP_HAVE_LIBCAP
#define VSF_SYSDEP_HAVE_UTMPX
+#ifndef __USE_GNU
#define __USE_GNU
+#endif
#include <utmpx.h>
/* BEGIN config */

7
vsftpd.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Apr 23 10:38:40 UTC 2012 - brian@aljex.com
- fix building on 11.4 x86_64 and lower
* fix where, when, & how __USE_GNU gets #defined
* make seccomp optional and disable it on 10.3 and lower
-------------------------------------------------------------------
Tue Apr 10 14:13:12 UTC 2012 - mvyskocil@suse.cz

10
vsftpd.spec
View File

@ -52,6 +52,8 @@ 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
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: ftp-server
PreReq: %insserv_prereq /usr/sbin/useradd
@ -80,10 +82,16 @@ tests.
%patch8
%patch9
%patch10 -p1
%patch11 -p1
%patch12 -p1
%build
%define seccomp_opts %{nil}
%if 0%{?suse_version} > 1030
%define seccomp_opts -D_GNU_SOURCE -DUSE_SECCOMP
%endif
rm -f dummyinc/sys/capability.h
make CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fPIE -fstack-protector --param=ssp-buffer-size=4" \
make CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fPIE -fstack-protector --param=ssp-buffer-size=4 %{seccomp_opts}" \
LDFLAGS="-fPIE -pie -Wl,-z,relro -Wl,-z,now" LINK=
%install