From 2152478c874bed731c36994e686850280708b028 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 10 Apr 2012 14:54:07 +0000
Subject: [PATCH] [packages] vsftpd: override LDFLAGS as well to avoid -fpic
 requirement, refresh patches (#11263)

SVN-Revision: 31241
---
 net/vsftpd/Makefile                    | 1 +
 net/vsftpd/patches/001-destdir.patch   | 8 ++++----
 net/vsftpd/patches/002-find_libs.patch | 2 +-
 net/vsftpd/patches/003-chroot.patch    | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile
index f6dd53dc31..db10b3c0a4 100644
--- a/net/vsftpd/Makefile
+++ b/net/vsftpd/Makefile
@@ -34,6 +34,7 @@ define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CC="$(TARGET_CC)" \
 		CFLAGS="$(TARGET_CFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
 		vsftpd
 endef
 
diff --git a/net/vsftpd/patches/001-destdir.patch b/net/vsftpd/patches/001-destdir.patch
index 33897b2b34..70d95927f0 100644
--- a/net/vsftpd/patches/001-destdir.patch
+++ b/net/vsftpd/patches/001-destdir.patch
@@ -1,7 +1,7 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -17,6 +17,8 @@ OBJS	=	main.o utility.o prelogin.o ftpcm
-     ssl.o sslslave.o ptracesandbox.o ftppolicy.o sysutil.o sysdeputil.o
+@@ -22,6 +22,8 @@ OBJS	=	main.o utility.o prelogin.o ftpcm
+     seccompsandbox.o
  
  
 +DESTDIR =
@@ -9,8 +9,8 @@
  .c.o:
  	$(CC) -c $*.c $(CFLAGS) $(IFLAGS)
  
-@@ -24,21 +26,20 @@ vsftpd: $(OBJS) 
- 	$(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) $(LDFLAGS)
+@@ -29,21 +31,20 @@ vsftpd: $(OBJS) 
+ 	$(CC) -o vsftpd $(OBJS) $(LINK) $(LDFLAGS) $(LIBS)
  
  install:
 -	if [ -x /usr/local/sbin ]; then \
diff --git a/net/vsftpd/patches/002-find_libs.patch b/net/vsftpd/patches/002-find_libs.patch
index 6f1ac3512b..daf83efabd 100644
--- a/net/vsftpd/patches/002-find_libs.patch
+++ b/net/vsftpd/patches/002-find_libs.patch
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -8,8 +8,8 @@
+@@ -8,8 +8,8 @@ CFLAGS	=	-O2 -fPIE -fstack-protector --p
  	-D_FORTIFY_SOURCE=2 \
  	#-pedantic -Wconversion
  
diff --git a/net/vsftpd/patches/003-chroot.patch b/net/vsftpd/patches/003-chroot.patch
index 6f7c34a66c..8965da4179 100644
--- a/net/vsftpd/patches/003-chroot.patch
+++ b/net/vsftpd/patches/003-chroot.patch
@@ -1,6 +1,6 @@
 --- a/tunables.c
 +++ b/tunables.c
-@@ -250,7 +250,7 @@ tunables_load_defaults()
+@@ -254,7 +254,7 @@ tunables_load_defaults()
    /* -rw------- */
    tunable_chown_upload_mode = 0600;
  
-- 
2.30.2