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 [thread overview]
Message-ID: <1491469516.2643.122.camel@ipfire.org> (raw)
In-Reply-To: <20170318103031.23595-1-marcel.lorenz@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 4944 bytes --]
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>
> ---
> config/rootfiles/common/gzip | 25 ++++++++++++-------------
> lfs/gzip | 36 ++++++++++++------------------------
> 2 files changed, 24 insertions(+), 37 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..537662c 100644
> --- a/lfs/gzip
> +++ b/lfs/gzip
> @@ -1,7 +1,7 @@
> #############################################################################
> ##
> #
> #
> # IPFire.org - A linux based
> firewall #
> -# Copyright (C) 2007 Michael Tremer & Christian
> Schmidt #
> +# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org>
> #
> #
> #
> # This program is free software: you can redistribute it and/or
> modify #
> # it under the terms of the GNU General Public License as published
> by #
> @@ -24,10 +24,10 @@
>
> include Config
>
> -VER = 1.3.5
> +VER = 1.8
>
> 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 = f7caabb65cddc1a4165b398009bd05b9
>
> 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)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2017-04-06 9:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-18 10:30 Marcel Lorenz
2017-04-06 9:05 ` Michael Tremer [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-05-17 12:10 [PATCH] gzip: Update " Alexander Marx
2016-05-17 12:24 ` Michael Tremer
2016-05-17 12:27 ` Alexander Marx
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=1491469516.2643.122.camel@ipfire.org \
--to=michael.tremer@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