rpms/gawk/F-13 gawk-3.1.7-max-int.patch, NONE, 1.1 gawk-3.1.7-syntax.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 gawk.spec, 1.62, 1.63 sources, 1.13, 1.14

Jan Zeleny jzeleny at fedoraproject.org
Fri Jun 25 08:31:50 UTC 2010


Author: jzeleny

Update of /cvs/extras/rpms/gawk/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25926

Modified Files:
	.cvsignore gawk.spec sources 
Added Files:
	gawk-3.1.7-max-int.patch gawk-3.1.7-syntax.patch 
Log Message:
rebased to 3.1.8, fixed some syntax issues and handling of extreme int values

gawk-3.1.7-max-int.patch:
 node.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gawk-3.1.7-max-int.patch ---
--- gawk-3.1.7/node.c.orig	2010-05-28 09:38:42.000000000 +0200
+++ gawk-3.1.7/node.c	2010-05-28 09:38:51.000000000 +0200
@@ -212,7 +212,7 @@ format_val(const char *format, int index
 
 	/* not an integral value, or out of range */
 	if ((val = double_to_int(s->numbr)) != s->numbr
-	    || val < LONG_MIN || val > LONG_MAX) {
+	    || val <= LONG_MIN || val >= LONG_MAX) {
 		/*
 		 * Once upon a time, if GFMT_WORKAROUND wasn't defined,
 		 * we just blindly did this:

gawk-3.1.7-syntax.patch:
 awkgram.y |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE gawk-3.1.7-syntax.patch ---
--- 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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gawk/F-13/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	9 Sep 2009 20:27:50 -0000	1.13
+++ .cvsignore	25 Jun 2010 08:31:49 -0000	1.14
@@ -1 +1 @@
-gawk-3.1.7.tar.xz
+gawk-3.1.8.tar.bz2


Index: gawk.spec
===================================================================
RCS file: /cvs/extras/rpms/gawk/F-13/gawk.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- gawk.spec	1 Apr 2010 14:23:53 -0000	1.62
+++ gawk.spec	25 Jun 2010 08:31:50 -0000	1.63
@@ -1,7 +1,7 @@
 Summary: The GNU version of the awk text processing utility
 Name: gawk
-Version: 3.1.7
-Release: 3%{?dist}
+Version: 3.1.8
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Text
 URL: http://www.gnu.org/software/gawk/gawk.html
@@ -9,6 +9,8 @@ Source0: http://ftp.gnu.org/gnu/gawk/gaw
 # Patch from Arnold, the upstream maintainer:
 Patch0: gawk-posix-mode-argv0.patch
 Patch1: gawk-3.1.7-prec-utf8.patch
+Patch2: gawk-3.1.7-max-int.patch
+Patch3: gawk-3.1.7-syntax.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires(post): /sbin/install-info
@@ -26,6 +28,8 @@ considered to be a standard Linux tool f
 %setup -q
 %patch0
 %patch1 -p1 -b .prec-utf8
+%patch2 -p1 -b .max-int
+%patch3 -p1 -b .syntaxt
 
 %build
 %configure --bindir=/bin --disable-libsigsegv
@@ -74,6 +78,11 @@ fi
 %{_datadir}/awk
 
 %changelog
+* Fri Jun 25 2010 Jan Zeleny <jzeleny at 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 at redhat.com> - 3.1.7-3
 - fix issue with utf8 precision recognition (#513234)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gawk/F-13/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	9 Sep 2009 20:27:51 -0000	1.13
+++ sources	25 Jun 2010 08:31:50 -0000	1.14
@@ -1 +1 @@
-7f16a68357c10c385ac76066b264f39d  gawk-3.1.7.tar.xz
+52b41c6c4418b3226dfb8f82076193bb  gawk-3.1.8.tar.bz2



More information about the scm-commits mailing list