Changes 8.2.16:

* Add new configuration parameter ssl_renegotiation_limit to control
  how often we do session key renegotiation for an SSL connection
* Fix possible deadlock during backend startup
* Fix possible crashes due to not handling errors during relcache
  reload cleanly
* Fix possible crashes when trying to recover from a failure in
   subtransaction start
* Fix server memory leak associated with use of savepoints and a
  client encoding different from server's encoding
* Fix incorrect WAL data emitted during end-of-recovery cleanup of a
  GIST index page split
* Make substring() for bit types treat any negative length as meaning
  "all the rest of the string"
  The previous coding treated only -1 that way, and would produce an
  invalid result value for other negative values, possibly leading to
  a crash (CVE-2010-0442).
* Fix integer-to-bit-string conversions to handle the first
  fractional byte correctly when the output bit width is wider than
  the given integer by something other than a multiple of 8 bits
* Fix some cases of pathologically slow regular expression matching
* Fix the STOP WAL LOCATION entry in backup history files to report
  the next WAL segment's name when the end location is exactly at a
  segment boundary
* Fix some more cases of temporary-file leakage
* Improve constraint exclusion processing of boolean-variable cases,
  in particular make it possible to exclude a partition that has a
  "bool_column = false" constraint
* When reading "pg_hba.conf" and related files, do not treat
  @something as a file inclusion request if the @ appears inside
  quote marks; also, never treat @ by itself as a file inclusion
  request
* Prevent infinite loop on some platforms if a directory is named as
  an inclusion target in "pg_hba.conf" and related files
* Fix possible infinite loop if SSL_read or SSL_write fails without
  setting errno
  This is reportedly possible with some Windows versions of openssl.
* Fix psql's numericlocale option to not format strings it shouldn't
  in latex and troff output formats
* Make psql return the correct exit status (3) when ON_ERROR_STOP and
  --single-transaction are both specified and an error occurs during
  the implied "COMMIT"
* Fix plpgsql failure in one case where a composite column is set to NULL
* Fix possible failure when calling PL/Perl functions from PL/PerlU
  or vice versa
* Add volatile markings in PL/Python to avoid possible
  compiler-specific misbehavior
* Ensure PL/Tcl initializes the Tcl interpreter fully
  The only known symptom of this oversight is that the Tcl clock
  command misbehaves if using Tcl 8.5 or later.
* Prevent crash in "contrib/dblink" when too many key columns are
  specified to a dblink_build_sql_* function
* Fix assorted crashes in "contrib/xml2" caused by sloppy memory
  management
* Make building of "contrib/xml2" more robust on Windows
* Fix race condition in Windows signal handling
  One known symptom of this bug is that rows in pg_listener could be
  dropped under heavy load.
* Update time zone data files to tzdata release 2010e for DST law
  changes in Bangladesh, Chile, Fiji, Mexico, Paraguay, Samoa.

4 files changed, 26 insertions, 183 deletions

diff --git a/databases/postgresql82/Makefile.common b/databases/postgresql82/Makefile.common
index 392c4d3f344..ace3910e76e 100644
--- a/databases/postgresql82/Makefile.common
+++ b/databases/postgresql82/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2009/12/16 21:18:31 adam Exp $
+# $NetBSD: Makefile.common,v 1.19 2010/04/12 09:48:48 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -32,13 +32,10 @@ COMMON_FILESDIR?=	${.CURDIR}/../postgresql82/files
 PATCHDIR?=		${.CURDIR}/../postgresql82/patches
 
 # Version numbering scheme:
-#
 # DIST_VERS		version number on the postgresql distfile
 # BASE_VERS		pkgsrc-mangled version number (convert pl -> .)
-#
 # Note: Do not forget jdbc-postgresql82 when updating version
-#
-DIST_VERS?=		8.2.15
+DIST_VERS?=		8.2.16
 BASE_VERS?=		${DIST_VERS}
 
 BUILDLINK_API_DEPENDS.postgresql82-client+=	postgresql82-client>=${BASE_VERS}
@@ -56,9 +53,10 @@ SUBST_SED.pglocale=	-e 's|\( localedir[	 :]*=\).*|\1${PG_LOCALE_DIR}|'
 
 .include "../../mk/bsd.prefs.mk"
 
