This commit is contained in:
parent
0d04feafeb
commit
802c58f3ed
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5c843004934142cc85decf4ae0f5f8b8b568834d3e23f1568193b3836422d2bb
|
||||
size 1793624
|
144
tar-1.17-testsuite12.patch
Normal file
144
tar-1.17-testsuite12.patch
Normal file
@ -0,0 +1,144 @@
|
||||
Index: tests/exclude.at
|
||||
===================================================================
|
||||
RCS file: /cvsroot/tar/tar/tests/exclude.at,v
|
||||
retrieving revision 1.1
|
||||
diff -p -u -r1.1 exclude.at
|
||||
--- tests/exclude.at 23 Jan 2007 10:26:20 -0000 1.1
|
||||
+++ tests/exclude.at 9 Jun 2007 17:00:07 -0000
|
||||
@@ -24,6 +24,8 @@ AT_SETUP([exclude])
|
||||
AT_KEYWORDS([exclude])
|
||||
|
||||
AT_TAR_CHECK([
|
||||
+AT_SORT_PREREQ
|
||||
+
|
||||
mkdir dir
|
||||
echo blues > dir/blues
|
||||
echo jazz > dir/jazz
|
||||
@@ -37,79 +39,79 @@ echo "test" > dir/rock/file
|
||||
for option in exclude-caches exclude-caches-under exclude-caches-all
|
||||
do
|
||||
echo OPTION $option
|
||||
- tar -cf archive.tar --$option -v dir 2>err
|
||||
+ tar -cf archive.tar --$option -v dir 2>err | sort
|
||||
cat err
|
||||
echo ARCHIVE
|
||||
- tar tf archive.tar
|
||||
+ tar tf archive.tar | sort
|
||||
done
|
||||
|
||||
for option in exclude-tag exclude-tag-under exclude-tag-all
|
||||
do
|
||||
echo OPTION $option
|
||||
- tar -cf archive.tar --${option}=tagfile -v dir 2>err
|
||||
+ tar -cf archive.tar --${option}=tagfile -v dir 2>err | sort
|
||||
cat err
|
||||
echo ARCHIVE
|
||||
- tar tf archive.tar
|
||||
+ tar tf archive.tar | sort
|
||||
done
|
||||
],
|
||||
[0],
|
||||
[OPTION exclude-caches
|
||||
dir/
|
||||
dir/blues
|
||||
-dir/jazz
|
||||
dir/folk/
|
||||
-dir/folk/tagfile
|
||||
dir/folk/sanjuan
|
||||
+dir/folk/tagfile
|
||||
+dir/jazz
|
||||
dir/rock/
|
||||
dir/rock/CACHEDIR.TAG
|
||||
tar: dir/rock/: contains a cache directory tag CACHEDIR.TAG; contents not dumped
|
||||
ARCHIVE
|
||||
dir/
|
||||
dir/blues
|
||||
-dir/jazz
|
||||
dir/folk/
|
||||
-dir/folk/tagfile
|
||||
dir/folk/sanjuan
|
||||
+dir/folk/tagfile
|
||||
+dir/jazz
|
||||
dir/rock/
|
||||
dir/rock/CACHEDIR.TAG
|
||||
OPTION exclude-caches-under
|
||||
dir/
|
||||
dir/blues
|
||||
-dir/jazz
|
||||
dir/folk/
|
||||
-dir/folk/tagfile
|
||||
dir/folk/sanjuan
|
||||
+dir/folk/tagfile
|
||||
+dir/jazz
|
||||
dir/rock/
|
||||
tar: dir/rock/: contains a cache directory tag CACHEDIR.TAG; contents not dumped
|
||||
ARCHIVE
|
||||
dir/
|
||||
dir/blues
|
||||
-dir/jazz
|
||||
dir/folk/
|
||||
-dir/folk/tagfile
|
||||
dir/folk/sanjuan
|
||||
+dir/folk/tagfile
|
||||
+dir/jazz
|
||||
dir/rock/
|
||||
OPTION exclude-caches-all
|
||||
dir/
|
||||
dir/blues
|
||||
-dir/jazz
|
||||
dir/folk/
|
||||
-dir/folk/tagfile
|
||||
dir/folk/sanjuan
|
||||
+dir/folk/tagfile
|
||||
+dir/jazz
|
||||
tar: dir/rock/: contains a cache directory tag CACHEDIR.TAG; directory not dumped
|
||||
ARCHIVE
|
||||
dir/
|
||||
dir/blues
|
||||
-dir/jazz
|
||||
dir/folk/
|
||||
-dir/folk/tagfile
|
||||
dir/folk/sanjuan
|
||||
+dir/folk/tagfile
|
||||
+dir/jazz
|
||||
OPTION exclude-tag
|
||||
dir/
|
||||
dir/blues
|
||||
-dir/jazz
|
||||
dir/folk/
|
||||
dir/folk/tagfile
|
||||
+dir/jazz
|
||||
dir/rock/
|
||||
dir/rock/CACHEDIR.TAG
|
||||
dir/rock/file
|
||||
@@ -117,17 +119,17 @@ tar: dir/folk/: contains a cache directo
|
||||
ARCHIVE
|
||||
dir/
|
||||
dir/blues
|
||||
-dir/jazz
|
||||
dir/folk/
|
||||
dir/folk/tagfile
|
||||
+dir/jazz
|
||||
dir/rock/
|
||||
dir/rock/CACHEDIR.TAG
|
||||
dir/rock/file
|
||||
OPTION exclude-tag-under
|
||||
dir/
|
||||
dir/blues
|
||||
-dir/jazz
|
||||
dir/folk/
|
||||
+dir/jazz
|
||||
dir/rock/
|
||||
dir/rock/CACHEDIR.TAG
|
||||
dir/rock/file
|
||||
@@ -135,8 +137,8 @@ tar: dir/folk/: contains a cache directo
|
||||
ARCHIVE
|
||||
dir/
|
||||
dir/blues
|
||||
-dir/jazz
|
||||
dir/folk/
|
||||
+dir/jazz
|
||||
dir/rock/
|
||||
dir/rock/CACHEDIR.TAG
|
||||
dir/rock/file
|
||||
|
3
tar-1.17.tar.bz2
Normal file
3
tar-1.17.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:19f9021dda51a16295e4706e80870e71f87107675e51c176a491eba0fc4ca492
|
||||
size 1882911
|
@ -1,42 +0,0 @@
|
||||
Index: tar-1.16.1/lib/utimens.c
|
||||
===================================================================
|
||||
--- tar-1.16.1.orig/lib/utimens.c
|
||||
+++ tar-1.16.1/lib/utimens.c
|
||||
@@ -73,7 +73,7 @@ struct utimbuf
|
||||
Return 0 on success, -1 (setting errno) on failure. */
|
||||
|
||||
int
|
||||
-futimens (int fd ATTRIBUTE_UNUSED,
|
||||
+my_futimens (int fd ATTRIBUTE_UNUSED,
|
||||
char const *file, struct timespec const timespec[2])
|
||||
{
|
||||
/* There's currently no interface to set file timestamps with
|
||||
@@ -166,5 +166,5 @@ futimens (int fd ATTRIBUTE_UNUSED,
|
||||
int
|
||||
utimens (char const *file, struct timespec const timespec[2])
|
||||
{
|
||||
- return futimens (-1, file, timespec);
|
||||
+ return my_futimens (-1, file, timespec);
|
||||
}
|
||||
Index: tar-1.16.1/lib/utimens.h
|
||||
===================================================================
|
||||
--- tar-1.16.1.orig/lib/utimens.h
|
||||
+++ tar-1.16.1/lib/utimens.h
|
||||
@@ -1,3 +1,3 @@
|
||||
#include "timespec.h"
|
||||
-int futimens (int, char const *, struct timespec const [2]);
|
||||
+int my_futimens (int, char const *, struct timespec const [2]);
|
||||
int utimens (char const *, struct timespec const [2]);
|
||||
Index: tar-1.16.1/src/misc.c
|
||||
===================================================================
|
||||
--- tar-1.16.1.orig/src/misc.c
|
||||
+++ tar-1.16.1/src/misc.c
|
||||
@@ -518,7 +518,7 @@ set_file_atime (int fd, char const *file
|
||||
}
|
||||
#endif
|
||||
|
||||
- return futimens (fd, file, timespec);
|
||||
+ return my_futimens (fd, file, timespec);
|
||||
}
|
||||
|
||||
/* A description of a working directory. */
|
14
tar.changes
14
tar.changes
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 21 10:17:56 CEST 2007 - mkoenig@suse.de
|
||||
|
||||
- update to version 1.17:
|
||||
* Fix archivation of sparse files in posix mode
|
||||
* Fix operation of --verify --listed-incremental
|
||||
* Fix --occurence
|
||||
* Scope of --transform and --strip-components options
|
||||
* End-of-volume script can send the new volume name to tar
|
||||
- remove patch (fixed upstream)
|
||||
tar-1.6.1-futimens.patch
|
||||
- fix test 12
|
||||
tar-1.17-testsuite12.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 22 13:37:49 CEST 2007 - mkoenig@suse.de
|
||||
|
||||
|
21
tar.spec
21
tar.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package tar (Version 1.16.1)
|
||||
# spec file for package tar (Version 1.17)
|
||||
#
|
||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@ -18,14 +18,14 @@ Group: System/Base
|
||||
Provides: base:/bin/tar
|
||||
PreReq: %install_info_prereq
|
||||
Autoreqprov: on
|
||||
Version: 1.16.1
|
||||
Release: 16
|
||||
Version: 1.17
|
||||
Release: 1
|
||||
Summary: GNU implementation of tar ((t)ape (ar)chiver)
|
||||
Source0: %name-%version.tar.bz2
|
||||
Patch0: tar-disable_languages.patch
|
||||
Patch1: tar-disable-listed02-test.diff
|
||||
Patch2: tar-manpage.patch
|
||||
Patch3: tar-1.6.1-futimens.patch
|
||||
Patch3: tar-1.17-testsuite12.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%define _bindir /bin
|
||||
|
||||
@ -64,7 +64,7 @@ Authors:
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch3
|
||||
|
||||
%build
|
||||
rm -f po/no.* po/ky.*
|
||||
@ -106,6 +106,17 @@ rm -r %buildroot/usr/libexec
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%changelog
|
||||
* Thu Jun 21 2007 - mkoenig@suse.de
|
||||
- update to version 1.17:
|
||||
* Fix archivation of sparse files in posix mode
|
||||
* Fix operation of --verify --listed-incremental
|
||||
* Fix --occurence
|
||||
* Scope of --transform and --strip-components options
|
||||
* End-of-volume script can send the new volume name to tar
|
||||
- remove patch (fixed upstream)
|
||||
tar-1.6.1-futimens.patch
|
||||
- fix test 12
|
||||
tar-1.17-testsuite12.patch
|
||||
* Tue May 22 2007 - mkoenig@suse.de
|
||||
- fix build
|
||||
* Tue May 15 2007 - coolo@suse.de
|
||||
|
Loading…
Reference in New Issue
Block a user