X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fbzip2;h=89f0ca7adcddd464e65937848f7a15c4d4744480;hp=f32367081e278c2ce597a7d828691de0fe2816c1;hb=faa5472a2e75d69946c8321f09ee5c34f601d73b;hpb=70df830214c97a68fcb7e89ae0d7df58c35590be

diff --git a/lfs/bzip2 b/lfs/bzip2
index f32367081e..89f0ca7adc 100644
--- a/lfs/bzip2
+++ b/lfs/bzip2
@@ -24,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,7 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8a716bebecb6e647d2e8a29ea5d8447f
+$(DL_FILE)_MD5 = 00b516f4704d4a7cb50a1d97e6e8e15b
 
 install : $(TARGET)
 
@@ -78,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
+	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
-	rm -v /usr/bin/{bunzip2,bzcat,bzip2}
 	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)