[packages] vsftpd: override LDFLAGS as well to avoid -fpic requirement, refresh patches (#11263)
git-svn-id: svn://svn.openwrt.org/openwrt/packages@31241 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
0dd954b2ce
commit
f44fb45149
@ -34,6 +34,7 @@ define Build/Compile
|
|||||||
$(MAKE) -C $(PKG_BUILD_DIR) \
|
$(MAKE) -C $(PKG_BUILD_DIR) \
|
||||||
CC="$(TARGET_CC)" \
|
CC="$(TARGET_CC)" \
|
||||||
CFLAGS="$(TARGET_CFLAGS)" \
|
CFLAGS="$(TARGET_CFLAGS)" \
|
||||||
|
LDFLAGS="$(TARGET_LDFLAGS)" \
|
||||||
vsftpd
|
vsftpd
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
--- a/Makefile
|
--- a/Makefile
|
||||||
+++ b/Makefile
|
+++ b/Makefile
|
||||||
@@ -17,6 +17,8 @@ OBJS = main.o utility.o prelogin.o ftpcm
|
@@ -22,6 +22,8 @@ OBJS = main.o utility.o prelogin.o ftpcm
|
||||||
ssl.o sslslave.o ptracesandbox.o ftppolicy.o sysutil.o sysdeputil.o
|
seccompsandbox.o
|
||||||
|
|
||||||
|
|
||||||
+DESTDIR =
|
+DESTDIR =
|
||||||
@ -9,8 +9,8 @@
|
|||||||
.c.o:
|
.c.o:
|
||||||
$(CC) -c $*.c $(CFLAGS) $(IFLAGS)
|
$(CC) -c $*.c $(CFLAGS) $(IFLAGS)
|
||||||
|
|
||||||
@@ -24,21 +26,20 @@ vsftpd: $(OBJS)
|
@@ -29,21 +31,20 @@ vsftpd: $(OBJS)
|
||||||
$(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) $(LDFLAGS)
|
$(CC) -o vsftpd $(OBJS) $(LINK) $(LDFLAGS) $(LIBS)
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- if [ -x /usr/local/sbin ]; then \
|
- if [ -x /usr/local/sbin ]; then \
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/Makefile
|
--- a/Makefile
|
||||||
+++ b/Makefile
|
+++ b/Makefile
|
||||||
@@ -8,8 +8,8 @@
|
@@ -8,8 +8,8 @@ CFLAGS = -O2 -fPIE -fstack-protector --p
|
||||||
-D_FORTIFY_SOURCE=2 \
|
-D_FORTIFY_SOURCE=2 \
|
||||||
#-pedantic -Wconversion
|
#-pedantic -Wconversion
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/tunables.c
|
--- a/tunables.c
|
||||||
+++ b/tunables.c
|
+++ b/tunables.c
|
||||||
@@ -250,7 +250,7 @@ tunables_load_defaults()
|
@@ -254,7 +254,7 @@ tunables_load_defaults()
|
||||||
/* -rw------- */
|
/* -rw------- */
|
||||||
tunable_chown_upload_mode = 0600;
|
tunable_chown_upload_mode = 0600;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user