X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Funzip;h=6fa9c787cd882c9bec8ce3e801f7bc4c28df139f;hp=15e7967eda1a14c4facf0e7c0d8531378d7c58ca;hb=d111587cc3b0007b35c09dd847d035e6ffadffc7;hpb=70df830214c97a68fcb7e89ae0d7df58c35590be

diff --git a/lfs/unzip b/lfs/unzip
index 15e7967eda..6fa9c787cd 100644
--- a/lfs/unzip
+++ b/lfs/unzip
@@ -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,12 +24,12 @@
 
 include Config
 
-VER        = 552
+VER        = 60
 
 THISAPP    = unzip$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/unzip-5.52
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9d23919999d6eac9217d1f41472034a9
+$(DL_FILE)_MD5 = 62b490407489521db863b523a7f86375
 
 install : $(TARGET)
 
@@ -70,7 +70,14 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux
-	cd $(DIR_APP) && make prefix=/usr install
+	cd $(DIR_APP) && make -f unix/Makefile clean
+	cd $(DIR_APP)/unix && ./configure
+ifeq "$(BUILD_ARCH)" "i586"
+	cd $(DIR_APP) && make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 generic
+else
+	# ARM/x86_64 cannot use the x86 32 bit assembly code.
+	cd $(DIR_APP) && make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux_noasm
+endif
+	cd $(DIR_APP) && make prefix=/usr MANDIR=/usr/share/man/man1 -f unix/Makefile install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)