mympd: remove create config start

[ipfire-2.x.git] / lfs / bzip2

diff --git a/lfs/bzip2 b/lfs/bzip2
index ed3e1ed71ca103037cf14de8188eccb829f22e48..8a2e16cfad3a3f1f8b0437754ed95c8358d51f54 100644 (file)
--- 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.8
 
 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)
@@ -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)_BLAKE2 = 22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad
 
 install : $(TARGET)
 
@@ -58,10 +55,10 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -70,8 +67,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
        @$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+       @$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -80,24 +77,20 @@ $(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_SRC)/src/patches/bzip2-1.0.3-bzgrep_security-1.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 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 $(MAKETUNING)
+       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
-       rm -f /tools/bin/{bzgrep,bzegrep,bzfgrep,bzcmp,bzless}
-       cd $(DIR_APP) && make PREFIX=/tools install
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make PREFIX=$(TOOLS_DIR) install
 endif
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)