Update all PostgreSQL ports to latest versions.

This includes a bunch of security fixes: CVE-2007-6067, CVE-2007-4772,
CVE-2007-6601, CVE-2007-6600 and CVE-2007-4769.

Security: http://www.postgresql.org/about/news.905

4 files changed, 24 insertions, 26 deletions

diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index ebed545d6c77..1c7502ab8ac6 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.1.10
-PORTREVISION?=	2
+PORTVERSION?=	8.1.11
+PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
 PKGNAMESUFFIX?=	-server
-DISTFILES?=	postgresql-base-${PORTVERSION}${EXTRACT_SUFX} \
-		postgresql-opt-${PORTVERSION}${EXTRACT_SUFX}
+DISTFILES?=	postgresql-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER?=	girgen@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere
@@ -113,15 +112,11 @@ USE_AUTOTOOLS=	autoconf:261
 CONFIGURE_ARGS+=--with-icu
 LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
 PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
-PATCHFILES+=	pg-814-icu-xx-2006-09-25.diff.gz:icu
+PATCHFILES+=	pg-8111-icu-xx-2008-01-07.diff.gz:icu
 .  endif
 
 PATCH_DIST_STRIP=-p1
 
-.  ifmake makesum
-DISTFILES+=	postgresql-docs-${PORTVERSION}${EXTRACT_SUFX}
-.  endif
-
 .  if defined(SERVER_ONLY) && defined(WITH_PAM)
 CONFIGURE_ARGS+=--with-pam
 .  endif
@@ -175,13 +170,12 @@ CONFIGURE_ARGS+=--with-krb5
 # Postgresql apps will not link properly when libpq is linked with base heimdal in /usr,
 # so we always use the heimdal port. See
 # http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018809.html
-LIB_DEPENDS+=	krb5.21:${PORTSDIR}/security/heimdal
+LIB_DEPENDS+=	krb5.23:${PORTSDIR}/security/heimdal
 CONFIGURE_ARGS+=--with-krb5
 .    endif
 .  endif
 
 .  if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || make(makesum)
-DISTFILES+=	postgresql-test-${PORTVERSION}${EXTRACT_SUFX}
 EXTRA_PATCHES=	${FILESDIR}/regresspatch-src-test-regress-pgregress-sh
 .  endif
 
diff --git a/databases/postgresql81-server/distinfo b/databases/postgresql81-server/distinfo
index c5220a8397c9..a0da1d493ce7 100644
--- a/databases/postgresql81-server/distinfo
+++ b/databases/postgresql81-server/distinfo
@@ -1,18 +1,9 @@
-MD5 (postgresql/postgresql-base-8.1.10.tar.bz2) = dbb5c5e48a43037e979b621f0c03614b
-SHA256 (postgresql/postgresql-base-8.1.10.tar.bz2) = c49b8b094838024ef09d1e574181c409dbc3bb13c8470ae495e74a0185aed981
-SIZE (postgresql/postgresql-base-8.1.10.tar.bz2) = 8110015
-MD5 (postgresql/postgresql-opt-8.1.10.tar.bz2) = 23f7f08905a05a50a681ea2a83b049ab
-SHA256 (postgresql/postgresql-opt-8.1.10.tar.bz2) = 9c99a8c31515107e29201e2ba1c5362871851b54bcf6bb9a5d3f81848196834f
-SIZE (postgresql/postgresql-opt-8.1.10.tar.bz2) = 144584
-MD5 (postgresql/postgresql-docs-8.1.10.tar.bz2) = c6423b4745c1f677448af4f20dfda5f9
-SHA256 (postgresql/postgresql-docs-8.1.10.tar.bz2) = 870edb5e0d364d235f9f83820256db66eaf1aebfd47e05b7a4546bff53bfac88
-SIZE (postgresql/postgresql-docs-8.1.10.tar.bz2) = 2507870
-MD5 (postgresql/postgresql-test-8.1.10.tar.bz2) = 3dce92e7913ea70ca0c240a3adf93140
-SHA256 (postgresql/postgresql-test-8.1.10.tar.bz2) = d887a18cade52167c0390fa7270bf86e33d95cba34d2ac3f755e13a1360d9de8
-SIZE (postgresql/postgresql-test-8.1.10.tar.bz2) = 948352
+MD5 (postgresql/postgresql-8.1.11.tar.bz2) = 48922512bcf683d5ea22a99df5eaaecd
+SHA256 (postgresql/postgresql-8.1.11.tar.bz2) = 3e91cdfc1353fa9c6416d9fc8ae9d6ab3171565f00aeb6c882214c2f08a03e2e
+SIZE (postgresql/postgresql-8.1.11.tar.bz2) = 11735420
 MD5 (postgresql/hier-Pg8.1.2-0.5.5.diff.gz) = 15916bf13b99702599ce70b6475f7d86
 SHA256 (postgresql/hier-Pg8.1.2-0.5.5.diff.gz) = 14ecc3809ce69f47c3460efee3fc7fce78f68802936650fc4e1132adffd41d1e
 SIZE (postgresql/hier-Pg8.1.2-0.5.5.diff.gz) = 31203
