From 6d134be229c5b67a95df807e8daaf8caadee0685 Mon Sep 17 00:00:00 2001
From: Markham <markham001@gmx.de>
Date: Sat, 23 Jan 2016 15:44:05 +0100
Subject: [PATCH] vsftpd: update target; bump version 3.0.3

---
 make/applications.mk | 55 +++++++-------------------------------------
 make/archives.mk     |  4 ++--
 make/versions.mk     |  3 +++
 3 files changed, 13 insertions(+), 49 deletions(-)

diff --git a/make/applications.mk b/make/applications.mk
index 668396e..88a76a7 100755
--- a/make/applications.mk
+++ b/make/applications.mk
@@ -109,59 +109,20 @@ $(D)/ntp: $(D)/openssl $(ARCHIVE)/ntp-$(NTP_VER).tar.gz | $(TARGETPREFIX)
 	$(REMOVE)/ntp-$(NTP_VER)
 	touch $@
 
-$(D)/vsftpd: $(ARCHIVE)/vsftpd-3.0.2.tar.gz | $(TARGETPREFIX)
-	if [ $(PLATFORM) = "nevis" ]; then \
-		$(MAKE) $(D)/vsftpd-nevis; \
-	elif [ $(PLATFORM) = "apollo" ]; then \
-		$(MAKE) $(D)/vsftpd-apollo; \
-	elif [ $(PLATFORM) = "kronos" ]; then \
-		$(MAKE) $(D)/vsftpd-kronos; \
-	else \
-		$(MAKE) $(D)/vsftpd-nevis; \
-	fi
-	touch $@
-
-$(D)/vsftpd-nevis: $(ARCHIVE)/vsftpd-3.0.2.tar.gz | $(TARGETPREFIX)
-	$(UNTAR)/vsftpd-3.0.2.tar.gz
-	pushd $(BUILD_TMP)/vsftpd-3.0.2 && \
-	mv $(BUILD_TMP)/vsftpd-3.0.2/parseconf.c $(BUILD_TMP)/vsftpd-3.0.2/parseconf.tmp && \
-	sed -e 's/die("config file not owned by correct user, or not a file");/\/\/die("config file not owned by correct user, or not a file");/g' $(BUILD_TMP)/vsftpd-3.0.2/parseconf.tmp > $(BUILD_TMP)/vsftpd-3.0.2/parseconf.c && \
+$(D)/vsftpd: $(ARCHIVE)/vsftpd-$(VSFTPD_VER).tar.gz | $(TARGETPREFIX)
+	$(UNTAR)/vsftpd-$(VSFTPD_VER).tar.gz
+	pushd $(BUILD_TMP)/vsftpd-$(VSFTPD_VER) && \
+	mv $(BUILD_TMP)/vsftpd-$(VSFTPD_VER)/parseconf.c $(BUILD_TMP)/vsftpd-$(VSFTPD_VER)/parseconf.tmp && \
+	sed -e 's/die("config file not owned by correct user, or not a file");/\/\/die("config file not owned by correct user, or not a file");/g' $(BUILD_TMP)/vsftpd-$(VSFTPD_VER)/parseconf.tmp > $(BUILD_TMP)/vsftpd-$(VSFTPD_VER)/parseconf.c && \
 		cp $(PATCHES)/vsftpd-new.conf vsftpd.conf && \
 		$(PATCH)/vsftpd-new.diff && \
-		TARGETPREFIX=$(TARGETPREFIX) $(MAKE) CC=$(TARGET)-gcc CFLAGS="$(TARGET_CFLAGS)" LIBS="-lcrypt" && \
+		TARGETPREFIX=$(TARGETPREFIX) $(MAKE) CC=$(TARGET)-gcc CFLAGS="-pipe -O2 -g0 -I$(TARGETPREFIX)/include" LDFLAGS="$(LD_FLAGS) -Wl,-rpath-link,$(TARGETLIB)" && \
 		mkdir -p $(TARGETPREFIX)/sbin && \
 		install -m755 vsftpd $(TARGETPREFIX)/sbin/vsftpd && \
 		install -m 644 vsftpd.conf $(TARGETPREFIX)/etc/vsftpd.conf && \
 		install -d $(TARGETPREFIX)/share/empty && \
