diff --git a/.cvsignore b/.cvsignore index 47d825a..517f113 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -gawk-3.1.4.tar.gz -gawk-3.1.4-ps.tar.gz +gawk-3.1.3.tar.bz2 +gawk-3.1.3-ps.tar.gz diff --git a/gawk-3.1.3-getpgrp_void.patch b/gawk-3.1.3-getpgrp_void.patch new file mode 100644 index 0000000..50a48f3 --- /dev/null +++ b/gawk-3.1.3-getpgrp_void.patch @@ -0,0 +1,45 @@ +--- gawk-3.1.3/main.c.getpgrp_void 2004-01-26 12:08:26.000000000 +0100 ++++ gawk-3.1.3/main.c 2004-01-26 12:15:22.000000000 +0100 +@@ -874,14 +874,11 @@ + + PROCINFO_node = install("PROCINFO", + node((NODE *) NULL, Node_var_array, (NODE *) NULL)); +- + #ifdef GETPGRP_VOID +-#define getpgrp_arg() /* nothing */ ++ value = getpgrp(); + #else +-#define getpgrp_arg() getpid() ++ value = getpgrp(getpid()); + #endif +- +- value = getpgrp(getpgrp_arg()); + aptr = assoc_lookup(PROCINFO_node, tmp_string("pgrpid", 6), FALSE); + *aptr = make_number(value); + +--- gawk-3.1.3/io.c.getpgrp_void 2004-01-26 12:08:36.000000000 +0100 ++++ gawk-3.1.3/io.c 2004-01-26 12:16:04.000000000 +0100 +@@ -1422,11 +1422,6 @@ + return 0; + } + +-#ifdef GETPGRP_VOID +-#define getpgrp_arg() /* nothing */ +-#else +-#define getpgrp_arg() getpid() +-#endif + + /* pidopen --- "open" /dev/pid, /dev/ppid, and /dev/pgrpid */ + +@@ -1440,7 +1435,11 @@ + warning(_("use `PROCINFO[\"%s\"]' instead of `%s'"), cp, name); + + if (name[6] == 'g') ++#ifdef GETPGRP_VOID ++ sprintf(tbuf, "%d\n", (int) getpgrp()); ++#else + sprintf(tbuf, "%d\n", (int) getpgrp(getpgrp_arg())); ++#endif + else if (name[6] == 'i') + sprintf(tbuf, "%d\n", (int) getpid()); + else diff --git a/gawk.spec b/gawk.spec index 4b95c03..9679d57 100644 --- a/gawk.spec +++ b/gawk.spec @@ -1,12 +1,19 @@ Summary: The GNU version of the awk text processing utility. Name: gawk -Version: 3.1.4 -Release: 2 +Version: 3.1.3 +Release: 10 License: GPL Group: Applications/Text -Source0: ftp://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.gz +Source0: ftp://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.bz2 Source1: ftp://ftp.gnu.org/gnu/gawk/gawk-%{version}-ps.tar.gz -Patch1: gawk-3.1.4-getpgrp_void.patch +Patch3: gawk-3.1.3-fix1.patch +Patch4: gawk-3.1.3-fix2.patch +Patch5: gawk-3.1.3-fix3.patch +Patch6: gawk-3.1.3-fix4.patch +Patch7: gawk-3.1.3-fix5.patch +Patch8: gawk-3.1.3-getpgrp_void.patch +Patch9: gawk-3.1.3-numfiles.patch +Patch10: gawk-3.1.3-trans.patch Prereq: /sbin/install-info Requires: /bin/mktemp @@ -22,7 +29,14 @@ considered to be a standard Linux tool for processing text. %prep %setup -q -b 1 -%patch1 -p1 -b .getpgrp_void +%patch3 -p1 -b .fix1 +%patch4 -p0 -b .fix2 +%patch5 -p1 -b .fix3 +%patch6 -p1 -b .fix4 +%patch7 -p1 -b .fix5 +%patch8 -p1 -b .getpgrp_void +%patch9 -p1 -b .fix64 +%patch10 -p1 -b .trans %build %configure @@ -71,9 +85,6 @@ fi %{_datadir} %changelog -* Mon Nov 8 2004 Karel Zak 3.1.4-2 -- update to new upstream version 3.1.4 - * Thu Nov 4 2004 Karel Zak 3.1.3-10 - fixed crash on non-UTF8 locales (#137832) diff --git a/sources b/sources index 754682a..81e3394 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -3c8935efb9fdc7202720894279ad04a7 gawk-3.1.4.tar.gz -2d5b69cfbdd930e3cd88f0574cd2e7a2 gawk-3.1.4-ps.tar.gz +a116eec17e7ba085febb74c7758823bd gawk-3.1.3.tar.bz2 +0c6ceed28ceb25efc079c6f42899110e gawk-3.1.3-ps.tar.gz