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)

4 files changed, 29 insertions, 10 deletions

diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 5fffaf3232b3..a5cb7bd19671 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
-PORTVERSION?=	8.0.2
+PORTVERSION?=	8.0.3
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
@@ -43,7 +43,8 @@ CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
 
-BUILD_DIRS?=	src/timezone src/backend src/backend/utils/mb/conversion_procs src/pl
+BUILD_DIRS?=	src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
+		src/pl src/utils
 INSTALL_DIRS?=	${BUILD_DIRS}
 PKGMESSAGE=	${WRKDIR}/.pkg-message${PKGNAMESUFFIX}
 
@@ -85,6 +86,7 @@ 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
 OPTIONS+=	LIBC_R "Link w/ libc_r, used by plpython (server)" off
+OPTIONS+=	THREADSAFE "make libpq thread safe" off
 #  to run regression tests:
 OPTIONS+=	TESTS "Allows the use of a \"check\" target (server)" off
 OPTIONS+=	DEBUG "Builds with debugging symbols" off
@@ -176,6 +178,10 @@ DISTFILES+=	postgresql-test-${PORTVERSION}${EXTRACT_SUFX}
 EXTRA_PATCHES=	${FILESDIR}/regresspatch-src-test-regress-pgregress-sh
 .  endif
 
+.  if defined(WITH_THREADSAFE)
+CONFIGURE_ARGS+=--enable-thread-safety
+.  endif
+
 .  if defined(SERVER_ONLY) && defined(WITH_LIBC_R)
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
@@ -295,6 +301,9 @@ do-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/502.pgsql \
 			${PREFIX}/etc/periodic/daily
 .  endif # SERVER_ONLY
+.  if defined(CLIENT_ONLY)
+	@ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} install-local
+.  endif
 	@ if [ -r ${PKGMESSAGE} ]; then \
 		${MKDIR} ${DOCSDIR} ;\
 		${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README${PKGNAMESUFFIX} ;\
diff --git a/databases/postgresql84-server/distinfo b/databases/postgresql84-server/distinfo
index 4d5961c5cc18..16254e9c696a 100644
--- a/databases/postgresql84-server/distinfo
+++ b/databases/postgresql84-server/distinfo
@@ -1,11 +1,11 @@
-MD5 (postgresql/postgresql-base-8.0.2.tar.bz2) = 39ef5bfca3d573b356c755b5429aea8b
-SIZE (postgresql/postgresql-base-8.0.2.tar.bz2) = 7806083
-MD5 (postgresql/postgresql-docs-8.0.2.tar.bz2) = 9840cc8892ac52e7ae0ac5a357b5b610
-SIZE (postgresql/postgresql-docs-8.0.2.tar.bz2) = 2202096
-MD5 (postgresql/postgresql-opt-8.0.2.tar.bz2) = ed57846ed0b4a0044fe545437fcf6f6f
-SIZE (postgresql/postgresql-opt-8.0.2.tar.bz2) = 133708
-MD5 (postgresql/postgresql-test-8.0.2.tar.bz2) = 3942e1c0119cabc6de124a54ba1d2d38
-SIZE (postgresql/postgresql-test-8.0.2.tar.bz2) = 959433
+MD5 (postgresql/postgresql-base-8.0.3.tar.bz2) = 35ff2b9a3bc5c65f55b4192a334b0e88
+SIZE (postgresql/postgresql-base-8.0.3.tar.bz2) = 7818251
+MD5 (postgresql/postgresql-docs-8.0.3.tar.bz2) = a9bb1e0dbc7ff862a30b6b9ca00b6470
+SIZE (postgresql/postgresql-docs-8.0.3.tar.bz2) = 2213693
+MD5 (postgresql/postgresql-opt-8.0.3.tar.bz2) = ea1ce6f570a4408e934af914de71da0e
+SIZE (postgresql/postgresql-opt-8.0.3.tar.bz2) = 133623
+MD5 (postgresql/postgresql-test-8.0.3.tar.bz2) = 4dac47d2c87bb83ba6f2cd788ec794a6
+SIZE (postgresql/postgresql-test-8.0.3.tar.bz2) = 959642
 MD5 (postgresql/hier-Pg8.0.1-0.5.4.diff.gz) = 1d410cfb38253675fee36c8f9ee655e2
 SIZE (postgresql/hier-Pg8.0.1-0.5.4.diff.gz) = 30662
 MD5 (postgresql/pg-802-icu-2005-05-06.diff.gz) = 67b1a4104f447ddcdd59ff616bdb263e
diff --git a/databases/postgresql84-server/pkg-plist-client b/databases/postgresql84-server/pkg-plist-client
index ec7bde8ab088..5810e57ecead 100644
--- a/databases/postgresql84-server/pkg-plist-client
+++ b/databases/postgresql84-server/pkg-plist-client
@@ -420,6 +420,15 @@ lib/libpq.so.4
 lib/libpgtypes.a
 lib/libpgtypes.so
 lib/libpgtypes.so.2
+lib/postgresql/pgxs/src/makefiles/pgxs.mk
+@dirrm lib/postgresql/pgxs/src/makefiles
+lib/postgresql/pgxs/src/Makefile.global
+lib/postgresql/pgxs/src/Makefile.port
+lib/postgresql/pgxs/src/Makefile.shlib
+lib/postgresql/pgxs/src/nls-global.mk
+@dirrm lib/postgresql/pgxs/src
+@dirrm lib/postgresql/pgxs
+@dirrm lib/postgresql
 %%DOCSDIR%%/README-client
 @unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
 share/postgresql/pg_service.conf.sample
diff --git a/databases/postgresql84-server/pkg-plist-server b/databases/postgresql84-server/pkg-plist-server
index 44b57f274dbc..24cff6b753f0 100644
--- a/databases/postgresql84-server/pkg-plist-server
+++ b/databases/postgresql84-server/pkg-plist-server
@@ -2,6 +2,7 @@ bin/postmaster
 bin/postgres
 etc/periodic/daily/502.pgsql
 etc/rc.d/010.pgsql.sh
+lib/libpgport.a
 lib/postgresql/ascii_and_mic.so
 lib/postgresql/cyrillic_and_mic.so
 lib/postgresql/euc_cn_and_mic.so