summaryrefslogtreecommitdiffstats
path: root/main/vsftpd
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-05-20 19:39:18 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-05-20 19:39:18 +0000
commita2a9a8e8f7050c5bc449987ced0453bc416d6a79 (patch)
tree81d4a1d1d3516646248c5e9b62a02f89f30bdadd /main/vsftpd
parent05f2984940d9e43e5b9baf0dfcc2e0c853a25b69 (diff)
main/vsftpd: build fix for x86_64
Diffstat (limited to 'main/vsftpd')
-rw-r--r--main/vsftpd/APKBUILD4
-rw-r--r--main/vsftpd/vsftpd-gnu-source.patch12
2 files changed, 16 insertions, 0 deletions
diff --git a/main/vsftpd/APKBUILD b/main/vsftpd/APKBUILD
index 5603df12b94..e9c80754a3c 100644
--- a/main/vsftpd/APKBUILD
+++ b/main/vsftpd/APKBUILD
@@ -12,6 +12,7 @@ makedepends="openssl-dev libcap-dev wget linux-pam-dev"
subpackages="$pkgname-doc"
source="https://security.appspot.com/downloads/vsftpd-${pkgver}.tar.gz
vsftpd-enable-ssl.patch
+ vsftpd-gnu-source.patch
vsftpd.initd
vsftpd.confd"
@@ -21,6 +22,8 @@ prepare() {
cd $_builddir
#Enable SSL support
patch -p0 -i "$srcdir"/vsftpd-enable-ssl.patch || return 1
+ #build fix for x86_64
+ patch -p1 -i "$srcdir"/vsftpd-gnu-source.patch || return 1
# we dont have libnsl
sed -i -e '/-lnsl/d' vsf_findlibs.sh || return 1
# Let abuild control stripping
@@ -45,5 +48,6 @@ package() {
md5sums="ad9fa952558c2c5b0426ccaccff0f972 vsftpd-3.0.0.tar.gz
f3cbaf364cd3c46a2a03b00de9d7e184 vsftpd-enable-ssl.patch
+f2245efcc271356743805f38d6c5aea3 vsftpd-gnu-source.patch
1a56bcc7698dba6490f0007f37c75e9b vsftpd.initd
431dfe7403323e247a88b97beade5d78 vsftpd.confd"
diff --git a/main/vsftpd/vsftpd-gnu-source.patch b/main/vsftpd/vsftpd-gnu-source.patch
new file mode 100644
index 00000000000..a7f09d3912f
--- /dev/null
+++ b/main/vsftpd/vsftpd-gnu-source.patch
@@ -0,0 +1,12 @@
+--- ./seccompsandbox.c.orig
++++ ./seccompsandbox.c
+@@ -12,6 +12,9 @@
+
+ #if defined(__linux__) && defined(__x86_64__)
+
++/* for O_DIRECTORY */
++#define _GNU_SOURCE
++
+ #include "session.h"
+ #include "sysutil.h"
+ #include "tunables.h"