From: Marcel Lorenz <marcel.lorenz@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 1/3] gzip: update to 1.6
Date: Tue, 08 Mar 2016 11:09:31 +0100 [thread overview]
Message-ID: <1457431773-6715-1-git-send-email-marcel.lorenz@ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 3387 bytes --]
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
---
config/rootfiles/common/gzip | 25 ++++++++++++-------------
lfs/gzip | 34 +++++++++++-----------------------
2 files changed, 23 insertions(+), 36 deletions(-)
diff --git a/config/rootfiles/common/gzip b/config/rootfiles/common/gzip
index f01fb59..c470a38 100644
--- a/config/rootfiles/common/gzip
+++ b/config/rootfiles/common/gzip
@@ -1,4 +1,3 @@
-#bin/compress
bin/gunzip
bin/gzip
bin/uncompress
@@ -13,15 +12,15 @@ bin/zcat
#usr/bin/zless
#usr/bin/zmore
#usr/bin/znew
-#usr/info/gzip.info
-#usr/man/man1/gunzip.1
-#usr/man/man1/gzexe.1
-#usr/man/man1/gzip.1
-#usr/man/man1/zcat.1
-#usr/man/man1/zcmp.1
-#usr/man/man1/zdiff.1
-#usr/man/man1/zforce.1
-#usr/man/man1/zgrep.1
-#usr/man/man1/zless.1
-#usr/man/man1/zmore.1
-#usr/man/man1/znew.1
+#usr/share/info/gzip.info
+#usr/share/man/man1/gunzip.1
+#usr/share/man/man1/gzexe.1
+#usr/share/man/man1/gzip.1
+#usr/share/man/man1/zcat.1
+#usr/share/man/man1/zcmp.1
+#usr/share/man/man1/zdiff.1
+#usr/share/man/man1/zforce.1
+#usr/share/man/man1/zgrep.1
+#usr/share/man/man1/zless.1
+#usr/share/man/man1/zmore.1
+#usr/share/man/man1/znew.1
diff --git a/lfs/gzip b/lfs/gzip
index 0afd1ff..b83bb0d 100644
--- a/lfs/gzip
+++ b/lfs/gzip
@@ -24,10 +24,10 @@
include Config
-VER = 1.3.5
+VER = 1.6
THISAPP = gzip-$(VER)
-DL_FILE = $(THISAPP).tar.gz
+DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
@@ -35,14 +35,10 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
#
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
- EXTRA_CONFIG = --prefix=/usr --disable-nls
- EXTRA_MAKE =
- EXTRA_INSTALL =
+ EXTRA_CONFIG = --prefix=/usr --disable-nls --bindir=/bin
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools
EXTRA_CONFIG = --prefix=/tools --disable-nls
- EXTRA_MAKE =
- EXTRA_INSTALL =
endif
###############################################################################
@@ -53,7 +49,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 3d6c191dfd2bf307014b421c12dc8469
+$(DL_FILE)_MD5 = da981f86677d58a106496e68de6f8995
install : $(TARGET)
@@ -82,23 +78,15 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-ifeq "$(ROOT)" ""
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-security_fixes-1.patch
-endif
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
ifeq "$(ROOT)" ""
- cd $(DIR_APP) && sed -i 's@"BINDIR"@/bin(a)g' gzexe.in
-endif
- cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
- cd $(DIR_APP) && make $(EXTRA_INSTALL) install
-ifeq "$(ROOT)" ""
- mv -v /usr/bin/gzip /bin
- rm -v /usr/bin/{gunzip,zcat}
- ln -sv gzip /bin/gunzip
- ln -sv gzip /bin/zcat
- ln -sv gzip /bin/compress
- ln -sv gunzip /bin/uncompress
+ ln -sfv gzip /bin/gunzip
+ ln -sfv gzip /bin/zcat
+ mv -v /bin/{gzexe,zcmp,zdiff,zegrep} /usr/bin
+ mv -v /bin/{zfgrep,zforce,zgrep,zless,zmore,znew} /usr/bin
endif
@rm -rf $(DIR_APP)
@$(POSTBUILD)
--
1.9.1
next reply other threads:[~2016-03-08 10:09 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-08 10:09 Marcel Lorenz [this message]
2016-03-08 10:09 ` [PATCH 2/3] dhcp: update lfs file after gzip update to fix build fail Marcel Lorenz
2016-03-08 14:26 ` Michael Tremer
2016-03-08 17:03 ` Marcel Lorenz
2016-03-08 17:06 ` Michael Tremer
2016-03-08 17:18 ` Marcel Lorenz
2016-03-08 22:39 ` Michael Tremer
2016-03-09 13:34 ` Michael Tremer
2016-03-08 10:09 ` [PATCH 3/3] binutils: fix rootfiles after gzip update (check rootfile msg) Marcel Lorenz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1457431773-6715-1-git-send-email-marcel.lorenz@ipfire.org \
--to=marcel.lorenz@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox