gzip: update to 1.6
mbox

Message ID 1457332715-12151-1-git-send-email-marcel.lorenz@ipfire.org
State New
Headers show

Message

Marcel Lorenz March 7, 2016, 5:38 p.m. UTC
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. 

Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org>

---
 config/rootfiles/common/gzip | 25 ++++++++++++-------------
 lfs/dhcp                     | 10 ++--------
 lfs/gzip                     | 34 +++++++++++-----------------------
 3 files changed, 25 insertions(+), 44 deletions(-)

Comments

Michael Tremer March 8, 2016, 5:19 a.m. UTC | #1
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. 
> 
> Signed-off-by: Marcel Lorenz <marcel.lorenz@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.patch
>  	cd $(DIR_APP) && patch -Np1 <
> $(DIR_SRC)/src/patches/dhcp/dhcp-stateless-DUID-LLT.patch
>  
> -	# 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=/usr \
>  			--sysconfdir=/etc/dhcp \
>  			--with-srv-lease-
> file=/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 @@
>  
>  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@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)