Changes 8.2.6:

This release contains a variety of fixes from 8.2.5, including fixes
for significant security issues.

6 files changed, 21 insertions, 15 deletions

diff --git a/databases/postgresql82-client/PLIST b/databases/postgresql82-client/PLIST
index 859d89d805b..53a6372466e 100644
--- a/databases/postgresql82-client/PLIST
+++ b/databases/postgresql82-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2007/09/19 20:02:12 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/01/07 20:14:36 adam Exp $
 ${PG_SUBPREFIX}${PKGLOCALEDIR}/locale/af/LC_MESSAGES/libpq.mo
 ${PG_SUBPREFIX}${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/initdb.mo
 ${PG_SUBPREFIX}${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/libpq.mo
@@ -1172,8 +1172,9 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-16.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-17.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-18.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-19.html
-${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-20.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-2.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-20.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-21.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-4.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-5.html
@@ -1192,6 +1193,7 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-15.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-16.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-17.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-18.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-19.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-2.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-4.html
@@ -1207,6 +1209,7 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-11.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-12.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-13.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-14.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-15.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-2.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-4.html
@@ -1218,6 +1221,7 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-9.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-1.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-10.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-11.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-2.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-4.html
@@ -1233,6 +1237,7 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-2.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-4.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-5.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-6.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/resources.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/role-attributes.html
@@ -1498,7 +1503,7 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/wal-intro.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/wal-reliability.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/wal.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/warm-standby.html
-${PG_SUBPREFIX}share/doc/postgresql/html/x71187.html
+${PG_SUBPREFIX}share/doc/postgresql/html/x71195.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/xaggr.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/xfunc-c.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/xfunc-internal.html
diff --git a/databases/postgresql82-server/PLIST b/databases/postgresql82-server/PLIST
index e432688c3d2..f95e56bfdb1 100644
--- a/databases/postgresql82-server/PLIST
+++ b/databases/postgresql82-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2007/09/19 20:02:12 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/01/07 20:14:36 adam Exp $
 ${PG_SUBPREFIX}bin/postgres
 ${PG_SUBPREFIX}bin/postmaster
 ${PG_SUBPREFIX}lib/postgresql/ascii_and_mic.la
@@ -200,6 +200,7 @@ ${PG_SUBPREFIX}share/postgresql/timezone/America/Louisville
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Maceio
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Managua
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Manaus
+${PG_SUBPREFIX}share/postgresql/timezone/America/Marigot
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Martinique
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Mazatlan
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Mendoza
@@ -240,6 +241,7 @@ ${PG_SUBPREFIX}share/postgresql/timezone/America/Santo_Domingo
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Sao_Paulo
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Scoresbysund
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Shiprock
+${PG_SUBPREFIX}share/postgresql/timezone/America/St_Barthelemy
 ${PG_SUBPREFIX}share/postgresql/timezone/America/St_Johns
 ${PG_SUBPREFIX}share/postgresql/timezone/America/St_Kitts
 ${PG_SUBPREFIX}share/postgresql/timezone/America/St_Lucia
diff --git a/databases/postgresql82-tsearch2/Makefile b/databases/postgresql82-tsearch2/Makefile
index d135efa753b..e0c0ebede1e 100644
--- a/databases/postgresql82-tsearch2/Makefile
+++ b/databases/postgresql82-tsearch2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2007/09/20 21:31:20 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2008/01/07 20:14:36 adam Exp $
 
 PKGNAME=	postgresql82-tsearch2-${BASE_VERS}
-PKGREVISION=	1
 COMMENT=	Tsearch2 contrib module for fulltext indexing in PostgreSQL
 
 DEPENDS+=	postgresql82-server>=${BASE_VERS}:../../databases/postgresql82-server
diff --git a/databases/postgresql82/Makefile.common b/databases/postgresql82/Makefile.common
index 0d737476187..90f8b697ccf 100644
--- a/databases/postgresql82/Makefile.common
+++ b/databases/postgresql82/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2007/09/19 20:02:12 adam Exp $
+# $NetBSD: Makefile.common,v 1.8 2008/01/07 20:14:35 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -36,7 +36,7 @@ PATCHDIR?=		${.CURDIR}/../postgresql82/patches
 #
 # Note: Do not forget jdbc-postgresql82 when updating version
 #
-DIST_VERS?=		8.2.5
+DIST_VERS?=		8.2.6
 BASE_VERS?=		${DIST_VERS}
 
 BUILDLINK_API_DEPENDS.postgresql82-client+=	postgresql82-client>=${BASE_VERS}
diff --git a/databases/postgresql82/distinfo b/databases/postgresql82/distinfo
index f87eab68263..e8358022d64 100644
--- a/databases/postgresql82/distinfo
+++ b/databases/postgresql82/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2007/10/09 20:17:08 adam Exp $
+$NetBSD: distinfo,v 1.10 2008/01/07 20:14:36 adam Exp $
 
-SHA1 (postgresql-8.2.5.tar.bz2) = 45ddb77b542e8b279013f374edab65a8860a636d
-RMD160 (postgresql-8.2.5.tar.bz2) = 90e4afd6a2ae5f7203ff8409970c73401171e0ff
-Size (postgresql-8.2.5.tar.bz2) = 12510411 bytes
+SHA1 (postgresql-8.2.6.tar.bz2) = 8934dfbd4c1d8c4f2945cb80f02072611681f967
+RMD160 (postgresql-8.2.6.tar.bz2) = fa12ce310919cb52be3558d38a7e329bc73bbe33
+Size (postgresql-8.2.6.tar.bz2) = 12559117 bytes
 SHA1 (patch-aa) = a7112ce2e9fc28f638afcf2e196d3cdc0f4c254d
 SHA1 (patch-ab) = d952d47918f0294cdc1462233b1cfd39e3bc2f73
 SHA1 (patch-ac) = cbd302a60d43171854c37171b57ee7bbf1194ad9
@@ -15,5 +15,5 @@ SHA1 (patch-ai) = 6f7f5c1182ded751650e0ae7858c5784dfa96987
 SHA1 (patch-aj) = 0ffb4c0aa8a32a61cd753d0e7cf67fdc5ae94195
 SHA1 (patch-ak) = 3009e020dc5f9397846dd3339c2bdd15269bb332
 SHA1 (patch-al) = 32818ae8de92ef66d839d4891f4f686db732f7b6
-SHA1 (patch-am) = 1436c3e9d3c74b9ef7c81c8dfde1c270ba5372f1
+SHA1 (patch-am) = f8933e8d429842d03ce56a98747a5683065e3cc4
 SHA1 (patch-an) = ca4caddde9ea68e4f8648f5abf9369e407874702
diff --git a/databases/postgresql82/patches/patch-am b/databases/postgresql82/patches/patch-am
index 430201aa7d9..b543a9217f4 100644
--- a/databases/postgresql82/patches/patch-am
+++ b/databases/postgresql82/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.2 2007/10/09 20:17:08 adam Exp $
+$NetBSD: patch-am,v 1.3 2008/01/07 20:14:36 adam Exp $
 
 --- contrib/tsearch2/Makefile.orig	2006-09-11 17:14:46.000000000 +0200
 +++ contrib/tsearch2/Makefile
@@ -24,7 +24,7 @@ $NetBSD: patch-am,v 1.2 2007/10/09 20:17:08 adam Exp $
  top_builddir = ../..
  include $(top_builddir)/src/Makefile.global
  include $(top_srcdir)/contrib/contrib-global.mk
-+include $(top_builddir)/src/Makefile.shlib
++include $(top_srcdir)/src/Makefile.shlib
  endif