-MD5 (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 2eb31538f3ee367767aeacd95b11d623
-SHA256 (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 8dea05bdbc2b78426b159f628b693f69da17b930fe4882e166d5e8a3e698b7d9
-SIZE (postgresql/pg-814-icu-xx-2006-09-25.diff.gz) = 3987
+MD5 (postgresql/pg-8111-icu-xx-2008-01-07.diff.gz) = f26773d83077402744866f264474d39b
+SHA256 (postgresql/pg-8111-icu-xx-2008-01-07.diff.gz) = 925e15db3c3495b453946c544ff29ed6cdce026419f2ba70a5905696013a2e72
+SIZE (postgresql/pg-8111-icu-xx-2008-01-07.diff.gz) = 4517
diff --git a/databases/postgresql81-server/files/patch-doc-Makefile b/databases/postgresql81-server/files/patch-doc-Makefile
new file mode 100644
index 000000000000..fbb0844d0c60
--- /dev/null
+++ b/databases/postgresql81-server/files/patch-doc-Makefile
@@ -0,0 +1,11 @@
+--- doc/Makefile~	2003-11-29 20:51:36.000000000 +0100
++++ doc/Makefile	2008-01-07 11:59:15.000000000 +0100
+@@ -27,7 +27,7 @@
+ 
+ ifneq ($(wildcard $(srcdir)/postgres.tar.gz),)
+ ifneq (,$(docdir))
+-found_html := yes
++#found_html := yes
+ endif
+ endif
+ 
diff --git a/databases/postgresql81-server/pkg-plist-server b/databases/postgresql81-server/pkg-plist-server
index 8ce72bda7181..922331a91702 100644
--- a/databases/postgresql81-server/pkg-plist-server
+++ b/databases/postgresql81-server/pkg-plist-server
@@ -276,6 +276,7 @@ share/postgresql/timezone/America/Louisville
 share/postgresql/timezone/America/Maceio
 share/postgresql/timezone/America/Managua
 share/postgresql/timezone/America/Manaus
+share/postgresql/timezone/America/Marigot
 share/postgresql/timezone/America/Martinique
 share/postgresql/timezone/America/Mazatlan
 share/postgresql/timezone/America/Mendoza
@@ -316,6 +317,7 @@ share/postgresql/timezone/America/Santo_Domingo
 share/postgresql/timezone/America/Sao_Paulo
 share/postgresql/timezone/America/Scoresbysund
 share/postgresql/timezone/America/Shiprock
+share/postgresql/timezone/America/St_Barthelemy
 share/postgresql/timezone/America/St_Johns
 share/postgresql/timezone/America/St_Kitts
 share/postgresql/timezone/America/St_Lucia