-PGSQL_TEMPLATE.SunOS=		solaris
-.if !defined(PGSQL_TEMPLATE.${OPSYS})
-PGSQL_TEMPLATE.${OPSYS}=	${LOWER_OPSYS}
+PG_TEMPLATE.SunOS=	solaris
+PG_TEMPLATE.IRIX=	irix5
+.if !defined(PG_TEMPLATE.${OPSYS})
+PG_TEMPLATE.${OPSYS}=	${LOWER_OPSYS}
 .endif
 
 PG_SUBPREFIX=		# empty
@@ -80,7 +78,7 @@ GNU_CONFIGURE_PREFIX=	${PG_PREFIX}
 CONFIGURE_ARGS+=	--sysconfdir=${PG_ETC_DIR}
 CONFIGURE_ARGS+=	--datadir=${PG_DATA_DIR}
 CONFIGURE_ARGS+=	--with-docdir=${PG_DOC_DIR}
-CONFIGURE_ARGS+=	--with-template=${PGSQL_TEMPLATE.${OPSYS}}
+CONFIGURE_ARGS+=	--with-template=${PG_TEMPLATE.${OPSYS}}
 CONFIGURE_ARGS+=	--without-readline
 CONFIGURE_ARGS+=	--without-zlib
 CONFIGURE_ARGS+=	--enable-nls
@@ -100,7 +98,6 @@ BUILDLINK_TRANSFORM+=	rm:-ffast-math
 
 # USE_LIBLTDL is "yes" or "no" depending on whether we're using libltdl
 # to provide "dlopen" functionality for the PostgreSQL backend.
-#
 .if ${OPSYS} == "Interix"
 USE_LIBLTDL?=		yes
 .endif
@@ -111,58 +108,29 @@ FILES_SUBST+=		PG_PREFIX=${PG_PREFIX:Q}
 .include "../../devel/gettext-lib/buildlink3.mk"
 
 post-extract:
-	if ${TEST} -d ${WRKSRC}/src; then				\
-		rm -f ${WRKSRC}/src/Makefile.custom;			\
-		cp -f ${COMMON_FILESDIR}/Makefile.custom		\
-			${WRKSRC}/src/Makefile.custom;			\
-		rm -f ${WRKSRC}/src/Makefile.shlib;			\
-		cp -f ${COMMON_FILESDIR}/Makefile.libtool		\
-			${WRKSRC}/src/Makefile.shlib;			\
-	fi
-	if ${TEST} -d ${WRKSRC}/src/interfaces/libpq; then		\
-		rm -f ${WRKSRC}/src/interfaces/libpq/GNUmakefile;	\
-		cp -f ${COMMON_FILESDIR}/GNUmakefile.libpq		\
-			${WRKSRC}/src/interfaces/libpq/GNUmakefile;	\
-	fi
-	if ${TEST} -d ${WRKSRC}/src/interfaces/libpgtcl; then		\
-		rm -f ${WRKSRC}/src/interfaces/libpgtcl/GNUmakefile;	\
-		cp -f ${COMMON_FILESDIR}/GNUmakefile.libpgtcl	\
-			${WRKSRC}/src/interfaces/libpgtcl/GNUmakefile;	\
-	fi
+	cp -f ${COMMON_FILESDIR}/Makefile.custom ${WRKSRC}/src/Makefile.custom
+	cp -f ${COMMON_FILESDIR}/Makefile.libtool ${WRKSRC}/src/Makefile.shlib
 .if !empty(USE_LIBLTDL:M[yY][eE][sS])
-	if ${TEST} -d ${WRKSRC}/src/backend/port/dynloader; then	\
-		template=${PGSQL_TEMPLATE.${OPSYS}:Q};			\
-		rm -f ${WRKSRC}/src/backend/port/dynloader/$$template.[ch]; \
-		cp -f ${COMMON_FILESDIR}/dynloader-ltdl.h		\
-			${WRKSRC}/src/backend/port/dynloader/$$template.h; \
-		${ECHO} "static int dummy = 0;"				\
-			 >${WRKSRC}/src/backend/port/dynloader/$$template.c
-	fi
+	cp -f ${COMMON_FILESDIR}/dynloader-ltdl.h \
+		${WRKSRC}/src/backend/port/dynloader/${PG_TEMPLATE.${OPSYS}:Q}.h
+	${ECHO} "static int dummy = 0;" \
+		> ${WRKSRC}/src/backend/port/dynloader/${PG_TEMPLATE.${OPSYS}:Q}.c
 .endif
