diff options
| author | Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org> | 2014-02-05 20:24:13 +0100 |
|---|---|---|
| committer | Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org> | 2014-02-05 20:24:40 +0100 |
| commit | 479c4ec9daa04d204d6b3e1ce44af077dc9b437d (patch) | |
| tree | 735aa40f1e4c05f4e256388745769befe9adbf46 | |
| parent | b99a8fe7be8e04db750ca4cf28f9ea73a032f946 (diff) | |
| download | aports-479c4ec9daa04d204d6b3e1ce44af077dc9b437d.tar.bz2 aports-479c4ec9daa04d204d6b3e1ce44af077dc9b437d.tar.xz | |
main/vsftpd: fix musl build
| -rw-r--r-- | main/vsftpd/APKBUILD | 20 | ||||
| -rw-r--r-- | main/vsftpd/wtmpx_file.patch | 35 |
2 files changed, 48 insertions, 7 deletions
diff --git a/main/vsftpd/APKBUILD b/main/vsftpd/APKBUILD index 7e2c537d14..6bb3440faf 100644 --- a/main/vsftpd/APKBUILD +++ b/main/vsftpd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=vsftpd pkgver=3.0.2 -pkgrel=4 +pkgrel=5 pkgdesc="Very secure ftpd" url="http://vsftpd.beasts.org" arch="all" @@ -15,17 +15,20 @@ source="https://security.appspot.com/downloads/vsftpd-${pkgver}.tar.gz vsftpd-enable-ssl.patch vsftpd-gnu-source.patch vsftpd.initd - vsftpd.confd" + vsftpd.confd + wtmpx_file.patch" _builddir="$srcdir/$pkgname-$pkgver" prepare() { cd $_builddir - #Enable SSL support + #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 # we dont have libnsl - sed -i -e '/-lnsl/d' vsf_findlibs.sh || return 1 + sed -i -e '/-lnsl/d' vsf_findlibs.sh || return 1 # Let abuild control stripping sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile } @@ -50,14 +53,17 @@ md5sums="8b00c749719089401315bd3c44dddbb2 vsftpd-3.0.2.tar.gz f3cbaf364cd3c46a2a03b00de9d7e184 vsftpd-enable-ssl.patch f2245efcc271356743805f38d6c5aea3 vsftpd-gnu-source.patch b48784af42b0f787e55276fc20476aa2 vsftpd.initd -9e495776096c78c3f9d9e6756a8c3003 vsftpd.confd" +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 78d79b46017accf34d64f02e22d2f1d7bd58c78d8bc5cb6f692c139d285a562a vsftpd.initd -5ed45cbe507676fd1252427016047e02b775acfb3dd0f3e44fe61410a8e7a1ba vsftpd.confd" +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 23c9b66f2463b16d54f9ec5f03134f893692700f269dc9baa57f4659599b2afe04c5b0f302a610deee763656447b50a4ef082fc8551241c399122fc4c1a9431e vsftpd.initd -7bd138cf66356db55d00796f99b327e9aedf45a48b6fc9b464801fd17a69949ca1296131513c289b0293d27b29c1add08e601068501591108ed7fb13efeeacf3 vsftpd.confd" +7bd138cf66356db55d00796f99b327e9aedf45a48b6fc9b464801fd17a69949ca1296131513c289b0293d27b29c1add08e601068501591108ed7fb13efeeacf3 vsftpd.confd +bb1bcb97df769d658e3d99a1ed1b585250a84ecfb7371adc17dff85732eee0bdc53442725c91e7563dda250d3c0b1cea1f3a5e805f3abc36aa7d27a7ba237742 wtmpx_file.patch" diff --git a/main/vsftpd/wtmpx_file.patch b/main/vsftpd/wtmpx_file.patch new file mode 100644 index 0000000000..6ca8416933 --- /dev/null +++ b/main/vsftpd/wtmpx_file.patch @@ -0,0 +1,35 @@ +diff -rupN a/seccompsandbox.c b/seccompsandbox.c +--- a/seccompsandbox.c 2012-09-18 08:52:30.000000000 +0200 ++++ b/seccompsandbox.c 2014-02-05 20:22:15.919607188 +0100 +@@ -21,7 +21,7 @@ + + #include <netinet/in.h> + +-#include <sys/fcntl.h> ++#include <fcntl.h> + #include <sys/mman.h> + #include <sys/prctl.h> + #include <sys/socket.h> +diff -rupN a/sysdeputil.c b/sysdeputil.c +--- a/sysdeputil.c 2012-09-16 06:18:04.000000000 +0200 ++++ b/sysdeputil.c 2014-02-05 20:20:07.212933389 +0100 +@@ -1216,7 +1216,9 @@ vsf_insert_uwtmp(const struct mystr* p_u + setutxent(); + (void) pututxline(&s_utent); + endutxent(); ++#if defined(WTMPX_FILE) + updwtmpx(WTMPX_FILE, &s_utent); ++#endif + } + + void +@@ -1235,7 +1237,9 @@ vsf_remove_uwtmp(void) + (void) pututxline(&s_utent); + endutxent(); + s_utent.ut_tv.tv_sec = vsf_sysutil_get_time_sec(); ++#if defined(WTMPX_FILE) + updwtmpx(WTMPX_FILE, &s_utent); ++#endif + } + + #endif /* !VSF_SYSDEP_HAVE_UTMPX */ |