From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] gzip: update to 1.6
Date: Mon, 07 Mar 2016 18:19:34 +0000
Message-ID: <1457374774.6973.98.camel@ipfire.org>
In-Reply-To: <1457332715-12151-1-git-send-email-marcel.lorenz@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6090724996727541282=="
List-Id: <development.lists.ipfire.org>

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

Hi,

here are changes of lfs/dhcp in the patch...

-Michael

On Mon, 2016-03-07 at 07:38 +0100, Marcel Lorenz wrote:
> 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.=C2=A0
>=20
> Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
>=20
> ---
> =C2=A0config/rootfiles/common/gzip | 25 ++++++++++++-------------
> =C2=A0lfs/dhcp=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0| 10 ++----=
----
> =C2=A0lfs/gzip=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0| 34 ++++++=
+++++-----------------------
> =C2=A03 files changed, 25 insertions(+), 44 deletions(-)
>=20
> 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
> =C2=A0bin/gunzip
> =C2=A0bin/gzip
> =C2=A0bin/uncompress
> @@ -13,15 +12,15 @@ bin/zcat
> =C2=A0#usr/bin/zless
> =C2=A0#usr/bin/zmore
> =C2=A0#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))
> =C2=A0	cd $(DIR_APP) && patch -Np1 <
> $(DIR_SRC)/src/patches/dhcp/dhcp-gpxe-cid.patch
> =C2=A0	cd $(DIR_APP) && patch -Np1 <
> $(DIR_SRC)/src/patches/dhcp/dhcp-stateless-DUID-LLT.patch
> =C2=A0
> -	# 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 \
> =C2=A0			--prefix=3D/usr \
> =C2=A0			--sysconfdir=3D/etc/dhcp \
> =C2=A0			--with-srv-lease-
> file=3D/var/state/dhcp/dhcpd.leases \
> -			--disable-static \
> =C2=A0			--enable-paranoia \
> =C2=A0			--enable-early-chroot \
> =C2=A0			--disable-dhcpv6
> diff --git a/lfs/gzip b/lfs/gzip
> index 0afd1ff..b83bb0d 100644
> --- a/lfs/gzip
> +++ b/lfs/gzip
> @@ -24,10 +24,10 @@
> =C2=A0
> =C2=A0include Config
> =C2=A0
> -VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 1.3.5
> +VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 1.6
> =C2=A0
> =C2=A0THISAPP=C2=A0=C2=A0=C2=A0=C2=A0=3D gzip-$(VER)
> -DL_FILE=C2=A0=C2=A0=C2=A0=C2=A0=3D $(THISAPP).tar.gz
> +DL_FILE=C2=A0=C2=A0=C2=A0=C2=A0=3D $(THISAPP).tar.xz
> =C2=A0DL_FROM=C2=A0=C2=A0=C2=A0=C2=A0=3D $(URL_IPFIRE)
> =C2=A0DIR_APP=C2=A0=C2=A0=C2=A0=C2=A0=3D $(DIR_SRC)/$(THISAPP)
> =C2=A0
> @@ -35,14 +35,10 @@ DIR_APP=C2=A0=C2=A0=C2=A0=C2=A0=3D $(DIR_SRC)/$(THISAPP)
> =C2=A0#
> =C2=A0ifeq "$(ROOT)" ""
> =C2=A0=C2=A0=C2=A0TARGET =3D $(DIR_INFO)/$(THISAPP)
> -=C2=A0=C2=A0EXTRA_CONFIG =3D --prefix=3D/usr --disable-nls
> -=C2=A0=C2=A0EXTRA_MAKE =3D
> -=C2=A0=C2=A0EXTRA_INSTALL =3D
> +=C2=A0=C2=A0EXTRA_CONFIG =3D --prefix=3D/usr --disable-nls --bindir=3D/bin
> =C2=A0else
> =C2=A0=C2=A0=C2=A0TARGET =3D $(DIR_INFO)/$(THISAPP)-tools
> =C2=A0=C2=A0=C2=A0EXTRA_CONFIG =3D --prefix=3D/tools --disable-nls
> -=C2=A0=C2=A0EXTRA_MAKE =3D=C2=A0
> -=C2=A0=C2=A0EXTRA_INSTALL =3D=C2=A0
> =C2=A0endif
> =C2=A0
> =C2=A0####################################################################
> ###########
> @@ -53,7 +49,7 @@ objects =3D $(DL_FILE)
> =C2=A0
> =C2=A0$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
> =C2=A0
> -$(DL_FILE)_MD5 =3D 3d6c191dfd2bf307014b421c12dc8469
> +$(DL_FILE)_MD5 =3D da981f86677d58a106496e68de6f8995
> =C2=A0
> =C2=A0install : $(TARGET)
> =C2=A0
> @@ -82,23 +78,15 @@ $(subst %,%_MD5,$(objects)) :
> =C2=A0
> =C2=A0$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> =C2=A0	@$(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)
> =C2=A0	cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
> +	cd $(DIR_APP) && make $(MAKETUNING)
> +	cd $(DIR_APP) && make install
> =C2=A0ifeq "$(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
> =C2=A0endif
> =C2=A0	@rm -rf $(DIR_APP)
> =C2=A0	@$(POSTBUILD)

