Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-2.x

[people/pmueller/ipfire-2.x.git] / lfs / gzip

diff --git a/lfs/gzip b/lfs/gzip
index 5c814082aed3b4b9d09b7f798d62535f896ba29a..0afd1ff403e629ccc78b4f2ba7612b50af18ad71 100644 (file)
--- a/lfs/gzip
+++ b/lfs/gzip
@@ -1,28 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# 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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
-#                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: gzip,v 1.3.2.4 2005/07/18 20:40:37 gespinasse Exp $
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -36,7 +28,7 @@ VER        = 1.3.5
 
 THISAPP    = gzip-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_AGNU)/gzip
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 # Normal build or /tools build.
@@ -91,24 +83,22 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       #only gzip is include, so fix only this part
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gzip-1.3.5-asm-execstack.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gzip-1.3.3-window-size.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gzip-1.3.5-perm.patch              # CAN-2005-0988
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gzip-1.3.5-gunzip-dir.patch        # CAN-2005-1228
+ifeq "$(ROOT)" ""
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-security_fixes-1.patch
+endif
        cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
 ifeq "$(ROOT)" ""
-       cd $(DIR_APP) && cp gzexe.in{,.backup}
-       cd $(DIR_APP) && sed 's%"BINDIR"%/bin%' gzexe.in.backup > gzexe.in
+       cd $(DIR_APP) && sed -i 's@"BINDIR"@/bin@g' gzexe.in
 endif
-       cd $(DIR_APP) && make $(EXTRA_MAKE)
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make $(EXTRA_INSTALL) install
 ifeq "$(ROOT)" ""
-       mv /usr/bin/gzip /bin
-       rm /usr/bin/{gunzip,zcat}
-       ln -sf gzip /bin/gunzip
-       ln -sf gzip /bin/zcat
-       ln -sf gunzip /bin/uncompress
+       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
 endif
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)