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.8
Date: Thu, 06 Apr 2017 10:05:16 +0100
Message-ID: <1491469516.2643.122.camel@ipfire.org>
In-Reply-To: <20170318103031.23595-1-marcel.lorenz@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0199458183603593079=="
List-Id: <development.lists.ipfire.org>

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

Please do not forget to drop patches that are not applied any more.

I did this for you this time, but in future I might just reject merging.

Best,
-Michael

On Sat, 2017-03-18 at 11:30 +0100, Marcel Lorenz wrote:
> Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
> ---
> =C2=A0config/rootfiles/common/gzip | 25 ++++++++++++-------------
> =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| 36 ++++++=
++++++------------------------
> =C2=A02 files changed, 24 insertions(+), 37 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/gzip b/lfs/gzip
> index 0afd1ff..537662c 100644
> --- a/lfs/gzip
> +++ b/lfs/gzip
> @@ -1,7 +1,7 @@
> =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=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=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=
=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# IPFire.org - A linux based
> firewall=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=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#
> -# Copyright (C) 2007=C2=A0=C2=A0Michael Tremer & Christian
> Schmidt=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=C2=A0#
> +# Copyright (C) 2007-2016=C2=A0=C2=A0IPFire Team=C2=A0=C2=A0<info(a)ipfire=
.org>=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#
> =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=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=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=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# This program is free software: you can redistribute it and/or
> modify=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0#
> =C2=A0# it under the terms of the GNU General Public License as published
> by=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0#
> @@ -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.8
> =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 f7caabb65cddc1a4165b398009bd05b9
> =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)

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

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC
Q2dBR0JRSlk1Z1RNQUFvSkVJQjU4UDl2a0FrSHZ6WVAvamUrL1pCZTBZdlBwSFRjSDF0YXhwclQK
QWs5TlROYTVnRnQ0bklETUNwZTZvU2prWGlWUG8vZFVuTExQS0JiS1hwdGFrUmJVd0ZFb0JnOTll
MmIzNGUwVwpjZ0x5V1NnKzd0bEVrcnhNbDFEcWpoRzF2TGdycVRwbXJTNUtmSW1Ec2tWcW84V1pM
dmZVdlVuSm9XRXpBTkZYCjJvTHNGZ1dHOXp6TE5jUzhhNVM4Q09pNEpUYTVwbEFnZXJxVHlUSjdq
aDJCaGZ6ZnRrWFl0cDJZU2NOWVBHMSsKSlh6K3g2SGF5eFU5TTZzbzZ2QldDc3RYS0x1ekJOdkhS
aTlpREpPZFFNNDF4OUhPL3RRWVFkRmlQZ0tPU2tvcQpOUGZ4SFFSVC9oakdhVkVzS2wvMFk3ZG1W
ZmdFSFNJUnlWWmV1VjhubFZwdWQ1a0dDNW5YQndPZWJWSVpibEIrClo3OVNsQUdUVEtjNktWekUv
Qy80dWhrZUI4ckFQNzNhamw2bkpLNkxmZDh2NW1hdFcxNFJjQktrMXV0R3dLQVgKZWI3ZXNTVTFQ
OEVQRnFMQUxhY3JqbGdTV0R4RktTUGY0M1daTjA4a0ZkbWZHTkpTQjcyYVNmU1p6cDZ4OW9GSgpP
K1N3ODJaNW14R1FFVTUxaHNsd0VWSzU3YlRZVHl3cTVNcHhTN0FKNmN4d2xLSjE2VTQyaUhKNi9Z
MTZ2WFgxClNpbk9TdTZnaG05SFJnZ0ZsbHVxSlluendNTHFMc0dtbVRQaWdldUpHWmt2ZVlkYlo3
M1FCM2padjQyWGVTZ2cKWm9vTkFQNXdOc3NLY3BkMTEyb3R3Tm1POGU1QTlPTnUzU1F3cWhmSk5D
b1c1WWxKTURrSU1YOUxscUJFSGlPUgpWOFhjWVhyVCtqV0JLREVtM1JlMwo9L3J6NgotLS0tLUVO
RCBQR1AgU0lHTkFUVVJFLS0tLS0K

--===============0199458183603593079==--