From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 22 Apr 2010 15:05:30 +0000 (+0200)
Subject: patch: Update to alpha release 2.6.1.28-d909.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fdaad7aacba043fb0651d9f3929a7a716b5932c;p=ipfire-3.x.git

patch: Update to alpha release 2.6.1.28-d909.

The stable version wasn't able to be built with gcc-4.5.0
and produces segmentation faults.
---

diff --git a/pkgs/core/patch/patch.nm b/pkgs/core/patch/patch.nm
index a1e0a9800..2d1d2b57d 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.1
+PKG_VER        = 2.6.1.28-d909
 PKG_REL        = 0
 
 PKG_MAINTAINER =
diff --git a/pkgs/core/patch/patches/patch-2.5.4-sigsegv.patch b/pkgs/core/patch/patches/patch-2.5.4-sigsegv.patch
new file mode 100644
index 000000000..c018153ac
--- /dev/null
+++ b/pkgs/core/patch/patches/patch-2.5.4-sigsegv.patch
@@ -0,0 +1,42 @@
+diff -up patch-2.6/src/inp.c.sigsegv patch-2.6/src/inp.c
+--- patch-2.6/src/inp.c.sigsegv	2009-11-02 19:09:57.000000000 +0000
++++ patch-2.6/src/inp.c	2009-11-16 09:31:52.305022200 +0000
+@@ -77,6 +77,14 @@ re_input (void)
+     }
+ }
+ 
++void
++reset_scan_input_vars()
++{
++ using_plan_a = 1;
++ i_buffer = NULL;
++ i_ptr = NULL;
++}
++
+ /* Construct the line index, somehow or other. */
+ 
+ void
+diff -up patch-2.6/src/inp.h.sigsegv patch-2.6/src/inp.h
+--- patch-2.6/src/inp.h.sigsegv	2009-11-02 19:09:57.000000000 +0000
++++ patch-2.6/src/inp.h	2009-11-16 09:32:24.440021838 +0000
+@@ -24,4 +24,5 @@ XTERN LINENUM input_lines;		/* how long 
+ char const *ifetch (LINENUM, bool, size_t *);
+ void get_input_file (char const *, char const *);
+ void re_input (void);
++void reset_scan_input_vars (void);
+ void scan_input (char *);
+diff -up patch-2.6/src/patch.c.sigsegv patch-2.6/src/patch.c
+--- patch-2.6/src/patch.c.sigsegv	2009-11-02 19:09:57.000000000 +0000
++++ patch-2.6/src/patch.c	2009-11-16 09:31:52.306021801 +0000
+@@ -210,7 +210,10 @@ main (int argc, char **argv)
+ 
+ 	/* find out where all the lines are */
+ 	if (!skip_rest_of_patch)
+-	    scan_input (inname);
++          scan_input (inname);
++        else
++          reset_scan_input_vars ();
++        
+ 
+ 	/* from here on, open no standard i/o files, because malloc */
+ 	/* might misfire and we can't catch it easily */
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
deleted file mode 100644
index d80f766e9..000000000
--- a/pkgs/core/patch/patches/patch-2.6.1-test_fix-1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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$
diff --git a/pkgs/toolchain/patch/patches/patch-2.5.4-sigsegv.patch b/pkgs/toolchain/patch/patches/patch-2.5.4-sigsegv.patch
new file mode 100644
index 000000000..c018153ac
--- /dev/null
+++ b/pkgs/toolchain/patch/patches/patch-2.5.4-sigsegv.patch
@@ -0,0 +1,42 @@
+diff -up patch-2.6/src/inp.c.sigsegv patch-2.6/src/inp.c
+--- patch-2.6/src/inp.c.sigsegv	2009-11-02 19:09:57.000000000 +0000
++++ patch-2.6/src/inp.c	2009-11-16 09:31:52.305022200 +0000
+@@ -77,6 +77,14 @@ re_input (void)
+     }
+ }
+ 
++void
++reset_scan_input_vars()
++{
++ using_plan_a = 1;
++ i_buffer = NULL;
++ i_ptr = NULL;
++}
++
+ /* Construct the line index, somehow or other. */
+ 
+ void
+diff -up patch-2.6/src/inp.h.sigsegv patch-2.6/src/inp.h
+--- patch-2.6/src/inp.h.sigsegv	2009-11-02 19:09:57.000000000 +0000
++++ patch-2.6/src/inp.h	2009-11-16 09:32:24.440021838 +0000
+@@ -24,4 +24,5 @@ XTERN LINENUM input_lines;		/* how long 
+ char const *ifetch (LINENUM, bool, size_t *);
+ void get_input_file (char const *, char const *);
+ void re_input (void);
++void reset_scan_input_vars (void);
+ void scan_input (char *);
+diff -up patch-2.6/src/patch.c.sigsegv patch-2.6/src/patch.c
+--- patch-2.6/src/patch.c.sigsegv	2009-11-02 19:09:57.000000000 +0000
++++ patch-2.6/src/patch.c	2009-11-16 09:31:52.306021801 +0000
+@@ -210,7 +210,10 @@ main (int argc, char **argv)
+ 
+ 	/* find out where all the lines are */
+ 	if (!skip_rest_of_patch)
+-	    scan_input (inname);
++          scan_input (inname);
++        else
++          reset_scan_input_vars ();
++        
+ 
+ 	/* from here on, open no standard i/o files, because malloc */
+ 	/* might misfire and we can't catch it easily */