X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fcpio;h=48a4393e6110e5a1329a0dcbdf12fef162465243;hb=33359c68d9187d6ed8b0a1c2a3c31c792a6cfd29;hp=e5db0d1e0d6da8d708cc2900b1290e9c644e3ef7;hpb=ad9d4caf99c5f34895882da0343b8c441a237a02;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/cpio b/lfs/cpio
index e5db0d1e0d..48a4393e61 100644
--- a/lfs/cpio
+++ b/lfs/cpio
@@ -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  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>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,7 +24,7 @@
 
 include Config
 
-VER        = 2.6
+VER        = 2.11
 
 THISAPP    = cpio-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -42,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 76b4145f33df088a5bade3bf4373d17d
+$(DL_FILE)_MD5 = 1112bb6c45863468b5496ba128792f6c
 
 install : $(TARGET)
 
@@ -72,12 +70,9 @@ $(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) && sed -i "s/invalid_arg/argmatch_invalid/" src/mt.c
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-security_fixes-1.patch
 	cd $(DIR_APP) && ./configure CPIO_MT_PROG=mt --prefix=/usr \
 				--bindir=/bin --libexecdir=/tmp \
 				--with-rmt=/usr/sbin/rmt
-	cd $(DIR_APP) && echo "#define HAVE_LSTAT 1" >> config.h
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)