-	if ${TEST} -d ${WRKSRC}/src/template; then			\
-		touch ${WRKSRC}/src/template/dragonfly;		\
-	fi
-	if ${TEST} -d ${WRKSRC}/src/backend/port/dynloader; then	\
-		cp ${WRKSRC}/src/backend/port/dynloader/freebsd.c	\
-			${WRKSRC}/src/backend/port/dynloader/dragonfly.c; \
-		cp ${WRKSRC}/src/backend/port/dynloader/freebsd.h	\
-			${WRKSRC}/src/backend/port/dynloader/dragonfly.h; \
-	fi
-	if ${TEST} -d ${WRKSRC}/src/include/port; then			\
-		cp ${WRKSRC}/src/include/port/freebsd.h		\
-			${WRKSRC}/src/include/port/dragonfly.h;		\
-	fi
-	if ${TEST} -d ${WRKSRC}/src/makefiles; then			\
-		cp ${WRKSRC}/src/makefiles/Makefile.freebsd		\
-			${WRKSRC}/src/makefiles/Makefile.dragonfly;	\
-	fi
+	touch ${WRKSRC}/src/template/dragonfly
+	cp ${WRKSRC}/src/backend/port/dynloader/freebsd.c \
+		${WRKSRC}/src/backend/port/dynloader/dragonfly.c
+	cp ${WRKSRC}/src/backend/port/dynloader/freebsd.h \
+		${WRKSRC}/src/backend/port/dynloader/dragonfly.h
+	cp ${WRKSRC}/src/include/port/freebsd.h \
+		${WRKSRC}/src/include/port/dragonfly.h
+	cp ${WRKSRC}/src/makefiles/Makefile.freebsd \
+		${WRKSRC}/src/makefiles/Makefile.dragonfly
 
 # PGSQL_BLCKSZ is the size in bytes of a PostgreSQL disk page or block.
 # This also limits the size of a tuple.  The valid values are powers
 # of 2 up to 32768, and the default size is 8196 (hardcoded in the
 # PostgreSQL sources).  Please don't change this value unless you know
 # what you are doing.
-#
 BUILD_DEFS+=	PGSQL_BLCKSZ
 
 .if defined(PGSQL_BLCKSZ)
diff --git a/databases/postgresql82/distinfo b/databases/postgresql82/distinfo
index ae8b68483f4..48889b505f4 100644
--- a/databases/postgresql82/distinfo
+++ b/databases/postgresql82/distinfo
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.18 2009/12/16 21:18:31 adam Exp $
+$NetBSD: distinfo,v 1.19 2010/04/12 09:48:48 adam Exp $
 
-SHA1 (postgresql-8.2.15.tar.bz2) = 4de199b3223dba2164a9e56d998f6deb708f0f74
-RMD160 (postgresql-8.2.15.tar.bz2) = ae2556833810e6a8d28f8e101edc94e190b67536
-Size (postgresql-8.2.15.tar.bz2) = 12653038 bytes
+SHA1 (postgresql-8.2.16.tar.bz2) = 092e95438b6db24b65469433439c05dc6435d335
+RMD160 (postgresql-8.2.16.tar.bz2) = 5d3fe8ab522f3f0d744f902b3d31b2eab514e0f4
+Size (postgresql-8.2.16.tar.bz2) = 12637799 bytes
 SHA1 (patch-aa) = 850a02acbd718a01d3597a99e929e3b3f663f07c
 SHA1 (patch-ab) = d09e44921e9dd005e1b1dfbb5da4e56737ea05ab
 SHA1 (patch-ac) = cbd302a60d43171854c37171b57ee7bbf1194ad9
-SHA1 (patch-ad) = 84ce70fa661b44f267a502ea73fe01b84776c91c
-SHA1 (patch-ae) = 8b3e47320dfe05d94b769c9b079fd7ca6d26f5d6
 SHA1 (patch-af) = 89cb9318946cb7c34ad79dbae107ce66bd1c5022
 SHA1 (patch-ag) = 402d5d211af99efdfa35677299c97e91e14ed85d
 SHA1 (patch-ah) = 3640573195f66a46c37d9fca2648d6be39f5593b
