summaryrefslogtreecommitdiff
path: root/package/vsftpd
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-06-05 19:58:50 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2009-06-05 19:58:50 +0200
commite874f84fdb6eb83d905a72b35d87398374594b97 (patch)
tree38ecc86989a194756836fa411c4bfb7c4b68913f /package/vsftpd
parent68e89ea1a3ec3690ddefbd97c45174f799847a16 (diff)
more regressions found at runtime on alic1c
Diffstat (limited to 'package/vsftpd')
-rw-r--r--package/vsftpd/Makefile2
-rw-r--r--package/vsftpd/patches/patch-Makefile8
2 files changed, 5 insertions, 5 deletions
diff --git a/package/vsftpd/Makefile b/package/vsftpd/Makefile
index 2975d938d..e0cb84ec2 100644
--- a/package/vsftpd/Makefile
+++ b/package/vsftpd/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:= ftp://vsftpd.beasts.org/users/cevans/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,VSFTPD,vsftpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,VSFTPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
BUILD_STYLE:= auto
XAKE_FLAGS+= ${TARGET_CONFIGURE_OPTS}
diff --git a/package/vsftpd/patches/patch-Makefile b/package/vsftpd/patches/patch-Makefile
index fac3a012e..eecb47336 100644
--- a/package/vsftpd/patches/patch-Makefile
+++ b/package/vsftpd/patches/patch-Makefile
@@ -1,19 +1,19 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- vsftpd-2.0.7.orig/Makefile 2008-02-12 04:52:15.000000000 +0100
-+++ vsftpd-2.0.7/Makefile 2008-08-31 21:53:34.000000000 +0200
+--- vsftpd-2.1.2.orig/Makefile 2009-05-22 21:44:52.000000000 +0200
++++ vsftpd-2.1.2/Makefile 2009-06-04 22:15:07.000000000 +0200
@@ -5,8 +5,8 @@ IFLAGS = -idirafter dummyinc
#CFLAGS = -g
CFLAGS = -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
-LIBS = `./vsf_findlibs.sh`
-LINK = -Wl,-s
-+LIBS = -lcrypt -lnsl
++LIBS = -lcrypt
+LINK =
OBJS = main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \
tunables.o ftpdataio.o secbuf.o ls.o \
@@ -17,6 +17,8 @@ OBJS = main.o utility.o prelogin.o ftpcm
- ssl.o sysutil.o sysdeputil.o
+ ssl.o sslslave.o ptracesandbox.o ftppolicy.o sysutil.o sysdeputil.o
+DESTDIR =