From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marcel Lorenz <marcel.lorenz@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] gzip: update to 1.6
Date: Mon, 07 Mar 2016 07:38:35 +0100
Message-ID: <1457332715-12151-1-git-send-email-marcel.lorenz@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6466913075431597121=="
List-Id: <development.lists.ipfire.org>

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

This patch updates gzip to verion 1.6 and a fixes build fail of the dhcp
package after this update. The make of dhcp can't extract the bind archive.
I add a command to do this manually before the make command.=20

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

---
 config/rootfiles/common/gzip | 25 ++++++++++++-------------
 lfs/dhcp                     | 10 ++--------
 lfs/gzip                     | 34 +++++++++++-----------------------
 3 files changed, 25 insertions(+), 44 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/dhcp b/lfs/dhcp
index 9a89d40..cec8628 100644
--- a/lfs/dhcp
+++ b/lfs/dhcp
@@ -99,17 +99,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp/dhcp-gpxe-cid.pat=
ch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp/dhcp-stateless-DU=
ID-LLT.patch
=20
-	# Remove bundled BIND stuff.
-	# (requires newer autoconf)
-	#rm -rfv $(DIR_APP)/bind/bind.tar.gz
-	#cd $(DIR_APP) && autoreconf --verbose --force --install
-
-	cd $(DIR_APP) && \
-		./configure \
+	cd $(DIR_APP)/bind && tar -axf bind.tar.gz
+	cd $(DIR_APP) && ./configure \
 			--prefix=3D/usr \
 			--sysconfdir=3D/etc/dhcp \
 			--with-srv-lease-file=3D/var/state/dhcp/dhcpd.leases \
-			--disable-static \
 			--enable-paranoia \
 			--enable-early-chroot \
 			--disable-dhcpv6
diff --git a/lfs/gzip b/lfs/gzip
index 0afd1ff..b83bb0d 100644
--- a/lfs/gzip
+++ b/lfs/gzip
@@ -24,10 +24,10 @@
=20
 include Config
=20
-VER        =3D 1.3.5
+VER        =3D 1.6
=20
 THISAPP    =3D gzip-$(VER)
-DL_FILE    =3D $(THISAPP).tar.gz
+DL_FILE    =3D $(THISAPP).tar.xz
 DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
=20
@@ -35,14 +35,10 @@ DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET =3D $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG =3D --prefix=3D/usr --disable-nls
-  EXTRA_MAKE =3D
-  EXTRA_INSTALL =3D
+  EXTRA_CONFIG =3D --prefix=3D/usr --disable-nls --bindir=3D/bin
 else
   TARGET =3D $(DIR_INFO)/$(THISAPP)-tools
   EXTRA_CONFIG =3D --prefix=3D/tools --disable-nls
-  EXTRA_MAKE =3D=20
-  EXTRA_INSTALL =3D=20
 endif
=20
 ############################################################################=
###
@@ -53,7 +49,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 3d6c191dfd2bf307014b421c12dc8469
+$(DL_FILE)_MD5 =3D da981f86677d58a106496e68de6f8995
=20
 install : $(TARGET)
=20
@@ -82,23 +78,15 @@ $(subst %,%_MD5,$(objects)) :
=20
 $(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_fi=
xes-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)
--=20
1.9.1


--===============6466913075431597121==--