Mailinglist Archive: opensuse-commit (1423 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package vsftpd for openSUSE:Factory checked 
in at 2012-05-08 06:49:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vsftpd (Old)
 and      /work/SRC/openSUSE:Factory/.vsftpd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "vsftpd", Maintainer is "MVyskocil@xxxxxxxx"

Changes:
--------
--- /work/SRC/openSUSE:Factory/vsftpd/vsftpd.changes    2012-04-12 
09:55:58.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.vsftpd.new/vsftpd.changes       2012-05-08 
06:50:19.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Apr 23 10:38:40 UTC 2012 - brian@xxxxxxxxx
+
+- 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
+
+-------------------------------------------------------------------

New:
----
  vsftpd-3.0.0-optional-seccomp.patch
  vsftpd-3.0.0_gnu_source_defines.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ vsftpd.spec ++++++
--- /var/tmp/diff_new_pack.PJSjJK/_old  2012-05-08 06:50:21.000000000 +0200
+++ /var/tmp/diff_new_pack.PJSjJK/_new  2012-05-08 06:50:21.000000000 +0200
@@ -52,6 +52,8 @@
 #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 @@
 %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

++++++ vsftpd-3.0.0-optional-seccomp.patch ++++++
--- 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"
++++++ vsftpd-3.0.0_gnu_source_defines.patch ++++++
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 */

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx