X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Ftar;h=740677d5a84204278c8b0776f7970447f24dba51;hb=e7300402791239107a64c31aba4acf1270d43651;hp=04e27d18ad423b2922486547d1a76c0fed08d0b8;hpb=cd1a2927226c734d96478e12bb768256fb64a06a;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/tar b/lfs/tar
index 04e27d18a..740677d5a 100644
--- a/lfs/tar
+++ b/lfs/tar
@@ -1,28 +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>                        #
-#                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: tar,v 1.3.2.5 2006/01/30 19:46:45 gespinasse Exp $
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -32,11 +24,11 @@
 
 include Config
 
-VER        = 1.13.25
+VER        = 1.15.1
 
 THISAPP    = tar-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_AGNU)/tar
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 # Normal build or /tools build.
@@ -44,7 +36,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
   EXTRA_CONFIG = --prefix=/usr --bindir=/bin \
-    --libexecdir=/usr/bin --disable-nls
+	--libexecdir=/usr/sbin --disable-nls
   EXTRA_MAKE =
   EXTRA_INSTALL =
 else
@@ -58,14 +50,11 @@ endif
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) \
-	tar-1.13.25-dot_dot-1.patch
+objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-tar-1.13.25-dot_dot-1.patch        = $(URL_LFS)/tar/tar-1.13.25-dot_dot-1.patch
 
-$(DL_FILE)_MD5 = 6ef8c906e81eee441f8335652670ac4a
-tar-1.13.25-dot_dot-1.patch_MD5    = 56ab09592243847e7410c4fde8d37f62
+$(DL_FILE)_MD5 = 57da3c38f8e06589699548a34d5a5d07
 
 install : $(TARGET)
 
@@ -94,10 +83,14 @@ $(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)/tar-1.13.25-dot_dot-1.patch
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gcc4_fix_tests-1.patch
+ifeq "$(ROOT)" ""
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-sparse_fix-1.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-security_fixes-1.patch
+endif
 	cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
-	cd $(DIR_APP) && make $(EXTRA_MAKE)
+	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)