OBS User unknown 2007-10-08 10:32:55 +00:00 committed by Git OBS Bridge
parent 81e7469863
commit c00d162a78
6 changed files with 29 additions and 161 deletions

View File

@ -1,144 +0,0 @@
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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:19f9021dda51a16295e4706e80870e71f87107675e51c176a491eba0fc4ca492
size 1882911

3
tar-1.18.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:44944ee0427c8e0d8dbaa0b8f900073a7456819610cc521c53630c3eb117cf5e
size 1877207

View File

@ -1,11 +1,11 @@
Index: tar-1.16/doc/Makefile.am
Index: tar-1.18/doc/Makefile.am
===================================================================
--- tar-1.16.orig/doc/Makefile.am
+++ tar-1.16/doc/Makefile.am
--- tar-1.18.orig/doc/Makefile.am
+++ tar-1.18/doc/Makefile.am
@@ -32,6 +32,9 @@ tar_TEXINFOS = \
sparse.texi\
value.texi
EXTRA_DIST = gendocs_template mastermenu.el texify.sed
DISTCLEANFILES=*.info*
+dist_man_MANS = tar.1
+TAR = $(top_builddir)/src/tar
+HELP2MAN = /usr/bin/help2man
@ -23,10 +23,10 @@ Index: tar-1.16/doc/Makefile.am
header.texi: $(top_srcdir)/src/tar.h
sed -f $(srcdir)/texify.sed $(top_srcdir)/src/tar.h \
| expand >$@
Index: tar-1.16/Makefile.am
Index: tar-1.18/Makefile.am
===================================================================
--- tar-1.16.orig/Makefile.am
+++ tar-1.16/Makefile.am
--- tar-1.18.orig/Makefile.am
+++ tar-1.18/Makefile.am
@@ -20,7 +20,7 @@
ACLOCAL_AMFLAGS = -I m4

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Oct 5 16:06:49 CEST 2007 - mkoenig@suse.de
- update to version 1.18
Licensed under the GPLv3
- merged patches:
tar-1.17-testsuite12.patch
-------------------------------------------------------------------
Mon Oct 1 10:48:23 CEST 2007 - mkoenig@suse.de

View File

@ -1,5 +1,5 @@
#
# spec file for package tar (Version 1.17)
# spec file for package tar (Version 1.18)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -13,19 +13,19 @@
Name: tar
BuildRequires: help2man
Url: http://www.gnu.org/software/tar/
License: GPL v2 or later
License: GPL v3 or later
Group: System/Base
Provides: base:/bin/tar
PreReq: %install_info_prereq
AutoReqProv: on
Version: 1.17
Release: 22
Version: 1.18
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.17-testsuite12.patch
#Patch3: tar-1.17-testsuite12.patch
Patch4: tar-1.17-paxlib-owl-alloca.patch
Patch5: tar-1.15.1-CVE-2001-1267.patch
Patch6: tar-gcc43.patch
@ -67,7 +67,6 @@ Authors:
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3
%patch4
%patch5 -p0
%patch6
@ -76,7 +75,7 @@ Authors:
rm -f po/no.* po/ky.*
#autoreconf -fi
aclocal -I m4
automake -f
automake --force --add-missing
%define my_cflags -W -Wall -Wpointer-arith -Wstrict-prototypes -Wformat-security -Wno-unused-parameter
export CFLAGS="$RPM_OPT_FLAGS %my_cflags"
export RSH="/usr/bin/rsh"
@ -110,6 +109,11 @@ rm -r %buildroot/usr/libexec
%clean
rm -rf $RPM_BUILD_ROOT
%changelog
* Fri Oct 05 2007 - mkoenig@suse.de
- update to version 1.18
Licensed under the GPLv3
- merged patches:
tar-1.17-testsuite12.patch
* Mon Oct 01 2007 - mkoenig@suse.de
- fix build with gcc-4.3
* Fri Aug 31 2007 - mkoenig@suse.de