remove awk script modifications someone added for compatibility -- they

are wrong and caused out-of-bounds memory accesses
bump PKGREVISION

7 files changed, 3 insertions, 174 deletions

diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile
index 900702eed9f..3f9f7f0efe4 100644
--- a/security/libgpg-error/Makefile
+++ b/security/libgpg-error/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2010/06/08 10:15:32 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2010/08/05 13:28:24 drochner Exp $
 
 DISTNAME=	libgpg-error-1.8
+PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/libgpg-error/ \
 		ftp://ftp.ring.gr.jp/pub/net/gnupg/libgpg-error/ \
diff --git a/security/libgpg-error/distinfo b/security/libgpg-error/distinfo
index fa1920be638..fa73b73c533 100644
--- a/security/libgpg-error/distinfo
+++ b/security/libgpg-error/distinfo
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.10 2010/06/08 10:15:32 wiz Exp $
+$NetBSD: distinfo,v 1.11 2010/08/05 13:28:24 drochner Exp $
 
 SHA1 (libgpg-error-1.8.tar.bz2) = f5cf677a7cd684645feaa9704d09eb5cd6d97e8a
 RMD160 (libgpg-error-1.8.tar.bz2) = 65d2c96bced82af76d9a68c416bfb9ea183ab087
 Size (libgpg-error-1.8.tar.bz2) = 435341 bytes
 SHA1 (patch-aa) = c8641b95f0e2f8637f4e32383c5e5a778fddf5b9
