diff --git a/tar-1.26-xattrs-gnulib-prepare.patch b/tar-1.26-xattrs-gnulib-prepare.patch index c29ef42..f51f3c0 100644 --- a/tar-1.26-xattrs-gnulib-prepare.patch +++ b/tar-1.26-xattrs-gnulib-prepare.patch @@ -1,10 +1,11 @@ -From 1975192b75aefe1d75360e47496725f2f7c589a8 Mon Sep 17 00:00:00 2001 +From 3a172f4a23be198bf79da30c38453c231b059500 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup -Date: Tue, 14 Aug 2012 15:42:15 +0200 +Date: Fri, 5 Oct 2012 09:29:31 +0200 Subject: [PATCH 1/2] Prepare gnulib for xattrs patch --- - gnu/Makefile.am | 98 +++++- + build-aux/snippet/unused-parameter.h | 38 ++ + gnu/Makefile.am | 123 ++++++- gnu/acl-internal.h | 267 ++++++++++++++ gnu/acl.h | 30 ++ gnu/acl_entries.c | 77 ++++ @@ -24,7 +25,8 @@ Subject: [PATCH 1/2] Prepare gnulib for xattrs patch m4/gnulib-comp.m4 | 33 +- m4/selinux-context-h.m4 | 22 ++ m4/selinux-selinux-h.m4 | 69 ++++ - 20 files changed, 3613 insertions(+), 7 deletions(-) + 21 files changed, 3676 insertions(+), 7 deletions(-) + create mode 100644 build-aux/snippet/unused-parameter.h create mode 100644 gnu/acl-internal.h create mode 100644 gnu/acl.h create mode 100644 gnu/acl_entries.c @@ -44,8 +46,52 @@ Subject: [PATCH 1/2] Prepare gnulib for xattrs patch create mode 100644 m4/selinux-context-h.m4 create mode 100644 m4/selinux-selinux-h.m4 +diff --git a/build-aux/snippet/unused-parameter.h b/build-aux/snippet/unused-parameter.h +new file mode 100644 +index 0000000..6b60482 +--- /dev/null ++++ b/build-aux/snippet/unused-parameter.h +@@ -0,0 +1,38 @@ ++/* -*- buffer-read-only: t -*- vi: set ro: */ ++/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ ++/* A C macro for declaring that specific function parameters are not used. ++ Copyright (C) 2008-2012 Free Software Foundation, Inc. ++ ++ This program is free software: you can redistribute it and/or modify it ++ under the terms of the GNU General Public License as published ++ by the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . */ ++ ++/* _GL_UNUSED_PARAMETER is a marker that can be appended to function parameter ++ declarations for parameters that are not used. This helps to reduce ++ warnings, such as from GCC -Wunused-parameter. The syntax is as follows: ++ type param _GL_UNUSED_PARAMETER ++ or more generally ++ param_decl _GL_UNUSED_PARAMETER ++ For example: ++ int param _GL_UNUSED_PARAMETER ++ int *(*param)(void) _GL_UNUSED_PARAMETER ++ Other possible, but obscure and discouraged syntaxes: ++ int _GL_UNUSED_PARAMETER *(*param)(void) ++ _GL_UNUSED_PARAMETER int *(*param)(void) ++ */ ++#ifndef _GL_UNUSED_PARAMETER ++# if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) ++# define _GL_UNUSED_PARAMETER __attribute__ ((__unused__)) ++# else ++# define _GL_UNUSED_PARAMETER ++# endif ++#endif diff --git a/gnu/Makefile.am b/gnu/Makefile.am -index 06eb0d9..e5913db 100644 +index 06eb0d9..406999c 100644 --- a/gnu/Makefile.am +++ b/gnu/Makefile.am @@ -1,6 +1,3 @@ @@ -65,16 +111,48 @@ index 06eb0d9..e5913db 100644 +libgnu_a_SOURCES += set-mode-acl.c copy-acl.c file-has-acl.c + +EXTRA_DIST += acl-internal.h acl.h acl_entries.c - -+EXTRA_libgnu_a_SOURCES += acl_entries.c + ++EXTRA_libgnu_a_SOURCES += acl_entries.c + +## end gnulib module acl + +## begin gnulib module alloca EXTRA_DIST += alloca.c -@@ -1386,6 +1392,60 @@ EXTRA_libgnu_a_SOURCES += savedir.c +@@ -179,6 +185,31 @@ EXTRA_DIST += $(top_srcdir)/build-aux/c++defs.h + + ## end gnulib module c++defs + ++## begin gnulib module snippet/unused-parameter ++ ++# The BUILT_SOURCES created by this Makefile snippet are not used via #include ++# statements but through direct file reference. Therefore this snippet must be ++# present in all Makefile.am that need it. This is ensured by the applicability ++# 'all' defined above. ++ ++BUILT_SOURCES += unused-parameter.h ++# The unused-parameter.h that gets inserted into generated .h files is the same ++# as build-aux/snippet/unused-parameter.h, except that it has the copyright ++# header cut off. ++unused-parameter.h: $(top_srcdir)/build-aux/snippet/unused-parameter.h ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \ ++ < $(top_srcdir)/build-aux/snippet/unused-parameter.h \ ++ > $@-t && \ ++ mv $@-t $@ ++MOSTLYCLEANFILES += unused-parameter.h unused-parameter.h-t ++ ++UNUSED_PARAMETER_H=unused-parameter.h ++ ++EXTRA_DIST += $(top_srcdir)/build-aux/snippet/unused-parameter.h ++ ++## end gnulib module snippet/unused-parameter ++ + ## begin gnulib module c-ctype + + libgnu_a_SOURCES += c-ctype.h c-ctype.c +@@ -1386,6 +1417,60 @@ EXTRA_libgnu_a_SOURCES += savedir.c ## end gnulib module savedir @@ -135,7 +213,7 @@ index 06eb0d9..e5913db 100644 ## begin gnulib module setenv -@@ -2695,6 +2755,36 @@ libgnu_a_SOURCES += xalloc-die.c +@@ -2695,6 +2780,36 @@ libgnu_a_SOURCES += xalloc-die.c ## end gnulib module xalloc-die @@ -3888,5 +3966,5 @@ index 0000000..ed5215b + fi +]) -- -1.7.11.2 +1.7.11.4 diff --git a/tar.spec b/tar.spec index d2aa567..5d83814 100644 --- a/tar.spec +++ b/tar.spec @@ -1,11 +1,11 @@ %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} -%define WITH_SELINUX 1 +%global WITH_SELINUX 1 %endif Summary: A GNU file archiving program Name: tar Epoch: 2 Version: 1.26 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv3+ Group: Applications/Archiving URL: http://www.gnu.org/software/tar/ @@ -40,14 +40,13 @@ Patch10: tar-1.26-stdio.in.patch Patch11: tar-1.26-xattrs-gnulib-prepare.patch Patch12: tar-1.26-xattrs.patch -BuildRequires: autoconf automake gzip texinfo gettext libacl-devel gawk rsh +BuildRequires: autoconf automake texinfo gettext libacl-devel rsh # allow proper tests for extended attributes -BuildRequires: attr acl coreutils policycoreutils +BuildRequires: attr acl policycoreutils %if %{WITH_SELINUX} BuildRequires: libselinux-devel %endif -Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: bundled(gnulib) Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -68,7 +67,6 @@ the rmt package. %setup -q %patch1 -p1 -b .loneZeroWarning %patch2 -p1 -b .vfatTruncate -#%patch3 -p1 -b .xattrs %patch4 -p1 -b .wildcards %patch5 -p1 -b .rofs %patch6 -p1 -b .oldarchive @@ -89,26 +87,25 @@ autoreconf make %install -rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT bindir=/bin libexecdir=/sbin install -ln -s tar ${RPM_BUILD_ROOT}/bin/gtar +ln -s tar $RPM_BUILD_ROOT/bin/gtar rm -f $RPM_BUILD_ROOT/%{_infodir}/dir -mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 -install -c -p -m 0644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_mandir}/man1 -ln -s tar.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/gtar.1 +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 +install -c -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1 +ln -s tar.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/gtar.1 # XXX Nuke unpackaged files. -rm -f ${RPM_BUILD_ROOT}/sbin/rmt +rm -f $RPM_BUILD_ROOT/sbin/rmt %find_lang %name %check -rm -f ${RPM_BUILD_ROOT}/test/testsuite +rm -f $RPM_BUILD_ROOT/test/testsuite TESTSUITEFLAGS=-v make check %clean -rm -rf ${RPM_BUILD_ROOT} +rm -rf $RPM_BUILD_ROOT %post if [ -f %{_infodir}/tar.info.gz ]; then @@ -123,7 +120,6 @@ if [ $1 = 0 ]; then fi %files -f %{name}.lang -%defattr(-,root,root) %doc AUTHORS ChangeLog ChangeLog.1 COPYING NEWS README THANKS TODO %ifos linux /bin/tar @@ -139,6 +135,16 @@ fi %{_infodir}/tar.info* %changelog +* Fri Oct 05 2012 Pavel Raiskup 2:1.26-12 +- repair the xattr-gnulib-prepare patch to allow build tar without SELinux + support +- fedora-review compliance -> remove trailing white-spaces, remove macro from + comment, remove BR of gawk;coreutils;gzip that should be covered automatically + by minimum build environment, do not `rm -rf' buildroot at the beginning of + install phase (needed only in EPEL), remove BuildRoot definition, remove + defattr macro, s/define/global/ +- do not use ${VAR} syntax for bash variables, use just $VAR + * Wed Aug 22 2012 Pavel Raiskup 2:1.26-11 - fix manpage to reflect #850291 related commit @@ -218,7 +224,7 @@ fi * Wed Apr 07 2010 Ondrej Vasik 2:1.23-3 - allow storing of extended attributes for fifo and block or character devices files(#573147) - + * Mon Mar 15 2010 Ondrej Vasik 2:1.23-2 - update help2maned manpage @@ -395,7 +401,7 @@ fi - fix tar-1.15.1-xattrs.patch (#208701) * Tue Sep 19 2006 Peter Vrabec 2:1.15.1-17 -- start new epoch, downgrade to solid stable 1.15.1-16 (#206979), +- start new epoch, downgrade to solid stable 1.15.1-16 (#206979), - all patches are backported * Tue Sep 19 2006 Peter Vrabec 1.15.91-2 @@ -411,11 +417,11 @@ fi - add xattr support (#200925), patch from james.antill@redhat.com * Mon Jul 24 2006 Peter Vrabec 1.15.90-5 -- fix incompatibilities in appending files to the end +- fix incompatibilities in appending files to the end of an archive (#199515) * Tue Jul 18 2006 Peter Vrabec 1.15.90-4 -- fix problem with unpacking archives in a directory for which +- fix problem with unpacking archives in a directory for which one has write permission but does not own (such as /tmp) (#149686) * Wed Jul 12 2006 Jesse Keating - 1.15.90-3.1 @@ -425,14 +431,14 @@ fi - fix typo in tar.1 man page * Tue Apr 25 2006 Peter Vrabec 1.15.90-2 -- exclude listed02.at from testsuite again, because it +- exclude listed02.at from testsuite again, because it still fails on s390 * Tue Apr 25 2006 Peter Vrabec 1.15.90-1 - upgrade * Mon Apr 24 2006 Peter Vrabec 1.15.1-16 -- fix problem when options at the end of command line were +- fix problem when options at the end of command line were not recognized (#188707) * Thu Apr 13 2006 Peter Vrabec 1.15.1-15 @@ -469,7 +475,7 @@ fi * Wed Jul 27 2005 Peter Vrabec 1.15.1-8 - A file is dumpable if it is sparse and both --sparse and --totals are specified (#154882) - + * Tue Jul 26 2005 Peter Vrabec 1.15.1-7 - exclude listed02.at from testsuite @@ -656,11 +662,11 @@ fi * Mon Mar 29 1999 Jeff Johnson - fix suspended tar with compression over pipe produces error (#390). -* Sun Mar 21 1999 Cristian Gafton +* Sun Mar 21 1999 Cristian Gafton - auto rebuild in the new build environment (release 8) * Mon Mar 08 1999 Michael Maher -- added patch for bad name cache. +- added patch for bad name cache. - FIXES BUG 320 * Wed Feb 24 1999 Preston Brown