rpms/gawk/devel gawk-posix-mode-argv0.patch, NONE, 1.1 gawk.spec, 1.60, 1.61

[Štěpán Kasal]

Author: kasal

Update of /cvs/extras/rpms/gawk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14480

Modified Files:
	gawk.spec 
Added Files:
	gawk-posix-mode-argv0.patch 
Log Message:
- in posix mode, make ARGV[0] = argv[0] (#525381)

gawk-posix-mode-argv0.patch:
 main.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE gawk-posix-mode-argv0.patch ---
Sun Oct  4 21:46:11 2009  Arnold D. Robbins  <arnold at skeeve.com>

	* 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)



Index: gawk.spec
===================================================================
RCS file: /cvs/extras/rpms/gawk/devel/gawk.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- gawk.spec	9 Sep 2009 20:27:51 -0000	1.60
+++ gawk.spec	8 Oct 2009 11:41:58 -0000	1.61
@@ -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 f
 
 %prep
 %setup -q
+%patch0
 
 %build
 %configure --bindir=/bin --disable-libsigsegv
@@ -69,6 +72,9 @@ fi
 %{_datadir}/awk
 
 %changelog
+* Thu Oct  8 2009 Stepan Kasal <skasal at redhat.com> - 3.1.7-2
+- in posix mode, make ARGV[0] = argv[0] (#525381)
+
 * Wed Sep  9 2009 Stepan Kasal <skasal at redhat.com> - 3.1.7-1
 - new upstream version
 - disable libsigsegv