From 01941e6770f9b629367a7e20275eaff6839e3e5ee785e365fc0ed73b7f734994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=C4=9Bzslav=20=C4=8C=C3=AD=C5=BEek?= Date: Sun, 3 Aug 2014 09:54:51 +0000 Subject: [PATCH] Accepting request 243496 from home:AndreasStieger:branches:Base:System GNU tar 1.28 OBS-URL: https://build.opensuse.org/request/show/243496 OBS-URL: https://build.opensuse.org/package/show/Base:System/tar?expand=0&rev=57 --- add_readme-tests.patch | 37 ++++++++++++--------- tar-1.27.1.tar.bz2 | 3 -- tar-1.27.1.tar.bz2.sig | 7 ---- tar-1.28.tar.bz2 | 3 ++ tar-1.28.tar.bz2.sig | 7 ++++ tar-fix_eternal_loop_in_handle_option.patch | 19 ----------- tar.changes | 18 ++++++++++ tar.spec | 6 ++-- 8 files changed, 52 insertions(+), 48 deletions(-) delete mode 100644 tar-1.27.1.tar.bz2 delete mode 100644 tar-1.27.1.tar.bz2.sig create mode 100644 tar-1.28.tar.bz2 create mode 100644 tar-1.28.tar.bz2.sig delete mode 100644 tar-fix_eternal_loop_in_handle_option.patch diff --git a/add_readme-tests.patch b/add_readme-tests.patch index f3f79af..c9ca222 100644 --- a/add_readme-tests.patch +++ b/add_readme-tests.patch @@ -1,7 +1,25 @@ -Index: tar-1.27.1/README-tests +--- + Makefile.in | 2 +- + README-tests | 22 ++++++++++++++++++++++ + 2 files changed, 23 insertions(+), 1 deletion(-) + +Index: tar-1.28/Makefile.in =================================================================== ---- /dev/null -+++ tar-1.27.1/README-tests +--- tar-1.28.orig/Makefile.in 2014-07-27 21:33:48.000000000 +0100 ++++ tar-1.28/Makefile.in 2014-08-03 00:15:17.000000000 +0100 +@@ -141,7 +141,7 @@ PRE_UNINSTALL = : + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +-DIST_COMMON = $(srcdir)/Make.rules INSTALL NEWS README AUTHORS \ ++DIST_COMMON = $(srcdir)/Make.rules INSTALL NEWS README README-tests AUTHORS \ + ChangeLog THANKS $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in ABOUT-NLS COPYING TODO build-aux/compile \ +Index: tar-1.28/README-tests +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ tar-1.28/README-tests 2014-08-03 00:15:17.000000000 +0100 @@ -0,0 +1,22 @@ +Subpackage tar-tests +==================== @@ -25,16 +43,3 @@ Index: tar-1.27.1/README-tests +# needed for genfile binary used in tests +./testsuite AUTOTEST_PATH=/var/lib/tests/tar/bin [other options] + -Index: tar-1.27.1/Makefile.in -=================================================================== ---- tar-1.27.1.orig/Makefile.in -+++ tar-1.27.1/Makefile.in -@@ -141,7 +141,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ --DIST_COMMON = $(srcdir)/Make.rules INSTALL NEWS README AUTHORS \ -+DIST_COMMON = $(srcdir)/Make.rules INSTALL NEWS README README-tests AUTHORS \ - ChangeLog THANKS $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in ABOUT-NLS README-alpha COPYING TODO \ diff --git a/tar-1.27.1.tar.bz2 b/tar-1.27.1.tar.bz2 deleted file mode 100644 index c3026b5..0000000 --- a/tar-1.27.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9b0fb3ce8512059337add0da5f8f0f7d7647f2201f5ece24581d620ea60337c6 -size 2573070 diff --git a/tar-1.27.1.tar.bz2.sig b/tar-1.27.1.tar.bz2.sig deleted file mode 100644 index 0f36d9f..0000000 --- a/tar-1.27.1.tar.bz2.sig +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.12 (GNU/Linux) - -iD8DBQBSiPUMNgKwf1XQxzIRAvgkAJ9j8NjtX5l8nY09uzT5azrkM0t7UwCgk9wK -9KD1C1iRhk9ur7/7FVNXE4M= -=Mfmh ------END PGP SIGNATURE----- diff --git a/tar-1.28.tar.bz2 b/tar-1.28.tar.bz2 new file mode 100644 index 0000000..13fd489 --- /dev/null +++ b/tar-1.28.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60e4bfe0602fef34cd908d91cf638e17eeb09394d7b98c2487217dc4d3147562 +size 2693989 diff --git a/tar-1.28.tar.bz2.sig b/tar-1.28.tar.bz2.sig new file mode 100644 index 0000000..e6f0e89 --- /dev/null +++ b/tar-1.28.tar.bz2.sig @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.12 (GNU/Linux) + +iEYEABECAAYFAlPVZ+MACgkQNgKwf1XQxzIWNwCfcuHMajzNTV2bS2V5BMbdnNKE +x70AoIbnIhZVvC0ht0suIRStvXK8jGrb +=9y58 +-----END PGP SIGNATURE----- diff --git a/tar-fix_eternal_loop_in_handle_option.patch b/tar-fix_eternal_loop_in_handle_option.patch deleted file mode 100644 index 44e6a09..0000000 --- a/tar-fix_eternal_loop_in_handle_option.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit c13948fd0aef759e95038bd28416077b12f7dd29 -Author: Vitezslav Cizek -Date: Wed Mar 26 18:34:53 2014 +0100 - - fix an eternal loop in handle_option - -diff --git a/src/names.c b/src/names.c -index 9fc0ad5..963ec07 100644 ---- a/src/names.c -+++ b/src/names.c -@@ -439,7 +439,7 @@ handle_option (const char *str) - int i; - - while (*str && isspace (*str)) -- ; -+ str++; - if (*str != '-') - return 1; - diff --git a/tar.changes b/tar.changes index d6c27b9..b8c471f 100644 --- a/tar.changes +++ b/tar.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Sat Aug 2 23:32:30 UTC 2014 - andreas.stieger@gmx.de + +- GNU tar 1.28: + * New --checkpoint-action=totals + * Extended checkpoint format specification + * New option --one-top-level + * New option --sort + * New exclusion options: + --exclude-ignore=FILE + --exclude-ignore-recursive=FILE + --exclude-vcs-ignores + * refuses to read input from and write output to a tty +- packaging changes: + * adjust patch for context change: add_readme-tests.patch + * remove patch applied upstream: + tar-fix_eternal_loop_in_handle_option.patch + ------------------------------------------------------------------- Mon Jul 28 20:01:53 UTC 2014 - vcizek@suse.com diff --git a/tar.spec b/tar.spec index 805422a..01479d0 100644 --- a/tar.spec +++ b/tar.spec @@ -20,7 +20,7 @@ %define min_suse_ver 1010 Name: tar -Version: 1.27.1 +Version: 1.28 Release: 0 Summary: GNU implementation of tar ((t)ape (ar)chiver) License: GPL-3.0+ @@ -34,7 +34,6 @@ Source2: tar.keyring Patch3: tar-wildcards.patch Patch6: tar-backup-spec-fix-paths.patch Patch7: tar-1.26-remove_O_NONBLOCK.patch -Patch8: tar-fix_eternal_loop_in_handle_option.patch Patch10: paxutils-rtapelib_mtget.patch # don't print warning about zero blocks # the patch is used in Fedora and Debian @@ -82,7 +81,6 @@ Upstream testsuite for the package %patch3 -p1 %patch6 -p1 %patch7 -p1 -%patch8 -p1 %patch10 -p1 %patch11 -p1 %patch20 -p1 @@ -120,6 +118,8 @@ help2man ./src/tar --name "The GNU version of the tar archiving utility" -p tar install -d -m 755 %{buildroot}%{_sysconfdir}/backup install -D -m 644 scripts/backup-specs %{buildroot}%{_sysconfdir}/backup/backup-specs rm -rf %{buildroot}%{_libexecdir}/rmt +rm -rvf %{buildroot}/%{_mandir}/man8/rmt.8.gz +rm -rvf %{buildroot}/%{_mandir}/man8 rm -f %{buildroot}%{_infodir}/dir install -d -m 755 %{buildroot}/var/lib/tests cp -r tests %{buildroot}/var/lib/tests/tar