# 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: bzip2,v 1.4.2.9 2005/07/15 08:13:35 alanh Exp $
-# #
###############################################################################
###############################################################################
THISAPP = bzip2-$(VER)
DL_FILE = $(THISAPP).tar.gz
-DL_FROM = http://www.bzip.org/$(VER)
+DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
# Normal build or /tools build.
###############################################################################
# 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 = 8a716bebecb6e647d2e8a29ea5d8447f
install : $(TARGET)
$(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) && 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
- 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
+ rm -v /usr/bin/{bunzip2,bzcat,bzip2}
+ 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)