[pax] fix FTBFS with gcc4.6+ - (#715754)

Ondrej Vasik ovasik at fedoraproject.org
Wed Jun 29 12:57:01 UTC 2011


commit 9c44d667fb6b7cc13c4bfe214506a80c70eb5c45
Author: Ondřej Vašík <ovasik at redhat.com>
Date:   Wed Jun 29 14:56:46 2011 +0200

    fix FTBFS with gcc4.6+ - (#715754)

 pax-gcc46.patch |   18 ++++++++++++++++++
 pax.spec        |    8 +++++++-
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/pax-gcc46.patch b/pax-gcc46.patch
new file mode 100644
index 0000000..da4f550
--- /dev/null
+++ b/pax-gcc46.patch
@@ -0,0 +1,18 @@
+diff -urNp pax-3.4-orig/lib/fts.c pax-3.4/lib/fts.c
+--- pax-3.4-orig/lib/fts.c	2005-07-29 09:55:25.000000000 +0200
++++ pax-3.4/lib/fts.c	2011-06-29 14:50:05.256431237 +0200
+@@ -465,12 +465,8 @@ name:		t = sp->fts_path + NAPPEND(p->fts
+  */
+ /* ARGSUSED */
+ int
+-fts_set(sp, p, instr)
+-	FTS *sp;
+-	FTSENT *p;
+-	int instr;
++fts_set(FTS *sp __attribute__ ((__unused__)), FTSENT *p, int instr)
+ {
+-sp = NULL;	/* stop compiler whinging */
+ 	if (instr != 0 && instr != FTS_AGAIN && instr != FTS_FOLLOW &&
+ 	    instr != FTS_NOINSTR && instr != FTS_SKIP) {
+ 		errno = EINVAL;
+Binary files pax-3.4-orig/lib/.fts.c.swp and pax-3.4/lib/.fts.c.swp differ
diff --git a/pax.spec b/pax.spec
index 5743141..c8aa8fc 100644
--- a/pax.spec
+++ b/pax.spec
@@ -1,7 +1,7 @@
 Summary: POSIX File System Archiver
 Name: pax
 Version: 3.4
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: BSD
 Group: Applications/Archiving
 Source: ftp://ftp.suse.com/pub/people/kukuk/pax/%{name}-%{version}.tar.bz2
@@ -12,6 +12,8 @@ Patch0: pax-3.0-PATHMAX.patch
 Patch1: pax-3.4-abs100.patch
 #do not truncate names when extracting
 Patch2: pax-3.4-rdtruncate.patch
+#do not fail with gcc-4.6+
+Patch3: pax-gcc46.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
@@ -23,6 +25,7 @@ common forms of standard Unix archive (backup) files - CPIO and TAR.
 %patch0 -p1 -b .PATHMAX
 %patch1 -p1 -b .abs100
 %patch2 -p1 -b .rdtruncate
+%patch3 -p1 -b .gcc46
 
 %build
 %configure
@@ -42,6 +45,9 @@ rm -rf %{buildroot}
 %doc %{_mandir}/man1/*
 
 %changelog
+* Wed Jun 29 2011 Ondrej Vasik <ovasik at redhat.com> - 3.4-12
+- fix FTBFS with gcc4.6+ - (#715754)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list