[packages] vsftpd: override LDFLAGS as well to avoid -fpic requirement, refresh patch...

SVN-Revision: 31241

diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile
index f6dd53dc31d53401efe7e02172e628112e6ba38f..db10b3c0a4ea2bf2c13d03c57933836c0a7ebf3e 100644 (file)
--- 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 33897b2b341caa889382159c21f13c3aaf596a2b..70d95927f0ce2fbbc648c18298ae3be13a91e79a 100644 (file)
--- 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 6f1ac3512b9ba17af74178ae774a8c3b80eb7cc3..daf83efabd4ae59e92c699ac674ee061f27f676c 100644 (file)
--- 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 6f7c34a66cba0fb870b76c1b2e0105a4f1134f20..8965da4179c9aa3dbbf554660abfc8774b25e8af 100644 (file)
--- 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;