Fixing problems with the recent security patch: When bison was not

installed, the patched gram.y file would not be used and the security
patch would be a no-op. Also, I've had reports of compilation errors
related to bison.

Since checking for the correct version of bison is hard and error
prone, I'm doing what the postgresql distribution does - patching the
yacc:ed .c file to get rid of the building dependency.

Bumping portrevision of -server.

Pointy hat to:	me
Noticed by:	Mike Harding and others
Security:	http://www.vuxml.org/freebsd/6b4b0b3f-8127-11d9-a9e7-0001020eed82.html
Approved by:	seanc (implicit)

20 files changed, 906 insertions, 10 deletions

diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index 5de1e985822f..510b8ad823d6 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -8,7 +8,7 @@
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
 PORTVERSION?=	7.3.9
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql73-server/files/patch-src-pl-plpgsql-src-pl-gram-c b/databases/postgresql73-server/files/patch-src-pl-plpgsql-src-pl-gram-c
new file mode 100644
index 000000000000..b45f80e433f3
--- /dev/null
+++ b/databases/postgresql73-server/files/patch-src-pl-plpgsql-src-pl-gram-c
@@ -0,0 +1,80 @@
+--- /opt/portbuild/tmp/opt/ports/databases/postgresql73-server/work/postgresql-7.3.9/src/pl/plpgsql/src/pl.tab.h	Sun Feb 20 03:13:44 2005
++++ src/pl/plpgsql/src/pl.tab.h	Sun Feb 20 05:40:07 2005
+@@ -203,7 +203,7 @@
+ 		PLpgSQL_stmt_block		*program;
+ 		PLpgSQL_nsitem			*nsitem;
+ } PLPGSQL_YYSTYPE;
+-/* Line 1248 of yacc.c.  */
++/* Line 1238 of yacc.c.  */
+ #line 207 "y.tab.h"
+ # define plpgsql_yystype PLPGSQL_YYSTYPE /* obsolescent; will be withdrawn */
+ # define PLPGSQL_YYSTYPE_IS_DECLARED 1
+--- /opt/portbuild/tmp/opt/ports/databases/postgresql73-server/work/postgresql-7.3.9/src/pl/plpgsql/src/pl_gram.c	Mon Jan 31 18:17:16 2005
++++ src/pl/plpgsql/src/pl_gram.c	Sun Feb 20 05:40:07 2005
+@@ -191,7 +191,7 @@
+  *						  procedural language
+  *
+  * IDENTIFICATION
+- *	  $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.39.2.1 2005/01/27 01:44:42 neilc Exp $
++ *	  $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.39.2.2 2005/02/08 18:22:45 tgl Exp $
+  *
+  *	  This software is copyrighted by Jan Wieck - Hamburg.
+  *
+@@ -3247,6 +3233,14 @@
+ 		}
+ 		if (plpgsql_SpaceScanned)
+ 			plpgsql_dstring_append(&ds, " ");
++
++		/* Check for array overflow */
++		if (nparams >= 1024)
++		{
++			plpgsql_error_lineno = lno;
++			elog(ERROR, "too many variables specified in SQL statement");
++		}
++
+ 		switch (tok)
+ 		{
+ 			case T_VARIABLE:
+@@ -3396,6 +3390,13 @@
+ 
+ 					while ((tok = plpgsql_yylex()) == ',')
+ 					{
++						/* Check for array overflow */
++						if (nfields >= 1024)
++						{
++							plpgsql_error_lineno = plpgsql_yylineno;
++							elog(ERROR, "too many INTO variables specified");
++						}
++
+ 						tok = plpgsql_yylex();
+ 						switch(tok)
+ 						{
+@@ -3444,6 +3445,14 @@
+ 
+ 		if (plpgsql_SpaceScanned)
+ 			plpgsql_dstring_append(&ds, " ");
++
++		/* Check for array overflow */
++		if (nparams >= 1024)
++		{
++			plpgsql_error_lineno = plpgsql_yylineno;
++			elog(ERROR, "too many variables specified in SQL statement");
++		}
++
+ 		switch (tok)
+ 		{
+ 			case T_VARIABLE:
+@@ -3527,6 +3536,13 @@
+ 
+ 				while ((tok = plpgsql_yylex()) == ',')
+ 				{
++					/* Check for array overflow */
++					if (nfields >= 1024)
++					{
++						plpgsql_error_lineno = plpgsql_yylineno;
++						elog(ERROR, "too many INTO variables specified");
++					}
++
+ 					tok = plpgsql_yylex();
+ 					switch(tok)
+ 					{
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index bd24cd934c1f..39d4f44bebc4 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -8,7 +8,7 @@
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
 PORTVERSION?=	7.4.7
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql74-server/files/patch-src-pl-plpgsql-src-pl-gram-c b/databases/postgresql74-server/files/patch-src-pl-plpgsql-src-pl-gram-c
new file mode 100644
index 000000000000..6e2062f5af36
--- /dev/null
+++ b/databases/postgresql74-server/files/patch-src-pl-plpgsql-src-pl-gram-c
@@ -0,0 +1,88 @@
+--- /opt/portbuild/tmp/opt/ports/databases/postgresql74-server/work/postgresql-7.4.7/src/pl/plpgsql/src/pl_gram.c	Mon Jan 31 11:20:24 2005
++++ src/pl/plpgsql/src/pl_gram.c	Sun Feb 20 02:42:46 2005
+@@ -191,7 +191,7 @@
+  *						  procedural language
+  *
+  * IDENTIFICATION
+- *	  $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.48.2.1 2005/01/21 00:31:21 neilc Exp $
++ *	  $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.48.2.3 2005/02/08 18:22:11 tgl Exp $
+  *
+  *	  This software is copyrighted by Jan Wieck - Hamburg.
+  *
+@@ -3337,6 +3323,16 @@
+ 		}
+ 		if (plpgsql_SpaceScanned)
+ 			plpgsql_dstring_append(&ds, " ");
++
++		/* Check for array overflow */
++		if (nparams >= 1024)
++		{
++			plpgsql_error_lineno = lno;
++			ereport(ERROR,
++					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++					 errmsg("too many variables specified in SQL statement")));
++		}
++
+ 		switch (tok)
+ 		{
+ 			case T_VARIABLE:
+@@ -3494,6 +3490,15 @@
+ 
+ 					while ((tok = plpgsql_yylex()) == ',')
+ 					{
++						/* Check for array overflow */
++						if (nfields >= 1024)
++						{
++							plpgsql_error_lineno = plpgsql_scanner_lineno();
++							ereport(ERROR,
++									(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++									 errmsg("too many INTO variables specified")));
++						}
++
+ 						tok = plpgsql_yylex();
+ 						switch(tok)
+ 						{
+@@ -3544,6 +3549,16 @@
+ 
+ 		if (plpgsql_SpaceScanned)
+ 			plpgsql_dstring_append(&ds, " ");
++
++		/* Check for array overflow */
++		if (nparams >= 1024)
++		{
++			plpgsql_error_lineno = plpgsql_scanner_lineno();
++			ereport(ERROR,
++					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++					 errmsg("too many variables specified in SQL statement")));
++		}
++
+ 		switch (tok)
+ 		{
+ 			case T_VARIABLE:
+@@ -3627,6 +3642,15 @@
+ 
+ 				while ((tok = plpgsql_yylex()) == ',')
+ 				{
++					/* Check for array overflow */
++					if (nfields >= 1024)
++					{
++						plpgsql_error_lineno = plpgsql_scanner_lineno();
++						ereport(ERROR,
++								(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++								 errmsg("too many INTO variables specified")));
++					}
++
+ 					tok = plpgsql_yylex();
+ 					switch(tok)
+ 					{
+--- /opt/portbuild/tmp/opt/ports/databases/postgresql74-server/work/postgresql-7.4.7/src/pl/plpgsql/src/pl.tab.h	Mon Jan 31 11:20:24 2005
++++ src/pl/plpgsql/src/pl.tab.h	Sun Feb 20 06:20:02 2005
+@@ -203,7 +203,7 @@
+ 		PLpgSQL_stmt_block		*program;
+ 		PLpgSQL_nsitem			*nsitem;
+ } PLPGSQL_YYSTYPE;
+-/* Line 1248 of yacc.c.  */
++/* Line 1238 of yacc.c.  */
+ #line 207 "y.tab.h"
+ # define plpgsql_yystype PLPGSQL_YYSTYPE /* obsolescent; will be withdrawn */
+ # define PLPGSQL_YYSTYPE_IS_DECLARED 1
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index 4505f524c045..b5865e71c52f 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -8,7 +8,7 @@
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
 PORTVERSION?=	8.0.1
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql80-server/files/patch-src-pl-plpgsql-src-pl-gram-c b/databases/postgresql80-server/files/patch-src-pl-plpgsql-src-pl-gram-c
new file mode 100644
index 000000000000..e4cb940fda72
--- /dev/null
+++ b/databases/postgresql80-server/files/patch-src-pl-plpgsql-src-pl-gram-c
@@ -0,0 +1,91 @@
+--- /opt/portbuild/tmp/opt/ports/databases/postgresql80-server/work/postgresql-8.0.1/src/pl/plpgsql/src/pl_gram.c	Mon Jan 31 02:41:48 2005
++++ src/pl/plpgsql/src/pl_gram.c	Sun Feb 20 02:19:34 2005
+@@ -191,7 +191,7 @@
+  *						  procedural language
+  *
+  * IDENTIFICATION
+- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.64.4.1 2005/01/21 00:17:02 neilc Exp $
++ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.64.4.2 2005/02/07 03:52:22 neilc Exp $
+  *
+  *	  This software is copyrighted by Jan Wieck - Hamburg.
+  *
+@@ -3426,8 +3412,19 @@
+ 						 errmsg("missing \"%s\" at end of SQL statement",
+ 								expected)));
+ 		}
++
+ 		if (plpgsql_SpaceScanned)
+ 			plpgsql_dstring_append(&ds, " ");
++
++		/* Check for array overflow */
++		if (nparams >= 1024)
++		{
++			plpgsql_error_lineno = lno;
++			ereport(ERROR,
++					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++					 errmsg("too many variables specified in SQL statement")));
++		}
++
+ 		switch (tok)
+ 		{
+ 			case T_SCALAR:
+@@ -3600,6 +3597,15 @@
+ 
+ 					while ((tok = plpgsql_yylex()) == ',')
+ 					{
++						/* Check for array overflow */
++						if (nfields >= 1024)
++						{
++							plpgsql_error_lineno = plpgsql_scanner_lineno();
++							ereport(ERROR,
++									(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++									 errmsg("too many INTO variables specified")));
++						}
++
+ 						tok = plpgsql_yylex();
+ 						switch(tok)
+ 						{
+@@ -3650,6 +3656,16 @@
+ 
+ 		if (plpgsql_SpaceScanned)
+ 			plpgsql_dstring_append(&ds, " ");
++
++		/* Check for array overflow */
++		if (nparams >= 1024)
++		{
++			plpgsql_error_lineno = plpgsql_scanner_lineno();
++			ereport(ERROR,
++					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++					 errmsg("too many variables specified in SQL statement")));
++		}
++
+ 		switch (tok)
+ 		{
+ 			case T_SCALAR:
+@@ -3745,6 +3761,15 @@
+ 
+ 				while ((tok = plpgsql_yylex()) == ',')
+ 				{
++					/* Check for array overflow */
++					if (nfields >= 1024)
++					{
++						plpgsql_error_lineno = plpgsql_scanner_lineno();
++						ereport(ERROR,
++								(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++								 errmsg("too many INTO variables specified")));
++					}
++
+ 					tok = plpgsql_yylex();
+ 					switch(tok)
+ 					{
+--- src/pl/plpgsql/src/pl.tab.h.orig	Sun Feb 20 06:27:24 2005
++++ src/pl/plpgsql/src/pl.tab.h	Sun Feb 20 06:27:34 2005
+@@ -209,7 +209,7 @@
+ 		PLpgSQL_exceptions		*exceptions;
+ 		PLpgSQL_nsitem			*nsitem;
+ } PLPGSQL_YYSTYPE;
+-/* Line 1248 of yacc.c.  */
++/* Line 1238 of yacc.c.  */
+ #line 213 "y.tab.h"
+ # define plpgsql_yystype PLPGSQL_YYSTYPE /* obsolescent; will be withdrawn */
+ # define PLPGSQL_YYSTYPE_IS_DECLARED 1
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index 4505f524c045..b5865e71c52f 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -8,7 +8,7 @@
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
 PORTVERSION?=	8.0.1
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql81-server/files/patch-src-pl-plpgsql-src-pl-gram-c b/databases/postgresql81-server/files/patch-src-pl-plpgsql-src-pl-gram-c
new file mode 100644
index 000000000000..e4cb940fda72
--- /dev/null
+++ b/databases/postgresql81-server/files/patch-src-pl-plpgsql-src-pl-gram-c
@@ -0,0 +1,91 @@
+--- /opt/portbuild/tmp/opt/ports/databases/postgresql80-server/work/postgresql-8.0.1/src/pl/plpgsql/src/pl_gram.c	Mon Jan 31 02:41:48 2005
++++ src/pl/plpgsql/src/pl_gram.c	Sun Feb 20 02:19:34 2005
+@@ -191,7 +191,7 @@
+  *						  procedural language
+  *
+  * IDENTIFICATION
+- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.64.4.1 2005/01/21 00:17:02 neilc Exp $
++ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.64.4.2 2005/02/07 03:52:22 neilc Exp $
+  *
+  *	  This software is copyrighted by Jan Wieck - Hamburg.
+  *
+@@ -3426,8 +3412,19 @@
+ 						 errmsg("missing \"%s\" at end of SQL statement",
+ 								expected)));
+ 		}
++
+ 		if (plpgsql_SpaceScanned)
+ 			plpgsql_dstring_append(&ds, " ");
++
++		/* Check for array overflow */
++		if (nparams >= 1024)
++		{
++			plpgsql_error_lineno = lno;
++			ereport(ERROR,
++					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++					 errmsg("too many variables specified in SQL statement")));
++		}
++
+ 		switch (tok)
+ 		{
+ 			case T_SCALAR:
+@@ -3600,6 +3597,15 @@
+ 
+ 					while ((tok = plpgsql_yylex()) == ',')
+ 					{
++						/* Check for array overflow */
++						if (nfields >= 1024)
++						{
++							plpgsql_error_lineno = plpgsql_scanner_lineno();
++							ereport(ERROR,
++									(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++									 errmsg("too many INTO variables specified")));
++						}
++
+ 						tok = plpgsql_yylex();
+ 						switch(tok)
+ 						{
+@@ -3650,6 +3656,16 @@
+ 
+ 		if (plpgsql_SpaceScanned)
+ 			plpgsql_dstring_append(&ds, " ");
++
++		/* Check for array overflow */
++		if (nparams >= 1024)
++		{
++			plpgsql_error_lineno = plpgsql_scanner_lineno();
++			ereport(ERROR,
++					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++					 errmsg("too many variables specified in SQL statement")));
++		}
++
+ 		switch (tok)
+ 		{
+ 			case T_SCALAR:
+@@ -3745,6 +3761,15 @@
+ 
+ 				while ((tok = plpgsql_yylex()) == ',')
+ 				{
++					/* Check for array overflow */
++					if (nfields >= 1024)
++					{
++						plpgsql_error_lineno = plpgsql_scanner_lineno();
++						ereport(ERROR,
++								(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++								 errmsg("too many INTO variables specified")));
++					}
++
+ 					tok = plpgsql_yylex();
+ 					switch(tok)
+ 					{
+--- src/pl/plpgsql/src/pl.tab.h.orig	Sun Feb 20 06:27:24 2005
++++ src/pl/plpgsql/src/pl.tab.h	Sun Feb 20 06:27:34 2005
+@@ -209,7 +209,7 @@
+ 		PLpgSQL_exceptions		*exceptions;
+ 		PLpgSQL_nsitem			*nsitem;
+ } PLPGSQL_YYSTYPE;
+-/* Line 1248 of yacc.c.  */
++/* Line 1238 of yacc.c.  */
+ #line 213 "y.tab.h"
+ # define plpgsql_yystype PLPGSQL_YYSTYPE /* obsolescent; will be withdrawn */
+ # define PLPGSQL_YYSTYPE_IS_DECLARED 1
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index 4505f524c045..b5865e71c52f 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -8,7 +8,7 @@
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
 PORTVERSION?=	8.0.1
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql82-server/files/patch-src-pl-plpgsql-src-pl-gram-c b/databases/postgresql82-server/files/patch-src-pl-plpgsql-src-pl-gram-c
new file mode 100644
index 000000000000..e4cb940fda72
--- /dev/null
+++ b/databases/postgresql82-server/files/patch-src-pl-plpgsql-src-pl-gram-c
@@ -0,0 +1,91 @@
+--- /opt/portbuild/tmp/opt/ports/databases/postgresql80-server/work/postgresql-8.0.1/src/pl/plpgsql/src/pl_gram.c	Mon Jan 31 02:41:48 2005
++++ src/pl/plpgsql/src/pl_gram.c	Sun Feb 20 02:19:34 2005
+@@ -191,7 +191,7 @@
+  *						  procedural language
+  *
+  * IDENTIFICATION
+- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.64.4.1 2005/01/21 00:17:02 neilc Exp $
++ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.64.4.2 2005/02/07 03:52:22 neilc Exp $
+  *
+  *	  This software is copyrighted by Jan Wieck - Hamburg.
+  *
+@@ -3426,8 +3412,19 @@
+ 						 errmsg("missing \"%s\" at end of SQL statement",
+ 								expected)));
+ 		}
++
+ 		if (plpgsql_SpaceScanned)
+ 			plpgsql_dstring_append(&ds, " ");
++
++		/* Check for array overflow */
++		if (nparams >= 1024)
++		{
++			plpgsql_error_lineno = lno;
++			ereport(ERROR,
++					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++					 errmsg("too many variables specified in SQL statement")));
++		}
++
+ 		switch (tok)
+ 		{
+ 			case T_SCALAR:
+@@ -3600,6 +3597,15 @@
+ 
+ 					while ((tok = plpgsql_yylex()) == ',')
+ 					{
++						/* Check for array overflow */
++						if (nfields >= 1024)
++						{
++							plpgsql_error_lineno = plpgsql_scanner_lineno();
++							ereport(ERROR,
++									(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++									 errmsg("too many INTO variables specified")));
++						}
++
+ 						tok = plpgsql_yylex();
+ 						switch(tok)
+ 						{
+@@ -3650,6 +3656,16 @@
+ 
+ 		if (plpgsql_SpaceScanned)
+ 			plpgsql_dstring_append(&ds, " ");
++
++		/* Check for array overflow */
++		if (nparams >= 1024)
++		{
++			plpgsql_error_lineno = plpgsql_scanner_lineno();
++			ereport(ERROR,
++					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++					 errmsg("too many variables specified in SQL statement")));
++		}
++
+ 		switch (tok)
+ 		{
+ 			case T_SCALAR:
+@@ -3745,6 +3761,15 @@
+ 
+ 				while ((tok = plpgsql_yylex()) == ',')
+ 				{
++					/* Check for array overflow */
++					if (nfields >= 1024)
++					{
++						plpgsql_error_lineno = plpgsql_scanner_lineno();
++						ereport(ERROR,
++								(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++								 errmsg("too many INTO variables specified")));
++					}
++
+ 					tok = plpgsql_yylex();
+ 					switch(tok)
+ 					{
+--- src/pl/plpgsql/src/pl.tab.h.orig	Sun Feb 20 06:27:24 2005
++++ src/pl/plpgsql/src/pl.tab.h	Sun Feb 20 06:27:34 2005
+@@ -209,7 +209,7 @@
+ 		PLpgSQL_exceptions		*exceptions;
+ 		PLpgSQL_nsitem			*nsitem;
+ } PLPGSQL_YYSTYPE;
+-/* Line 1248 of yacc.c.  */
++/* Line 1238 of yacc.c.  */
+ #line 213 "y.tab.h"
+ # define plpgsql_yystype PLPGSQL_YYSTYPE /* obsolescent; will be withdrawn */
+ # define PLPGSQL_YYSTYPE_IS_DECLARED 1
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index 4505f524c045..b5865e71c52f 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -8,7 +8,7 @@
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
 PORTVERSION?=	8.0.1
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql83-server/files/patch-src-pl-plpgsql-src-pl-gram-c b/databases/postgresql83-server/files/patch-src-pl-plpgsql-src-pl-gram-c
new file mode 100644
index 000000000000..e4cb940fda72
--- /dev/null
+++ b/databases/postgresql83-server/files/patch-src-pl-plpgsql-src-pl-gram-c
@@ -0,0 +1,91 @@
+--- /opt/portbuild/tmp/opt/ports/databases/postgresql80-server/work/postgresql-8.0.1/src/pl/plpgsql/src/pl_gram.c	Mon Jan 31 02:41:48 2005
++++ src/pl/plpgsql/src/pl_gram.c	Sun Feb 20 02:19:34 2005
+@@ -191,7 +191,7 @@
+  *						  procedural language
+  *
+  * IDENTIFICATION
+- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.64.4.1 2005/01/21 00:17:02 neilc Exp $
++ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.64.4.2 2005/02/07 03:52:22 neilc Exp $
+  *
+  *	  This software is copyrighted by Jan Wieck - Hamburg.
+  *
+@@ -3426,8 +3412,19 @@
+ 						 errmsg("missing \"%s\" at end of SQL statement",
+ 								expected)));
+ 		}
++
+ 		if (plpgsql_SpaceScanned)
+ 			plpgsql_dstring_append(&ds, " ");
++
++		/* Check for array overflow */
++		if (nparams >= 1024)
++		{
++			plpgsql_error_lineno = lno;
++			ereport(ERROR,
++					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++					 errmsg("too many variables specified in SQL statement")));
++		}
++
+ 		switch (tok)
+ 		{
+ 			case T_SCALAR:
+@@ -3600,6 +3597,15 @@
+ 
+ 					while ((tok = plpgsql_yylex()) == ',')
+ 					{
++						/* Check for array overflow */
++						if (nfields >= 1024)
++						{
++							plpgsql_error_lineno = plpgsql_scanner_lineno();
++							ereport(ERROR,
++									(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++									 errmsg("too many INTO variables specified")));
++						}
++
+ 						tok = plpgsql_yylex();
+ 						switch(tok)
+ 						{
+@@ -3650,6 +3656,16 @@
+ 
+ 		if (plpgsql_SpaceScanned)
+ 			plpgsql_dstring_append(&ds, " ");
++
++		/* Check for array overflow */
++		if (nparams >= 1024)
++		{
++			plpgsql_error_lineno = plpgsql_scanner_lineno();
++			ereport(ERROR,
++					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++					 errmsg("too many variables specified in SQL statement")));
++		}
++
+ 		switch (tok)
+ 		{
+ 			case T_SCALAR:
+@@ -3745,6 +3761,15 @@
+ 
+ 				while ((tok = plpgsql_yylex()) == ',')
+ 				{
++					/* Check for array overflow */
++					if (nfields >= 1024)
++					{
++						plpgsql_error_lineno = plpgsql_scanner_lineno();
++						ereport(ERROR,
++								(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++								 errmsg("too many INTO variables specified")));
++					}
++
+ 					tok = plpgsql_yylex();
+ 					switch(tok)
+ 					{
+--- src/pl/plpgsql/src/pl.tab.h.orig	Sun Feb 20 06:27:24 2005
++++ src/pl/plpgsql/src/pl.tab.h	Sun Feb 20 06:27:34 2005
+@@ -209,7 +209,7 @@
+ 		PLpgSQL_exceptions		*exceptions;
+ 		PLpgSQL_nsitem			*nsitem;
+ } PLPGSQL_YYSTYPE;
+-/* Line 1248 of yacc.c.  */
++/* Line 1238 of yacc.c.  */
+ #line 213 "y.tab.h"
+ # define plpgsql_yystype PLPGSQL_YYSTYPE /* obsolescent; will be withdrawn */
+ # define PLPGSQL_YYSTYPE_IS_DECLARED 1
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 4505f524c045..b5865e71c52f 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -8,7 +8,7 @@
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
 PORTVERSION?=	8.0.1
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql84-server/files/patch-src-pl-plpgsql-src-pl-gram-c b/databases/postgresql84-server/files/patch-src-pl-plpgsql-src-pl-gram-c
new file mode 100644
index 000000000000..e4cb940fda72
--- /dev/null
+++ b/databases/postgresql84-server/files/patch-src-pl-plpgsql-src-pl-gram-c
@@ -0,0 +1,91 @@
+--- /opt/portbuild/tmp/opt/ports/databases/postgresql80-server/work/postgresql-8.0.1/src/pl/plpgsql/src/pl_gram.c	Mon Jan 31 02:41:48 2005
++++ src/pl/plpgsql/src/pl_gram.c	Sun Feb 20 02:19:34 2005
+@@ -191,7 +191,7 @@
+  *						  procedural language
+  *
+  * IDENTIFICATION
+- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.64.4.1 2005/01/21 00:17:02 neilc Exp $
++ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.64.4.2 2005/02/07 03:52:22 neilc Exp $
+  *
+  *	  This software is copyrighted by Jan Wieck - Hamburg.
+  *
+@@ -3426,8 +3412,19 @@
+ 						 errmsg("missing \"%s\" at end of SQL statement",
+ 								expected)));
+ 		}
++
+ 		if (plpgsql_SpaceScanned)
+ 			plpgsql_dstring_append(&ds, " ");
++
++		/* Check for array overflow */
++		if (nparams >= 1024)
++		{
++			plpgsql_error_lineno = lno;
++			ereport(ERROR,
++					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++					 errmsg("too many variables specified in SQL statement")));
++		}
++
+ 		switch (tok)
+ 		{
+ 			case T_SCALAR:
+@@ -3600,6 +3597,15 @@
+ 
+ 					while ((tok = plpgsql_yylex()) == ',')
+ 					{
++						/* Check for array overflow */
++						if (nfields >= 1024)
++						{
++							plpgsql_error_lineno = plpgsql_scanner_lineno();
++							ereport(ERROR,
++									(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++									 errmsg("too many INTO variables specified")));
++						}
++
+ 						tok = plpgsql_yylex();
+ 						switch(tok)
+ 						{
+@@ -3650,6 +3656,16 @@
+ 
+ 		if (plpgsql_SpaceScanned)
+ 			plpgsql_dstring_append(&ds, " ");
++
++		/* Check for array overflow */
++		if (nparams >= 1024)
++		{
++			plpgsql_error_lineno = plpgsql_scanner_lineno();
++			ereport(ERROR,
++					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++					 errmsg("too many variables specified in SQL statement")));
++		}
++
+ 		switch (tok)
+ 		{
+ 			case T_SCALAR:
+@@ -3745,6 +3761,15 @@
+ 
+ 				while ((tok = plpgsql_yylex()) == ',')
+ 				{
++					/* Check for array overflow */
++					if (nfields >= 1024)
++					{
++						plpgsql_error_lineno = plpgsql_scanner_lineno();
++						ereport(ERROR,
++								(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++								 errmsg("too many INTO variables specified")));
++					}
++
+ 					tok = plpgsql_yylex();
+ 					switch(tok)
+ 					{
+--- src/pl/plpgsql/src/pl.tab.h.orig	Sun Feb 20 06:27:24 2005
++++ src/pl/plpgsql/src/pl.tab.h	Sun Feb 20 06:27:34 2005
+@@ -209,7 +209,7 @@
+ 		PLpgSQL_exceptions		*exceptions;
+ 		PLpgSQL_nsitem			*nsitem;
+ } PLPGSQL_YYSTYPE;
+-/* Line 1248 of yacc.c.  */
++/* Line 1238 of yacc.c.  */
+ #line 213 "y.tab.h"
+ # define plpgsql_yystype PLPGSQL_YYSTYPE /* obsolescent; will be withdrawn */
+ # define PLPGSQL_YYSTYPE_IS_DECLARED 1
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index 4505f524c045..b5865e71c52f 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -8,7 +8,7 @@
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
 PORTVERSION?=	8.0.1
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql90-server/files/patch-src-pl-plpgsql-src-pl-gram-c b/databases/postgresql90-server/files/patch-src-pl-plpgsql-src-pl-gram-c
new file mode 100644
index 000000000000..e4cb940fda72
--- /dev/null
+++ b/databases/postgresql90-server/files/patch-src-pl-plpgsql-src-pl-gram-c
@@ -0,0 +1,91 @@
+--- /opt/portbuild/tmp/opt/ports/databases/postgresql80-server/work/postgresql-8.0.1/src/pl/plpgsql/src/pl_gram.c	Mon Jan 31 02:41:48 2005
++++ src/pl/plpgsql/src/pl_gram.c	Sun Feb 20 02:19:34 2005
+@@ -191,7 +191,7 @@
+  *						  procedural language
+  *
+  * IDENTIFICATION
+- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.64.4.1 2005/01/21 00:17:02 neilc Exp $
++ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.64.4.2 2005/02/07 03:52:22 neilc Exp $
+  *
+  *	  This software is copyrighted by Jan Wieck - Hamburg.
+  *
+@@ -3426,8 +3412,19 @@
+ 						 errmsg("missing \"%s\" at end of SQL statement",
+ 								expected)));
+ 		}
++
+ 		if (plpgsql_SpaceScanned)
+ 			plpgsql_dstring_append(&ds, " ");
++
++		/* Check for array overflow */
++		if (nparams >= 1024)
++		{
++			plpgsql_error_lineno = lno;
++			ereport(ERROR,
++					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++					 errmsg("too many variables specified in SQL statement")));
++		}
++
+ 		switch (tok)
+ 		{
+ 			case T_SCALAR:
+@@ -3600,6 +3597,15 @@
+ 
+ 					while ((tok = plpgsql_yylex()) == ',')
+ 					{
++						/* Check for array overflow */
++						if (nfields >= 1024)
++						{
++							plpgsql_error_lineno = plpgsql_scanner_lineno();
++							ereport(ERROR,
++									(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++									 errmsg("too many INTO variables specified")));
++						}
++
+ 						tok = plpgsql_yylex();
+ 						switch(tok)
+ 						{
+@@ -3650,6 +3656,16 @@
+ 
+ 		if (plpgsql_SpaceScanned)
+ 			plpgsql_dstring_append(&ds, " ");
++
++		/* Check for array overflow */
++		if (nparams >= 1024)
++		{
++			plpgsql_error_lineno = plpgsql_scanner_lineno();
++			ereport(ERROR,
++					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++					 errmsg("too many variables specified in SQL statement")));
++		}
++
+ 		switch (tok)
+ 		{
+ 			case T_SCALAR:
+@@ -3745,6 +3761,15 @@
+ 
+ 				while ((tok = plpgsql_yylex()) == ',')
+ 				{
++					/* Check for array overflow */
++					if (nfields >= 1024)
++					{
++						plpgsql_error_lineno = plpgsql_scanner_lineno();
++						ereport(ERROR,
++								(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++								 errmsg("too many INTO variables specified")));
++					}
++
+ 					tok = plpgsql_yylex();
+ 					switch(tok)
+ 					{
+--- src/pl/plpgsql/src/pl.tab.h.orig	Sun Feb 20 06:27:24 2005
++++ src/pl/plpgsql/src/pl.tab.h	Sun Feb 20 06:27:34 2005
+@@ -209,7 +209,7 @@
+ 		PLpgSQL_exceptions		*exceptions;
+ 		PLpgSQL_nsitem			*nsitem;
+ } PLPGSQL_YYSTYPE;
+-/* Line 1248 of yacc.c.  */
++/* Line 1238 of yacc.c.  */
+ #line 213 "y.tab.h"
+ # define plpgsql_yystype PLPGSQL_YYSTYPE /* obsolescent; will be withdrawn */
+ # define PLPGSQL_YYSTYPE_IS_DECLARED 1
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 4505f524c045..b5865e71c52f 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -8,7 +8,7 @@
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
 PORTVERSION?=	8.0.1
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql91-server/files/patch-src-pl-plpgsql-src-pl-gram-c b/databases/postgresql91-server/files/patch-src-pl-plpgsql-src-pl-gram-c
new file mode 100644
index 000000000000..e4cb940fda72
--- /dev/null
+++ b/databases/postgresql91-server/files/patch-src-pl-plpgsql-src-pl-gram-c
@@ -0,0 +1,91 @@
+--- /opt/portbuild/tmp/opt/ports/databases/postgresql80-server/work/postgresql-8.0.1/src/pl/plpgsql/src/pl_gram.c	Mon Jan 31 02:41:48 2005
++++ src/pl/plpgsql/src/pl_gram.c	Sun Feb 20 02:19:34 2005
+@@ -191,7 +191,7 @@
+  *						  procedural language
+  *
+  * IDENTIFICATION
+- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.64.4.1 2005/01/21 00:17:02 neilc Exp $
++ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.64.4.2 2005/02/07 03:52:22 neilc Exp $
+  *
+  *	  This software is copyrighted by Jan Wieck - Hamburg.
+  *
+@@ -3426,8 +3412,19 @@
+ 						 errmsg("missing \"%s\" at end of SQL statement",
+ 								expected)));
+ 		}
++
+ 		if (plpgsql_SpaceScanned)
+ 			plpgsql_dstring_append(&ds, " ");
++
++		/* Check for array overflow */
++		if (nparams >= 1024)
++		{
++			plpgsql_error_lineno = lno;
++			ereport(ERROR,
++					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++					 errmsg("too many variables specified in SQL statement")));
++		}
++
+ 		switch (tok)
+ 		{
+ 			case T_SCALAR:
+@@ -3600,6 +3597,15 @@
+ 
+ 					while ((tok = plpgsql_yylex()) == ',')
+ 					{
++						/* Check for array overflow */
++						if (nfields >= 1024)
++						{
++							plpgsql_error_lineno = plpgsql_scanner_lineno();
++							ereport(ERROR,
++									(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++									 errmsg("too many INTO variables specified")));
++						}
++
+ 						tok = plpgsql_yylex();
+ 						switch(tok)
+ 						{
+@@ -3650,6 +3656,16 @@
+ 
+ 		if (plpgsql_SpaceScanned)
+ 			plpgsql_dstring_append(&ds, " ");
++
++		/* Check for array overflow */
++		if (nparams >= 1024)
++		{
++			plpgsql_error_lineno = plpgsql_scanner_lineno();
++			ereport(ERROR,
++					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++					 errmsg("too many variables specified in SQL statement")));
++		}
++
+ 		switch (tok)
+ 		{
+ 			case T_SCALAR:
+@@ -3745,6 +3761,15 @@
+ 
+ 				while ((tok = plpgsql_yylex()) == ',')
+ 				{
++					/* Check for array overflow */
++					if (nfields >= 1024)
++					{
++						plpgsql_error_lineno = plpgsql_scanner_lineno();
++						ereport(ERROR,
++								(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++								 errmsg("too many INTO variables specified")));
++					}
++
+ 					tok = plpgsql_yylex();
+ 					switch(tok)
+ 					{
+--- src/pl/plpgsql/src/pl.tab.h.orig	Sun Feb 20 06:27:24 2005
++++ src/pl/plpgsql/src/pl.tab.h	Sun Feb 20 06:27:34 2005
+@@ -209,7 +209,7 @@
+ 		PLpgSQL_exceptions		*exceptions;
+ 		PLpgSQL_nsitem			*nsitem;
+ } PLPGSQL_YYSTYPE;
+-/* Line 1248 of yacc.c.  */
++/* Line 1238 of yacc.c.  */
+ #line 213 "y.tab.h"
+ # define plpgsql_yystype PLPGSQL_YYSTYPE /* obsolescent; will be withdrawn */
+ # define PLPGSQL_YYSTYPE_IS_DECLARED 1
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 4505f524c045..b5865e71c52f 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -8,7 +8,7 @@
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
 PORTVERSION?=	8.0.1
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql92-server/files/patch-src-pl-plpgsql-src-pl-gram-c b/databases/postgresql92-server/files/patch-src-pl-plpgsql-src-pl-gram-c
new file mode 100644
index 000000000000..e4cb940fda72
--- /dev/null
+++ b/databases/postgresql92-server/files/patch-src-pl-plpgsql-src-pl-gram-c
@@ -0,0 +1,91 @@
+--- /opt/portbuild/tmp/opt/ports/databases/postgresql80-server/work/postgresql-8.0.1/src/pl/plpgsql/src/pl_gram.c	Mon Jan 31 02:41:48 2005
++++ src/pl/plpgsql/src/pl_gram.c	Sun Feb 20 02:19:34 2005
+@@ -191,7 +191,7 @@
+  *						  procedural language
+  *
+  * IDENTIFICATION
+- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.64.4.1 2005/01/21 00:17:02 neilc Exp $
++ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.64.4.2 2005/02/07 03:52:22 neilc Exp $
+  *
+  *	  This software is copyrighted by Jan Wieck - Hamburg.
+  *
+@@ -3426,8 +3412,19 @@
+ 						 errmsg("missing \"%s\" at end of SQL statement",
+ 								expected)));
+ 		}
++
+ 		if (plpgsql_SpaceScanned)
+ 			plpgsql_dstring_append(&ds, " ");
++
++		/* Check for array overflow */
++		if (nparams >= 1024)
++		{
++			plpgsql_error_lineno = lno;
++			ereport(ERROR,
++					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++					 errmsg("too many variables specified in SQL statement")));
++		}
++
+ 		switch (tok)
+ 		{
+ 			case T_SCALAR:
+@@ -3600,6 +3597,15 @@
+ 
+ 					while ((tok = plpgsql_yylex()) == ',')
+ 					{
++						/* Check for array overflow */
++						if (nfields >= 1024)
++						{
++							plpgsql_error_lineno = plpgsql_scanner_lineno();
++							ereport(ERROR,
++									(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++									 errmsg("too many INTO variables specified")));
++						}
++
+ 						tok = plpgsql_yylex();
+ 						switch(tok)
+ 						{
+@@ -3650,6 +3656,16 @@
+ 
+ 		if (plpgsql_SpaceScanned)
+ 			plpgsql_dstring_append(&ds, " ");
++
++		/* Check for array overflow */
++		if (nparams >= 1024)
++		{
++			plpgsql_error_lineno = plpgsql_scanner_lineno();
++			ereport(ERROR,
++					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++					 errmsg("too many variables specified in SQL statement")));
++		}
++
+ 		switch (tok)
+ 		{
+ 			case T_SCALAR:
+@@ -3745,6 +3761,15 @@
+ 
+ 				while ((tok = plpgsql_yylex()) == ',')
+ 				{
++					/* Check for array overflow */
++					if (nfields >= 1024)
++					{
++						plpgsql_error_lineno = plpgsql_scanner_lineno();
++						ereport(ERROR,
++								(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
++								 errmsg("too many INTO variables specified")));
++					}
++
+ 					tok = plpgsql_yylex();
+ 					switch(tok)
+ 					{
+--- src/pl/plpgsql/src/pl.tab.h.orig	Sun Feb 20 06:27:24 2005
++++ src/pl/plpgsql/src/pl.tab.h	Sun Feb 20 06:27:34 2005
+@@ -209,7 +209,7 @@
+ 		PLpgSQL_exceptions		*exceptions;
+ 		PLpgSQL_nsitem			*nsitem;
+ } PLPGSQL_YYSTYPE;
+-/* Line 1248 of yacc.c.  */
++/* Line 1238 of yacc.c.  */
+ #line 213 "y.tab.h"
+ # define plpgsql_yystype PLPGSQL_YYSTYPE /* obsolescent; will be withdrawn */
+ # define PLPGSQL_YYSTYPE_IS_DECLARED 1