Merge branch 'master' of ssh://stevee@git.ipfire.org/pub/git/ipfire-2.x

diff --git a/config/rootfiles/common/tar b/config/rootfiles/common/tar
index 835d3a36ca364c5364f8c0d7da80969ab2c33c2e..9e31cc0b73f2907a0e7b095833e35748824b4045 100644 (file)
--- a/config/rootfiles/common/tar
+++ b/config/rootfiles/common/tar
@@ -1,5 +1,5 @@
 bin/tar
-#usr/info/tar.info
-#usr/info/tar.info-1
-#usr/info/tar.info-2
+#usr/share/info/tar.info
+#usr/share/info/tar.info-1
+#usr/share/info/tar.info-2
 #usr/sbin/rmt

diff --git a/lfs/tar b/lfs/tar
index 740677d5a84204278c8b0776f7970447f24dba51..b1ef2fc9831ca92d382c866aaca2ef0b9629738b 100644 (file)
--- a/lfs/tar
+++ b/lfs/tar
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.15.1
+VER        = 1.22
 
 THISAPP    = tar-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -54,7 +54,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 57da3c38f8e06589699548a34d5a5d07
+$(DL_FILE)_MD5 = 07fa517027f426bb80f5f5ff91b63585
 
 install : $(TARGET)
 
@@ -84,11 +84,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @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 $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make $(EXTRA_INSTALL) install