--===============6090724996727541282==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjEKCmlRSWNCQUFC
Q2dBR0JRSlczY1kyQUFvSkVJQjU4UDl2a0FrSHlHNFAvalRyZnpHNENDaStHYXN2U2g0aW5Kd1IK
UkhJVEZCQUQzRXg5NUUzd3BkYlRHWk51SlY4SjRmRk5aQW85Q1NkbDJvL3VZREZobEFFVWpyQ2lm
d1JtU2dUdQpESk1VY3dxOUIrMDVCYW9wbEhzV3dmWHdISEtWckFDSk44a1RqRFFPenhoa244ME1E
c2lSYzI2bFFsSFp2N2MrCkIrNjNtUkR4TGl2L3QzempxaktmM0h2K1FXeDRwK0tESG5BSkxIYTVJ
Y2xzZC8xRWZycUFoN29xODU0MlF3ajUKMzZJV0k5VGx0WHd3TUFtdXVTQjFRNi8yMWFUZkFvVWxz
dkw5Y2pUWFRwVGtnTERUQ2Vhenpac3lrWFlReC9PegpacmJZRlNSRTZMOGcrdHlvUFpUTnJjampm
MVhOSXlXVlhLc1BTRldaZDNKWWtnV2tGVHdDblQvZjZueTdWbkl2Ckdtc0NWdmVaQXdtUE9TNmQx
SWtmZzFTUTlTdGsxUDZIS2J6WVA5aDBCY3dYWEtLbGtGbGNhanhQOEhzaDlqQnEKQlVldGFFeUxZ
MWxKd2dMMEVWOWl1T1NTTnc3bmhGN0dBdEVyM2hrM1RsVk40OU8wNm14UGszZlNWZEVOd3lQSwpB
MzNKZXFCVkFaejBwb3U3bG50RG9Ha0JOditHTmI2cXYxTWNnMVRId1ArdlNRa09ZdmhPbGt2L2JG
UHYxamdoCmp4MGZ4RWZ5VmZMci8zaGFpNzR1SHN0SHR3aHhGbjJSRGpIUmdTZjdDblBOK1Jxa21X
RkxkNDNLNGdhY1U0RWEKSTBqU0JFZklFL2JZaFB4UE5HeWtpamJwZFo0ajdwTTNEN2pJUEFLcXVi
WHZ5eWNjRWlrOGhPUlRzZkhkVXBYSgpvaFhhT3dFV2xwZVNqbkl0VXJZVgo9L2xWdQotLS0tLUVO
RCBQR1AgU0lHTkFUVVJFLS0tLS0K

--===============6090724996727541282==--