From: Jakub Bogusz Date: Tue, 26 Oct 2010 06:15:36 +0000 (+0000) Subject: - updated to 1.24 X-Git-Tag: auto/th/tar-1_24-1 X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=7236c760f23a77226fb889216fcd410a8b744430;p=packages%2Ftar.git - updated to 1.24 - updated pl.po-update patch (from TP) - removed outdated am-nosilentrules,git patches Changed files: am-nosilentrules.patch -> 1.2 tar-git.patch -> 1.2 tar-pl.po-update.patch -> 1.19 tar.spec -> 1.129 --- diff --git a/am-nosilentrules.patch b/am-nosilentrules.patch deleted file mode 100644 index d2d786b..0000000 --- a/am-nosilentrules.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- tar-1.23/configure.ac~ 2010-04-26 09:26:23.000000000 +0300 -+++ tar-1.23/configure.ac 2010-04-26 09:26:25.460605965 +0300 -@@ -24,10 +24,7 @@ - AC_CONFIG_AUX_DIR([build-aux]) - AC_CONFIG_HEADERS([config.h]) - AC_PREREQ([2.63]) --AM_INIT_AUTOMAKE([1.11 gnits tar-ustar dist-bzip2 dist-shar std-options silent-rules]) -- --# Enable silent rules by default: --AM_SILENT_RULES([yes]) -+AM_INIT_AUTOMAKE([1.10 gnits tar-ustar dist-bzip2 dist-shar std-options]) - - AC_PROG_CC - AC_EXEEXT diff --git a/tar-git.patch b/tar-git.patch deleted file mode 100644 index dfc69cd..0000000 --- a/tar-git.patch +++ /dev/null @@ -1,187 +0,0 @@ -commit a3f1d933cc5e61037100f5e60eac45764b8b4b50 -Author: Sergey Poznyakoff -Date: Thu Mar 11 12:19:32 2010 +0200 - - Bugfix. - - * src/names.c (collect_and_sort_names): Initialize prev_name. - Reported by Dmitry V. Levin. - -diff --git a/src/names.c b/src/names.c -index 1146020..ea2ce76 100644 ---- a/src/names.c -+++ b/src/names.c -@@ -871,7 +871,7 @@ void - collect_and_sort_names (void) - { - struct name *name; -- struct name *next_name, *prev_name; -+ struct name *next_name, *prev_name = NULL; - int num_names; - struct stat statbuf; - Hash_table *nametab; -commit 67b4f3519d838c6f16f5b6b63c0b9b8669fb3dd9 -Author: Sergey Poznyakoff -Date: Fri Mar 12 09:48:46 2010 +0200 - - Bugfixes. - - * src/buffer.c (check_label_pattern): Initialize result. - * tests/remfiles01.at: Skip if run with root privileges. - -diff --git a/src/buffer.c b/src/buffer.c -index 8e1bb9b..dfc8456 100644 ---- a/src/buffer.c -+++ b/src/buffer.c -@@ -1374,7 +1374,7 @@ static bool - check_label_pattern (const char *label) - { - char *string; -- bool result; -+ bool result = false; - - if (fnmatch (volume_label_option, label, 0) == 0) - return true; -diff --git a/tests/remfiles01.at b/tests/remfiles01.at -index 940fd95..73752b4 100644 ---- a/tests/remfiles01.at -+++ b/tests/remfiles01.at -@@ -30,6 +30,7 @@ AT_KEYWORDS([create remove-files remfiles01 gzip]) - - unset TAR_OPTIONS - AT_CHECK([ -+AT_UNPRIVILEGED_PREREQ - AT_GZIP_PREREQ - AT_SORT_PREREQ - -commit 340dbf5aabfee4e1e657f8ebf202a2fee1750a63 -Author: Sergey Poznyakoff -Date: Sat Mar 20 13:14:31 2010 +0200 - - Fix undesired error exit on receiving SIGPIPE. - - * src/tar.c: Do not ignore SIGPIPE. - * tests/sigpipe.at: New testcase. - * tests/Makefile.am, tests/testsuite.at: Add sigpipe.at - * tests/remfiles01.at: Fix error code expectation. - * NEWS: Update. - -diff --git a/src/tar.c b/src/tar.c -index e3fdf7b..b127963 100644 ---- a/src/tar.c -+++ b/src/tar.c -@@ -2570,8 +2570,6 @@ main (int argc, char **argv) - - obstack_init (&argv_stk); - -- /* Ensure default behavior for some signals */ -- signal (SIGPIPE, SIG_IGN); - /* System V fork+wait does not work if SIGCHLD is ignored. */ - signal (SIGCHLD, SIG_DFL); - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 8f16244..31811b0 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -127,6 +127,7 @@ TESTSUITE_AT = \ - shortfile.at\ - shortupd.at\ - shortrec.at\ -+ sigpipe.at\ - sparse01.at\ - sparse02.at\ - sparse03.at\ -diff --git a/tests/remfiles01.at b/tests/remfiles01.at -index 73752b4..86b5c03 100644 ---- a/tests/remfiles01.at -+++ b/tests/remfiles01.at -@@ -52,7 +52,9 @@ EC=$? - sed -n '/(child)/p' err >&2 - rm err - find . | sort --exit $EC -+# Gzip exit code is propagated to the shell. Usually it is -+# 141. We convert all non-zero exits to 2 to make it predictable. -+test $EC && exit 2 - ], - [2], - [. -diff --git a/tests/sigpipe.at b/tests/sigpipe.at -new file mode 100644 -index 0000000..9edca77 ---- /dev/null -+++ b/tests/sigpipe.at -@@ -0,0 +1,39 @@ -+# Process this file with autom4te to create testsuite. -*- Autotest -*- -+ -+# Test suite for GNU tar. -+# Copyright (C) 2010 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, see . -+ -+AT_SETUP([sigpipe handling]) -+AT_KEYWORDS([sigpipe]) -+ -+# Description: Tar 1.23 ignored sigpipe which lead to spurious "write -+# error" diagnostics when piping output to another programs. -+# Reported-by: "Dmitry V. Levin" -+# References: http://lists.gnu.org/archive/html/bug-tar/2010-03/msg00039.html -+# <20100319184141.GC30047@wo.int.altlinux.org> -+ -+AT_CHECK([ -+genfile --length 2048 --file first -+genfile --length 2048 --file second -+genfile --length 2049 --file third -+ -+tar cf archive first second third -+ -+tar tf archive | : -+], -+[0]) -+ -+AT_CLEANUP -diff --git a/tests/testsuite.at b/tests/testsuite.at -index 3e75ed8..9205d52 100644 ---- a/tests/testsuite.at -+++ b/tests/testsuite.at -@@ -231,6 +231,8 @@ m4_include([remfiles01.at]) - m4_include([remfiles02.at]) - m4_include([remfiles03.at]) - -+m4_include([sigpipe.at]) -+ - m4_include([star/gtarfail.at]) - m4_include([star/gtarfail2.at]) - -commit 40dea1ae7fc892a54eae2efd30ddd8559c697525 -Author: Sergey Poznyakoff -Date: Sat Mar 27 22:24:19 2010 +0200 - - Fix coredump. - - * src/names.c (collect_and_sort_names): Remove - entry from the table before freeing it. - -diff --git a/src/names.c b/src/names.c -index 2beaf3e..a3c6f58 100644 ---- a/src/names.c -+++ b/src/names.c -@@ -986,6 +986,7 @@ collect_and_sort_names (void) - { - if (p->child) - rebase_child_list (p->child, name); -+ hash_delete (nametab, name); - /* FIXME: remove_directory (p->caname); ? */ - remname (p); - free_name (p); diff --git a/tar-pl.po-update.patch b/tar-pl.po-update.patch index 3983077..7044cd8 100644 --- a/tar-pl.po-update.patch +++ b/tar-pl.po-update.patch @@ -1,41 +1,36 @@ ---- tar-1.23/po/pl.po.orig 2010-03-10 11:54:04.000000000 +0100 -+++ tar-1.23/po/pl.po 2010-04-01 09:25:19.736993924 +0200 -@@ -533,7 +533,7 @@ - #: lib/rtapelib.c:429 - #, c-format - msgid "Cannot connect to %s: resolve failed" --msgstr "" -+msgstr "Nie można połączyć się z %s: rozwiązanie nazwy nie powiodło się" - - #: lib/rtapelib.c:515 - #, c-format -@@ -1307,17 +1307,15 @@ - msgstr "kanał między procesami" - - #: src/names.c:601 --#, fuzzy - msgid "Pattern matching characters used in file names" --msgstr "W nazwach plików użyto znaków dopasowania wzorców. Proszę" -+msgstr "W nazwach plików użyto znaków dopasowania wzorców" - - #: src/names.c:603 --#, fuzzy +--- tar-1.24/po/pl.po.orig 2010-10-24 22:08:51.000000000 +0200 ++++ tar-1.24/po/pl.po 2010-10-25 22:31:11.755736853 +0200 +@@ -6,13 +6,12 @@ + #: src/create.c:1550 msgid "" - "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " - "this warning" msgstr "" --"użyć --wildcards aby włączyć porównywanie wzorców albo --no-wildcards żeby" -+"Proszę użyć --wildcards aby włączyć porównywanie wzorców albo --no-wildcards żeby uniknąć tego ostrzeżenia" +-"Project-Id-Version: tar 1.23.90\n" ++"Project-Id-Version: tar 1.24\n" + "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" + "POT-Creation-Date: 2010-10-24 23:08+0300\n" +-"PO-Revision-Date: 2010-07-13 14:50+0200\n" ++"PO-Revision-Date: 2010-10-25 10:00+0200\n" + "Last-Translator: Rafał Maszkowski \n" + "Language-Team: Polish \n" +-"Language: pl\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8-bit\n" +@@ -1274,9 +1273,8 @@ + msgstr "Tworzony jest katalog:" - #: src/names.c:619 src/names.c:637 + #: src/misc.c:298 +-#, fuzzy + msgid "Cannot get working directory" +-msgstr "Nie można zmienić katalogu" ++msgstr "Nie można odczytać bieżącego katalogu" + + #: src/misc.c:571 #, c-format -@@ -2747,9 +2745,3 @@ +@@ -2760,6 +2758,3 @@ #, c-format msgid "--stat requires file names" msgstr "--stat wymaga podania nazwy pliku" - --#~ msgid "Cannot resolve hostname %s" --#~ msgstr "Nieznany adres nazwy %s" -- --#~ msgid "suppress this warning." --#~ msgstr "wyłączyć to ostrzeżenie" +-#~ msgid "Cannot save working directory" +-#~ msgstr "Nie można zapisać bieżącego katalogu" diff --git a/tar.spec b/tar.spec index d961f0f..1c40c43 100644 --- a/tar.spec +++ b/tar.spec @@ -10,24 +10,22 @@ Summary(pl.UTF-8): Program do archiwizacji (GNU) Summary(pt_BR.UTF-8): GNU Tape Archiver (tar) Summary(tr.UTF-8): Yaygın kullanılan yedekleyici Name: tar -Version: 1.23 -Release: 6 +Version: 1.24 +Release: 1 Epoch: 1 License: GPL v3+ Group: Applications/Archiving Source0: http://ftp.gnu.org/gnu/tar/%{name}-%{version}.tar.bz2 -# Source0-md5: 41e2ca4b924ec7860e51b43ad06cdb7e +# Source0-md5: ba905d8b1dcf06254e8025cc4468d8e5 Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source1-md5: 4e4b1655fe42c27a4eb5d7bcd82e74ac Patch0: %{name}-info.patch Patch1: %{name}-pl.po-update.patch Patch2: %{name}-zero-block.patch -Patch3: am-nosilentrules.patch -Patch4: %{name}-fortifysourcessigabrt.patch -Patch5: %{name}-git.patch +Patch3: %{name}-fortifysourcessigabrt.patch URL: http://www.gnu.org/software/tar/tar.html -BuildRequires: autoconf >= 2.60 -BuildRequires: automake >= 1:1.9 +BuildRequires: autoconf >= 2.63 +BuildRequires: automake >= 1:1.11 BuildRequires: bison BuildRequires: gettext-devel >= 0.16 BuildRequires: help2man @@ -146,8 +144,6 @@ z pakietu dump. %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 %{__rm} po/stamp-po @@ -157,7 +153,8 @@ z pakietu dump. %{__autoconf} %{__autoheader} %{__automake} -%configure +%configure \ + --disable-silent-rules %{__make}