rpms/cpio
5
0
Fork 0
Code Issues Pull Requests Releases Activity

remove redundant setLocale patch - synchronize branches

Browse Source
This commit is contained in:
Ondrej Vasik 2010-03-10 14:03:51 +00:00
parent 8de53aedda
commit 1f941eef52
2 changed files with 22 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cpio-2.6-setLocale.patch
View File

@ -1,11 +0,0 @@
--- cpio-2.6/lib/system.h.setLocale 2006-12-05 11:36:04.000000000 +0100
+++ cpio-2.6/lib/system.h 2006-12-05 11:36:22.000000000 +0100
@@ -471,6 +471,8 @@
/* Prototypes for external functions. */
+#define HAVE_SETLOCALE 1
+
#if HAVE_LOCALE_H
# include <locale.h>
#endif

45
cpio.spec
View File

@ -9,19 +9,18 @@ Group: Applications/Archiving
URL: http://www.gnu.org/software/cpio/ URL: http://www.gnu.org/software/cpio/
Source: ftp://ftp.gnu.org/gnu/cpio/cpio-%{version}.tar.bz2 Source: ftp://ftp.gnu.org/gnu/cpio/cpio-%{version}.tar.bz2
Source1: cpio.1 Source1: cpio.1
Patch1: cpio-2.6-setLocale.patch Patch1: cpio-2.9-rh.patch
Patch2: cpio-2.9-rh.patch Patch2: cpio-2.9-chmodRaceC.patch
Patch3: cpio-2.9-chmodRaceC.patch Patch3: cpio-2.9-exitCode.patch
Patch4: cpio-2.9-exitCode.patch Patch4: cpio-2.9-dir_perm.patch
Patch5: cpio-2.9-dir_perm.patch Patch5: cpio-2.9-dev_number.patch
Patch6: cpio-2.9-dev_number.patch Patch6: cpio-2.9-sys_umask.patch
Patch7: cpio-2.9-sys_umask.patch Patch7: cpio-2.9.90-defaultremoteshell.patch
Patch8: cpio-2.9.90-defaultremoteshell.patch Patch8: cpio-2.10-utimens.patch
Patch9: cpio-2.10-utimens.patch Patch9: cpio-2.10-patternnamesigsegv.patch
Patch10: cpio-2.10-patternnamesigsegv.patch
# CVE-2010-0624 fix heap-based buffer overflow by expanding # CVE-2010-0624 fix heap-based buffer overflow by expanding
# a specially-crafted archive(#572150) # a specially-crafted archive(#572150)
Patch11: cpio-2.10-rtapeliboverflow.patch Patch10: cpio-2.10-rtapeliboverflow.patch
Requires(post): /sbin/install-info Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info Requires(preun): /sbin/install-info
BuildRequires: texinfo, autoconf, gettext, rmt BuildRequires: texinfo, autoconf, gettext, rmt
@ -43,17 +42,16 @@ Install cpio if you need a program to manage file archives.
%prep %prep
%setup -q %setup -q
%patch1 -p1 -b .setLocale %patch1 -p1 -b .rh
%patch2 -p1 -b .rh %patch2 -p1 -b .chmodRaceC
%patch3 -p1 -b .chmodRaceC %patch3 -p1 -b .exitCode
%patch4 -p1 -b .exitCode %patch4 -p1 -b .dir_perm
%patch5 -p1 -b .dir_perm %patch5 -p1 -b .dev_number
%patch6 -p1 -b .dev_number %patch6 -p1 -b .sys_umask
%patch7 -p1 -b .sys_umask %patch7 -p1 -b .defaultremote
%patch8 -p1 -b .defaultremote %patch8 -p1 -b .utimens
%patch9 -p1 -b .utimens %patch9 -p1 -b .patternsegv
%patch10 -p1 -b .patternsegv %patch10 -p1 -b .rtapelib
%patch11 -p1 -b .rtapelib
autoheader autoheader
@ -102,7 +100,8 @@ fi
- CVE-2010-0624 fix heap-based buffer overflow by expanding - CVE-2010-0624 fix heap-based buffer overflow by expanding
a specially-crafted archive(#572150) a specially-crafted archive(#572150)
* Mon Feb 22 2010 Ondrej Vasik <ovasik@redhat.com> 2.10-5 * Thu Feb 25 2010 Ondrej Vasik <ovasik@redhat.com> 2.10-5
- remove redundant setLocale patch
- fix segfault with nonexisting file with patternnames - fix segfault with nonexisting file with patternnames
(#567022) (#567022)