rpms/tar/devel tar-1.19-gcc43.patch, NONE, 1.1 tar-1.19-xattrs.patch, 1.2, 1.3 tar.spec, 1.68, 1.69

[Radek Brich (rbrich)]

Author: rbrich

Update of /cvs/extras/rpms/tar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3525

Modified Files:
	tar-1.19-xattrs.patch tar.spec 
Added Files:
	tar-1.19-gcc43.patch 
Log Message:
fix for GCC 4.3

tar-1.19-gcc43.patch:

--- NEW FILE tar-1.19-gcc43.patch ---
diff -up tar-1.19/lib/argp-fmtstream.h.gcc43 tar-1.19/lib/argp-fmtstream.h
--- tar-1.19/lib/argp-fmtstream.h.gcc43	2007-09-28 15:11:36.000000000 +0200
+++ tar-1.19/lib/argp-fmtstream.h	2008-02-13 16:56:58.000000000 +0100
@@ -198,7 +198,11 @@ extern int __argp_fmtstream_ensure (argp
 #endif
 
 #ifndef ARGP_FS_EI
-#define ARGP_FS_EI extern inline
+# 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
diff -up tar-1.19/lib/argp.h.gcc43 tar-1.19/lib/argp.h
--- tar-1.19/lib/argp.h.gcc43	2007-09-28 15:11:36.000000000 +0200
+++ tar-1.19/lib/argp.h	2008-02-13 16:55:36.000000000 +0100
@@ -580,7 +580,11 @@ extern void *__argp_input (const struct 
 # 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

tar-1.19-xattrs.patch:

Index: tar-1.19-xattrs.patch
===================================================================
RCS file: /cvs/extras/rpms/tar/devel/tar-1.19-xattrs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tar-1.19-xattrs.patch	13 Feb 2008 09:10:03 -0000	1.2
+++ tar-1.19-xattrs.patch	13 Feb 2008 16:20:29 -0000	1.3
@@ -231,7 +231,7 @@
 +{ /* "system.posix_acl_access" */
 +#ifdef HAVE_LIBACL
 +  char *val = NULL;
-+  size_t len;
++  ssize_t len;
 +  acl_t acl;
 +
 +  if (fd != -1)
@@ -260,7 +260,7 @@
 +    return;
 +  }
 +  
-+  *ret_ptr = xstrndup (val, len);
++  *ret_ptr = xstrdup (val);
 +  *ret_len = len;
 +  
 +  acl_free (val);
@@ -273,7 +273,7 @@
 +{ /* "system.posix_acl_default" */
 +#ifdef HAVE_LIBACL
 +  char *val = NULL;
-+  size_t len;
++  ssize_t len;
 +  acl_t acl;
 +  
 +  if ((acl = acl_get_file (file_name, ACL_TYPE_DEFAULT)) == (acl_t)NULL)
@@ -292,7 +292,7 @@
 +    return;
 +  }
 +  
-+  *ret_ptr = xstrndup (val, len);
++  *ret_ptr = xstrdup (val);
 +  *ret_len = len;
 +  
 +  acl_free (val);


Index: tar.spec
===================================================================
RCS file: /cvs/extras/rpms/tar/devel/tar.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- tar.spec	13 Feb 2008 09:10:03 -0000	1.68
+++ tar.spec	13 Feb 2008 16:20:29 -0000	1.69
@@ -14,7 +14,7 @@
 Patch3: tar-1.19-xattrs.patch
 Patch4: tar-1.19-xattrs-conf.patch
 Patch5: tar-1.17-wildcards.patch
-
+Patch6: tar-1.19-gcc43.patch
 Prereq: info
 BuildRequires: autoconf automake gzip texinfo gettext libacl-devel libselinux-devel gawk
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -40,6 +40,7 @@
 %patch3 -p1 -b .xattrs
 %patch4 -p1 -b .xattrs-conf
 %patch5 -p1 -b .wildcards
+%patch6 -p1 -b .gcc43
 
 %build
 %configure --bindir=/bin --libexecdir=/sbin
@@ -93,6 +94,7 @@
 * Tue Feb 12 2008 Radek Brich <rbrich at redhat.com> 2:1.19-3
 - do not print getfilecon/setfilecon warnings when SELinux is disabled
   or SELinux data are not available (bz#431879)
+- fix for GCC 4.3
 
 * Mon Jan 21 2008 Radek Brich <rbrich at redhat.com> 2:1.19-2
 - fix errors in man page