* [PATCH] unzip: update to 60
@ 2017-03-18 10:25 Marcel Lorenz
0 siblings, 0 replies; 2+ messages in thread
From: Marcel Lorenz @ 2017-03-18 10:25 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2953 bytes --]
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 @@
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,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=-D_FILE_OFFSET_BITS=64 linux
+ 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 install
+ cd $(DIR_APP) && make prefix=/usr MANDIR=/usr/share/man/man1 -f unix/Makefile install
@rm -rf $(DIR_APP)
@$(POSTBUILD)
--
2.9.3
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH] unzip: update to 60
@ 2016-03-13 11:17 Marcel Lorenz
0 siblings, 0 replies; 2+ messages in thread
From: Marcel Lorenz @ 2016-03-13 11:17 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 3079 bytes --]
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 @@
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,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=-D_FILE_OFFSET_BITS=64 linux
+ 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 install
+ cd $(DIR_APP) && make prefix=/usr MANDIR=/usr/share/man/man1 -f unix/Makefile install
@rm -rf $(DIR_APP)
@$(POSTBUILD)
--
1.9.1
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-03-18 10:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-18 10:25 [PATCH] unzip: update to 60 Marcel Lorenz
-- strict thread matches above, loose matches on Subject: below --
2016-03-13 11:17 Marcel Lorenz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox