From 191b24e70033da9344790fcd4925f2537f5f50ea Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 09:54:22 +0000
Subject: [PATCH] auto-import changelog data from patch-2.5.4-10.src.rpm Tue
 May 29 2001 Tim Waugh <twaugh@redhat.com> - Merge Mandrake patch: - fix
 possible segfault

---
 patch-2.5.4-sigsegv.patch | 44 +++++++++++++++++++++++++++++++++++++++
 patch.spec                |  8 ++++++-
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 patch-2.5.4-sigsegv.patch

diff --git a/patch-2.5.4-sigsegv.patch b/patch-2.5.4-sigsegv.patch
new file mode 100644
index 0000000..df0676e
--- /dev/null
+++ b/patch-2.5.4-sigsegv.patch
@@ -0,0 +1,44 @@
+Bug report: #14693
+Reported by: Vincent Renardias <vincent@waw.com>
+Patch: jdassen@wi.leidenuniv.nl (J.H.M.Dassen)
+Since Version: 2.5-2
+
+--- patch-2.5.orig/inp.c
++++ patch-2.5/inp.c
+@@ -71,6 +71,14 @@
+     }
+ }
+ 
++void
++reset_scan_input_vars()
++{
++ using_plan_a = 1;
++ i_buffer = NULL;
++ i_ptr = NULL;
++}
++
+ /* Construct the line index, somehow or other. */
+ 
+ void
+--- patch-2.5.orig/patch.c
++++ patch-2.5/patch.c
+@@ -210,7 +210,10 @@
+ 
+ 	/* 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 */
+--- patch-2.5.orig/inp.h
++++ patch-2.5/inp.h
+@@ -7,4 +7,5 @@
+ char const *ifetch PARAMS ((LINENUM, int, size_t *));
+ void get_input_file PARAMS ((char const *, char const *));
+ void re_input PARAMS ((void));
++void reset_scan_input_vars PARAMS (());
+ void scan_input PARAMS ((char *));
diff --git a/patch.spec b/patch.spec
index bc7c69e..6ff30fb 100644
--- a/patch.spec
+++ b/patch.spec
@@ -1,13 +1,14 @@
 Summary: The GNU patch command, for modifying/upgrading files.
 Name: patch
 Version: 2.5.4
-Release: 9
+Release: 10
 Copyright: GPL
 URL: http://www.gnu.org/software/patch/patch.html
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/gnu/patch/patch-%{version}.tar.gz
 Patch1: patch-2.5-stderr.patch
 Patch2: patch-2.5.4-suffix.patch
+Patch3: patch-2.5.4-sigsegv.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -24,6 +25,7 @@ applications.
 %setup -q
 %patch1 -p1 -b .stderr
 %patch2 -p1 -b .suffix
+%patch3 -p1 -b .sigsegv
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
@@ -50,6 +52,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 
 %changelog
+* Tue May 29 2001 Tim Waugh <twaugh@redhat.com>
+- Merge Mandrake patch:
+  - fix possible segfault
+
 * Fri Dec  1 2000 Tim Waugh <twaugh@redhat.com>
 - Rebuild because of fileutils bug.