From 912f53f00b1099247433dd445336699f322a4288 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 04:59:26 +0000
Subject: [PATCH] auto-import changelog data from gawk-3.1.3-6.src.rpm Mon Jan
 26 2004 Thomas Woerner <twoerner@redhat.com> 3.1.3-6 - fixed getpgrp_void
 problem (#114246) - removed old patches

---
 gawk-3.1.3-getpgrp_void.patch | 45 +++++++++++++++++++++++++++++++++++
 gawk.spec                     | 24 +++++++++----------
 2 files changed, 57 insertions(+), 12 deletions(-)
 create mode 100644 gawk-3.1.3-getpgrp_void.patch

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 967dfe1..7c45f36 100644
--- a/gawk.spec
+++ b/gawk.spec
@@ -1,19 +1,17 @@
 Summary: The GNU version of the awk text processing utility.
 Name: gawk
 Version: 3.1.3
-Release: 5
+Release: 6
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.bz2
 Source1: ftp://ftp.gnu.org/gnu/gawk/gawk-%{version}-ps.tar.gz
-Patch0: gawk-3.1.0-newsecurity.patch
-Patch1: gawk-3.1.0-shutup.patch
-Patch2: gawk-3.1.1-ngroups.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
 Prereq: /sbin/install-info
 Requires: /bin/mktemp
 Buildroot: %{_tmppath}/%{name}-root
@@ -28,14 +26,12 @@ considered to be a standard Linux tool for processing text.
 
 %prep
 %setup -q -b 1
-#%patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
-%patch3 -p1
-%patch4 -p0
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+%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
 
 %build
 %configure
@@ -84,6 +80,10 @@ fi
 %{_datadir}
 
 %changelog
+* Mon Jan 26 2004 Thomas Woerner <twoerner@redhat.com> 3.1.3-6
+- fixed getpgrp_void problem (#114246)
+- removed old patches
+
 * Fri Jan 09 2004 Florian La Roche <Florian.LaRoche@redhat.de>
 - add a "make check"