diff --git a/databases/postgresql82/patches/patch-ad b/databases/postgresql82/patches/patch-ad
deleted file mode 100644
index 46fd11c5049..00000000000
--- a/databases/postgresql82/patches/patch-ad
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2008/04/05 16:40:08 adam Exp $
-
---- src/backend/port/dynloader/netbsd.c.orig	2008-04-05 11:33:08.000000000 +0200
-+++ src/backend/port/dynloader/netbsd.c
-@@ -46,64 +46,30 @@ static char sccsid[] = "@(#)dl.c	5.4 (Be
- 
- #include "dynloader.h"
- 
--static char error_message[BUFSIZ];
-+#ifndef HAVE_DLOPEN
- 
- char *
--BSD44_derived_dlerror(void)
-+pg_dlerror(void)
- {
--	static char ret[BUFSIZ];
--
--	strcpy(ret, error_message);
--	error_message[0] = 0;
--	return (ret[0] == 0) ? NULL : ret;
-+	return "dynaloader unsupported";
- }
- 
- void *
--BSD44_derived_dlopen(const char *file, int num)
-+pg_dlopen(const char *file, int num)
- {
--#if !defined(HAVE_DLOPEN)
--	snprintf(error_message, sizeof(error_message),
--			 "dlopen (%s) not supported", file);
-+	elog(ERROR, "dynamic load not supported");
- 	return NULL;
--#else
--	void	   *vp;
--
--	if ((vp = dlopen((char *) file, num)) == NULL)
--		snprintf(error_message, sizeof(error_message),
--				 "dlopen (%s) failed: %s", file, dlerror());
--	return vp;
--#endif
- }
- 
- void *
--BSD44_derived_dlsym(void *handle, const char *name)
-+pg_dlsym(void *handle, const char *name)
- {
--#if !defined(HAVE_DLOPEN)
--	snprintf(error_message, sizeof(error_message),
--			 "dlsym (%s) failed", name);
- 	return NULL;
--#elif defined(__ELF__)
--	return dlsym(handle, name);
--#else
--	void	   *vp;
--	char		buf[BUFSIZ];
--
--	if (*name != '_')
--	{
--		snprintf(buf, sizeof(buf), "_%s", name);
--		name = buf;
--	}
--	if ((vp = dlsym(handle, (char *) name)) == NULL)
--		snprintf(error_message, sizeof(error_message),
--				 "dlsym (%s) failed", name);
--	return vp;
--#endif
- }
- 
- void
--BSD44_derived_dlclose(void *handle)
-+pg_dlclose(void *handle)
- {
--#if defined(HAVE_DLOPEN)
--	dlclose(handle);
--#endif
- }
-+
-+#endif /* ! HAVE_DLOPEN */
diff --git a/databases/postgresql82/patches/patch-ae b/databases/postgresql82/patches/patch-ae
deleted file mode 100644
index 5c0bb2f65d4..00000000000
--- a/databases/postgresql82/patches/patch-ae
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2006/12/09 15:34:13 adam Exp $
-
---- src/backend/port/dynloader/netbsd.h.orig	2005-01-01 07:00:32.000000000 +0900
-+++ src/backend/port/dynloader/netbsd.h
-@@ -21,19 +21,7 @@
- 
- #include "utils/dynamic_loader.h"
- 
--/*
-- * Dynamic Loader on NetBSD 1.0.
-- *
-- * this dynamic loader uses the system dynamic loading interface for shared
-- * libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared
-- * library as the file to be dynamically loaded.
-- *
-- * agc - I know this is all a bit crufty, but it does work, is fairly
-- * portable, and works (the stipulation that the d.l. function must
-- * begin with an underscore is fairly tricky, and some versions of
-- * NetBSD (like 1.0, and 1.0A pre June 1995) have no dlerror.)
-- */
--
-+#ifdef HAVE_DLOPEN
- /*
-  * In some older systems, the RTLD_NOW flag isn't defined and the mode
-  * argument to dlopen must always be 1.  The RTLD_GLOBAL flag is wanted
-@@ -47,14 +35,11 @@
- #define RTLD_GLOBAL 0
- #endif
- 
--#define		   pg_dlopen(f)    BSD44_derived_dlopen((f), RTLD_NOW | RTLD_GLOBAL)
--#define		   pg_dlsym		   BSD44_derived_dlsym
--#define		   pg_dlclose	   BSD44_derived_dlclose
--#define		   pg_dlerror	   BSD44_derived_dlerror
-+#define	   pg_dlopen(f)    dlopen((f), RTLD_NOW | RTLD_GLOBAL)
-+#define	   pg_dlsym		   dlsym
-+#define	   pg_dlclose	   dlclose
-+#define	   pg_dlerror	   dlerror
- 
--char	   *BSD44_derived_dlerror(void);
--void	   *BSD44_derived_dlopen(const char *filename, int num);
--void	   *BSD44_derived_dlsym(void *handle, const char *name);
--void		BSD44_derived_dlclose(void *handle);
-+#endif /* HAVE_DLOPEN */
- 
- #endif   /* PORT_PROTOS_H */