X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fwget;h=b8c83d10d333813aace0783245796576d474836d;hp=0c29155f00c42ce855a97810806d6daaea611a4a;hb=ea8a02c232835200d5ea37d4c72e75b864beb8b0;hpb=70df830214c97a68fcb7e89ae0d7df58c35590be

diff --git a/lfs/wget b/lfs/wget
index 0c29155f00..b8c83d10d3 100644
--- a/lfs/wget
+++ b/lfs/wget
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,17 +24,13 @@
 
 include Config
 
-VER        = 1.10.2
+VER        = 1.20.1
 
 THISAPP    = wget-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-ifeq "$(LFS_PASS)" "install"
-  TARGET     = $(DIR_INFO)/$(THISAPP)-install
-else
-  TARGET     = $(DIR_INFO)/$(THISAPP)
-endif
+TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 795fefbb7099f93e2d346b026785c4b8
+$(DL_FILE)_MD5 = f6ebe9c7b375fc9832fb1b2028271fb7
 
 install : $(TARGET)
 
@@ -73,16 +69,17 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-ifeq "$(LFS_PASS)" "install"
-	cd $(DIR_APP) && ./configure --prefix=/ --disable-nls --disable-ipv6
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP)/src && install -m 755 wget /install/initrd/bin
-else
-	cd $(DIR_APP) && ./configure --prefix=/usr --with-ssl \
-					--disable-nls --disable-ipv6
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--with-ssl=openssl \
+		--disable-nls \
+		--disable-ipv6
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-endif
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)