rpms/gawk/devel gawk-stable-tree.patch, NONE, 1.1 gawk-3.1.5-test-lc_num1.patch, 1.2, 1.3 gawk.spec, 1.55, 1.56
Štěpán Kasal
kasal at fedoraproject.org
Thu Dec 11 11:25:55 UTC 2008
Author: kasal
Update of /cvs/extras/rpms/gawk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26618
Modified Files:
gawk-3.1.5-test-lc_num1.patch gawk.spec
Added Files:
gawk-stable-tree.patch
Log Message:
grab the current stable tree from savannah
gawk-stable-tree.patch:
--- NEW FILE gawk-stable-tree.patch ---
2008-12-11 Stepan Kasal <skasal at redhat.com>
Patch generated from gawk stable tree on savannah on
Thu Dec 11 11:52:53 CET 2008
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gawk/gawk-stable/ChangeLog,v
retrieving revision 1.55
retrieving revision 1.83
diff -u -r1.55 -r1.83
--- ChangeLog 22 Oct 2007 06:55:44 -0000 1.55
+++ ChangeLog 5 Dec 2008 09:14:48 -0000 1.83
@@ -1,3 +1,185 @@
+Fri Dec 5 11:12:11 2008 Arnold D. Robbins <arnold at skeeve.com>
+
+ * io.c (free_rp): New function.
+ (redirect): Improved logic for yesterday's change, including
+ use of free_rp.
+ (close_redir): Use free_rp.
+
+Thu Dec 4 22:35:05 2008 Arnold D. Robbins <arnold at skeeve.com>
+
+ * io.c (redirect): Only put the new struct redirect into
+ the list if the file or pipe could actually be opened. Fixes
+ a bug with the wrong return value of close, noticed by
+ Seb <sbb at tuxfamily.org>.
+ * dfa.c (parse_bracket_exp_mb): Don't zero out work_mbc->chars
+ after we malloc'ed it. Fixes a leak found by valgrind when
+ using UTF-8. (Hmmm. This got fixed in January 2007; It seems
+ to have crept back into the code in the August 2007 merge with
+ GNU grep. Sigh.)
+
+Mon Oct 20 11:47:59 2008 Arnold D. Robbins <arnold at skeeve.com>
+
+ * configure.ac: Add -g3 and -gdwarf-2 to CFLAGS if compiling with
+ GCC and doing development. Should have done this ages ago.
+
+Sun Aug 31 22:03:55 2008 Arnold D. Robbins <arnold at skeeve.com>
+
+ * eval.c (set_BINMODE): Tighten up the code to even more so
+ that it matches the documentation.
+
+Mon Aug 25 22:41:47 2008 Arnold D. Robbins <arnold at skeeve.com>
+
+ * eval.c (set_BINMODE): Tighten up the code to only allow
+ certain reasonable values when setting BINMODE.
+
+Fri Aug 22 14:43:49 2008 Arnold D. Robbins <arnold at skeeve.com>
+
+ * io.c (nextfile): Users Strong In The Ways Of The Source can use
+ non-existant files on the command line without it being a fatal error.
+
+Wed Jul 30 23:10:51 2008 Arnold D. Robbins <arnold at skeeve.com>
+
+ * re.c (research): Don't ever use DFA if need_start. It can
+ break on some weird cases. Reported by
+ "T. X. G." <leopardie333 at yahoo.com>.
+
+Wed Jul 30 22:27:20 2008 Arnold D. Robbins <arnold at skeeve.com>
+
+ * builtin.c (do_match): Add MAYBE_NUM flag to elements of array
+ created by `match' since data could come from user. Similar
+ semantics to `split'. Thanks to Dr. Dirk Zimoch <dirk.zimoch at psi.ch>
+ for reporting the bug.
+
+Tue Jun 24 07:44:06 2008 Arnold D. Robbins <arnold at skeeve.com>
+
+ * dfa.c (insert): Reworked for significant speed improvement
+ by Johan Walles <johan.walles at gmail.com>. Imported from grep
+ bug list.
+ * profile.c (tree_eval): Do a return after all the built-in
+ variables instead of a break. Thanks again to Hermann Peifer
+ <peifer at gmx.eu> for finding the problem.
+
+Sun Jun 22 23:08:14 2008 Arnold D. Robbins <arnold at skeeve.com>
+
+ * node.c (format_val): Restore old code to use %ld when the value
+ is within the range of a long; improves performance noticably for
+ applications that convert integers to strings. Use %.0f only for
+ integral values that are outside the range of a long. Thanks to
+ Hermann Peifer <peifer at gmx.eu> for pointing out the existence
+ of a problem.
+
+Fri May 23 12:08:24 2008 Arnold D. Robbins <arnold at skeeve.com>
+
+ * dfa.c (epsclosure): Change type of `visited' from int to char for
+ potential speedup. Based on bug report to bug-grep list from
+ Johan Walles <johan.walles at gmail.com>.
+
+Wed May 14 05:55:48 2008 Arnold D. Robbins <arnold at skeeve.com>
+
+ * builtin.c (format_tree): For `%c' case, add a lint warning
+ if the value is greater than 255.
+ (mbc_byte_count, mbc_char_count): Remove unused variable `i'.
+
+Thu Apr 24 20:31:03 2008 Bruno Haible <bruno at clisp.org>
+
+ * main.c (main): Move call to catch SIGBUS to before installation of
+ libsigsegv handler, since on some systems libsigsegv installs its
+ own handler for SIGBUS.
+ [STACK_SIZE]: Add a constant instead of inline. ADR.
+
+Wed Apr 23 22:30:27 2008 Duncan Moore <duncan.m00re at btinternet.com>
+
+ * builtin.c (state): Do as an integer array for systems that need it.
+ (do_rand, init_rand): Modify call to `initstate' as needed.
+
+Wed Apr 23 22:22:06 2008 Arnold D. Robbins <arnold at skeeve.com>
+
+ * dfa.c (prednames): Add an extra zero to final initializer to
+ silence a compiler warning. Reported by Duncan Moore
+ <duncan.m00re at btinternet.com>.
+
+Wed Apr 23 21:36:06 2008 Steffen Schuler <schuler.steffen at googlemail.com>
+
+ * field.c (fw_parse_field): Add code for multibyte case.
+
+Sat Mar 15 22:17:21 2008 Arnold D. Robbins <arnold at skeeve.com>
+
+ * builtin.c (do_length): Handle the case of the parameter being
+ an array that was a function parameter.
+
+Tue Mar 11 22:49:11 2008 Kimura Koichi <kimura.koichi at canon.co.jp>
+
+ * builtin.c (format_tree): Fix call to mbc_byte_count to pass the
+ right number of characters based on the format type.
+
+Tue Mar 11 22:31:58 2008 Arnold D. Robbins <arnold at skeeve.com>
+
+ * libsigsegv: Incorporated into the dist.
+ * Makefile.am (SUBDIRS): Added. Make it first so that the library
+ is built before gawk is.
+ (LDADD): Add the library.
+ (AM_CPPFLAGS): Add -I option to find <sigsegv.h> header.
+ * configure.ac: Add call to AC_CONFIG_SUBDIRS for libsigsegv.
+ * main.c (catchsegv, catchstackoverflow): New functions.
+ (main): Call into sigsegv library with them.
+
+Tue Mar 4 21:02:25 2008 Arnold D. Robbins <arnold at skeeve.com>
+
+ * builtin.c (mbc_char_count, mbc_byte_count): New functions to return
+ the number of m.b. chars there are and the number of bytes needed to
+ copy them.
+ (format_tree): Use them for %s and %c cases to adjust precision and
+ for copying characters at pr_tail label.
+
+Thu Feb 14 14:05:01 2008 Arnold D. Robbins <arnold at skeeve.com>
+
+ * main.c (init_args): Adjust type of third arg to remove warning from
+ GCC 4.2, add cast in call to make_string. Bleah.
+
+Fri Jan 25 12:13:39 2008 Dave Pitts <dpitts at cozx.com>
+
+ * README_d/README.zos: New file.
+ * Makefile.am: Add sed on y.tab.c to convert older Bison "parse error"
+ messages to "syntax error" messages.
+ * configure.ac: Added ZOS_USS changes.
+ * m4/arch.m4: Added ZOS_USS changes.
+ * m4/inttypes_h.m4: Added ZOS_USS changes.
+ * m4/inttypes.m4: Added ZOS_USS changes.
+ * m4/stdint_h.m4: Added ZOS_USS changes.
+ * awkgram.y: Added USE_EBCDIC changes for EBCDIC collating sequence.
+ * awk.h: Added ZOS_USS compile changes.
+ * eval.c: Added EBCDIC casetable and ZOS_USS changes.
+ * regcomp.c: Added btowc function for ZOS_USS.
+ * regex.h: Changed __string to __cstring to avoid ZOS_USS header usage.
+ * regex_internal.h: Added ZOS_USS changes and type defines.
+
+Sun Jan 13 08:16:38 2008 Arnold D. Robbins <arnold at skeeve.com>
+
+ * dfa.c (epsclosure): Replace MALLOC + zero-out-loop with CALLOC for
+ large potential speedup, based on bug report to bug-grep list from
+ Johan Walles <johan.walles at gmail.com>.
+ (dfaanalyze): Made a similar change.
+
+Fri Dec 21 11:22:16 2007 Arnold D. Robbins <arnold at skeeve.com>
+
+ * profile.c (pprint): Add a missing `#ifdef PROFILING'.
+
+Thu Dec 13 22:19:19 2007 Arnold D. Robbins <arnold at skeeve.com>
+
+ * profile.c (parenthesize): Remove "!" from output string.
+ (tree_eval): Fix quotes for delete array case.
+ (pp_var): New function, call it as appropriate everywhere else.
+
+Fri Nov 30 11:11:52 2007 Arnold D. Robbins <arnold at skeeve.com>
+
+ * io.c (socketopen): Use NULL as first argument to `getaddrinfo'
+ if any_remote_host is true. Should help on Non-GLIBC systems.
+
+Thu Nov 15 22:01:36 2007 Arnold D. Robbins <arnold at skeeve.com>
+
+ * io.c (two_way_open): Case for ptys. Change search for letters
+ to avoid ASCII / EBCDIC problems.
+
Mon Oct 22 08:49:05 2007 Arnold D. Robbins <arnold at skeeve.com>
* Release 3.1.6: Release tar file made.
@@ -568,7 +750,7 @@
[...35082 lines suppressed...]
+# is supposed to (or "for (i in array) lgth++" if you don't want to be
+# gawk-specific) but it does seem like a bug. Anyone know if there's a list of
+# known gawk bugs on-line somewhere?
+#
+# Ed.
+#
+#
--- /dev/null 2008-12-08 00:24:16.653006400 +0100
+++ test/funlen.in 2008-04-23 21:36:13.000000000 +0200
@@ -0,0 +1,8 @@
+CD NAME
+AT Austria
+BG Bulgaria
+CH Switzerland
+DE Germany
+EE Estonia
+FR France
+GR Greece
--- /dev/null 2008-12-08 00:24:16.653006400 +0100
+++ test/funlen.ok 2008-04-23 21:36:13.000000000 +0200
@@ -0,0 +1,2 @@
+array: 7
+array_A: 7
--- /dev/null 2008-12-08 00:24:16.653006400 +0100
+++ test/gsubtst6.awk 2008-07-31 20:46:47.000000000 +0200
@@ -0,0 +1,24 @@
+# From: "T. X. G." <leopardie333 at yahoo.com>
+# Subject: Bug in regular expression \B using DFA
+# Date: Wed, 16 Jul 2008 05:23:09 -0700 (PDT)
+# To: bug-gawk at gnu.org
+#
+# ~ gawk --version
+# GNU Awk 3.1.6
+# Copyright (C) 1989, 1991-2007 Free Software Foundation.
+#
+# ......
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~ LC_ALL=C gawk 'BEGIN{x="abcd";gsub(/\B/,":",x);print x}'
+# a:b:cd
+#
+# ~ LC_ALL=en_US.UTF-8 gawk 'BEGIN{x="abcd";gsub(/\B/,":",x);print x}'
+# a:b:c:d
+#
+# ~ GAWK_NO_DFA=1 gawk 'BEGIN{x="abcd";gsub(/\B/,":",x);print x}'
+# a:b:c:d
+
+BEGIN { x = "abcd"; gsub(/\B/,":",x); print x }
--- /dev/null 2008-12-08 00:24:16.653006400 +0100
+++ test/gsubtst6.ok 2008-07-31 20:46:47.000000000 +0200
@@ -0,0 +1 @@
+a:b:c:d
--- /dev/null 2008-12-08 00:24:16.653006400 +0100
+++ test/match3.awk 2008-07-31 20:46:47.000000000 +0200
@@ -0,0 +1,46 @@
+# Date: Mon, 28 Jul 2008 17:25:32 +0200
+# From: Dirk Zimoch <dirk.zimoch at psi.ch>
+# Subject: match() prevents numeric strings from beeing treated numerically
+# To: bug-gawk at gnu.org
+# Message-id: <488DE4EC.6020400 at psi.ch>
+#
+# In gawk version 3.1.5, numeric user input that is parsed with match() is not
+# recognized as "numeric string" any more. I.e. mixed string-numeric comparison
+# does not work any more. In version 3.1.1, it worked. (Even though the
+# documentation never explicitly mentioned this behavior for match(), as it does
+# for split(). But is says that "user input" should be treated that way.)
+#
+# awk 'BEGIN{match(".5",/.*/,a);print a[0]==.5?"OK":"FAULT"}'
+#
+# Version 3.1.1 prints OK, version 3.1.5 prints FAULT.
+#
+# awk '{match($0,/.*/,a);print a[0]==a[0]+0?"OK":"FAULT"}' << EOF
+# 5
+# 5.0
+# 0.5
+# .5
+# EOF
+#
+# Version 3.1.1 prints
+# OK
+# OK
+# OK
+# OK
+#
+# Version 3.1.5 prints
+# OK
+# FAULT
+# OK
+# FAULT
+#
+#
+# --
+# Dr. Dirk Zimoch
+# Paul Scherrer Institut, WBGB/006
+# 5232 Villigen PSI, Switzerland
+# Phone +41 56 310 5182
+#
+{
+ match($0,/.*/,a)
+ print a[0] == a[0]+0 ? "OK" : "FAULT"
+}
--- /dev/null 2008-12-08 00:24:16.653006400 +0100
+++ test/match3.in 2008-07-31 20:46:47.000000000 +0200
@@ -0,0 +1,4 @@
+5
+5.0
+0.5
+.5
--- /dev/null 2008-12-08 00:24:16.653006400 +0100
+++ test/match3.ok 2008-07-31 20:46:47.000000000 +0200
@@ -0,0 +1,4 @@
+OK
+OK
+OK
+OK
--- /dev/null 2008-12-08 00:24:16.653006400 +0100
+++ test/mbfw1.awk 2008-04-23 21:36:13.000000000 +0200
@@ -0,0 +1,40 @@
+# Date: Sun, 16 Mar 2008 18:51:14 +0100
+# From: Hermann Peifer <peifer at gmx.eu>
+# Subject: [Fwd: Gawk FIELDWIDTHS and multibyte characters]
+# To: bug-gawk at gnu.org
+# Message-id: <47DD5E12.2010403 at gmx.eu>
+#
+# See below. Regards, Hermann
+#
+# --- Original Message ---
+#
+# Newsgroups: comp.lang.awk
+# From: Hermann Peifer <peifer at gmx.eu>
+# Date: Sun, 16 Mar 2008 01:23:38 -0700 (PDT)
+# Subject: Gawk FIELDWIDTHS and multibyte characters
+#
+# Hi,
+#
+# It looks to me that Gawk's FIELDWIDTHS extension is not aware of
+# multibyte characters, see my example below.
+#
+# $ cat testdata
+# CDRegion Commune Site
+# SEVästsverige Hallands län Kungsbacka
+# SESmåland med öarna Västra Götalands länGöteborg
+# SEKronoberg Alvesta Stenungsund
+#
+# $ file testdata
+# testdata: UTF-8 Unicode text
+#
+# $ awk 'BEGIN{FIELDWIDTHS = "2 20 20 20"}{print $4}' testdata
+# Site
+# Kungsbacka
+# länGöteborg
+# Stenungsund
+#
+# Can someone confirm?
+#
+# Hermann
+BEGIN { FIELDWIDTHS = "2 20 20 20" }
+{ print $4 }
--- /dev/null 2008-12-08 00:24:16.653006400 +0100
+++ test/mbfw1.in 2008-04-23 21:36:13.000000000 +0200
@@ -0,0 +1,4 @@
+CDRegion Commune Site
+SEVästsverige Hallands län Kungsbacka
+SESmåland med öarna Västra Götalands länGöteborg
+SEKronoberg Alvesta Stenungsund
--- /dev/null 2008-12-08 00:24:16.653006400 +0100
+++ test/mbfw1.ok 2008-04-23 21:36:13.000000000 +0200
@@ -0,0 +1,4 @@
+Site
+Kungsbacka
+Göteborg
+Stenungsund
--- /dev/null 2008-12-08 00:24:16.653006400 +0100
+++ test/mbprintf1.awk 2008-04-23 21:36:13.000000000 +0200
@@ -0,0 +1 @@
+{ printf "%-7s|\n", $0 }
--- /dev/null 2008-12-08 00:24:16.653006400 +0100
+++ test/mbprintf1.in 2008-04-23 21:36:13.000000000 +0200
@@ -0,0 +1,2 @@
+AAA
+ÅÃÆ
--- /dev/null 2008-12-08 00:24:16.653006400 +0100
+++ test/mbprintf1.ok 2008-04-23 21:36:13.000000000 +0200
@@ -0,0 +1,2 @@
+AAA |
+ÅÃÆ |
--- /dev/null 2008-12-08 00:24:16.653006400 +0100
+++ test/mbprintf2.awk 2008-04-23 21:36:13.000000000 +0200
@@ -0,0 +1,4 @@
+BEGIN {
+ printf "%c\n", 65
+ printf "%c\n", "AA"
+}
--- /dev/null 2008-12-08 00:24:16.653006400 +0100
+++ test/mbprintf2.ok 2008-04-23 21:36:13.000000000 +0200
@@ -0,0 +1,2 @@
+A
+A
gawk-3.1.5-test-lc_num1.patch:
Index: gawk-3.1.5-test-lc_num1.patch
===================================================================
RCS file: /cvs/extras/rpms/gawk/devel/gawk-3.1.5-test-lc_num1.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gawk-3.1.5-test-lc_num1.patch 25 Nov 2008 17:03:04 -0000 1.2
+++ gawk-3.1.5-test-lc_num1.patch 11 Dec 2008 11:25:53 -0000 1.3
@@ -1,6 +1,6 @@
---- test/Makefile.am.ulitest 2005-07-26 20:07:43.000000000 +0200
-+++ test/Makefile.am 2007-09-27 10:48:51.000000000 +0200
-@@ -300,6 +300,8 @@
+--- test/Makefile.am.ulitest 2008-12-11 11:59:23.000000000 +0100
++++ test/Makefile.am 2008-12-11 12:00:34.000000000 +0100
+@@ -307,6 +307,8 @@ EXTRA_DIST = \
intprec.ok \
iobug1.awk \
iobug1.ok \
@@ -9,16 +9,16 @@
leaddig.awk \
leaddig.ok \
leadnl.awk \
-@@ -658,7 +660,7 @@
+@@ -676,7 +678,7 @@ BASIC_TESTS = addcomma anchgsub argarray
fordel forsimp fsbs fsspcoln fsrs fstabplus funsemnl funsmnam funstack getline \
getline2 getline3 getlnbuf getnr2tb getnr2tm gsubasgn gsubtest \
- gsubtst2 gsubtst3 gsubtst4 gsubtst5 hex hsprint inputred intest intformat \
+ gsubtst2 gsubtst3 gsubtst4 gsubtst5 gsubtst6 hex hsprint inputred intest intformat \
- intprec iobug1 leaddig leadnl litoct longsub longwrds manglprm math membug1 \
+ intprec iobug1 lc_num1 leaddig leadnl litoct longsub longwrds manglprm math membug1 \
messages minusstr mmap8k mtchi18n nasty nasty2 negexp nested nfldstr \
nfneg nfset nlfldsep nlinstr nlstrina noeffect nofile nofmtch noloop1 \
noloop2 nonl noparms nors nulrsend numindex numsubstr octsub ofmt \
-@@ -755,6 +757,12 @@
+@@ -774,6 +776,12 @@ extend-msg-start:
extend-msg-end:
@echo "======== Done with gawk extension tests ========"
Index: gawk.spec
===================================================================
RCS file: /cvs/extras/rpms/gawk/devel/gawk.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- gawk.spec 26 Nov 2008 15:36:08 -0000 1.55
+++ gawk.spec 11 Dec 2008 11:25:53 -0000 1.56
@@ -1,19 +1,21 @@
Summary: The GNU version of the awk text processing utility
Name: gawk
Version: 3.1.6
-Release: 2%{?dist}
-License: GPLv2+
+Release: 3%{?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.bz2
+Source1: http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-2.6.tar.gz
+Patch0: gawk-stable-tree.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
Requires: /bin/mktemp
-# for patch14
-BuildRequires: autoconf automake
+# patching the sources for these tools
+BuildRequires: autoconf automake gettext-devel texinfo bison
# test for #299551, submitted:
# http://lists.gnu.org/archive/html/bug-gnu-utils/2008-11/msg00044.html
@@ -28,11 +30,16 @@
considered to be a standard Linux tool for processing text.
%prep
-%setup -q
-%patch14 -p0 -b .ulitest
+%setup -q -a 1
+mv libsigsegv-2.6 libsigsegv
+# do not install with gawk
+echo 'install:' >>libsigsegv/Makefile.am
+%patch0
+# we have patched the sources for these:
+rm awkgram.c doc/*.info
+%patch14 -b .ulitest
%build
-# for patch14:
autoreconf
%configure --bindir=/bin
make %{?_smp_mflags}
@@ -79,6 +86,9 @@
%{_datadir}/awk
%changelog
+* Thu Dec 11 2008 Stepan Kasal <skasal at redhat.com> - 3.1.6-3
+- grab the current stable tree from savannah
+
* Wed Nov 26 2008 Stepan Kasal <skasal at redhat.com> - 3.1.6-2
- test-lc_num1.patch submitted upstream, link added
More information about the fedora-extras-commits
mailing list