- fix #629196: Double free in free_wstr

- fix license tag, add description
- remove BuildRoot tag

.cvsignore

@@ -1 +0,0 @@
-gawk-3.1.7.tar.xz

.gitignore

@@ -0,0 +1 @@
+gawk-3.1.8.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: gawk
-# $Id: Makefile,v 1.2 2007/10/15 18:46:28 notting Exp $
-NAME := gawk
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

gawk-3.1.8-double-free-wstptr.patch

@@ -0,0 +1,23 @@
+Index: node.c
+===================================================================
+RCS file: /sources/gawk/gawk-devel/node.c,v
+retrieving revision 1.3
+diff -u -r1.3 node.c
+--- node.c	6 May 2010 19:00:58 -0000	1.3
++++ node.c	27 Oct 2010 17:56:49 -0000
+@@ -758,6 +758,15 @@
+ 
+ 	assert((n->flags & (STRING|STRCUR)) != 0);
+ 
++	/*
++	 * Don't convert global null string or global null field
++	 * variables to a wide string. They are both zero-length anyway.
++	 * This also avoids future double-free errors while releasing
++	 * shallow copies, eg. *tmp = *Null_field; free_wstr(tmp);
++	 */
++	if (n == Nnull_string || n == Null_field)
++		return n;
++
+ 	if ((n->flags & WSTRCUR) != 0) {
+ 		if (ptr == NULL)
+ 			return n;

gawk-3.1.8-syntax.patch

@@ -0,0 +1,22 @@
+--- gawk-3.1.7/awkgram.y.orig	2010-06-25 10:08:11.000000000 +0200
++++ gawk-3.1.7/awkgram.y	2010-06-25 10:10:34.000000000 +0200
+@@ -164,7 +164,7 @@
+ %nonassoc LEX_IN
+ %left FUNC_CALL LEX_BUILTIN LEX_LENGTH
+ %nonassoc ','
+-%nonassoc MATCHOP
++%left MATCHOP
+ %nonassoc RELOP '<' '>' IO_IN IO_OUT
+ %left CONCAT_OP
+ %left YSTRING YNUMBER
+@@ -702,8 +702,8 @@
+ 	 */
+ print_expression_list
+ 	: opt_expression_list
+-	| '(' exp comma expression_list r_paren
+-		{ $$ = node($2, Node_expression_list, $4); }
++	| '(' expression_list r_paren
++		{ $$ = $2; }
+ 	;
+ 
+ output_redir

gawk-posix-mode-argv0.patch

@@ -1,33 +0,0 @@
-Sun Oct  4 21:46:11 2009  Arnold D. Robbins  <arnold@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)
-

gawk.spec

@@ -1,17 +1,22 @@
 Summary: The GNU version of the awk text processing utility
 Name: gawk
-Version: 3.1.7
+Version: 3.1.8
 Release: 2%{?dist}
-License: GPLv3+
+# Most of source files are licensed under GPLv3+,
+# several files are GPL or LGPLv2.1+ licensed,
+# gettext.h is LGPL and random.c is BSD licensed
+License: GPLv3+ and GPL and LGPLv3+ and LGPL and BSD
 Group: Applications/Text
 URL: http://www.gnu.org/software/gawk/gawk.html
-Source0: http://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.xz
+Source0: http://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.bz2
 # Patch from Arnold, the upstream maintainer:
-Patch0: gawk-posix-mode-argv0.patch
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Patch0: gawk-3.1.8-syntax.patch
+# http://lists.gnu.org/archive/html/bug-gnu-utils/2010-11/msg00005.html
+Patch1: gawk-3.1.8-double-free-wstptr.patch
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
+BuildRequires: byacc
 
 %description
 The gawk package contains the GNU version of awk, a text processing
@@ -23,7 +28,8 @@ considered to be a standard Linux tool for processing text.
 
 %prep
 %setup -q
-%patch0
+%patch0 -p1 -b .syntax
+%patch1 -p0 -b .double-free-wstptr
 
 %build
 %configure --bindir=/bin --disable-libsigsegv
@@ -72,6 +78,19 @@ fi
 %{_datadir}/awk
 
 %changelog
+* Tue Nov 02 2010 Vojtech Vitek (V-Teq) <vvitek@redhat.com> - 3.1.8-2
+- fix #629196: Double free in free_wstr
+- fix license tag, add description
+- remove BuildRoot tag
+
+* Fri Jun 25 2010 Jan Zeleny <jzeleny@redhat.com> - 3.1.8-1
+- rebased to 3.1.8
+- fixed handling of extreme int values
+- fixed two syntax issues (#528623, #528625)
+
+* Thu Apr 01 2010 Jan Zeleny <jzeleny@redhat.com> - 3.1.7-3
+- fix issue with utf8 precision recognition (#513234)
+
 * Thu Oct  8 2009 Stepan Kasal <skasal@redhat.com> - 3.1.7-2
 - in posix mode, make ARGV[0] = argv[0] (#525381)
 

sources

@@ -1 +1 @@
-7f16a68357c10c385ac76066b264f39d  gawk-3.1.7.tar.xz
+52b41c6c4418b3226dfb8f82076193bb  gawk-3.1.8.tar.bz2