[tar/f16] Cummulative update from rawhide: tore&restore security.capability extended attributes category(#7719
Ondrej Vasik
ovasik at fedoraproject.org
Sat Jun 16 06:09:33 UTC 2012
commit 99263c7b740a143fc2e99f838c9f4e0f88bfdb47
Author: Ondřej Vašík <ovasik at redhat.com>
Date: Sat Jun 16 08:09:31 2012 +0200
Cummulative update from rawhide: tore&restore security.capability extended attributes category(#771927),add virtual provides for bundled(gnulib) copylib (#821790),fix for bad cooperation of the '-C' (change directory) and '-u' (update package) options (#688567),Man page heading formatting fixes.
tar-1.26-update-with-change-directory.patch | 148 +++++++++++++++++++++++++++
tar.1 | 28 +++---
tar.spec | 13 ++-
3 files changed, 174 insertions(+), 15 deletions(-)
---
diff --git a/tar-1.26-update-with-change-directory.patch b/tar-1.26-update-with-change-directory.patch
new file mode 100644
index 0000000..6a9a0cf
--- /dev/null
+++ b/tar-1.26-update-with-change-directory.patch
@@ -0,0 +1,148 @@
+From 207b445ca7018a95f2f96d9514b8d87c80e8e11e Mon Sep 17 00:00:00 2001
+From: Pavel Raiskup <praiskup at redhat.com>
+Date: Wed, 4 Apr 2012 18:04:53 +0200
+Subject: [PATCH] Bad cooperation of -C and -u options
+
+Previously, tar did not update archive with newly created files in archived
+directory -- it failed instead with "file not found" error (because it looked
+in bad directory in filesystem).
+---
+ src/update.c | 4 +-
+ tests/Makefile.am | 3 +-
+ tests/testsuite.at | 3 +-
+ tests/update03.at | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 65 insertions(+), 4 deletions(-)
+ create mode 100644 tests/update03.at
+
+diff --git a/src/update.c b/src/update.c
+index e3228d4..4739e0d 100644
+--- a/src/update.c
++++ b/src/update.c
+@@ -1,7 +1,7 @@
+ /* Update a tar archive.
+
+ Copyright (C) 1988, 1992, 1994, 1996, 1997, 1999, 2000, 2001, 2003,
+- 2004, 2005, 2007, 2010 Free Software Foundation, Inc.
++ 2004, 2005, 2007, 2010, 2011, 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
+@@ -159,7 +159,7 @@ update_archive (void)
+
+ for (p = dirp; *p; p += strlen (p) + 1)
+ addname (namebuf_name (nbuf, p),
+- 0, false, NULL);
++ name->change_dir, false, NULL);
+
+ namebuf_free (nbuf);
+ free (dirp);
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index ab7d104..119f1f3 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -1,7 +1,7 @@
+ # Makefile for GNU tar regression tests.
+
+ # Copyright (C) 1996, 1997, 1999, 2000, 2001, 2003, 2004, 2005,
+-# 2006, 2007, 2009 Free Software Foundation, Inc.
++# 2006, 2007, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+
+ # François Pinard <pinard at iro.umontreal.ca>, 1988.
+ # Sergey Poznyakoff <gray at mirddin.farlep.net>, 2004.
+@@ -156,6 +156,7 @@ TESTSUITE_AT = \
+ update.at\
+ update01.at\
+ update02.at\
++ update03.at\
+ volsize.at\
+ volume.at\
+ verbose.at\
+diff --git a/tests/testsuite.at b/tests/testsuite.at
+index 8366ef0..13f7506 100644
+--- a/tests/testsuite.at
++++ b/tests/testsuite.at
+@@ -1,7 +1,7 @@
+ # Process this file with autom4te to create testsuite. -*- Autotest -*-
+
+ # Test suite for GNU tar.
+-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 Free Software
++# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010, 2011, 2012 Free Software
+ # Foundation, Inc.
+
+ # This program is free software; you can redistribute it and/or modify
+@@ -241,6 +241,7 @@ m4_include([spmvp10.at])
+ m4_include([update.at])
+ m4_include([update01.at])
+ m4_include([update02.at])
++m4_include([update03.at])
+
+ m4_include([verify.at])
+
+diff --git a/tests/update03.at b/tests/update03.at
+new file mode 100644
+index 0000000..185f9eb
+--- /dev/null
++++ b/tests/update03.at
+@@ -0,0 +1,59 @@
++# Process this file with autom4te to create testsuite. -*- Autotest -*-
++
++# Test suite for GNU tar.
++# Copyright (C) 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, 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, write to the Free Software Foundation, Inc., 51 Franklin
++# Street, Fifth Floor, Boston, MA 02110-1301, USA.
++
++# Description:
++# Test if the '--update' option works with the '--directory DIR' option
++# properly. In version <= 1.26 tar this combination caused problems.
++#
++# References:
++# https://bugzilla.redhat.com/show_bug.cgi?id=688567
++#
++# Last-Affected-Version: 1.26.90
++
++AT_SETUP([update & change directory (-C)])
++AT_KEYWORDS([update update03])
++
++AT_TAR_CHECK([
++AT_SORT_PREREQ
++
++# prepare filesystem
++mkdir dir
++mkdir dir/subdir
++genfile --file dir/subdir/a
++
++# crate archive of subdir
++tar -C dir -cf file.tar subdir
++
++# update filesystem
++mkdir dir/subdir/b
++genfile --file dir/subdir/b/c
++
++# sync the 'file.tar' archive
++tar -C dir -uf file.tar subdir
++
++# print contents
++tar -tf file.tar | sort || exit 1
++],
++[0],
++[subdir/
++subdir/a
++subdir/b/
++subdir/b/c
++])
++
++AT_CLEANUP
+--
+1.7.7.6
+
diff --git a/tar.1 b/tar.1
index 5735975..da5f692 100644
--- a/tar.1
+++ b/tar.1
@@ -19,7 +19,7 @@ tar \fB\-tvf\fR archive.tar
tar \fB\-xf\fR archive.tar
# Extract all files from archive.tar.
.IP
-Main operation mode:
+.SH \fBMain operation mode:\fR
.TP
\fB\-A\fR, \fB\-\-catenate\fR, \fB\-\-concatenate\fR
append tar files to an archive
@@ -48,7 +48,7 @@ only append files newer than copy in archive
\fB\-x\fR, \fB\-\-extract\fR, \fB\-\-get\fR
extract files from an archive
.IP
-.SH\fBCommon Options:\fR
+.SH \fBCommon options:\fR
.TP
\fB-C\fR, \fB--directory=DIR\fR
change to directory DIR
@@ -71,7 +71,7 @@ verbosely list files processed
\fB-z\fR, \fB--gzip\fR
filter the archive through gzip
-.SH Operation modifiers:
+.SH \fBOperation modifiers:\fR
.TP
\fB\-\-check\-device\fR
check device numbers when creating incremental
@@ -114,7 +114,7 @@ set version of the sparse format to use (implies
\fB\-S\fR, \fB\-\-sparse\fR
handle sparse files efficiently
.IP
-.SH Overwrite control:
+.SH \fBOverwrite control:\fR
.TP
\fB\-k\fR, \fB\-\-keep\-old\-files\fR
don't replace existing files when extracting
@@ -145,7 +145,7 @@ remove each file prior to extracting over it
\fB\-W\fR, \fB\-\-verify\fR
attempt to verify the archive after writing it
.IP
-.SH Select output stream:
+.SH \fBSelect output stream:\fR
.HP
\fB\-\-ignore\-command\-error\fR ignore exit codes of children
.TP
@@ -235,7 +235,7 @@ Save the SELinux context to the archive
\fB\-\-xattrs\fR
Save the user/root xattrs to the archive
.IP
-.SH Device selection and switching:
+.SH \fBDevice selection and switching:\fR
.TP
\fB\-f\fR, \fB\-\-file\fR=\fIARCHIVE\fR
use archive file or device ARCHIVE
@@ -261,7 +261,7 @@ use remote COMMAND instead of rsh
\fB\-\-volno\-file\fR=\fIFILE\fR
use/update the volume number in FILE
.IP
-.SH Device blocking:
+.SH \fBDevice blocking:\fR
.TP
\fB\-b\fR, \fB\-\-blocking\-factor\fR=\fIBLOCKS\fR
BLOCKS x 512 bytes per record
@@ -275,7 +275,7 @@ ignore zeroed blocks in archive (means EOF)
\fB\-\-record\-size\fR=\fINUMBER\fR
NUMBER of bytes per record, multiple of 512
.IP
-.SH Archive format selection:
+.SH \fBArchive format selection:\fR
.TP
\fB\-H\fR, \fB\-\-format\fR=\fIFORMAT\fR
create archive of the given format
@@ -314,7 +314,7 @@ create archive with volume name TEXT; at
list/extract time, use TEXT as a globbing pattern
for volume name
.IP
-.SH Compression options:
+.SH \fBCompression options:\fR
.TP
\fB\-a\fR, \fB\-\-auto\-compress\fR
use archive suffix to determine the compression
@@ -349,7 +349,7 @@ filter the archive through compress
.TP
\fBNote: You might need to install external program (lzip/ncompress/lzma...) to use some of these compression options\fB
.IP
-.SH Local file selection:
+.SH \fBLocal file selection:\fR
.TP
\fB\-\-add\-file\fR=\fIFILE\fR
add given FILE to the archive (useful if its name
@@ -441,7 +441,7 @@ unquote filenames read with \fB\-T\fR (default)
\fB\-X\fR, \fB\-\-exclude\-from\fR=\fIFILE\fR
exclude patterns listed in FILE
.IP
-.SH File name transformations:
+.SH \fBFile name transformations:\fR
.TP
\fB\-\-strip\-components\fR=\fINUMBER\fR
strip NUMBER leading components from file
@@ -478,7 +478,7 @@ use wildcards (default)
\fB\-\-wildcards\-match\-slash\fR
wildcards match `/' (default for exclusion)
.IP
-.SH Informative output:
+.SH \fBInformative output:\fR
.TP
\fB\-\-checkpoint\fR[=\fINUMBER\fR]
display progress messages every NUMBERth record
@@ -536,13 +536,13 @@ warning control
\fB\-w\fR, \fB\-\-interactive\fR, \fB\-\-confirmation\fR
ask for confirmation for every action
.IP
-.SH Compatibility options:
+.SH \fBCompatibility options:\fR
.TP
\fB\-o\fR
when creating, same as \fB\-\-old\-archive\fR; when
extracting, same as \fB\-\-no\-same\-owner\fR
.IP
-.SH Other options:
+.SH \fBOther options:\fR
.TP
\-?, \fB\-\-help\fR
give this help list
diff --git a/tar.spec b/tar.spec
index 73cc22c..ca012a8 100644
--- a/tar.spec
+++ b/tar.spec
@@ -5,7 +5,7 @@ Summary: A GNU file archiving program
Name: tar
Epoch: 2
Version: 1.26
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv3+
Group: Applications/Archiving
URL: http://www.gnu.org/software/tar/
@@ -32,6 +32,8 @@ Patch6: tar-1.23-oldarchive.patch
Patch7: tar-sigpipe.patch
#partially revert upstream commit 4bde4f3 (#717684)
Patch8: tar-1.24-openat-partial-revert.patch
+# fix for bad cooperation of -C and -u options (#688567)
+Patch9: tar-1.26-update-with-change-directory.patch
BuildRequires: autoconf automake gzip texinfo gettext libacl-devel gawk rsh
%if %{WITH_SELINUX}
BuildRequires: libselinux-devel
@@ -62,6 +64,7 @@ the rmt package.
%patch6 -p1 -b .oldarchive
%patch7 -p1 -b .fail
%patch8 -p1 -b .openat
+%patch9 -p1 -b .changedir
autoreconf
@@ -123,6 +126,14 @@ fi
%{_infodir}/tar.info*
%changelog
+* Sat Jun 16 2012 Ondrej Vasik <ovasik at redhat.com> - 2:1.26-3
+- store&restore security.capability extended attributes category
+ (#771927)
+- add virtual provides for bundled(gnulib) copylib (#821790)
+- fix for bad cooperation of the '-C' (change directory) and '-u' (update
+ package) options (#688567)
+- Man page heading formatting fixes.
+
* Mon Sep 26 2011 Kamil Dudka <kdudka at redhat.com> 2:1.26-2
- restore basic functionality of --acl, --selinux, and --xattr (#717684)
More information about the scm-commits
mailing list