webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-23 09:22:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

gzip: update to 1.8

Browse Source 
Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Marcel Lorenz
2017-03-18 11:30:31 +01:00
committed by Michael Tremer
parent 361cc1bd0c
commit 3b7a290523
2 changed files with 24 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
config/rootfiles/common/gzip
View File

@@ -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

36
lfs/gzip
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2016 IPFire Team <info@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@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)