X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fbzip2;h=da20ce68cc19f045fc998f6987009d65a28de7c5;hp=fb7c0b3894afb0febf35215bb24c0605cdf52c14;hb=15b1a3e360a277dc7481103f8ddcbf189033e3a6;hpb=9b0ff0a0b64dc82a593e08256c2f3a8a76695493

diff --git a/lfs/bzip2 b/lfs/bzip2
index fb7c0b3894..da20ce68cc 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-2018  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        #
-# 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,14 +24,14 @@
 
 include Config
 
-VER        = 1.0.3
+VER        = 1.0.6
 
 THISAPP    = bzip2-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
-# Normal build or /tools build.
+# Normal build or $(TOOLS_DIR) build.
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
@@ -47,9 +45,9 @@ endif
 
 objects = $(DL_FILE)
 
-$(DL_FILE)                        = $(DL_FROM)/$(DL_FILE)
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5                    = 8a716bebecb6e647d2e8a29ea5d8447f
+$(DL_FILE)_MD5 = 00b516f4704d4a7cb50a1d97e6e8e15b
 
 install : $(TARGET)
 
@@ -80,21 +78,19 @@ $(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)-bzgrep_security-1.patch
 	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 $(MAKETUNING)
-	cd $(DIR_APP) && make install
-	cp -v bzip2-shared /bin/bzip2
-	cp -av libbz2.so* /lib
-	ln -sv ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so
-	rm -v /usr/bin/{bunzip2,bzcat,bzip2}
-	ln -sv bzip2 /bin/bunzip2
-	ln -sv bzip2 /bin/bzcat
+	cd $(DIR_APP) && make install PREFIX=/usr
+	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
 	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && make PREFIX=/tools install
+	cd $(DIR_APP) && make PREFIX=$(TOOLS_DIR) install
 endif
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)