rpms/cpio/F-13 cpio-2.10-patternnamesigsegv.patch, NONE, 1.1 cpio.spec, 1.69, 1.70 cpio-2.6-setLocale.patch, 1.1, NONE

[Ondrej Vasik]

Author: ovasik

Update of /cvs/pkgs/rpms/cpio/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21746

Modified Files:
	cpio.spec 
Added Files:
	cpio-2.10-patternnamesigsegv.patch 
Removed Files:
	cpio-2.6-setLocale.patch 
Log Message:
remove redundant setLocale patch, fix segfault with nonexisting file with patternnames(#567022)

cpio-2.10-patternnamesigsegv.patch:
 copyin.c |   31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

--- NEW FILE cpio-2.10-patternnamesigsegv.patch ---
diff -urNp cpio-2.10-orig/src/copyin.c cpio-2.10/src/copyin.c
--- cpio-2.10-orig/src/copyin.c	2010-02-22 12:57:59.000000000 +0100
+++ cpio-2.10/src/copyin.c	2010-02-22 12:55:26.000000000 +0100
@@ -944,20 +944,23 @@ read_pattern_file ()
   pattern_fp = fopen (pattern_file_name, "r");
   if (pattern_fp == NULL)
     open_error (pattern_file_name);
-  while (ds_fgetstr (pattern_fp, &pattern_name, '\n') != NULL)
-    {
-      if (new_num_patterns >= max_new_patterns)
-	{
-	  max_new_patterns += 1;
-	  new_save_patterns = (char **)
-	    xrealloc ((char *) new_save_patterns,
-		      max_new_patterns * sizeof (char *));
-	}
-      new_save_patterns[new_num_patterns] = xstrdup (pattern_name.ds_string);
-      ++new_num_patterns;
-    }
-  if (ferror (pattern_fp) || fclose (pattern_fp) == EOF)
-    close_error (pattern_file_name);
+  else
+  {
+    while (ds_fgetstr (pattern_fp, &pattern_name, '\n') != NULL)
+      {
+        if (new_num_patterns >= max_new_patterns)
+        {
+          max_new_patterns += 1;
+          new_save_patterns = (char **)
+          xrealloc ((char *) new_save_patterns,
+            max_new_patterns * sizeof (char *));
+        }
+        new_save_patterns[new_num_patterns] = xstrdup (pattern_name.ds_string);
+        ++new_num_patterns;
+      }
+    if (ferror (pattern_fp) || fclose (pattern_fp) == EOF)
+      close_error (pattern_file_name);
+  }
 
   for (i = 0; i < num_patterns; ++i)
     new_save_patterns[i] = save_patterns[i];


Index: cpio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpio/F-13/cpio.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- cpio.spec	6 Jan 2010 13:54:29 -0000	1.69
+++ cpio.spec	25 Feb 2010 08:53:05 -0000	1.70
@@ -3,21 +3,21 @@
 Summary: A GNU archiving program
 Name: cpio
 Version: 2.10
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3+
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/cpio/
 Source: ftp://ftp.gnu.org/gnu/cpio/cpio-%{version}.tar.bz2
 Source1: cpio.1
-Patch1: cpio-2.6-setLocale.patch
-Patch2: cpio-2.9-rh.patch
-Patch3: cpio-2.9-chmodRaceC.patch
-Patch4: cpio-2.9-exitCode.patch
-Patch5: cpio-2.9-dir_perm.patch
-Patch6: cpio-2.9-dev_number.patch
-Patch7: cpio-2.9-sys_umask.patch
-Patch8: cpio-2.9.90-defaultremoteshell.patch
-Patch9: cpio-2.10-utimens.patch
+Patch1: cpio-2.9-rh.patch
+Patch2: cpio-2.9-chmodRaceC.patch
+Patch3: cpio-2.9-exitCode.patch
+Patch4: cpio-2.9-dir_perm.patch
+Patch5: cpio-2.9-dev_number.patch
+Patch6: cpio-2.9-sys_umask.patch
+Patch7: cpio-2.9.90-defaultremoteshell.patch
+Patch8: cpio-2.10-utimens.patch
+Patch9: cpio-2.10-patternnamesigsegv.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 BuildRequires: texinfo, autoconf, gettext, rmt
@@ -39,15 +39,15 @@ Install cpio if you need a program to ma
 
 %prep
 %setup -q
-%patch1  -p1 -b .setLocale
-%patch2  -p1 -b .rh
-%patch3  -p1 -b .chmodRaceC
-%patch4  -p1 -b .exitCode
-%patch5  -p1 -b .dir_perm
-%patch6  -p1 -b .dev_number
-%patch7  -p1 -b .sys_umask
-%patch8  -p1 -b .defaultremote
-%patch9  -p1 -b .utimens
+%patch1  -p1 -b .rh
+%patch2  -p1 -b .chmodRaceC
+%patch3  -p1 -b .exitCode
+%patch4  -p1 -b .dir_perm
+%patch5  -p1 -b .dev_number
+%patch6  -p1 -b .sys_umask
+%patch7  -p1 -b .defaultremote
+%patch8  -p1 -b .utimens
+%patch9  -p1 -b .patternsegv
 
 autoheader
 
@@ -92,6 +92,11 @@ fi
 %{_infodir}/*.info*
 
 %changelog
+* Thu Feb 25 2010 Ondrej Vasik <ovasik at redhat.com> 2.10-5
+- remove redundant setLocale patch
+- fix segfault with nonexisting file with patternnames
+  (#567022)
+
 * Wed Jan 06 2010 Ondrej Vasik <ovasik at redhat.com> 2.10-4
 - do not fail with new POSIX 2008 utimens() glibc call
   (#552320)


--- cpio-2.6-setLocale.patch DELETED ---