From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 10 Mar 2010 09:43:00 +0000 (+0100)
Subject: patch: Update to 2.6.1.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f1e3542769ef2341c0894a0f2f4b3dec71c7bb7;p=ipfire-3.x.git

patch: Update to 2.6.1.
---

diff --git a/pkgs/core/patch/patch.nm b/pkgs/core/patch/patch.nm
index a372cf7fb..a1e0a9800 100644
--- a/pkgs/core/patch/patch.nm
+++ b/pkgs/core/patch/patch.nm
@@ -25,7 +25,7 @@
 include $(PKGROOT)/Include
 
 PKG_NAME       = patch
-PKG_VER        = 2.6
+PKG_VER        = 2.6.1
 PKG_REL        = 0
 
 PKG_MAINTAINER =
@@ -44,6 +44,10 @@ endef
 
 PKG_TARBALL    = $(THISAPP).tar.gz
 
+define STAGE_TEST
+	cd $(DIR_APP) && make check
+endef
+
 define STAGE_INSTALL
 	cd $(DIR_APP) && make install prefix=$(BUILDROOT)/usr
 endef
diff --git a/pkgs/core/patch/patches/patch-2.6.1-test_fix-1.patch b/pkgs/core/patch/patches/patch-2.6.1-test_fix-1.patch
new file mode 100644
index 000000000..d80f766e9
--- /dev/null
+++ b/pkgs/core/patch/patches/patch-2.6.1-test_fix-1.patch
@@ -0,0 +1,28 @@
+Submitted by:            Matt Burgess <matthew at linuxfromscratch.org>
+Date:                    2010-01-03
+Initial Package Version: 2.6.1
+Upstream Status:         Submitted
+Origin:                  Matt Burgess
+Description:             Prevents a test from failing when ed is not available.
+
+diff -Naur patch-2.6.1.orig/tests/crlf-handling patch-2.6.1/tests/crlf-handling
+--- patch-2.6.1.orig/tests/crlf-handling	2009-12-30 12:56:30.000000000 +0000
++++ patch-2.6.1/tests/crlf-handling	2010-01-03 11:06:00.340849916 +0000
+@@ -89,10 +89,14 @@
+ 
+ # --------------------------------------------------------------
+ 
+-diff -e a b > ab.diff
+-cp a c
+-check 'patch c < ab.diff' <<EOF
++if ! have_ed ; then
++    echo "The ed utility is not available; skipping ed related tests"
++else
++    diff -e a b > ab.diff
++    cp a c
++    check 'patch c < ab.diff' <<EOF
+ EOF
++fi
+ 
+ check 'cat -A c' <<EOF
+ 1b^M$