rpms/tar/devel tar-1.15.1-sparseTotals.patch, NONE, 1.1 tar.spec, 1.23, 1.24
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jul 27 09:19:05 UTC 2005
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org-1.9.121.rh164310.selinux-pipegiveup.desktop.patch, NONE, 1.1 openoffice.org.spec, 1.360, 1.361
- Next message (by thread): rpms/gcc/devel gcc4-fortran-equiv.patch, NONE, 1.1 gcc4-ppc32-msecure-plt.patch, NONE, 1.1 gcc4-pr21149-test.patch, NONE, 1.1 gcc4-pr22503.patch, NONE, 1.1 gcc4-libstdc++-pr22309.patch, 1.2, 1.3 gcc4-pr20606.patch, 1.1, 1.2 gcc4-vsb-stack.patch, 1.1, 1.2 gcc4.spec, 1.59, 1.60 gcc4-fortran-bzbn.patch, 1.1, NONE gcc4-fortran-data-range.patch, 1.1, NONE gcc4-fortran-inf.patch, 1.1, NONE gcc4-pr21828.patch, 1.1, NONE gcc4-rh163058.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pvrabec
Update of /cvs/dist/rpms/tar/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7245
Modified Files:
tar.spec
Added Files:
tar-1.15.1-sparseTotals.patch
Log Message:
A file is dumpable if it is sparse and both --sparse
and --totals are specified (#154882)
tar-1.15.1-sparseTotals.patch:
create.c | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
--- NEW FILE tar-1.15.1-sparseTotals.patch ---
--- tar-1.15.1/src/create.c.sparseTotals 2005-07-27 11:10:38.000000000 +0200
+++ tar-1.15.1/src/create.c 2005-07-27 11:10:50.000000000 +0200
@@ -332,16 +332,20 @@
}
-/* A file is not dumpable if
+/* A file is considered dumpable if it is sparse and both --sparse and --totals
+ are specified.
+ Otherwise, it is dumpable unless any of the following conditions occur:
+
a) it is empty *and* world-readable, or
b) current archive is /dev/null */
bool
file_dumpable_p (struct tar_stat_info *st)
{
- return !(dev_null_output
- || (st->archive_file_size == 0
- && (st->stat.st_mode & MODE_R) == MODE_R));
+ if (dev_null_output)
+ return totals_option && sparse_option && sparse_file_p (st);
+ return !(st->archive_file_size == 0
+ && (st->stat.st_mode & MODE_R) == MODE_R);
}
@@ -1437,7 +1441,7 @@
else
fd = -1;
- if (sparse_option && sparse_file_p (st))
+ if (fd != -1 && sparse_option && sparse_file_p (st))
{
status = sparse_dump_file (fd, st);
if (status == dump_status_not_implemented)
Index: tar.spec
===================================================================
RCS file: /cvs/dist/rpms/tar/devel/tar.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- tar.spec 26 Jul 2005 13:01:50 -0000 1.23
+++ tar.spec 27 Jul 2005 09:19:02 -0000 1.24
@@ -1,7 +1,7 @@
Summary: A GNU file archiving program.
Name: tar
Version: 1.15.1
-Release: 7
+Release: 8
License: GPL
Group: Applications/Archiving
URL: http://www.gnu.org/software/tar/
@@ -13,6 +13,7 @@
Patch9: tar-1.15.1-makeCheck.patch
Patch10: tar-1.15.1-gcc4.patch
Patch11: tar-1.15.1-lseek.patch
+Patch12: tar-1.15.1-sparseTotals.patch
Prereq: info
BuildRequires: autoconf automake gzip
Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -37,6 +38,7 @@
%patch9 -p1 -b .makeCheck
%patch10 -p1 -b .gcc4
%patch11 -p1 -b .lseek
+%patch12 -p1 -b .sparseTotals
%build
@@ -107,6 +109,10 @@
%{_infodir}/tar.info*
%changelog
+* Wed Jul 27 2005 Peter Vrabec <pvrabec at redhat.com> 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 <pvrabec at redhat.com> 1.15.1-7
- exclude listed02.at from testsuite
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org-1.9.121.rh164310.selinux-pipegiveup.desktop.patch, NONE, 1.1 openoffice.org.spec, 1.360, 1.361
- Next message (by thread): rpms/gcc/devel gcc4-fortran-equiv.patch, NONE, 1.1 gcc4-ppc32-msecure-plt.patch, NONE, 1.1 gcc4-pr21149-test.patch, NONE, 1.1 gcc4-pr22503.patch, NONE, 1.1 gcc4-libstdc++-pr22309.patch, 1.2, 1.3 gcc4-pr20606.patch, 1.1, 1.2 gcc4-vsb-stack.patch, 1.1, 1.2 gcc4.spec, 1.59, 1.60 gcc4-fortran-bzbn.patch, 1.1, NONE gcc4-fortran-data-range.patch, 1.1, NONE gcc4-fortran-inf.patch, 1.1, NONE gcc4-pr21828.patch, 1.1, NONE gcc4-rh163058.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list