4 files changed, 10 insertions, 175 deletions

diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index 6adc994923ad..9c6013c41d99 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -7,8 +7,8 @@
 
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
-PORTVERSION?=	7.4.7
-PORTREVISION?=	3
+PORTVERSION?=	7.4.8
+PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql74-server/distinfo b/databases/postgresql74-server/distinfo
index 0a40b21f8815..4fa52a3f2c3e 100644
--- a/databases/postgresql74-server/distinfo
+++ b/databases/postgresql74-server/distinfo
@@ -1,8 +1,8 @@
-MD5 (postgresql/postgresql-base-7.4.7.tar.bz2) = 70c07688c89f5fc7dbd9b8caee123582
-SIZE (postgresql/postgresql-base-7.4.7.tar.bz2) = 6582981
-MD5 (postgresql/postgresql-docs-7.4.7.tar.bz2) = 4fed2346dd0ec798554c055afaa84a89
-SIZE (postgresql/postgresql-docs-7.4.7.tar.bz2) = 2417733
-MD5 (postgresql/postgresql-opt-7.4.7.tar.bz2) = b72409a2d57c73bf6347e0d19b2cfb6e
-SIZE (postgresql/postgresql-opt-7.4.7.tar.bz2) = 332158
-MD5 (postgresql/postgresql-test-7.4.7.tar.bz2) = f02ba2d7a954e7b083fdeba798709963
-SIZE (postgresql/postgresql-test-7.4.7.tar.bz2) = 944002
+MD5 (postgresql/postgresql-base-7.4.8.tar.bz2) = c066dd74a746e15a49e0fded93a45329
+SIZE (postgresql/postgresql-base-7.4.8.tar.bz2) = 6588745
+MD5 (postgresql/postgresql-docs-7.4.8.tar.bz2) = c395130c09c98fdf333ef3ab1621b341
+SIZE (postgresql/postgresql-docs-7.4.8.tar.bz2) = 2424249
+MD5 (postgresql/postgresql-opt-7.4.8.tar.bz2) = b178144bdb13a2dd8eb0d17a49532296
+SIZE (postgresql/postgresql-opt-7.4.8.tar.bz2) = 332225
+MD5 (postgresql/postgresql-test-7.4.8.tar.bz2) = 9efb8ea9fb8a9424b98a0b4712d307b4
+SIZE (postgresql/postgresql-test-7.4.8.tar.bz2) = 944435
diff --git a/databases/postgresql74-server/files/patch-src-pl-plpgsql-src-gram-y b/databases/postgresql74-server/files/patch-src-pl-plpgsql-src-gram-y
deleted file mode 100644
index 053c44d5baf8..000000000000
--- a/databases/postgresql74-server/files/patch-src-pl-plpgsql-src-gram-y
+++ /dev/null
@@ -1,77 +0,0 @@
---- src/pl/plpgsql/src/gram.y	2005/01/21 00:31:21	1.48.2.1 REL7_4_7
-+++ src/pl/plpgsql/src/gram.y	2005/02/08 18:22:11	1.48.2.3 REL7_4_STABLE
-@@ -4,7 +4,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.
-  *
-@@ -1699,6 +1699,16 @@ read_sql_construct(int until,
- 		}
- 		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:
-@@ -1856,6 +1866,15 @@ make_select_stmt(void)
- 
- 					while ((tok = 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 = yylex();
- 						switch(tok)
- 						{
-@@ -1906,6 +1925,16 @@ make_select_stmt(void)
- 
- 		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:
-@@ -1989,6 +2018,15 @@ make_fetch_stmt(void)
- 
- 				while ((tok = 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 = yylex();
- 					switch(tok)
- 					{
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
deleted file mode 100644
index 6e2062f5af36..000000000000
--- a/databases/postgresql74-server/files/patch-src-pl-plpgsql-src-pl-gram-c
+++ /dev/null
@@ -1,88 +0,0 @@
---- /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