diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-13 21:59:33 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-13 21:59:33 +0200 |
| commit | 37cce3a71c9359d46dc20bdb7b11ea66dd60add3 (patch) | |
| tree | e67aff27a3984a048392d2ac88977d9c9aa5df17 /package/vsftpd | |
| parent | 198c7e39ba6b920adc9c4541a2ec5d13b4d3c986 (diff) | |
| parent | 025304e3d70b00ea7a91998d80a16e6183a62fad (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/vsftpd')
| -rw-r--r-- | package/vsftpd/Makefile | 9 | ||||
| -rw-r--r-- | package/vsftpd/patches/patch-Makefile | 6 | ||||
| -rw-r--r-- | package/vsftpd/patches/patch-builddefs_h | 11 |
3 files changed, 18 insertions, 8 deletions
diff --git a/package/vsftpd/Makefile b/package/vsftpd/Makefile index 61e1f80da..a275f1aad 100644 --- a/package/vsftpd/Makefile +++ b/package/vsftpd/Makefile @@ -4,25 +4,24 @@ include ${TOPDIR}/rules.mk PKG_NAME:= vsftpd -PKG_VERSION:= 2.2.0 +PKG_VERSION:= 2.3.4 PKG_RELEASE:= 1 -PKG_MD5SUM:= e4eb190af270ae65d57a84274a38ec31 +PKG_MD5SUM:= 2ea5d19978710527bb7444d93b67767a PKG_DESCR:= a fast and secure FTP server PKG_SECTION:= www PKG_URL:= http://vsftpd.beasts.org/ -PKG_SITES:= ftp://vsftpd.beasts.org/users/cevans/ +PKG_SITES:= http://security.appspot.com/downloads/ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,VSFTPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= manual - ALL_TARGET:= vsftpd post-install: ${INSTALL_DIR} ${IDIR_VSFTPD}/etc ${IDIR_VSFTPD}/usr/sbin ${INSTALL_DATA} ./files/vsftpd.conf ${IDIR_VSFTPD}/etc/vsftpd.conf - ${INSTALL_BIN} ${WRKINST}/usr/sbin/vsftpd ${IDIR_VSFTPD}/usr/sbin/ + ${INSTALL_BIN} ${WRKINST}/usr/sbin/vsftpd ${IDIR_VSFTPD}/usr/sbin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/vsftpd/patches/patch-Makefile b/package/vsftpd/patches/patch-Makefile index a6ebc0f30..83d21ca48 100644 --- a/package/vsftpd/patches/patch-Makefile +++ b/package/vsftpd/patches/patch-Makefile @@ -1,6 +1,6 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- vsftpd-2.2.0.orig/Makefile 2009-05-22 21:44:52.000000000 +0200 -+++ vsftpd-2.2.0/Makefile 2009-08-21 00:46:32.980346849 +0200 +--- vsftpd-2.3.4.orig/Makefile 2009-05-22 21:44:52.000000000 +0200 ++++ vsftpd-2.3.4/Makefile 2011-10-13 21:01:57.600352003 +0200 @@ -1,12 +1,12 @@ # Makefile for systems with GNU tools -CC = gcc @@ -27,7 +27,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ .c.o: $(CC) -c $*.c $(CFLAGS) $(IFLAGS) -@@ -24,21 +26,20 @@ vsftpd: $(OBJS) +@@ -24,21 +26,20 @@ vsftpd: $(OBJS) $(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) $(LDFLAGS) install: diff --git a/package/vsftpd/patches/patch-builddefs_h b/package/vsftpd/patches/patch-builddefs_h new file mode 100644 index 000000000..f44129e15 --- /dev/null +++ b/package/vsftpd/patches/patch-builddefs_h @@ -0,0 +1,11 @@ +--- vsftpd-2.3.4.orig/builddefs.h 2010-08-06 02:50:31.000000000 +0200 ++++ vsftpd-2.3.4/builddefs.h 2011-10-13 21:06:37.080352120 +0200 +@@ -2,7 +2,7 @@ + #define VSF_BUILDDEFS_H + + #undef VSF_BUILD_TCPWRAPPERS +-#define VSF_BUILD_PAM ++#undef VSF_BUILD_PAM + #undef VSF_BUILD_SSL + + #endif /* VSF_BUILDDEFS_H */ |