-SHA1 (patch-ae) = 16a63ce241b4f48922dd6711f442ed03c0e85d8a
-SHA1 (patch-af) = 30b605f53ef09cd71322e3f928c0ac2d05b4f4ed
-SHA1 (patch-ag) = 2332740f4f89d8d4775d88d86c3cb3ffea4df24b
-SHA1 (patch-ah) = 4dedd24724d7f2e4d65844456dba3f1c802604a8
-SHA1 (patch-ai) = da067509fb9ce547bad18caf0662770800d8b928
diff --git a/security/libgpg-error/patches/patch-ae b/security/libgpg-error/patches/patch-ae
deleted file mode 100644
index c5cc442c065..00000000000
--- a/security/libgpg-error/patches/patch-ae
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2010/06/08 10:15:32 wiz Exp $
-
-Setting FS in some versions of awk makes it null.  The default FS of
-"whitespace" works fine, so no need to redefine it.
-
---- src/mkerrcodes1.awk.orig	2009-07-23 13:52:35.000000000 +0000
-+++ src/mkerrcodes1.awk
-@@ -55,7 +55,7 @@
- # as is trailing whitespace.
- 
- BEGIN {
--  FS="[\t]+";
-+  #FS="[\t]+";
-   header = 1;
-   if (errnoidx == 0)
-     errnoidx = 2;
-@@ -67,7 +67,7 @@ BEGIN {
- /^#/ { next; }
- 
- header {
--  if ($1 ~ /^[0-9]/)
-+  if ($0 ~ /^[0-9]/)
-     {
-       print "#include <errno.h>";
-       print "#ifdef _WIN32";
diff --git a/security/libgpg-error/patches/patch-af b/security/libgpg-error/patches/patch-af
deleted file mode 100644
index 1299a184127..00000000000
--- a/security/libgpg-error/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.3 2010/06/08 10:15:33 wiz Exp $
-
---- src/mkerrcodes.awk.orig	2008-08-26 12:45:58.000000000 +0000
-+++ src/mkerrcodes.awk
-@@ -60,7 +60,7 @@
- # as is trailing whitespace.
- 
- BEGIN {
--  FS="[ \t]+GPG_ERR_";
-+  #FS="[ \t]+GPG_ERR_";
-   print "/* Output of mkerrcodes.awk.  DO NOT EDIT.  */";
-   print "";
-   header = 1;
-@@ -91,7 +91,7 @@ header {
-   if (/^$/)
-     next;
- 
--    print "  { " $1 ", \"GPG_ERR_" $2 "\" },";
-+    print "  { " $1 ", \"" $2 "\" },";
- }
- 
- END {
diff --git a/security/libgpg-error/patches/patch-ag b/security/libgpg-error/patches/patch-ag
deleted file mode 100644
index 1de78cf7445..00000000000
--- a/security/libgpg-error/patches/patch-ag
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2010/06/08 10:15:33 wiz Exp $
-
-Setting FS in some versions of awk makes it null.  The default FS of
-"whitespace" works fine, so no need to redefine it.
-
---- src/mkerrnos.awk.orig	2009-07-23 13:52:35.000000000 +0000
-+++ src/mkerrnos.awk
-@@ -56,7 +56,7 @@
- # as is trailing whitespace.
- 
- BEGIN {
--  FS="[\t]+";
-+  #FS="[\t]+";
-   header = 1;
-   if (errnoidx == 0)
-     errnoidx = 2;
-@@ -68,7 +68,7 @@ BEGIN {
- /^#/ { next; }
- 
- header {
--  if ($1 ~ /^[0-9]/)
-+  if ($0 ~ /^[0-9]/)
-     {
-       print "#include <errno.h>";
-       print "#ifdef _WIN32";
diff --git a/security/libgpg-error/patches/patch-ah b/security/libgpg-error/patches/patch-ah
deleted file mode 100644
index 45c026ef8fc..00000000000
--- a/security/libgpg-error/patches/patch-ah
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2010/06/08 10:15:33 wiz Exp $
-
-Setting FS in some versions of awk makes it null.  The default FS of
-"whitespace" works fine, so no need to redefine it.
-
---- src/mkstrtable.awk.orig	2010-01-21 11:09:02.000000000 +0000
-+++ src/mkstrtable.awk
-@@ -81,7 +81,7 @@
- # variable and macro name.
- 
- BEGIN {
--  FS = "[\t]+";
-+  #FS = "[\t]+";
- # cpos holds the current position in the message string.
-   cpos = 0;
- # msg holds the number of messages.
-@@ -97,7 +97,7 @@ BEGIN {
- /^#/ { next; }
- 
- header {
--  if ($1 ~ /^[0123456789]+$/)
-+  if ($0 ~ /^[0-9]+/)
-     {
-       print "/* The purpose of this complex string table is to produce";
-       print "   optimal code with a minimum of relocations.  */";
diff --git a/security/libgpg-error/patches/patch-ai b/security/libgpg-error/patches/patch-ai
deleted file mode 100644
index e6f6e35d11c..00000000000
--- a/security/libgpg-error/patches/patch-ai
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2010/06/08 10:15:33 wiz Exp $
-
-Setting FS in some versions of awk makes it null.  Make this script
-work with the default FS of "whitespace" instead.
-
---- src/mkheader.awk.orig	2010-03-15 10:49:49.000000000 +0000
-+++ src/mkheader.awk
-@@ -51,7 +51,7 @@
- # at the full path of the files in @srcdir@.
- 
- BEGIN {
--  FS = "[\t]+";
-+  #FS = "[\t]+";
- # sources_nr holds the number of error sources.
-   sources_nr = 0;
- # codes_nr holds the number of error codes.
-@@ -78,7 +78,7 @@ BEGIN {
- 
- 
- sources_header {
--  if ($1 ~ /^[0123456789]+$/)
-+  if ($0 ~ /^[0-9]+/)
-     {
-       sources_header = 0;
-       sources_body = 1;
-@@ -92,7 +92,7 @@ sources_body {
-   if (/^$/)
-     next;
- 
--  if ($1 == "")
-+  if ($0 !~ /^[0-9]+/)
-     {
-       sources_body = 0;
-       between_sources_and_codes = 1;
-@@ -107,7 +107,7 @@ sources_body {
- }
- 
- between_sources_and_codes {
--  if ($1 ~ /^[0123456789]+$/)
-+  if ($0 ~ /^[0-9]+/)
-     {
-       between_sources_and_codes = 0;
-       codes_body = 1;
-@@ -121,7 +121,7 @@ codes_body {
-   if (/^$/)
-     next;
- 
--  if ($1 == "")
-+  if ($0 !~ /^[0-9]+/)
-     {
-       codes_body = 0;
-       between_codes_and_errnos = 1;
-@@ -136,7 +136,7 @@ codes_body {
- }
- 
- between_codes_and_errnos {
--  if ($1 ~ /^[0-9]/)
-+  if ($0 ~ /^[0-9]+/)
-     {
-       between_codes_and_errnos = 0;
-       errnos_body = 1;
-@@ -150,7 +150,7 @@ errnos_body {
-   if (/^$/)
-     next;
- 
--  if ($1 !~ /^[0-9]/)
-+  if ($0 !~ /^[0-9]+/)
-     {
- # Note that this assumes that extra_body.in doesn't start with a digit.
-       errnos_body = 0;