diff --git a/.gitignore b/.gitignore index fd91f8c..3b462a0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ sharutils-4.9.tar.bz2 /sharutils-4.11.1.tar.bz2 /sharutils-4.13.1.tar.bz2 /sharutils-4.13.3.tar.xz +/sharutils-4.13.4.tar.xz diff --git a/sharutils-4.13.3-Allow-exactly-one-input-file-when-specifying-output-.patch b/sharutils-4.13.3-Allow-exactly-one-input-file-when-specifying-output-.patch deleted file mode 100644 index 1a57c33..0000000 --- a/sharutils-4.13.3-Allow-exactly-one-input-file-when-specifying-output-.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 2e633b222dbdccfd04506a0c0028471feb101524 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Wed, 23 Jan 2013 13:15:18 +0100 -Subject: [PATCH] Allow exactly one input file when specifying output file - -This fixes regression in 4.13.3. The fix ported from 4.13.4pre2. - ---- - src/uudecode.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/uudecode.c b/src/uudecode.c -index 2ef5a92..723bcff 100644 ---- a/src/uudecode.c -+++ b/src/uudecode.c -@@ -490,7 +490,7 @@ main (int argc, char const * const * argv) - exit_status = decode ("stdin"); - break; - -- case 1: -+ default: - if (HAVE_OPT(OUTPUT_FILE)) - { - usage_message(_("You cannot specify an output file when processing\n\ -@@ -499,7 +499,7 @@ multiple input files.\n")); - } - /* FALLTHROUGH */ - -- default: -+ case 1: - while (--argc >= 0) - { - char const * f = *(argv++); --- -1.8.1 - diff --git a/sharutils-4.13.3-Do-not-open-and-dev-stdout.patch b/sharutils-4.13.3-Do-not-open-and-dev-stdout.patch deleted file mode 100644 index 017dc9d..0000000 --- a/sharutils-4.13.3-Do-not-open-and-dev-stdout.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 49857a3ee79226ce870607104f7ef28bacae3f57 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Wed, 23 Jan 2013 14:06:50 +0100 -Subject: [PATCH] Do not open - and /dev/stdout - -Ported from 4.13.4pre2. - - -I have duplicated the autogen code to C because the build system does -not run autogen. ---- - src/uudecode-opts.c | 17 ++++++++++++++++- - src/uudecode-opts.def | 17 ++++++++++++++++- - 2 files changed, 32 insertions(+), 2 deletions(-) - -diff --git a/src/uudecode-opts.c b/src/uudecode-opts.c -index 19f4ee1..33ebe2f 100644 ---- a/src/uudecode-opts.c -+++ b/src/uudecode-opts.c -@@ -385,7 +385,22 @@ doOptOutput_File(tOptions* pOptions, tOptDesc* pOptDesc) - * reset its state. - */ - /* extracted from uudecode-opts.def, line 60 */ -- FILE * fp = freopen (pOptDesc->optArg.argString, "w", stdout); -+ FILE * fp; -+ switch (*pOptDesc->optArg.argString) -+ { -+ case '-': -+ if (pOptDesc->optArg.argString[1] == '\0') -+ return; -+ break; -+ -+ case '/': -+ if (strcmp (pOptDesc->optArg.argString + 1, "dev/stdout") == 0) -+ return; -+ -+ default: -+ break; -+ } -+ fp = freopen (pOptDesc->optArg.argString, "w", stdout); - if (fp != stdout) - { - error (0, errno, "%s", pOptDesc->optArg.argString); -diff --git a/src/uudecode-opts.def b/src/uudecode-opts.def -index ae11b0a..419387b 100644 ---- a/src/uudecode-opts.def -+++ b/src/uudecode-opts.def -@@ -57,7 +57,22 @@ flag = { - arg-name = file; - descrip = 'direct output to @file{file}'; - flag-code = <<- _EOCode_ -- FILE * fp = freopen (pOptDesc->optArg.argString, "w", stdout); -+ FILE * fp; -+ switch (*pOptDesc->optArg.argString) -+ { -+ case '-': -+ if (pOptDesc->optArg.argString[1] == '\0') -+ return; -+ break; -+ -+ case '/': -+ if (strcmp (pOptDesc->optArg.argString + 1, "dev/stdout") == 0) -+ return; -+ -+ default: -+ break; -+ } -+ fp = freopen (pOptDesc->optArg.argString, "w", stdout); - if (fp != stdout) - { - error (0, errno, "%s", pOptDesc->optArg.argString); --- -1.8.1 - diff --git a/sharutils.spec b/sharutils.spec index 05a5ee7..e6cc5ea 100644 --- a/sharutils.spec +++ b/sharutils.spec @@ -1,15 +1,11 @@ Summary: The GNU shar utilities for packaging and unpackaging shell archives Name: sharutils -Version: 4.13.3 -Release: 3%{?dist} +Version: 4.13.4 +Release: 1%{?dist} License: GPLv3+ and LGPLv2+ and Public Domain Group: Applications/Archiving Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz URL: http://www.gnu.org/software/%{name}/ -# Bug #901895, in upstream 4.13.4pre2 -Patch0: %{name}-4.13.3-Allow-exactly-one-input-file-when-specifying-output-.patch -# Bug #901895, in upstream 4.13.4pre2 -Patch1: %{name}-4.13.3-Do-not-open-and-dev-stdout.patch BuildRequires: gettext Requires(post): info Requires(preun): info @@ -30,8 +26,6 @@ shar files. %prep %setup -q -%patch0 -p1 -b .input_count -%patch1 -p1 -b .dev_stdout # convert TODO, THANKS to UTF-8 for i in TODO THANKS; do @@ -70,6 +64,9 @@ fi %{_mandir}/man5/* %changelog +* Wed Apr 03 2013 Petr Pisar - 4.13.4-1 +- 4.13.4 bump + * Fri Feb 08 2013 Petr Pisar - 4.13.3-3 - Collect message catalogs in install phase (bug #908967) diff --git a/sources b/sources index 56642d2..6422b3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ac996dbe2dfc74647b500506af56779b sharutils-4.13.3.tar.xz +b997cee3c5efbca232d39d16e37257e9 sharutils-4.13.4.tar.xz