This commit is contained in:
parent
037738a590
commit
81e7469863
31
tar-gcc43.patch
Normal file
31
tar-gcc43.patch
Normal file
@ -0,0 +1,31 @@
|
||||
--- 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,
|
||||
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 1 10:48:23 CEST 2007 - mkoenig@suse.de
|
||||
|
||||
- fix build with gcc-4.3
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 31 12:55:24 CEST 2007 - mkoenig@suse.de
|
||||
|
||||
|
12
tar.spec
12
tar.spec
@ -12,14 +12,14 @@
|
||||
|
||||
Name: tar
|
||||
BuildRequires: help2man
|
||||
URL: http://www.gnu.org/software/tar/
|
||||
Url: http://www.gnu.org/software/tar/
|
||||
License: GPL v2 or later
|
||||
Group: System/Base
|
||||
Provides: base:/bin/tar
|
||||
PreReq: %install_info_prereq
|
||||
Autoreqprov: on
|
||||
AutoReqProv: on
|
||||
Version: 1.17
|
||||
Release: 17
|
||||
Release: 22
|
||||
Summary: GNU implementation of tar ((t)ape (ar)chiver)
|
||||
Source0: %name-%version.tar.bz2
|
||||
Patch0: tar-disable_languages.patch
|
||||
@ -28,6 +28,7 @@ Patch2: tar-manpage.patch
|
||||
Patch3: tar-1.17-testsuite12.patch
|
||||
Patch4: tar-1.17-paxlib-owl-alloca.patch
|
||||
Patch5: tar-1.15.1-CVE-2001-1267.patch
|
||||
Patch6: tar-gcc43.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%define _bindir /bin
|
||||
|
||||
@ -69,6 +70,7 @@ Authors:
|
||||
%patch3
|
||||
%patch4
|
||||
%patch5 -p0
|
||||
%patch6
|
||||
|
||||
%build
|
||||
rm -f po/no.* po/ky.*
|
||||
@ -96,7 +98,6 @@ rm -r %buildroot/usr/libexec
|
||||
%defattr(-, root, root)
|
||||
%_bindir/tar
|
||||
%doc README* ABOUT-NLS AUTHORS COPYING NEWS THANKS ChangeLog PORTS TODO
|
||||
|
||||
%_infodir/tar.info*.gz
|
||||
%_mandir/man1/tar.1.gz
|
||||
|
||||
@ -108,8 +109,9 @@ rm -r %buildroot/usr/libexec
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%changelog
|
||||
* Mon Oct 01 2007 - mkoenig@suse.de
|
||||
- fix build with gcc-4.3
|
||||
* Fri Aug 31 2007 - mkoenig@suse.de
|
||||
- fixed another directory traversal vulnerability, CVE-2001-1267,
|
||||
CVE-2002-0399, [#29973]
|
||||
|
Loading…
Reference in New Issue
Block a user