# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: sam@linux-dipf-20080125183516-ignivi1nfsu56ufh
# target_branch: http://bzr.linux-foundation.org/lsb/devel/si/
# testament_sha1: 636dbf0e8ed47f5036ea60a144ce082cd19dc6f7
# timestamp: 2008-01-25 13:50:11 -0500
# base_revision_id: pqm@freestandards.org-20070817180026-\
#   xy3jra1zxwxskt7h
# 
# Begin patch
=== modified file 'build/bootstrap/packages/gawk.xml'
--- build/bootstrap/packages/gawk.xml	2002-08-24 07:22:53 +0000
+++ build/bootstrap/packages/gawk.xml	2008-01-25 08:28:55 +0000
@@ -10,6 +10,12 @@
 			<destination>&LSBsi-bootstrap;&build_dir;</destination>
 		</unpack>
 
+		<patch>
+			<base>&LSBsi-bootstrap;&build_dir;/&gawk-directory;</base>
+			<param>-p0</param>
+			<param>-i &LSBsi-bootstrap;&packages_dir;/&gawk-fix-invalid-pointer-patch;</param>
+		</patch>
+
 		<configure>
 			<base>
 			    &LSBsi-bootstrap;&build_dir;/&gawk-directory;

=== modified file 'build/entities/package'
--- build/entities/package	2006-08-04 00:06:35 +0000
+++ build/entities/package	2008-01-25 07:56:28 +0000
@@ -84,6 +84,7 @@
 
 <!ENTITY gawk-version "3.1.5">
 <!ENTITY gawk-package "gawk-3.1.5.tar.bz2">
+<!ENTITY gawk-fix-invalid-pointer-patch "gawk-3.1.5-fix-invalid-pointer.patch">
 <!ENTITY gawk-directory "gawk-3.1.5">
 
 <!ENTITY gcc-version "4.1.1">

=== modified file 'build/extras/md5sums'
--- build/extras/md5sums	2006-08-04 00:06:35 +0000
+++ build/extras/md5sums	2008-01-25 18:35:16 +0000
@@ -199,3 +199,4 @@
 dc1384c03ac08af21f6fefab32d982cf  qt-x11-free-3.3.6.tar.bz2
 005c52ecc3509c4ab584d8254deb7370  qt-x11-opensource-src-4.1.3.patch
 e6ae99aeee60e407138d0aa1ce7d1c11  glib-2.6.6.patch
+2d11012618790a275b598986f98224ec  gawk-3.1.5-fix-invalid-pointer.patch

=== added file 'build/patches/gawk-3.1.5-fix-invalid-pointer.patch'
--- build/patches/gawk-3.1.5-fix-invalid-pointer.patch	1970-01-01 00:00:00 +0000
+++ build/patches/gawk-3.1.5-fix-invalid-pointer.patch	2008-01-25 08:25:36 +0000
@@ -0,0 +1,43 @@
+Patch for LSB Project
+Submitted by: Sam Hart 
+Date: 2008-02-04
+Description: In io.c, only free 'iop' if it was malloc'ed previously.
+Original patch: Fri Aug 12 13:10:33 2005 Arnold D. Robbins
+http://lists.gnu.org/archive/html/bug-gnu-utils/2005-08/msg00047.html
+
+--- ../gawk-3.1.5/io.c	2005-07-26 21:07:43.000000000 +0300
++++ io.c 2005-08-12 13:10:28.239852344 +0300
+@@ -2480,9 +2480,12 @@
+ {
+ 	struct stat sbuf;
+ 	struct open_hook *oh;
++	int iop_malloced = FALSE;
+ 
+-	if (iop == NULL)
++	if (iop == NULL) {
+ 		emalloc(iop, IOBUF *, sizeof(IOBUF), "iop_alloc");
++		iop_malloced = TRUE;
++	}
+ 	memset(iop, '\0', sizeof(IOBUF));
+ 	iop->flag = 0;
+ 	iop->fd = fd;
+@@ -2495,7 +2498,8 @@
+ 	}
+ 
+ 	if (iop->fd == INVALID_HANDLE) {
+-		free(iop);
++		if (iop_malloced)
++			free(iop);
+ 		return NULL;
+ 	}
+ 	if (isatty(iop->fd))
+@@ -2503,7 +2507,7 @@
+ 	iop->readsize = iop->size = optimal_bufsize(iop->fd, & sbuf);
+ 	iop->sbuf = sbuf;
+ 	if (do_lint && S_ISREG(sbuf.st_mode) && sbuf.st_size == 0)
+-			lintwarn(_("data file `%s' is empty"), name);
++		lintwarn(_("data file `%s' is empty"), name);
+ 	errno = 0;
+ 	iop->count = iop->scanoff = 0;
+ 	emalloc(iop->buf, char *, iop->size += 2, "iop_alloc");
+ 

=== modified file 'build/phase2/package-build/gawk.xml'
--- build/phase2/package-build/gawk.xml	2002-07-30 20:49:59 +0000
+++ build/phase2/package-build/gawk.xml	2008-01-25 16:59:46 +0000
@@ -8,6 +8,12 @@
 			<destination>&build_dir;</destination>
 		</unpack>
 
+		<patch>
+			<base>&build_dir;/&gawk-directory;</base>
+			<param>-p0</param>
+			<param>-i &packages_dir;/&gawk-fix-invalid-pointer-patch;</param>
+		</patch>
+
 		<configure>
 			<base>&build_dir;/&gawk-directory;</base>
 			<param>--prefix=/usr</param>

=== modified file 'build/phase3/package-build/gawk.xml'
--- build/phase3/package-build/gawk.xml	2002-07-30 20:49:59 +0000
+++ build/phase3/package-build/gawk.xml	2008-01-25 17:01:19 +0000
@@ -8,6 +8,12 @@
 			<destination>&phase3_build_dir;</destination>
 		</unpack>
 
+		<patch>
+			<base>&phase3_build_dir;/&gawk-directory;</base>
+			<param>-p0</param>
+			<param>-i &packages_dir;/&gawk-fix-invalid-pointer-patch;</param>
+		</patch>
+
 		<configure>
 			<base>&phase3_build_dir;/&gawk-directory;</base>
 			<param>--prefix=/usr</param>

# Begin bundle
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