-	$(REMOVE)/vsftpd-3.0.2
-
-$(D)/vsftpd-apollo: $(ARCHIVE)/vsftpd-3.0.2.tar.gz | $(TARGETPREFIX)
-	$(UNTAR)/vsftpd-3.0.2.tar.gz
-	pushd $(BUILD_TMP)/vsftpd-3.0.2 && \
-	mv $(BUILD_TMP)/vsftpd-3.0.2/parseconf.c $(BUILD_TMP)/vsftpd-3.0.2/parseconf.tmp && \
-	sed -e 's/die("config file not owned by correct user, or not a file");/\/\/die("config file not owned by correct user, or not a file");/g' $(BUILD_TMP)/vsftpd-3.0.2/parseconf.tmp > $(BUILD_TMP)/vsftpd-3.0.2/parseconf.c && \
-		cp $(PATCHES)/vsftpd-new.conf vsftpd.conf && \
-		$(PATCH)/vsftpd-new.diff && \
-		TARGETPREFIX=$(TARGETPREFIX) $(MAKE) CC=$(TARGET)-gcc CFLAGS="$(TARGET_CFLAGS) -fPIC" LIBS="-lcrypt" && \
-		mkdir -p $(TARGETPREFIX)/sbin && \
-		install -m755 vsftpd $(TARGETPREFIX)/sbin/vsftpd && \
-		install -m 644 vsftpd.conf $(TARGETPREFIX)/etc/vsftpd.conf && \
-		install -d $(TARGETPREFIX)/share/empty && \
-	$(REMOVE)/vsftpd-3.0.2
-
-$(D)/vsftpd-kronos: $(ARCHIVE)/vsftpd-3.0.2.tar.gz | $(TARGETPREFIX)
-	$(UNTAR)/vsftpd-3.0.2.tar.gz
-	pushd $(BUILD_TMP)/vsftpd-3.0.2 && \
-	mv $(BUILD_TMP)/vsftpd-3.0.2/parseconf.c $(BUILD_TMP)/vsftpd-3.0.2/parseconf.tmp && \
-	sed -e 's/die("config file not owned by correct user, or not a file");/\/\/die("config file not owned by correct user, or not a file");/g' $(BUILD_TMP)/vsftpd-3.0.2/parseconf.tmp > $(BUILD_TMP)/vsftpd-3.0.2/parseconf.c && \
-		cp $(PATCHES)/vsftpd-new.conf vsftpd.conf && \
-		$(PATCH)/vsftpd-new.diff && \
-		TARGETPREFIX=$(TARGETPREFIX) $(MAKE) CC=$(TARGET)-gcc CFLAGS="$(TARGET_CFLAGS) -fPIC" LIBS="-lcrypt" && \
-		mkdir -p $(TARGETPREFIX)/sbin && \
-		install -m755 vsftpd $(TARGETPREFIX)/sbin/vsftpd && \
-		install -m 644 vsftpd.conf $(TARGETPREFIX)/etc/vsftpd.conf && \
-		install -d $(TARGETPREFIX)/share/empty && \
-	$(REMOVE)/vsftpd-3.0.2
+	$(REMOVE)/vsftpd-$(VSFTPD_VER)
+	touch $@
 
 $(D)/rsync: $(ARCHIVE)/rsync-3.1.1pre1.tar.gz | $(TARGETPREFIX)
 	$(UNTAR)/rsync-3.1.1pre1.tar.gz
diff --git a/make/archives.mk b/make/archives.mk
index b3db2d0..ffbbc33 100755
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -114,8 +114,8 @@ $(ARCHIVE)/alsa-lib-1.0.12.tar.gz:
 $(ARCHIVE)/alsa-utils-1.0.12.tar.gz:
 	$(WGET) http://www.fhloston-paradise.de/alsa-utils-1.0.12.tar.gz
 
-$(ARCHIVE)/vsftpd-3.0.2.tar.gz:
-	$(WGET) http://www.fhloston-paradise.de/vsftpd-3.0.2.tar.gz
+$(ARCHIVE)/vsftpd-$(VSFTPD_VER).tar.gz:
+	$(WGET) https://security.appspot.com/downloads/vsftpd-$(VSFTPD_VER).tar.gz
 
 $(ARCHIVE)/util-linux-2.20.tar.bz2:
 	$(WGET) http://www.fhloston-paradise.de/util-linux-2.20.tar.bz2
diff --git a/make/versions.mk b/make/versions.mk
index b73b49b..3b05340 100644
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -71,3 +71,6 @@ UNFS3_VER=0.9.22
 # ushare; uShare is a UPnP (TM) A/V Media Server.
 USHARE_VER = 1.1a
 
+# Very secure ftp-Server
+VSFTPD_VER = 3.0.3
+
-- 
2.39.5