diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-11 18:28:02 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-11 18:28:02 +0100 |
| commit | 2b2ad4912de8c60a2ad8372f93ee1cfe1a1bee7a (patch) | |
| tree | 8b401e576adce9b90709652019204ddd52bab7ed /package/vsftpd | |
| parent | 34139bdbf09278a6d6786185a4f013d729978e2b (diff) | |
| parent | 0cd03542850a3aacea7060d8debf0fdef333aacc (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/vsftpd')
| -rw-r--r-- | package/vsftpd/Makefile | 2 | ||||
| -rw-r--r-- | package/vsftpd/patches/patch-Makefile | 4 | ||||
| -rw-r--r-- | package/vsftpd/patches/patch-sysdeputil_c | 13 |
3 files changed, 16 insertions, 3 deletions
diff --git a/package/vsftpd/Makefile b/package/vsftpd/Makefile index 982cc111e..5d42e38da 100644 --- a/package/vsftpd/Makefile +++ b/package/vsftpd/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= vsftpd PKG_VERSION:= 3.0.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 8b00c749719089401315bd3c44dddbb2 PKG_DESCR:= a fast and secure FTP server PKG_SECTION:= www diff --git a/package/vsftpd/patches/patch-Makefile b/package/vsftpd/patches/patch-Makefile index fecf5ff17..1549bc920 100644 --- a/package/vsftpd/patches/patch-Makefile +++ b/package/vsftpd/patches/patch-Makefile @@ -1,5 +1,5 @@ --- vsftpd-3.0.2.orig/Makefile 2012-09-16 09:27:35.000000000 +0200 -+++ vsftpd-3.0.2/Makefile 2013-11-09 11:38:47.000000000 +0100 ++++ vsftpd-3.0.2/Makefile 2014-02-11 12:59:30.000000000 +0100 @@ -1,16 +1,16 @@ # Makefile for systems with GNU tools -CC = gcc @@ -21,7 +21,7 @@ OBJS = main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \ tunables.o ftpdataio.o secbuf.o ls.o \ -@@ -29,21 +29,8 @@ vsftpd: $(OBJS) +@@ -29,21 +29,8 @@ vsftpd: $(OBJS) $(CC) -o vsftpd $(OBJS) $(LINK) $(LDFLAGS) $(LIBS) install: diff --git a/package/vsftpd/patches/patch-sysdeputil_c b/package/vsftpd/patches/patch-sysdeputil_c new file mode 100644 index 000000000..693d90b63 --- /dev/null +++ b/package/vsftpd/patches/patch-sysdeputil_c @@ -0,0 +1,13 @@ +--- vsftpd-3.0.2.orig/sysdeputil.c 2012-09-16 06:18:04.000000000 +0200 ++++ vsftpd-3.0.2/sysdeputil.c 2014-02-11 14:21:18.000000000 +0100 +@@ -81,6 +81,10 @@ + #include <linux/unistd.h> + #include <errno.h> + #include <syscall.h> ++/* for musl */ ++#if !defined(__GLIBC__) ++#define WTMPX_FILE "/dev/null" ++#endif + #endif + + #if defined(__linux__) && !defined(__ia64__) && !defined(__s390__) |