From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marcel Lorenz <marcel.lorenz@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] unzip: update to 60
Date: Sun, 13 Mar 2016 12:17:46 +0100
Message-ID: <1457867866-20790-1-git-send-email-marcel.lorenz@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6608227527316398717=="
List-Id: <development.lists.ipfire.org>

--===============6608227527316398717==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Update unzip to last version from linux from scratch

http://www.linuxfromscratch.org/blfs/view/svn/general/unzip.html

Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>

---
 config/rootfiles/common/unzip | 10 +++++-----
 lfs/unzip                     | 14 ++++++++------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/config/rootfiles/common/unzip b/config/rootfiles/common/unzip
index 7d559c0..6213bcb 100644
--- a/config/rootfiles/common/unzip
+++ b/config/rootfiles/common/unzip
@@ -3,8 +3,8 @@ usr/bin/unzip
 #usr/bin/unzipsfx
 #usr/bin/zipgrep
 #usr/bin/zipinfo
-#usr/man/man1/funzip.1
-#usr/man/man1/unzip.1
-#usr/man/man1/unzipsfx.1
-#usr/man/man1/zipgrep.1
-#usr/man/man1/zipinfo.1
+#usr/share/man/man1/funzip.1
+#usr/share/man/man1/unzip.1
+#usr/share/man/man1/unzipsfx.1
+#usr/share/man/man1/zipgrep.1
+#usr/share/man/man1/zipinfo.1
diff --git a/lfs/unzip b/lfs/unzip
index f479d7e..7853dd0 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) 2016  IPFire Team  <info(a)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 @@
=20
 include Config
=20
-VER        =3D 552
+VER        =3D 60
=20
 THISAPP    =3D unzip$(VER)
 DL_FILE    =3D $(THISAPP).tar.gz
 DL_FROM    =3D $(URL_IPFIRE)
-DIR_APP    =3D $(DIR_SRC)/unzip-5.52
+DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
=20
 ############################################################################=
###
@@ -40,7 +40,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 9d23919999d6eac9217d1f41472034a9
+$(DL_FILE)_MD5 =3D 62b490407489521db863b523a7f86375
=20
 install : $(TARGET)
=20
@@ -70,12 +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 clean
+	cd $(DIR_APP)/unix && ./configure
 ifeq "$(MACHINE)" "i586"
-	cd $(DIR_APP) && make -f unix/Makefile LOCAL_UNZIP=3D-D_FILE_OFFSET_BITS=3D=
64 linux
+	cd $(DIR_APP) && make -f unix/Makefile LOCAL_UNZIP=3D-D_FILE_OFFSET_BITS=3D=
64 generic
 else
 	# ARM/x86_64 cannot use the x86 32 bit assembly code.
 	cd $(DIR_APP) && make -f unix/Makefile LOCAL_UNZIP=3D-D_FILE_OFFSET_BITS=3D=
64 linux_noasm
 endif
-	cd $(DIR_APP) && make prefix=3D/usr install
+	cd $(DIR_APP) && make prefix=3D/usr MANDIR=3D/usr/share/man/man1 -f unix/Ma=
kefile install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--=20
1.9.1


--===============6608227527316398717==--