[arch-commits] Commit in gawk/trunk (PKGBUILD gawk-3.1.5-segfault_fix-1.patch)

[Tobias Powalowski]

    Date: Saturday, August 1, 2009 @ 06:10:27
  Author: tpowa
Revision: 48262

upgpkg: gawk 3.1.7-1

Modified:
  gawk/trunk/PKGBUILD
Deleted:
  gawk/trunk/gawk-3.1.5-segfault_fix-1.patch

---------------------------------+
 PKGBUILD                        |    9 ++++---
 gawk-3.1.5-segfault_fix-1.patch |   43 --------------------------------------
 2 files changed, 5 insertions(+), 47 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-08-01 10:03:21 UTC (rev 48261)
+++ PKGBUILD	2009-08-01 10:10:27 UTC (rev 48262)
@@ -3,8 +3,8 @@
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=gawk
-pkgver=3.1.6
-pkgrel=3
+pkgver=3.1.7
+pkgrel=1
 pkgdesc="Gnu version of awk"
 arch=(i686 x86_64)
 url="http://www.gnu.org/directory/GNU/gawk.html"
@@ -13,8 +13,8 @@
 provides=('awk')
 install=gawk.install
 source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
-depends=('bash' 'glibc')
-md5sums=('b237751aef53c9ead9644e376bc53386')
+depends=('sh' 'glibc')
+md5sums=('a38d5dec19320ace01f1d16c8beb1363')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -29,3 +29,4 @@
   rm $pkgdir/usr/share/info/dir
   gzip -9 $pkgdir/usr/share/info/{gawk,gawkinet}.info
 }
+

Deleted: gawk-3.1.5-segfault_fix-1.patch
===================================================================
--- gawk-3.1.5-segfault_fix-1.patch	2009-08-01 10:03:21 UTC (rev 48261)
+++ gawk-3.1.5-segfault_fix-1.patch	2009-08-01 10:10:27 UTC (rev 48262)
@@ -1,43 +0,0 @@
-Submitted By: Matthew Burgess <matthew at linuxfromscratch.org>
-Date: 2005-09-24
-Initial Package Version: 3.1.5
-Upstream Status: From Upstream
-Origin: http://lists.gnu.org/archive/html/bug-gnu-utils/2005-08/msg00047.html
-Description: Fixes a bug which causes gawk to segfault when operating on a non-existent file.
-
-diff -Naur gawk-3.1.5.orig/io.c gawk-3.1.5/io.c
---- gawk-3.1.5.orig/io.c	2005-07-26 18:07:43.000000000 +0000
-+++ gawk-3.1.5/io.c	2005-09-24 14:43:13.771380264 +0000
-@@ -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");