X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fbzip2;h=4712f31d593f34fcfdd69d1d2336552868358417;hp=2f26be0e16ac2d3fa9e49fc204bc98326ed207d6;hb=ddd1589dabae74ed08ff00c51355ef7f3243ccc2;hpb=1751628e3cdc68df2429f5668c5e360e1b3ea73b

diff --git a/lfs/bzip2 b/lfs/bzip2
index 2f26be0e16..4712f31d59 100644
--- a/lfs/bzip2
+++ b/lfs/bzip2
@@ -1,22 +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>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,7 +24,7 @@
 
 include Config
 
-VER        = 1.0.3
+VER        = 1.0.5
 
 THISAPP    = bzip2-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -44,13 +42,12 @@ endif
 ###############################################################################
 # Top-level Rules
 ###############################################################################
-objects = $(DL_FILE) bzip2-1.0.2-use_mktemp-1.patch
 
-$(DL_FILE)                        = $(DL_FROM)/$(DL_FILE)
-bzip2-1.0.2-use_mktemp-1.patch     = $(URL_LFS)/bzip2/bzip2-1.0.2-use_mktemp-1.patch
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5                    = 8a716bebecb6e647d2e8a29ea5d8447f
-bzip2-1.0.2-use_mktemp-1.patch_MD5 = d8f29ca8b25c48e16dc2f7a093df21ef
+$(DL_FILE)_MD5 = 3c15a0c8d1d3ee1c46a1634d00617b1a
 
 install : $(TARGET)
 
@@ -80,23 +77,19 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/bzip2-1.0.2-use_mktemp-1.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bzip2-1.0.2-chmod.patch
 ifeq "$(ROOT)" ""
+	cd $(DIR_APP) && sed -i 's@tempfile -d /tmp -p bz@mktemp -p /tmp@' bzdiff
 	cd $(DIR_APP) && make -f Makefile-libbz2_so
 	cd $(DIR_APP) && make clean
-	cd $(DIR_APP) && make
-	rm -f /usr/bin/{bzgrep,bzegrep,bzfgrep,bzcmp,bzless}
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	cd $(DIR_APP) && cp bzip2-shared /bin/bzip2
-	cd $(DIR_APP) && cp -a libbz2.so* /lib
-	ln -sf ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so
-	rm /usr/bin/{bunzip2,bzcat,bzip2}
-	mv /usr/bin/{bzip2recover,bzless,bzmore} /bin
-	ln -sf bzip2 /bin/bunzip2
-	ln -sf bzip2 /bin/bzcat
+	cd $(DIR_APP) && cp -v bzip2-shared /bin/bzip2
+	cd $(DIR_APP) && cp -av libbz2.so* /lib
+	ln -sfv ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so
+	ln -sfv bzip2 /bin/bunzip2
+	ln -sfv bzip2 /bin/bzcat
 else
-	rm -f /tools/bin/{bzgrep,bzegrep,bzfgrep,bzcmp,bzless}
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make PREFIX=/tools install
 endif
 	@rm -rf $(DIR_APP)