From 81e7469863afee45e2e6ef8408d7175ec0c02c754d15b4ae3217b23b0a676e48 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 2 Oct 2007 23:13:53 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tar?expand=0&rev=9 --- tar-gcc43.patch | 31 +++++++++++++++++++++++++++++++ tar.changes | 5 +++++ tar.spec | 12 +++++++----- 3 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 tar-gcc43.patch diff --git a/tar-gcc43.patch b/tar-gcc43.patch new file mode 100644 index 0000000..7d3f1cc --- /dev/null +++ b/tar-gcc43.patch @@ -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, + diff --git a/tar.changes b/tar.changes index d1ba375..28d3c9b 100644 --- a/tar.changes +++ b/tar.changes @@ -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 diff --git a/tar.spec b/tar.spec index 7a5cbc8..07b3443 100644 --- a/tar.spec +++ b/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]