summaryrefslogtreecommitdiff
path: root/databases/postgresql73-server
diff options
context:
space:
mode:
Diffstat (limited to 'databases/postgresql73-server')
-rw-r--r--databases/postgresql73-server/Makefile18
-rw-r--r--databases/postgresql73-server/files/patch-src-pl-plpgsql-src-gram-y69
2 files changed, 78 insertions, 9 deletions
diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index 26852e5c4e9e..5de1e985822f 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -8,7 +8,7 @@
PORTNAME?= postgresql
PKGNAMESUFFIX?= -server
PORTVERSION?= 7.3.9
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -26,6 +26,9 @@ CONFLICTS?= ${PORTNAME}${PKGNAMESUFFIX}-7.[0-24-9]* \
WRKSRC= ${WRKDIR}/postgresql-${PORTVERSION}
DIST_SUBDIR= postgresql
+UNIQUENAME?= ${PORTNAME}73
+LATEST_LINK?= ${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX}
+
PKGINSTALL?= ${PKGDIR}/pkg-install${PKGNAMESUFFIX}
USE_BZIP2= YES
USE_GMAKE= YES
@@ -71,20 +74,17 @@ CONFIGURE_ARGS+=--with-openssl
.if !defined(SLAVE_ONLY)
# gnugetopt will always be used if already installed
-. if (${OSVERSION} < 500041) && !exists(${LOCALBASE}/include/getopt.h)
+. if ( ${OSVERSION} < 500041 ) && !exists(${LOCALBASE}/include/getopt.h)
OPTIONS+= GNUGETOPT "Use GNU getopt" on
. endif
-. if defined(SERVER_ONLY)
-OPTIONS+= PAM "Build with PAM support" off
-. endif
+# Note: server only options are no-ops for the client
+OPTIONS+= PAM "Build with PAM support (server only)" off
OPTIONS+= MIT_KRB5 "Build with MIT's kerberos support" off
OPTIONS+= HEIMDAL_KRB5 "Builds with Heimdal kerberos support" off
OPTIONS+= OPTIMIZED_CFLAGS "Builds with compiler optimizations (-O3)" off
-. if defined(SERVER_ONLY)
-OPTIONS+= LIBC_R "Link with libc_r, needed by plpython" off
+OPTIONS+= LIBC_R "Link w/ libc_r, used by plpython (server)" off
# to run regression tests:
-OPTIONS+= TESTS "Allows the use of a \"check\" target" off
-. endif
+OPTIONS+= TESTS "Allows the use of a \"check\" target (server)" off
OPTIONS+= DEBUG "Builds with debugging symbols" off
. if defined(SERVER_ONLY) && defined(WITH_PAM)
diff --git a/databases/postgresql73-server/files/patch-src-pl-plpgsql-src-gram-y b/databases/postgresql73-server/files/patch-src-pl-plpgsql-src-gram-y
new file mode 100644
index 000000000000..e9d23cac61ea
--- /dev/null
+++ b/databases/postgresql73-server/files/patch-src-pl-plpgsql-src-gram-y
@@ -0,0 +1,69 @@
+--- src/pl/plpgsql/src/gram.y 2005/01/27 01:44:42 1.39.2.1 REL7_3_9
++++ src/pl/plpgsql/src/gram.y 2005/02/08 18:22:45 1.39.2.2 REL7_3_STABLE
+@@ -4,7 +4,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.
+ *
+@@ -1612,6 +1612,14 @@ read_sql_construct(int until,
+ }
+ 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:
+@@ -1761,6 +1769,13 @@ make_select_stmt(void)
+
+ while ((tok = yylex()) == ',')
+ {
++ /* Check for array overflow */
++ if (nfields >= 1024)
++ {
++ plpgsql_error_lineno = yylineno;
++ elog(ERROR, "too many INTO variables specified");
++ }
++
+ tok = yylex();
+ switch(tok)
+ {
+@@ -1809,6 +1824,14 @@ make_select_stmt(void)
+
+ if (plpgsql_SpaceScanned)
+ plpgsql_dstring_append(&ds, " ");
++
++ /* Check for array overflow */
++ if (nparams >= 1024)
++ {
++ plpgsql_error_lineno = yylineno;
++ elog(ERROR, "too many variables specified in SQL statement");
++ }
++
+ switch (tok)
+ {
+ case T_VARIABLE:
+@@ -1892,6 +1915,13 @@ make_fetch_stmt(void)
+
+ while ((tok = yylex()) == ',')
+ {
++ /* Check for array overflow */
++ if (nfields >= 1024)
++ {
++ plpgsql_error_lineno = yylineno;
++ elog(ERROR, "too many INTO variables specified");
++ }
++
+ tok = yylex();
+ switch(tok)
+ {