This commit is contained in:
parent
732ecf52bf
commit
9e1a1df0dc
30
cpio-2.9-gcc4_3.patch
Normal file
30
cpio-2.9-gcc4_3.patch
Normal file
@ -0,0 +1,30 @@
|
||||
--- lib/argp.h.orig 2007-09-25 11:04:18.000000000 +0200
|
||||
+++ lib/argp.h 2007-09-25 11:06:24.000000000 +0200
|
||||
@@ -580,7 +580,11 @@
|
||||
# endif
|
||||
|
||||
# ifndef ARGP_EI
|
||||
-# define ARGP_EI extern __inline__
|
||||
+# if defined __GNUC_STDC_INLINE__
|
||||
+# define ARGP_EI extern __inline__ __attribute__((__gnu_inline__))
|
||||
+# else
|
||||
+# define ARGP_EI extern __inline__
|
||||
+# endif
|
||||
# endif
|
||||
|
||||
ARGP_EI void
|
||||
--- lib/argp-fmtstream.h.orig 2007-09-25 11:06:49.000000000 +0200
|
||||
+++ lib/argp-fmtstream.h 2007-09-25 11:07:35.000000000 +0200
|
||||
@@ -198,8 +198,12 @@
|
||||
#endif
|
||||
|
||||
#ifndef ARGP_FS_EI
|
||||
+#ifdef __GNUC_STDC_INLINE__
|
||||
+#define ARGP_FS_EI extern inline __attribute__((__gnu_inline__))
|
||||
+#else
|
||||
#define ARGP_FS_EI extern inline
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
ARGP_FS_EI size_t
|
||||
__argp_fmtstream_write (argp_fmtstream_t __fs,
|
11
cpio-2.9-segfault_in_copyin.patch
Normal file
11
cpio-2.9-segfault_in_copyin.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- src/copyin.c
|
||||
+++ src/copyin.c
|
||||
@@ -1277,7 +1277,7 @@
|
||||
error (0, 0, _("warning: archive header has reverse byte-order"));
|
||||
warned = 1;
|
||||
}
|
||||
- swab_array ((char *) &short_hdr, 13);
|
||||
+ swab_array ((char *) short_hdr, 13);
|
||||
}
|
||||
|
||||
file_hdr->c_dev_maj = major (short_hdr->c_dev);
|
11
cpio.changes
11
cpio.changes
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 1 11:31:02 CEST 2007 - lmichnovic@suse.cz
|
||||
|
||||
- Fixed typo in copin.c causing segfault [#329744]
|
||||
(*segfault_in_copyin.patch)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 25 11:51:52 CEST 2007 - lmichnovic@suse.cz
|
||||
|
||||
- fix for compiling with new gcc 4.3 (*gcc4_3.patch)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 20 18:11:29 CEST 2007 - lmichnovic@suse.cz
|
||||
|
||||
|
16
cpio.spec
16
cpio.spec
@ -11,12 +11,12 @@
|
||||
# norootforbuild
|
||||
|
||||
Name: cpio
|
||||
URL: http://www.gnu.org/software/cpio/cpio.html
|
||||
Url: http://www.gnu.org/software/cpio/cpio.html
|
||||
License: GPL v3 only
|
||||
Group: Productivity/Archiving/Compression
|
||||
Autoreqprov: on
|
||||
AutoReqProv: on
|
||||
Version: 2.9
|
||||
Release: 10
|
||||
Release: 18
|
||||
Summary: A Backup and Archiving Utility
|
||||
Source: cpio-2.9.tar.bz2
|
||||
Patch1: cpio-2.9-no_rmt.patch
|
||||
@ -27,6 +27,8 @@ Patch5: cpio-2.9-open_nonblock.patch
|
||||
Patch6: cpio-2.9-lfs_correction.patch
|
||||
Patch7: cpio-2.9-chmodRaceC.patch
|
||||
Patch8: cpio-2.9-paxlib-owl-alloca.patch
|
||||
Patch9: cpio-2.9-gcc4_3.patch
|
||||
Patch10: cpio-2.9-segfault_in_copyin.patch
|
||||
PreReq: %install_info_prereq
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
@ -59,6 +61,8 @@ Authors:
|
||||
%patch6
|
||||
%patch7
|
||||
%patch8
|
||||
%patch9
|
||||
%patch10
|
||||
chmod 755 .
|
||||
chmod u+w *
|
||||
chmod a+r *
|
||||
@ -97,8 +101,12 @@ ln -sf ../../bin/cpio $RPM_BUILD_ROOT/usr/bin/cpio
|
||||
%doc %{_mandir}/man1/cpio.1.gz
|
||||
%doc %{_mandir}/man1/mt.1.gz
|
||||
#/usr/share/locale/*/LC_MESSAGES/cpio.mo
|
||||
|
||||
%changelog
|
||||
* Mon Oct 01 2007 - lmichnovic@suse.cz
|
||||
- Fixed typo in copin.c causing segfault [#329744]
|
||||
(*segfault_in_copyin.patch)
|
||||
* Tue Sep 25 2007 - lmichnovic@suse.cz
|
||||
- fix for compiling with new gcc 4.3 (*gcc4_3.patch)
|
||||
* Mon Aug 20 2007 - lmichnovic@suse.cz
|
||||
- fixed typo in paxlib-owl-alloca.patch [#301416]
|
||||
* Fri Aug 17 2007 - lmichnovic@suse.cz
|
||||
|
Loading…
Reference in New Issue
Block a user