From 4b7ff3f82e599cf53dc70efb593abaf9c78e01a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Kasal?= Date: Thu, 8 Oct 2009 11:41:58 +0000 Subject: [PATCH] - in posix mode, make ARGV[0] = argv[0] (#525381) --- gawk-posix-mode-argv0.patch | 33 +++++++++++++++++++++++++++++++++ gawk.spec | 8 +++++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 gawk-posix-mode-argv0.patch diff --git a/gawk-posix-mode-argv0.patch b/gawk-posix-mode-argv0.patch new file mode 100644 index 0000000..46eb10f --- /dev/null +++ b/gawk-posix-mode-argv0.patch @@ -0,0 +1,33 @@ +Sun Oct 4 21:46:11 2009 Arnold D. Robbins + + * main.c (main): Don't reset argv[0] to myname. In call + to `init_args', pass argv[0] if do_posix. Based on + Fedora bug report. + +Index: main.c +=================================================================== +RCS file: /d/mongo/cvsrep/gawk-stable/main.c,v +retrieving revision 1.24 +diff -u -r1.24 main.c +--- main.c 9 Jul 2009 19:54:38 -0000 1.24 ++++ main.c 4 Oct 2009 19:46:06 -0000 +@@ -306,7 +306,6 @@ + #undef STACK_SIZE + + myname = gawk_name(argv[0]); +- argv[0] = (char *) myname; + os_arg_fixup(&argc, &argv); /* emulate redirection, expand wildcards */ + + /* remove sccs gunk */ +@@ -586,7 +585,9 @@ + optind++; + } + +- init_args(optind, argc, myname, argv); ++ init_args(optind, argc, ++ do_posix ? argv[0] : myname, ++ argv); + (void) tokexpand(); + + #if defined(LC_NUMERIC) + diff --git a/gawk.spec b/gawk.spec index ec0fa7f..46cdd79 100644 --- a/gawk.spec +++ b/gawk.spec @@ -1,11 +1,13 @@ Summary: The GNU version of the awk text processing utility Name: gawk Version: 3.1.7 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ Group: Applications/Text URL: http://www.gnu.org/software/gawk/gawk.html Source0: http://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.xz +# Patch from Arnold, the upstream maintainer: +Patch0: gawk-posix-mode-argv0.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires(post): /sbin/install-info @@ -21,6 +23,7 @@ considered to be a standard Linux tool for processing text. %prep %setup -q +%patch0 %build %configure --bindir=/bin --disable-libsigsegv @@ -69,6 +72,9 @@ fi %{_datadir}/awk %changelog +* Thu Oct 8 2009 Stepan Kasal - 3.1.7-2 +- in posix mode, make ARGV[0] = argv[0] (#525381) + * Wed Sep 9 2009 Stepan Kasal - 3.1.7-1 - new upstream version - disable libsigsegv