* [PATCH] gzip: update to 1.8
@ 2017-03-18 10:30 Marcel Lorenz
2017-04-06 9:05 ` Michael Tremer
0 siblings, 1 reply; 5+ messages in thread
From: Marcel Lorenz @ 2017-03-18 10:30 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 4062 bytes --]
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)
--
2.9.3
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] gzip: update to 1.8
2017-03-18 10:30 [PATCH] gzip: update to 1.8 Marcel Lorenz
@ 2017-04-06 9:05 ` Michael Tremer
0 siblings, 0 replies; 5+ messages in thread
From: Michael Tremer @ 2017-04-06 9:05 UTC (permalink / raw)
To: development
[-- 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 --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] gzip: Update to 1.8
2016-05-17 12:24 ` Michael Tremer
@ 2016-05-17 12:27 ` Alexander Marx
0 siblings, 0 replies; 5+ messages in thread
From: Alexander Marx @ 2016-05-17 12:27 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1446 bytes --]
Sorry, need to reboot after holidays .... running at 80%
Am 17.05.2016 um 14:24 schrieb Michael Tremer:
> Hi,
>
> just back from holiday and already fixing bugs. I like that.
>
> Unfortunately you forgot to include the bug number in the commit message. Please
> do that so the build system can automatically update and close the bug
> eventually.
>
> I will add it this time so you don't have to re-send this patch.
>
> Best,
> -Michael
>
> On Tue, 2016-05-17 at 14:10 +0200, Alexander Marx wrote:
>> This is an update-release
>>
>> gzip -l no longer falsely reports a write error when writing to a pipe.
>> [bug introduced in gzip-1.7]
>>
>> Port to Oracle Solaris Studio 12 on x86-64.
>> [bug present since at least gzip-1.2.4]
>>
>> When configuring gzip, ./configure DEFS='...-DNO_ASM...' now
>> suppresses assembler again. [bug introduced in gzip-1.3.5]
>>
>> Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
>> ---
>> gzip/gzip.nm | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/gzip/gzip.nm b/gzip/gzip.nm
>> index 1ba2326..a75fe44 100644
>> --- a/gzip/gzip.nm
>> +++ b/gzip/gzip.nm
>> @@ -4,7 +4,7 @@
>> #############################################################################
>> ##
>>
>> name = gzip
>> -version = 1.7
>> +version = 1.8
>> release = 1
>>
>> groups = Applications/Compression
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] gzip: Update to 1.8
2016-05-17 12:10 [PATCH] gzip: Update " Alexander Marx
@ 2016-05-17 12:24 ` Michael Tremer
2016-05-17 12:27 ` Alexander Marx
0 siblings, 1 reply; 5+ messages in thread
From: Michael Tremer @ 2016-05-17 12:24 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1314 bytes --]
Hi,
just back from holiday and already fixing bugs. I like that.
Unfortunately you forgot to include the bug number in the commit message. Please
do that so the build system can automatically update and close the bug
eventually.
I will add it this time so you don't have to re-send this patch.
Best,
-Michael
On Tue, 2016-05-17 at 14:10 +0200, Alexander Marx wrote:
> This is an update-release
>
> gzip -l no longer falsely reports a write error when writing to a pipe.
> [bug introduced in gzip-1.7]
>
> Port to Oracle Solaris Studio 12 on x86-64.
> [bug present since at least gzip-1.2.4]
>
> When configuring gzip, ./configure DEFS='...-DNO_ASM...' now
> suppresses assembler again. [bug introduced in gzip-1.3.5]
>
> Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
> ---
> gzip/gzip.nm | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/gzip/gzip.nm b/gzip/gzip.nm
> index 1ba2326..a75fe44 100644
> --- a/gzip/gzip.nm
> +++ b/gzip/gzip.nm
> @@ -4,7 +4,7 @@
> #############################################################################
> ##
>
> name = gzip
> -version = 1.7
> +version = 1.8
> release = 1
>
> groups = Applications/Compression
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] gzip: Update to 1.8
@ 2016-05-17 12:10 Alexander Marx
2016-05-17 12:24 ` Michael Tremer
0 siblings, 1 reply; 5+ messages in thread
From: Alexander Marx @ 2016-05-17 12:10 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 842 bytes --]
This is an update-release
gzip -l no longer falsely reports a write error when writing to a pipe.
[bug introduced in gzip-1.7]
Port to Oracle Solaris Studio 12 on x86-64.
[bug present since at least gzip-1.2.4]
When configuring gzip, ./configure DEFS='...-DNO_ASM...' now
suppresses assembler again. [bug introduced in gzip-1.3.5]
Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
---
gzip/gzip.nm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gzip/gzip.nm b/gzip/gzip.nm
index 1ba2326..a75fe44 100644
--- a/gzip/gzip.nm
+++ b/gzip/gzip.nm
@@ -4,7 +4,7 @@
###############################################################################
name = gzip
-version = 1.7
+version = 1.8
release = 1
groups = Applications/Compression
--
2.6.3
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-04-06 9:05 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-18 10:30 [PATCH] gzip: update to 1.8 Marcel Lorenz
2017-04-06 9:05 ` Michael Tremer
-- 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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox