diff options
Diffstat (limited to 'main/vsftpd')
| -rw-r--r-- | main/vsftpd/APKBUILD | 32 | ||||
| -rw-r--r-- | main/vsftpd/vsftpd-clearenv.patch | 21 | ||||
| -rw-r--r-- | main/vsftpd/vsftpd-enable-ssl.patch | 4 | ||||
| -rw-r--r-- | main/vsftpd/vsftpd-gnu-source.patch | 12 |
4 files changed, 39 insertions, 30 deletions
diff --git a/main/vsftpd/APKBUILD b/main/vsftpd/APKBUILD index af889c0b6a..f7ad93ef0e 100644 --- a/main/vsftpd/APKBUILD +++ b/main/vsftpd/APKBUILD @@ -2,10 +2,10 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=vsftpd pkgver=3.0.2 -pkgrel=6 +pkgrel=7 pkgdesc="Very secure ftpd" url="http://vsftpd.beasts.org" -arch="x86_64" +arch="all" license="GPL2" depends="" makedepends="openssl-dev libcap-dev linux-pam-dev" @@ -13,7 +13,7 @@ subpackages="$pkgname-doc" install="$pkgname.pre-install" source="https://security.appspot.com/downloads/vsftpd-${pkgver}.tar.gz vsftpd-enable-ssl.patch - vsftpd-gnu-source.patch + vsftpd-clearenv.patch vsftpd.initd vsftpd.confd wtmpx_file.patch" @@ -21,12 +21,12 @@ source="https://security.appspot.com/downloads/vsftpd-${pkgver}.tar.gz _builddir="$srcdir/$pkgname-$pkgver" 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 - #musl - patch -p1 -i "$srcdir"/wtmpx_file.patch || return 1 + local i + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done # we dont have libnsl sed -i -e '/-lnsl/d' vsf_findlibs.sh || return 1 # Let abuild control stripping @@ -35,7 +35,7 @@ prepare() { build() { cd $_builddir - make || return 1 + make CFLAGS="$CFLAGS -D_GNU_SOURCE" || return 1 } package() { @@ -50,20 +50,20 @@ package() { } md5sums="8b00c749719089401315bd3c44dddbb2 vsftpd-3.0.2.tar.gz -f3cbaf364cd3c46a2a03b00de9d7e184 vsftpd-enable-ssl.patch -f2245efcc271356743805f38d6c5aea3 vsftpd-gnu-source.patch +018ee421c56dd1b6f21bdfdf3628b97e vsftpd-enable-ssl.patch +a97b6a7c69d872393dc993f6eb291bfa vsftpd-clearenv.patch b48784af42b0f787e55276fc20476aa2 vsftpd.initd 9e495776096c78c3f9d9e6756a8c3003 vsftpd.confd a8ca7b0680a76bbb79b0fd978a6b5d0f wtmpx_file.patch" sha256sums="be46f0e2c5528fe021fafc8dab1ecfea0c1f183063a06977f8537fcd0b195e56 vsftpd-3.0.2.tar.gz -79fa4d1a78d5ec408f02b331c5ecb8dc25f94606f5a9c902624c545154323607 vsftpd-enable-ssl.patch -9ac07b8bf589a5632403c99c95aa2dd01c9c068c36e303868d08f459b17e0c9b vsftpd-gnu-source.patch +4cce385d98f0ddd76ab6bb07703d4ca6b6cab7f2b3c6f44da993b9df77e626db vsftpd-enable-ssl.patch +7c29e61c1fbb8881fc252c2b79c242a084b628299f7963f9c43d6e8162ed776e vsftpd-clearenv.patch 78d79b46017accf34d64f02e22d2f1d7bd58c78d8bc5cb6f692c139d285a562a vsftpd.initd 5ed45cbe507676fd1252427016047e02b775acfb3dd0f3e44fe61410a8e7a1ba vsftpd.confd 5ea711e43ae4dff6ca110432dec27af9cbea4b697920ba5ea0a254b2642e3e41 wtmpx_file.patch" sha512sums="d5b978e07d8b0a623b79a531824666fb9b970ad5989a8c34c21b545b62ba07cde4bfe3d77b40a8b6e92d17890c37cae209231af8f106da3404f6548e217bd023 vsftpd-3.0.2.tar.gz -7968c77d6eb03caa2b085bd09008c2953ec80e2b8ea836a39103bb7c2e54fba1a241607a118ea8a55d718a9efe46c1f017bcc22fce20ebd8f7e9a71e79b583e9 vsftpd-enable-ssl.patch -4fbf8bb953dec220ea5dc2f2ecd1f275dae27b24a06b17f437eea493cd94e05e95fd78910a81e7ebf27b84e60251c4db6780d4741da62ecc056a2f78a5a3c3a6 vsftpd-gnu-source.patch +842c1bd972f710e4ba15e1d62a4c8ebf133dc279607b844710ad6484834b6f3a43f9f3296a53e3176df2cec129b0d96b30f0610042ee66b3263d821e1efda398 vsftpd-enable-ssl.patch +13a3949695ad904c5389513206b9db71b6a4f5d35cd0c37484d9a8d8db1cd7a10c023b005661241a2e6b993fdd9c93eb7b3faaaf2542bf68a1520cf869abd710 vsftpd-clearenv.patch 23c9b66f2463b16d54f9ec5f03134f893692700f269dc9baa57f4659599b2afe04c5b0f302a610deee763656447b50a4ef082fc8551241c399122fc4c1a9431e vsftpd.initd 7bd138cf66356db55d00796f99b327e9aedf45a48b6fc9b464801fd17a69949ca1296131513c289b0293d27b29c1add08e601068501591108ed7fb13efeeacf3 vsftpd.confd bb1bcb97df769d658e3d99a1ed1b585250a84ecfb7371adc17dff85732eee0bdc53442725c91e7563dda250d3c0b1cea1f3a5e805f3abc36aa7d27a7ba237742 wtmpx_file.patch" diff --git a/main/vsftpd/vsftpd-clearenv.patch b/main/vsftpd/vsftpd-clearenv.patch new file mode 100644 index 0000000000..748cc9481b --- /dev/null +++ b/main/vsftpd/vsftpd-clearenv.patch @@ -0,0 +1,21 @@ +diff -ru vsftpd-3.0.2.orig/sysdeputil.c vsftpd-3.0.2/sysdeputil.c +--- vsftpd-3.0.2.orig/sysdeputil.c 2014-06-19 15:54:37.000000000 -0300 ++++ vsftpd-3.0.2/sysdeputil.c 2014-06-19 16:31:14.267550219 -0300 +@@ -37,6 +37,7 @@ + + #include <sys/prctl.h> + #include <signal.h> ++#include <stdlib.h> + + /* Configuration.. here are the possibilities */ + #undef VSF_SYSDEP_HAVE_CAPABILITIES +@@ -931,7 +932,8 @@ + p_env++; + } + /* Oops :-) */ +- environ = 0; ++ /* environ = 0; */ ++ clearenv(); + s_p_proctitle = (char*) argv[0]; + vsf_sysutil_memclr(s_p_proctitle, s_proctitle_space); + } diff --git a/main/vsftpd/vsftpd-enable-ssl.patch b/main/vsftpd/vsftpd-enable-ssl.patch index 22161907cd..93469e6fdc 100644 --- a/main/vsftpd/vsftpd-enable-ssl.patch +++ b/main/vsftpd/vsftpd-enable-ssl.patch @@ -1,5 +1,5 @@ ---- builddefs.h.orig Sun Mar 1 15:18:09 2009 -+++ builddefs.h Sun Mar 1 15:15:24 2009 +--- a/builddefs.h.orig Sun Mar 1 15:18:09 2009 ++++ b/builddefs.h Sun Mar 1 15:15:24 2009 @@ -3,7 +3,7 @@ #undef VSF_BUILD_TCPWRAPPERS diff --git a/main/vsftpd/vsftpd-gnu-source.patch b/main/vsftpd/vsftpd-gnu-source.patch deleted file mode 100644 index a7f09d3912..0000000000 --- a/main/vsftpd/vsftpd-gnu-source.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ./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" |