CVS commit: pkgsrc/databases

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/databases
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Thu, 8 Feb 2018 20:53:58 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Feb  8 20:53:58 UTC 2018

Modified Files:
        pkgsrc/databases/postgresql10: Makefile.common distinfo
        pkgsrc/databases/postgresql10-client: PLIST
        pkgsrc/databases/postgresql10-docs: PLIST
        pkgsrc/databases/postgresql10-server: PLIST
        pkgsrc/databases/postgresql10/patches: patch-config_perl.m4
            patch-configure patch-src_pl_plperl_plperl.h
        pkgsrc/databases/postgresql93: Makefile.common distinfo
        pkgsrc/databases/postgresql93-client: Makefile
        pkgsrc/databases/postgresql93-contrib: Makefile
        pkgsrc/databases/postgresql93-docs: Makefile PLIST
        pkgsrc/databases/postgresql93-plperl: Makefile
        pkgsrc/databases/postgresql93-plpython: Makefile
        pkgsrc/databases/postgresql93-pltcl: Makefile
        pkgsrc/databases/postgresql93-server: Makefile PLIST
        pkgsrc/databases/postgresql93/patches: patch-config_perl.m4
            patch-configure patch-src_pl_plperl_plperl.h
        pkgsrc/databases/postgresql94: Makefile.common distinfo
        pkgsrc/databases/postgresql94-docs: PLIST
        pkgsrc/databases/postgresql94-server: PLIST
        pkgsrc/databases/postgresql94/patches: patch-config_perl.m4
            patch-configure patch-src_pl_plperl_plperl.h
        pkgsrc/databases/postgresql95: Makefile.common distinfo
        pkgsrc/databases/postgresql95-docs: PLIST
        pkgsrc/databases/postgresql95-server: PLIST
        pkgsrc/databases/postgresql95/patches: patch-config_perl.m4
            patch-configure patch-src_pl_plperl_plperl.h
        pkgsrc/databases/postgresql96: Makefile.common distinfo
        pkgsrc/databases/postgresql96-docs: PLIST
        pkgsrc/databases/postgresql96-server: PLIST
        pkgsrc/databases/postgresql96/patches: patch-config_perl.m4
            patch-configure patch-src_pl_plperl_plperl.h

Log Message:
postgresql: updated to 10.2, 9.6.7, 9.5.11, 9.4.16, and 9.3.21

This release fixes two security issues. This release also fixes issues with VACUUM, GIN indexes, and hash indexes that could lead to data corruption, as well as fixes for using parallel queries and 
logical replication.

Security Issues
* CVE-2018-1052: Fix the processing of partition keys containing multiple expressions
* CVE-2018-1053: Ensure that all temporary files made with "pg_upgrade" are non-world-readable

Bug Fixes and Improvements
* Fix crash and potential disclosure of backend memory when processing partition keys containing multiple expressions
* Fix potential disclosure of temporary files containing database passwords created by pg_upgrade by not allowing these files to be world-accessible
* Fix cases where VACUUM would not remove dead rows if they were updated while "key-share" locked, leading to potential data corruption
* Fix for GIN indexes to prevent bloat by ensuring the pending-insertions list is cleaned up by VACUUM
* Fix potential index corruption with hash indexes due to failure to mark metapages as dirty
* Fix several potential crash scenarios for parallel queries, including when a bitmap heap scan cannot allocate memory
* Fix several potential hang-ups in parallel queries, including when a parallel worker fails to start
* Fix collection of EXPLAIN statistics from parallel workers
* Prevent fake deadlock failures when multiple sessions are running CREATE INDEX CONCURRENTLY
* Fix for trigger behavior when using logical replication
* Several fixes for "walsender" functionality to improve stability as well as visibility into the replication process
* Fix logical decoding to correctly clean up disk files for crashed transactions
* Several fixes for identity columns, including disallowing identity columns on tables derived from composite types and partitions
* Fix handling of list partitioning constraints for partition keys of boolean and array types
* Fix incorrectly generated plans for UPDATE and DELETE queries when a table has a mix of inherited regular and foreign child tables
* Fix incorrect query results from cases involving GROUPING SETS when used with flattened subqueries
* Fix UNION/INTERSECT/EXCEPT over zero columns, e.g. "SELECT UNION SELECT;"
* Several fixes for subqueries within a LATERAL subquery
* Several improvements for query planning estimation
* Allow a client that supports SCRAM channel binding, such as a future version of PostgreSQL or libpq, to connect to a PostgreSQL 10 server
* Fix sample INSTR() functions used to help transition from Oracle(r) PL/SQL to PostgreSQL PL/pgSQL to correctly match Oracle functional behavior
* Fix pg_dump to make permissions (ACL), security label, and comment entries reliably identifiable in archive outputs
* Modify behavior for contrib/cube's "cube ~> int" operator to make it compatible with KNN search. This is a backwards incompatible change and any expression indexes or materialized views using this 
operator will need to be reindexed and refreshed, respectively.
* Several fixes in contrib/postgres_fdw to prevent query planner errors
* Added modern examples of auto-start scripts for PostgreSQL on macOS in the contrib/start-scripts/macos directory
* Several fixes for Windows, including postmaster startup and compatibility with libperl
* Spinlock fixes and support for Motorola 68K and 88K architectures


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/postgresql10/Makefile.common
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/postgresql10/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/postgresql10-client/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/postgresql10-docs/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/postgresql10-server/PLIST
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/databases/postgresql10/patches/patch-config_perl.m4 \
    pkgsrc/databases/postgresql10/patches/patch-configure \
    pkgsrc/databases/postgresql10/patches/patch-src_pl_plperl_plperl.h
cvs rdiff -u -r1.31 -r1.32 pkgsrc/databases/postgresql93/Makefile.common
cvs rdiff -u -r1.27 -r1.28 pkgsrc/databases/postgresql93/distinfo
cvs rdiff -u -r1.14 -r1.15 pkgsrc/databases/postgresql93-client/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/postgresql93-contrib/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/postgresql93-docs/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/databases/postgresql93-docs/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/databases/postgresql93-plperl/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/postgresql93-plpython/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/postgresql93-pltcl/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/databases/postgresql93-server/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/databases/postgresql93-server/PLIST
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/databases/postgresql93/patches/patch-config_perl.m4
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/databases/postgresql93/patches/patch-configure \
    pkgsrc/databases/postgresql93/patches/patch-src_pl_plperl_plperl.h
cvs rdiff -u -r1.23 -r1.24 pkgsrc/databases/postgresql94/Makefile.common
cvs rdiff -u -r1.19 -r1.20 pkgsrc/databases/postgresql94/distinfo
cvs rdiff -u -r1.17 -r1.18 pkgsrc/databases/postgresql94-docs/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/databases/postgresql94-server/PLIST
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/databases/postgresql94/patches/patch-config_perl.m4 \
    pkgsrc/databases/postgresql94/patches/patch-configure
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/databases/postgresql94/patches/patch-src_pl_plperl_plperl.h
cvs rdiff -u -r1.17 -r1.18 pkgsrc/databases/postgresql95/Makefile.common
cvs rdiff -u -r1.12 -r1.13 pkgsrc/databases/postgresql95/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/databases/postgresql95-docs/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/postgresql95-server/PLIST
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/databases/postgresql95/patches/patch-config_perl.m4 \
    pkgsrc/databases/postgresql95/patches/patch-configure
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/databases/postgresql95/patches/patch-src_pl_plperl_plperl.h
cvs rdiff -u -r1.11 -r1.12 pkgsrc/databases/postgresql96/Makefile.common
cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/postgresql96/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/postgresql96-docs/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/postgresql96-server/PLIST
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/databases/postgresql96/patches/patch-config_perl.m4 \
    pkgsrc/databases/postgresql96/patches/patch-configure
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/databases/postgresql96/patches/patch-src_pl_plperl_plperl.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/postgresql10/Makefile.common
diff -u pkgsrc/databases/postgresql10/Makefile.common:1.5 pkgsrc/databases/postgresql10/Makefile.common:1.6
--- pkgsrc/databases/postgresql10/Makefile.common:1.5   Fri Dec 15 16:52:23 2017
+++ pkgsrc/databases/postgresql10/Makefile.common       Thu Feb  8 20:53:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2017/12/15 16:52:23 dholland Exp $
+# $NetBSD: Makefile.common,v 1.6 2018/02/08 20:53:56 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql10-pltcl/Makefile
 # used by databases/postgresql10-server/Makefile
 
-DISTNAME=      postgresql-10.1
+DISTNAME=      postgresql-10.2
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/databases/postgresql10/distinfo
diff -u pkgsrc/databases/postgresql10/distinfo:1.3 pkgsrc/databases/postgresql10/distinfo:1.4
--- pkgsrc/databases/postgresql10/distinfo:1.3  Mon Jan 22 11:05:29 2018
+++ pkgsrc/databases/postgresql10/distinfo      Thu Feb  8 20:53:56 2018
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.3 2018/01/22 11:05:29 jperkin Exp $
+$NetBSD: distinfo,v 1.4 2018/02/08 20:53:56 adam Exp $
 
-SHA1 (postgresql-10.1.tar.bz2) = 4adcfd527ec1652ecd7a22eb71541928d3d37277
-RMD160 (postgresql-10.1.tar.bz2) = 4238ae067e5e282ee36302d596ea0654dd9e96b8
-SHA512 (postgresql-10.1.tar.bz2) = 06050d353aa43f32e0de0199d833d8a4652aff893b718b1c40ed31837838f73fe4d977ac0f2164ab97b3eeff4aae3409f440601740898a893877d96bc0ed1882
-Size (postgresql-10.1.tar.bz2) = 19669989 bytes
+SHA1 (postgresql-10.2.tar.bz2) = b0597de368dac410cfb65ce92f89e324bbdc1ea1
+RMD160 (postgresql-10.2.tar.bz2) = fb755e381c32452959a9351570c1917b6fe596ba
+SHA512 (postgresql-10.2.tar.bz2) = bac61644c12c31e2dce97ec0134902a2a7141e922619015425961b963961b21210ca840f59ba585d3d75c7e34cb640f2ebeaa2b25c4a866db68f5e73a8f8a448
+Size (postgresql-10.2.tar.bz2) = 19901836 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
-SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5
-SHA1 (patch-configure) = 59fe9a768caf8a5d308acac60c28bc6bb2c40632
+SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
+SHA1 (patch-configure) = b0a758023b3b263ff51b154d0da32cf02520c6cd
 SHA1 (patch-contrib_dblink_dblink.c) = a6f87ab9f2c28a72608d70267b71bd77437b0921
 SHA1 (patch-src_Makefile.global.in) = 335b57afff23a9684ab0a09257665810c1ba2d1e
 SHA1 (patch-src_Makefile.shlib) = 6363b3c7c6887c7b23295da7ebf0371e1be2d93d
@@ -16,4 +16,4 @@ SHA1 (patch-src_interfaces_ecpg_pgtypesl
 SHA1 (patch-src_interfaces_libpq_Makefile) = 61bcf84eb69b6ec9faabab0b61913766f4b20f8c
 SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0
 SHA1 (patch-src_pl_plperl_GNUmakefile) = 6ee3e431f46ce5c2a94df499504b2b8bd458bbef
-SHA1 (patch-src_pl_plperl_plperl.h) = 0e7daec79a00d7378326e56525e50cfe61cfc174
+SHA1 (patch-src_pl_plperl_plperl.h) = 64d5b891362c114bde5ec48e48bc4855b56ab516

Index: pkgsrc/databases/postgresql10-client/PLIST
diff -u pkgsrc/databases/postgresql10-client/PLIST:1.1 pkgsrc/databases/postgresql10-client/PLIST:1.2
--- pkgsrc/databases/postgresql10-client/PLIST:1.1      Mon Oct 23 20:33:49 2017
+++ pkgsrc/databases/postgresql10-client/PLIST  Thu Feb  8 20:53:56 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2017/10/23 20:33:49 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/02/08 20:53:56 adam Exp $
 bin/clusterdb
 bin/createdb
 bin/createuser
@@ -654,6 +654,7 @@ include/postgresql/server/utils/freepage
 include/postgresql/server/utils/geo_decls.h
 include/postgresql/server/utils/guc.h
 include/postgresql/server/utils/guc_tables.h
+include/postgresql/server/utils/hashutils.h
 include/postgresql/server/utils/help_config.h
 include/postgresql/server/utils/hsearch.h
 include/postgresql/server/utils/index_selfuncs.h
@@ -923,7 +924,14 @@ share/locale/sv/LC_MESSAGES/psql-10.mo
 share/locale/ta/LC_MESSAGES/pg_config-10.mo
 share/locale/tr/LC_MESSAGES/ecpg-10.mo
 share/locale/tr/LC_MESSAGES/ecpglib6-10.mo
+share/locale/tr/LC_MESSAGES/libpq5-10.mo
+share/locale/tr/LC_MESSAGES/pg_archivecleanup-10.mo
+share/locale/tr/LC_MESSAGES/pg_basebackup-10.mo
 share/locale/tr/LC_MESSAGES/pg_config-10.mo
+share/locale/tr/LC_MESSAGES/pg_dump-10.mo
+share/locale/tr/LC_MESSAGES/pg_test_fsync-10.mo
+share/locale/tr/LC_MESSAGES/pg_upgrade-10.mo
+share/locale/tr/LC_MESSAGES/pg_waldump-10.mo
 share/locale/zh_CN/LC_MESSAGES/ecpg-10.mo
 share/locale/zh_CN/LC_MESSAGES/ecpglib6-10.mo
 share/locale/zh_CN/LC_MESSAGES/initdb-10.mo

Index: pkgsrc/databases/postgresql10-docs/PLIST
diff -u pkgsrc/databases/postgresql10-docs/PLIST:1.2 pkgsrc/databases/postgresql10-docs/PLIST:1.3
--- pkgsrc/databases/postgresql10-docs/PLIST:1.2        Mon Nov 13 09:33:31 2017
+++ pkgsrc/databases/postgresql10-docs/PLIST    Thu Feb  8 20:53:56 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2017/11/13 09:33:31 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/02/08 20:53:56 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createuser.1
@@ -915,6 +915,7 @@ share/doc/postgresql/html/release-1-01.h
 share/doc/postgresql/html/release-1-02.html
 share/doc/postgresql/html/release-1-09.html
 share/doc/postgresql/html/release-10-1.html
+share/doc/postgresql/html/release-10-2.html
 share/doc/postgresql/html/release-10.html
 share/doc/postgresql/html/release-6-0.html
 share/doc/postgresql/html/release-6-1-1.html
@@ -1210,6 +1211,7 @@ share/doc/postgresql/html/release-9-3-18
 share/doc/postgresql/html/release-9-3-19.html
 share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-20.html
+share/doc/postgresql/html/release-9-3-21.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
 share/doc/postgresql/html/release-9-3-5.html
@@ -1225,6 +1227,7 @@ share/doc/postgresql/html/release-9-4-12
 share/doc/postgresql/html/release-9-4-13.html
 share/doc/postgresql/html/release-9-4-14.html
 share/doc/postgresql/html/release-9-4-15.html
+share/doc/postgresql/html/release-9-4-16.html
 share/doc/postgresql/html/release-9-4-2.html
 share/doc/postgresql/html/release-9-4-3.html
 share/doc/postgresql/html/release-9-4-4.html
@@ -1236,6 +1239,7 @@ share/doc/postgresql/html/release-9-4-9.
 share/doc/postgresql/html/release-9-4.html
 share/doc/postgresql/html/release-9-5-1.html
 share/doc/postgresql/html/release-9-5-10.html
+share/doc/postgresql/html/release-9-5-11.html
 share/doc/postgresql/html/release-9-5-2.html
 share/doc/postgresql/html/release-9-5-3.html
 share/doc/postgresql/html/release-9-5-4.html
@@ -1251,6 +1255,7 @@ share/doc/postgresql/html/release-9-6-3.
 share/doc/postgresql/html/release-9-6-4.html
 share/doc/postgresql/html/release-9-6-5.html
 share/doc/postgresql/html/release-9-6-6.html
+share/doc/postgresql/html/release-9-6-7.html
 share/doc/postgresql/html/release-9-6.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/replication-origins.html

Index: pkgsrc/databases/postgresql10-server/PLIST
diff -u pkgsrc/databases/postgresql10-server/PLIST:1.2 pkgsrc/databases/postgresql10-server/PLIST:1.3
--- pkgsrc/databases/postgresql10-server/PLIST:1.2      Mon Nov 13 09:33:31 2017
+++ pkgsrc/databases/postgresql10-server/PLIST  Thu Feb  8 20:53:56 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2017/11/13 09:33:31 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/02/08 20:53:56 adam Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -50,6 +50,8 @@ share/locale/ro/LC_MESSAGES/plpgsql-10.m
 share/locale/ru/LC_MESSAGES/plpgsql-10.mo
 share/locale/ru/LC_MESSAGES/postgres-10.mo
 share/locale/sv/LC_MESSAGES/plpgsql-10.mo
+share/locale/sv/LC_MESSAGES/postgres-10.mo
+share/locale/tr/LC_MESSAGES/postgres-10.mo
 share/locale/zh_CN/LC_MESSAGES/plpgsql-10.mo
 share/locale/zh_CN/LC_MESSAGES/postgres-10.mo
 share/locale/zh_TW/LC_MESSAGES/plpgsql-10.mo
@@ -654,7 +656,6 @@ share/postgresql/timezone/US/Indiana-Sta
 share/postgresql/timezone/US/Michigan
 share/postgresql/timezone/US/Mountain
 share/postgresql/timezone/US/Pacific
-share/postgresql/timezone/US/Pacific-New
 share/postgresql/timezone/US/Samoa
 share/postgresql/timezone/UTC
 share/postgresql/timezone/Universal

Index: pkgsrc/databases/postgresql10/patches/patch-config_perl.m4
diff -u pkgsrc/databases/postgresql10/patches/patch-config_perl.m4:1.1 pkgsrc/databases/postgresql10/patches/patch-config_perl.m4:1.2
--- pkgsrc/databases/postgresql10/patches/patch-config_perl.m4:1.1      Mon Oct 23 20:33:49 2017
+++ pkgsrc/databases/postgresql10/patches/patch-config_perl.m4  Thu Feb  8 20:53:56 2018
@@ -1,15 +1,15 @@
-$NetBSD: patch-config_perl.m4,v 1.1 2017/10/23 20:33:49 adam Exp $
+$NetBSD: patch-config_perl.m4,v 1.2 2018/02/08 20:53:56 adam Exp $
 
---- config/perl.m4.orig        2013-09-02 20:53:17.000000000 +0000
+--- config/perl.m4.orig        2018-02-05 21:01:02.000000000 +0000
 +++ config/perl.m4
-@@ -62,9 +62,7 @@ if test "$PORTNAME" = "win32" ; then
- perl_lib=`basename $perl_archlibexp/CORE/perl[[5-9]]*.lib .lib`
- test -e "$perl_archlibexp/CORE/$perl_lib.lib" && perl_embed_ldflags="-L$perl_archlibexp/CORE -l$perl_lib"
+@@ -97,9 +97,7 @@ if test "$PORTNAME" = "win32" ; then
+               fi
+       fi
  else
--pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
--pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
--perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e ["s/ -arch [-a-zA-Z0-9_]*//g"]`
-+perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts`
+-      pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
+-      pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
+-      perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e ["s/ -arch [-a-zA-Z0-9_]*//g"]`
++      perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts`
  fi
  AC_SUBST(perl_embed_ldflags)dnl
  if test -z "$perl_embed_ldflags" ; then
Index: pkgsrc/databases/postgresql10/patches/patch-configure
diff -u pkgsrc/databases/postgresql10/patches/patch-configure:1.1 pkgsrc/databases/postgresql10/patches/patch-configure:1.2
--- pkgsrc/databases/postgresql10/patches/patch-configure:1.1   Mon Oct 23 20:33:49 2017
+++ pkgsrc/databases/postgresql10/patches/patch-configure       Thu Feb  8 20:53:56 2018
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.1 2017/10/23 20:33:49 adam Exp $
+$NetBSD: patch-configure,v 1.2 2018/02/08 20:53:56 adam Exp $
 
 Finally, native solaris uses -lgss for gssapi on mit-krb5.
 
---- configure.orig     2014-12-16 01:07:34.000000000 +0000
+--- configure.orig     2018-02-05 21:01:02.000000000 +0000
 +++ configure
-@@ -2852,6 +2852,7 @@ case $host_os in
+@@ -2879,6 +2879,7 @@ case $host_os in
    darwin*) template=darwin ;;
  dragonfly*) template=netbsd ;;
   freebsd*) template=freebsd ;;
@@ -12,18 +12,18 @@ Finally, native solaris uses -lgss for g
      hpux*) template=hpux ;;
   linux*|gnu*|k*bsd*-gnu)
             template=linux ;;
-@@ -7310,9 +7311,7 @@ if test "$PORTNAME" = "win32" ; then
- perl_lib=`basename $perl_archlibexp/CORE/perl[5-9]*.lib .lib`
- test -e "$perl_archlibexp/CORE/$perl_lib.lib" && perl_embed_ldflags="-L$perl_archlibexp/CORE -l$perl_lib"
+@@ -7884,9 +7885,7 @@ if test "$PORTNAME" = "win32" ; then
+               fi
+       fi
  else
--pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
--pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
--perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e "s/ -arch [-a-zA-Z0-9_]*//g"`
-+perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts`
+-      pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
+-      pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
+-      perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e "s/ -arch [-a-zA-Z0-9_]*//g"`
++      perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts`
  fi
  if test -z "$perl_embed_ldflags" ; then
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-@@ -8407,7 +8406,7 @@ return gss_init_sec_context ();
+@@ -9928,7 +9927,7 @@ return gss_init_sec_context ();
    return 0;
  }
  _ACEOF
Index: pkgsrc/databases/postgresql10/patches/patch-src_pl_plperl_plperl.h
diff -u pkgsrc/databases/postgresql10/patches/patch-src_pl_plperl_plperl.h:1.1 pkgsrc/databases/postgresql10/patches/patch-src_pl_plperl_plperl.h:1.2
--- pkgsrc/databases/postgresql10/patches/patch-src_pl_plperl_plperl.h:1.1      Mon Oct 23 20:33:49 2017
+++ pkgsrc/databases/postgresql10/patches/patch-src_pl_plperl_plperl.h  Thu Feb  8 20:53:56 2018
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_pl_plperl_plperl.h,v 1.1 2017/10/23 20:33:49 adam Exp $
+$NetBSD: patch-src_pl_plperl_plperl.h,v 1.2 2018/02/08 20:53:56 adam Exp $
 
---- src/pl/plperl/plperl.h.orig        2017-08-07 21:19:50.000000000 +0000
+--- src/pl/plperl/plperl.h.orig        2018-02-05 21:01:02.000000000 +0000
 +++ src/pl/plperl/plperl.h
-@@ -44,6 +44,10 @@
- #undef vsnprintf
+@@ -50,6 +50,10 @@
+ #define __inline__ inline
  #endif
  
 +#ifdef __sun
@@ -13,7 +13,7 @@ $NetBSD: patch-src_pl_plperl_plperl.h,v 
  
  /*
   * Get the basic Perl API.  We use PERL_NO_GET_CONTEXT mode so that our code
-@@ -62,6 +66,11 @@
+@@ -68,6 +72,11 @@
  #include "XSUB.h"
  #endif
  

Index: pkgsrc/databases/postgresql93/Makefile.common
diff -u pkgsrc/databases/postgresql93/Makefile.common:1.31 pkgsrc/databases/postgresql93/Makefile.common:1.32
--- pkgsrc/databases/postgresql93/Makefile.common:1.31  Fri Dec 15 16:52:24 2017
+++ pkgsrc/databases/postgresql93/Makefile.common       Thu Feb  8 20:53:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2017/12/15 16:52:24 dholland Exp $
+# $NetBSD: Makefile.common,v 1.32 2018/02/08 20:53:56 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql93-pltcl/Makefile
 # used by databases/postgresql93-server/Makefile
 
-DISTNAME=      postgresql-9.3.20
+DISTNAME=      postgresql-9.3.21
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/databases/postgresql93/distinfo
diff -u pkgsrc/databases/postgresql93/distinfo:1.27 pkgsrc/databases/postgresql93/distinfo:1.28
--- pkgsrc/databases/postgresql93/distinfo:1.27 Mon Jan 22 11:05:29 2018
+++ pkgsrc/databases/postgresql93/distinfo      Thu Feb  8 20:53:56 2018
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.27 2018/01/22 11:05:29 jperkin Exp $
+$NetBSD: distinfo,v 1.28 2018/02/08 20:53:56 adam Exp $
 
-SHA1 (postgresql-9.3.20.tar.bz2) = c42716dc68db04822f5454b75f884631d2830ed2
-RMD160 (postgresql-9.3.20.tar.bz2) = 2b19fce50fb1ebecc548d2da6e8e47ad08350353
-SHA512 (postgresql-9.3.20.tar.bz2) = 40098661bf00b64ad2d773b242613c44fe269b5ae984ad8990f85ce705b27138b127493c507103052fb6705d52f2e63a1df6692c7024d43c3c6b18154f2ef407
-Size (postgresql-9.3.20.tar.bz2) = 17197360 bytes
+SHA1 (postgresql-9.3.21.tar.bz2) = c0ac00ce4fdc91371c10b5bbb9a5b7ce85df8482
+RMD160 (postgresql-9.3.21.tar.bz2) = 9c7e39aa5cea5e1f5524d202376427f818af799d
+SHA512 (postgresql-9.3.21.tar.bz2) = 4c34ddf140a28b7095f8853f85c85cdc4ac44e4e5062ef66542c3082ada8509a201e0037e75d880e7909e1b41d0e3577713ad981cea8e693fb87644a0dce9929
+Size (postgresql-9.3.21.tar.bz2) = 17014472 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
-SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5
-SHA1 (patch-configure) = 3de7635fe18532a05a619941fecad7bcda6c51b9
+SHA1 (patch-config_perl.m4) = 2a423161cf0c394ff8b8f8cfb3ecffae1c65956a
+SHA1 (patch-configure) = 8fd9dcaa459ba2871b875c4b9c777064f7a57ee2
 SHA1 (patch-contrib_dblink_Makefile) = 11620938ce93109311df90df675b1ad6f0c15212
 SHA1 (patch-contrib_dblink_dblink.c) = a6f87ab9f2c28a72608d70267b71bd77437b0921
 SHA1 (patch-contrib_postgres__fdw_Makefile) = 07feda488e3acb71405b04d0d745c9920456b32b
@@ -18,4 +18,4 @@ SHA1 (patch-src_interfaces_ecpg_pgtypesl
 SHA1 (patch-src_interfaces_libpq_Makefile) = 0066301bc8b31b9e26c79153427537bc3865ef4d
 SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0
 SHA1 (patch-src_pl_plperl_GNUmakefile) = 6ee3e431f46ce5c2a94df499504b2b8bd458bbef
-SHA1 (patch-src_pl_plperl_plperl.h) = 0e7daec79a00d7378326e56525e50cfe61cfc174
+SHA1 (patch-src_pl_plperl_plperl.h) = 2e474dab7a014e21fa317d65f850da99192fc1c2

Index: pkgsrc/databases/postgresql93-client/Makefile
diff -u pkgsrc/databases/postgresql93-client/Makefile:1.14 pkgsrc/databases/postgresql93-client/Makefile:1.15
--- pkgsrc/databases/postgresql93-client/Makefile:1.14  Fri Dec 15 16:57:25 2017
+++ pkgsrc/databases/postgresql93-client/Makefile       Thu Feb  8 20:53:56 2018
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2017/12/15 16:57:25 dholland Exp $
+# $NetBSD: Makefile,v 1.15 2018/02/08 20:53:56 adam Exp $
 
 PKGNAME=       ${DISTNAME:C/-/93-client-/}
-PKGREVISION=   1
 COMMENT=       PostgreSQL database client programs
 
 .include "../../databases/postgresql93/Makefile.common"

Index: pkgsrc/databases/postgresql93-contrib/Makefile
diff -u pkgsrc/databases/postgresql93-contrib/Makefile:1.2 pkgsrc/databases/postgresql93-contrib/Makefile:1.3
--- pkgsrc/databases/postgresql93-contrib/Makefile:1.2  Fri Dec 15 16:57:25 2017
+++ pkgsrc/databases/postgresql93-contrib/Makefile      Thu Feb  8 20:53:56 2018
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2017/12/15 16:57:25 dholland Exp $
+# $NetBSD: Makefile,v 1.3 2018/02/08 20:53:56 adam Exp $
 
 PKGNAME=       ${DISTNAME:C/-/93-contrib-/}
-PKGREVISION=   1
 COMMENT=       Contrib subtree of tools and plug-ins
 
 .include "../../databases/postgresql93/Makefile.common"

Index: pkgsrc/databases/postgresql93-docs/Makefile
diff -u pkgsrc/databases/postgresql93-docs/Makefile:1.8 pkgsrc/databases/postgresql93-docs/Makefile:1.9
--- pkgsrc/databases/postgresql93-docs/Makefile:1.8     Fri Dec 15 16:57:25 2017
+++ pkgsrc/databases/postgresql93-docs/Makefile Thu Feb  8 20:53:57 2018
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2017/12/15 16:57:25 dholland Exp $
+# $NetBSD: Makefile,v 1.9 2018/02/08 20:53:57 adam Exp $
 
 PKGNAME=       ${DISTNAME:C/-/93-docs-/}
-PKGREVISION=   1
 COMMENT=       PostgreSQL database documentation
 
 .include "../../databases/postgresql93/Makefile.common"

Index: pkgsrc/databases/postgresql93-docs/PLIST
diff -u pkgsrc/databases/postgresql93-docs/PLIST:1.22 pkgsrc/databases/postgresql93-docs/PLIST:1.23
--- pkgsrc/databases/postgresql93-docs/PLIST:1.22       Mon Jan  1 22:29:22 2018
+++ pkgsrc/databases/postgresql93-docs/PLIST    Thu Feb  8 20:53:57 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2018/01/01 22:29:22 rillig Exp $
+@comment $NetBSD: PLIST,v 1.23 2018/02/08 20:53:57 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -1126,6 +1126,7 @@ share/doc/postgresql/html/release-9-3-18
 share/doc/postgresql/html/release-9-3-19.html
 share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-20.html
+share/doc/postgresql/html/release-9-3-21.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
 share/doc/postgresql/html/release-9-3-5.html

Index: pkgsrc/databases/postgresql93-plperl/Makefile
diff -u pkgsrc/databases/postgresql93-plperl/Makefile:1.13 pkgsrc/databases/postgresql93-plperl/Makefile:1.14
--- pkgsrc/databases/postgresql93-plperl/Makefile:1.13  Fri Dec 15 16:57:25 2017
+++ pkgsrc/databases/postgresql93-plperl/Makefile       Thu Feb  8 20:53:57 2018
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2017/12/15 16:57:25 dholland Exp $
+# $NetBSD: Makefile,v 1.14 2018/02/08 20:53:57 adam Exp $
 
 PKGNAME=       ${DISTNAME:C/-/93-plperl-/}
-PKGREVISION=   1
 COMMENT=       PL/Perl procedural language for the PostgreSQL backend
 
 DEPENDS+=      postgresql93-server>=${PKGVERSION_NOREV}:../../databases/postgresql93-server

Index: pkgsrc/databases/postgresql93-plpython/Makefile
diff -u pkgsrc/databases/postgresql93-plpython/Makefile:1.8 pkgsrc/databases/postgresql93-plpython/Makefile:1.9
--- pkgsrc/databases/postgresql93-plpython/Makefile:1.8 Fri Dec 15 16:57:25 2017
+++ pkgsrc/databases/postgresql93-plpython/Makefile     Thu Feb  8 20:53:57 2018
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2017/12/15 16:57:25 dholland Exp $
+# $NetBSD: Makefile,v 1.9 2018/02/08 20:53:57 adam Exp $
 
 PKGNAME=       ${DISTNAME:C/-/93-plpython-/}
-PKGREVISION=   1
 COMMENT=       PL/Python procedural language for the PostgreSQL backend
 
 DEPENDS+=      postgresql93-server>=${PKGVERSION_NOREV}:../../databases/postgresql93-server

Index: pkgsrc/databases/postgresql93-pltcl/Makefile
diff -u pkgsrc/databases/postgresql93-pltcl/Makefile:1.7 pkgsrc/databases/postgresql93-pltcl/Makefile:1.8
--- pkgsrc/databases/postgresql93-pltcl/Makefile:1.7    Fri Dec 15 16:57:25 2017
+++ pkgsrc/databases/postgresql93-pltcl/Makefile        Thu Feb  8 20:53:57 2018
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2017/12/15 16:57:25 dholland Exp $
+# $NetBSD: Makefile,v 1.8 2018/02/08 20:53:57 adam Exp $
 
 PKGNAME=       ${DISTNAME:C/-/93-pltcl-/}
-PKGREVISION=   1
 COMMENT=       PL/Tcl procedural language for the PostgreSQL backend
 
 DEPENDS+=      postgresql93-server>=${PKGVERSION_NOREV}:../../databases/postgresql93-server

Index: pkgsrc/databases/postgresql93-server/Makefile
diff -u pkgsrc/databases/postgresql93-server/Makefile:1.11 pkgsrc/databases/postgresql93-server/Makefile:1.12
--- pkgsrc/databases/postgresql93-server/Makefile:1.11  Fri Dec 15 16:57:25 2017
+++ pkgsrc/databases/postgresql93-server/Makefile       Thu Feb  8 20:53:57 2018
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2017/12/15 16:57:25 dholland Exp $
+# $NetBSD: Makefile,v 1.12 2018/02/08 20:53:57 adam Exp $
 
 PKGNAME=       ${DISTNAME:C/-/93-server-/}
-PKGREVISION=   1
 COMMENT=       PostgreSQL database server programs
 
 # mips has no TAS implementation

Index: pkgsrc/databases/postgresql93-server/PLIST
diff -u pkgsrc/databases/postgresql93-server/PLIST:1.12 pkgsrc/databases/postgresql93-server/PLIST:1.13
--- pkgsrc/databases/postgresql93-server/PLIST:1.12     Mon Nov 13 09:33:32 2017
+++ pkgsrc/databases/postgresql93-server/PLIST  Thu Feb  8 20:53:57 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2017/11/13 09:33:32 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2018/02/08 20:53:57 adam Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -654,7 +654,6 @@ share/postgresql/timezone/US/Indiana-Sta
 share/postgresql/timezone/US/Michigan
 share/postgresql/timezone/US/Mountain
 share/postgresql/timezone/US/Pacific
-share/postgresql/timezone/US/Pacific-New
 share/postgresql/timezone/US/Samoa
 share/postgresql/timezone/UTC
 share/postgresql/timezone/Universal

Index: pkgsrc/databases/postgresql93/patches/patch-config_perl.m4
diff -u pkgsrc/databases/postgresql93/patches/patch-config_perl.m4:1.1 pkgsrc/databases/postgresql93/patches/patch-config_perl.m4:1.2
--- pkgsrc/databases/postgresql93/patches/patch-config_perl.m4:1.1      Tue Sep 10 15:32:32 2013
+++ pkgsrc/databases/postgresql93/patches/patch-config_perl.m4  Thu Feb  8 20:53:56 2018
@@ -1,15 +1,15 @@
-$NetBSD: patch-config_perl.m4,v 1.1 2013/09/10 15:32:32 adam Exp $
+$NetBSD: patch-config_perl.m4,v 1.2 2018/02/08 20:53:56 adam Exp $
 
---- config/perl.m4.orig        2013-09-02 20:53:17.000000000 +0000
+--- config/perl.m4.orig        2018-02-05 21:08:57.000000000 +0000
 +++ config/perl.m4
-@@ -62,9 +62,7 @@ if test "$PORTNAME" = "win32" ; then
- perl_lib=`basename $perl_archlibexp/CORE/perl[[5-9]]*.lib .lib`
- test -e "$perl_archlibexp/CORE/$perl_lib.lib" && perl_embed_ldflags="-L$perl_archlibexp/CORE -l$perl_lib"
+@@ -100,9 +100,7 @@ if test "$PORTNAME" = "win32" ; then
+               fi
+       fi
  else
--pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
--pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
--perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e ["s/ -arch [-a-zA-Z0-9_]*//g"]`
-+perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts`
+-      pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
+-      pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
+-      perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e ["s/ -arch [-a-zA-Z0-9_]*//g"]`
++      perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts`
  fi
  AC_SUBST(perl_embed_ldflags)dnl
  if test -z "$perl_embed_ldflags" ; then

Index: pkgsrc/databases/postgresql93/patches/patch-configure
diff -u pkgsrc/databases/postgresql93/patches/patch-configure:1.2 pkgsrc/databases/postgresql93/patches/patch-configure:1.3
--- pkgsrc/databases/postgresql93/patches/patch-configure:1.2   Sat Oct 12 04:51:05 2013
+++ pkgsrc/databases/postgresql93/patches/patch-configure       Thu Feb  8 20:53:56 2018
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.2 2013/10/12 04:51:05 richard Exp $
+$NetBSD: patch-configure,v 1.3 2018/02/08 20:53:56 adam Exp $
 
 Finally, native solaris uses -lgss for gssapi on mit-krb5.
 
---- configure.orig     2013-09-02 20:53:17.000000000 +0000
+--- configure.orig     2018-02-05 21:08:57.000000000 +0000
 +++ configure
-@@ -2190,6 +2190,7 @@ case $host_os in
+@@ -2192,6 +2192,7 @@ case $host_os in
    darwin*) template=darwin ;;
  dragonfly*) template=netbsd ;;
   freebsd*) template=freebsd ;;
@@ -12,18 +12,18 @@ Finally, native solaris uses -lgss for g
      hpux*) template=hpux ;;
      irix*) template=irix ;;
   linux*|gnu*|k*bsd*-gnu)
-@@ -7472,9 +7473,7 @@ if test "$PORTNAME" = "win32" ; then
- perl_lib=`basename $perl_archlibexp/CORE/perl[5-9]*.lib .lib`
- test -e "$perl_archlibexp/CORE/$perl_lib.lib" && perl_embed_ldflags="-L$perl_archlibexp/CORE -l$perl_lib"
+@@ -7627,9 +7628,7 @@ if test "$PORTNAME" = "win32" ; then
+               fi
+       fi
  else
--pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
--pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
--perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e "s/ -arch [-a-zA-Z0-9_]*//g"`
-+perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts`
+-      pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
+-      pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
+-      perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e "s/ -arch [-a-zA-Z0-9_]*//g"`
++      perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts`
  fi
  if test -z "$perl_embed_ldflags" ; then
        { $as_echo "$as_me:$LINENO: result: no" >&5
-@@ -8898,7 +8897,7 @@ return gss_init_sec_context ();
+@@ -9115,7 +9114,7 @@ return gss_init_sec_context ();
    return 0;
  }
  _ACEOF
Index: pkgsrc/databases/postgresql93/patches/patch-src_pl_plperl_plperl.h
diff -u pkgsrc/databases/postgresql93/patches/patch-src_pl_plperl_plperl.h:1.2 pkgsrc/databases/postgresql93/patches/patch-src_pl_plperl_plperl.h:1.3
--- pkgsrc/databases/postgresql93/patches/patch-src_pl_plperl_plperl.h:1.2      Sun Aug 13 19:25:17 2017
+++ pkgsrc/databases/postgresql93/patches/patch-src_pl_plperl_plperl.h  Thu Feb  8 20:53:56 2018
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_pl_plperl_plperl.h,v 1.2 2017/08/13 19:25:17 adam Exp $
+$NetBSD: patch-src_pl_plperl_plperl.h,v 1.3 2018/02/08 20:53:56 adam Exp $
 
---- src/pl/plperl/plperl.h.orig        2017-08-07 21:19:50.000000000 +0000
+--- src/pl/plperl/plperl.h.orig        2018-02-05 21:08:57.000000000 +0000
 +++ src/pl/plperl/plperl.h
-@@ -44,6 +44,10 @@
- #undef vsnprintf
+@@ -52,6 +52,10 @@
+ #define __inline__ inline
  #endif
  
 +#ifdef __sun
@@ -13,7 +13,7 @@ $NetBSD: patch-src_pl_plperl_plperl.h,v 
  
  /*
   * Get the basic Perl API.  We use PERL_NO_GET_CONTEXT mode so that our code
-@@ -62,6 +66,11 @@
+@@ -70,6 +74,11 @@
  #include "XSUB.h"
  #endif
  

Index: pkgsrc/databases/postgresql94/Makefile.common
diff -u pkgsrc/databases/postgresql94/Makefile.common:1.23 pkgsrc/databases/postgresql94/Makefile.common:1.24
--- pkgsrc/databases/postgresql94/Makefile.common:1.23  Fri Dec 15 16:52:24 2017
+++ pkgsrc/databases/postgresql94/Makefile.common       Thu Feb  8 20:53:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2017/12/15 16:52:24 dholland Exp $
+# $NetBSD: Makefile.common,v 1.24 2018/02/08 20:53:57 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql94-pltcl/Makefile
 # used by databases/postgresql94-server/Makefile
 
-DISTNAME=      postgresql-9.4.15
+DISTNAME=      postgresql-9.4.16
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/databases/postgresql94/distinfo
diff -u pkgsrc/databases/postgresql94/distinfo:1.19 pkgsrc/databases/postgresql94/distinfo:1.20
--- pkgsrc/databases/postgresql94/distinfo:1.19 Mon Jan 22 11:05:29 2018
+++ pkgsrc/databases/postgresql94/distinfo      Thu Feb  8 20:53:57 2018
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.19 2018/01/22 11:05:29 jperkin Exp $
+$NetBSD: distinfo,v 1.20 2018/02/08 20:53:57 adam Exp $
 
-SHA1 (postgresql-9.4.15.tar.bz2) = 5e50e5c0a66c676c584a41b25f18e326781aecdb
-RMD160 (postgresql-9.4.15.tar.bz2) = 04dc5296bca61d8d1e32fa95b2002f36f9effc8f
-SHA512 (postgresql-9.4.15.tar.bz2) = be69f184cf18fb4c611d31a128f3593dc537551606f1db84a3ce9899b72f546876f05b29792435c3780c6c2b571759f4db2c172d62b2c012bd58574df80b4eb1
-Size (postgresql-9.4.15.tar.bz2) = 17921677 bytes
+SHA1 (postgresql-9.4.16.tar.bz2) = a5a1b327ae8a6a8ef598addf59bf697496cd5f29
+RMD160 (postgresql-9.4.16.tar.bz2) = ac5621449c04f2328c099967133c30a6a93746d7
+SHA512 (postgresql-9.4.16.tar.bz2) = 2e2bf14e2e63dec7254813e3c3a902a39cbd0aae89d8b3da5f75c6dead5d413a4f260fda6e87c9f84e4378df350c6531e67d972201f731a848b60bacef5b2bc8
+Size (postgresql-9.4.16.tar.bz2) = 17778763 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
-SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5
-SHA1 (patch-configure) = 59fe9a768caf8a5d308acac60c28bc6bb2c40632
+SHA1 (patch-config_perl.m4) = 14c9564577d0df6f82ae0027aeada2f3a6a8f07c
+SHA1 (patch-configure) = 1c0fee3fb270863eb39118a65769ce170391cfec
 SHA1 (patch-contrib_dblink_dblink.c) = a6f87ab9f2c28a72608d70267b71bd77437b0921
 SHA1 (patch-contrib_uuid-ossp_uuid-ossp.c) = b18da04850bc7c14f8fc80e0c86429ed1cc075c8
 SHA1 (patch-src_Makefile.global.in) = 2ab3affedc77b202f6749964287438d6179ca23a
@@ -17,5 +17,5 @@ SHA1 (patch-src_interfaces_ecpg_pgtypesl
 SHA1 (patch-src_interfaces_libpq_Makefile) = 0066301bc8b31b9e26c79153427537bc3865ef4d
 SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0
 SHA1 (patch-src_pl_plperl_GNUmakefile) = 6ee3e431f46ce5c2a94df499504b2b8bd458bbef
-SHA1 (patch-src_pl_plperl_plperl.h) = 0e7daec79a00d7378326e56525e50cfe61cfc174
+SHA1 (patch-src_pl_plperl_plperl.h) = 7b2549a487907994a7de898dca6a8691621dcc73
 SHA1 (patch-src_timezone_localtime.c) = 9b5748ef94b11b8798121ac85d2bb18cb99b3812

Index: pkgsrc/databases/postgresql94-docs/PLIST
diff -u pkgsrc/databases/postgresql94-docs/PLIST:1.17 pkgsrc/databases/postgresql94-docs/PLIST:1.18
--- pkgsrc/databases/postgresql94-docs/PLIST:1.17       Mon Jan  1 22:29:22 2018
+++ pkgsrc/databases/postgresql94-docs/PLIST    Thu Feb  8 20:53:57 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2018/01/01 22:29:22 rillig Exp $
+@comment $NetBSD: PLIST,v 1.18 2018/02/08 20:53:57 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -1146,6 +1146,7 @@ share/doc/postgresql/html/release-9-3-18
 share/doc/postgresql/html/release-9-3-19.html
 share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-20.html
+share/doc/postgresql/html/release-9-3-21.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
 share/doc/postgresql/html/release-9-3-5.html
@@ -1161,6 +1162,7 @@ share/doc/postgresql/html/release-9-4-12
 share/doc/postgresql/html/release-9-4-13.html
 share/doc/postgresql/html/release-9-4-14.html
 share/doc/postgresql/html/release-9-4-15.html
+share/doc/postgresql/html/release-9-4-16.html
 share/doc/postgresql/html/release-9-4-2.html
 share/doc/postgresql/html/release-9-4-3.html
 share/doc/postgresql/html/release-9-4-4.html

Index: pkgsrc/databases/postgresql94-server/PLIST
diff -u pkgsrc/databases/postgresql94-server/PLIST:1.9 pkgsrc/databases/postgresql94-server/PLIST:1.10
--- pkgsrc/databases/postgresql94-server/PLIST:1.9      Mon Nov 13 09:33:32 2017
+++ pkgsrc/databases/postgresql94-server/PLIST  Thu Feb  8 20:53:57 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2017/11/13 09:33:32 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2018/02/08 20:53:57 adam Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -654,7 +654,6 @@ share/postgresql/timezone/US/Indiana-Sta
 share/postgresql/timezone/US/Michigan
 share/postgresql/timezone/US/Mountain
 share/postgresql/timezone/US/Pacific
-share/postgresql/timezone/US/Pacific-New
 share/postgresql/timezone/US/Samoa
 share/postgresql/timezone/UTC
 share/postgresql/timezone/Universal

Index: pkgsrc/databases/postgresql94/patches/patch-config_perl.m4
diff -u pkgsrc/databases/postgresql94/patches/patch-config_perl.m4:1.1 pkgsrc/databases/postgresql94/patches/patch-config_perl.m4:1.2
--- pkgsrc/databases/postgresql94/patches/patch-config_perl.m4:1.1      Wed Jan 14 21:01:18 2015
+++ pkgsrc/databases/postgresql94/patches/patch-config_perl.m4  Thu Feb  8 20:53:57 2018
@@ -1,15 +1,15 @@
-$NetBSD: patch-config_perl.m4,v 1.1 2015/01/14 21:01:18 adam Exp $
+$NetBSD: patch-config_perl.m4,v 1.2 2018/02/08 20:53:57 adam Exp $
 
---- config/perl.m4.orig        2013-09-02 20:53:17.000000000 +0000
+--- config/perl.m4.orig        2018-02-05 21:07:03.000000000 +0000
 +++ config/perl.m4
-@@ -62,9 +62,7 @@ if test "$PORTNAME" = "win32" ; then
- perl_lib=`basename $perl_archlibexp/CORE/perl[[5-9]]*.lib .lib`
- test -e "$perl_archlibexp/CORE/$perl_lib.lib" && perl_embed_ldflags="-L$perl_archlibexp/CORE -l$perl_lib"
+@@ -100,9 +100,7 @@ if test "$PORTNAME" = "win32" ; then
+               fi
+       fi
  else
--pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
--pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
--perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e ["s/ -arch [-a-zA-Z0-9_]*//g"]`
-+perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts`
+-      pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
+-      pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
+-      perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e ["s/ -arch [-a-zA-Z0-9_]*//g"]`
++      perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts`
  fi
  AC_SUBST(perl_embed_ldflags)dnl
  if test -z "$perl_embed_ldflags" ; then
Index: pkgsrc/databases/postgresql94/patches/patch-configure
diff -u pkgsrc/databases/postgresql94/patches/patch-configure:1.1 pkgsrc/databases/postgresql94/patches/patch-configure:1.2
--- pkgsrc/databases/postgresql94/patches/patch-configure:1.1   Wed Jan 14 21:01:18 2015
+++ pkgsrc/databases/postgresql94/patches/patch-configure       Thu Feb  8 20:53:57 2018
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.1 2015/01/14 21:01:18 adam Exp $
+$NetBSD: patch-configure,v 1.2 2018/02/08 20:53:57 adam Exp $
 
 Finally, native solaris uses -lgss for gssapi on mit-krb5.
 
---- configure.orig     2014-12-16 01:07:34.000000000 +0000
+--- configure.orig     2018-02-05 21:07:03.000000000 +0000
 +++ configure
-@@ -2852,6 +2852,7 @@ case $host_os in
+@@ -2854,6 +2854,7 @@ case $host_os in
    darwin*) template=darwin ;;
  dragonfly*) template=netbsd ;;
   freebsd*) template=freebsd ;;
@@ -12,18 +12,18 @@ Finally, native solaris uses -lgss for g
      hpux*) template=hpux ;;
   linux*|gnu*|k*bsd*-gnu)
             template=linux ;;
-@@ -7310,9 +7311,7 @@ if test "$PORTNAME" = "win32" ; then
- perl_lib=`basename $perl_archlibexp/CORE/perl[5-9]*.lib .lib`
- test -e "$perl_archlibexp/CORE/$perl_lib.lib" && perl_embed_ldflags="-L$perl_archlibexp/CORE -l$perl_lib"
+@@ -7416,9 +7417,7 @@ if test "$PORTNAME" = "win32" ; then
+               fi
+       fi
  else
--pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
--pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
--perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e "s/ -arch [-a-zA-Z0-9_]*//g"`
-+perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts`
+-      pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
+-      pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
+-      perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e "s/ -arch [-a-zA-Z0-9_]*//g"`
++      perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts`
  fi
  if test -z "$perl_embed_ldflags" ; then
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-@@ -8407,7 +8406,7 @@ return gss_init_sec_context ();
+@@ -8553,7 +8552,7 @@ return gss_init_sec_context ();
    return 0;
  }
  _ACEOF

Index: pkgsrc/databases/postgresql94/patches/patch-src_pl_plperl_plperl.h
diff -u pkgsrc/databases/postgresql94/patches/patch-src_pl_plperl_plperl.h:1.2 pkgsrc/databases/postgresql94/patches/patch-src_pl_plperl_plperl.h:1.3
--- pkgsrc/databases/postgresql94/patches/patch-src_pl_plperl_plperl.h:1.2      Sun Aug 13 19:25:17 2017
+++ pkgsrc/databases/postgresql94/patches/patch-src_pl_plperl_plperl.h  Thu Feb  8 20:53:57 2018
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_pl_plperl_plperl.h,v 1.2 2017/08/13 19:25:17 adam Exp $
+$NetBSD: patch-src_pl_plperl_plperl.h,v 1.3 2018/02/08 20:53:57 adam Exp $
 
---- src/pl/plperl/plperl.h.orig        2017-08-07 21:19:50.000000000 +0000
+--- src/pl/plperl/plperl.h.orig        2018-02-05 21:07:03.000000000 +0000
 +++ src/pl/plperl/plperl.h
-@@ -44,6 +44,10 @@
- #undef vsnprintf
+@@ -52,6 +52,10 @@
+ #define __inline__ inline
  #endif
  
 +#ifdef __sun
@@ -13,7 +13,7 @@ $NetBSD: patch-src_pl_plperl_plperl.h,v 
  
  /*
   * Get the basic Perl API.  We use PERL_NO_GET_CONTEXT mode so that our code
-@@ -62,6 +66,11 @@
+@@ -70,6 +74,11 @@
  #include "XSUB.h"
  #endif
  

Index: pkgsrc/databases/postgresql95/Makefile.common
diff -u pkgsrc/databases/postgresql95/Makefile.common:1.17 pkgsrc/databases/postgresql95/Makefile.common:1.18
--- pkgsrc/databases/postgresql95/Makefile.common:1.17  Fri Dec 15 16:52:24 2017
+++ pkgsrc/databases/postgresql95/Makefile.common       Thu Feb  8 20:53:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2017/12/15 16:52:24 dholland Exp $
+# $NetBSD: Makefile.common,v 1.18 2018/02/08 20:53:57 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql95-pltcl/Makefile
 # used by databases/postgresql95-server/Makefile
 
-DISTNAME=      postgresql-9.5.10
+DISTNAME=      postgresql-9.5.11
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/databases/postgresql95/distinfo
diff -u pkgsrc/databases/postgresql95/distinfo:1.12 pkgsrc/databases/postgresql95/distinfo:1.13
--- pkgsrc/databases/postgresql95/distinfo:1.12 Mon Jan 22 11:05:30 2018
+++ pkgsrc/databases/postgresql95/distinfo      Thu Feb  8 20:53:57 2018
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.12 2018/01/22 11:05:30 jperkin Exp $
+$NetBSD: distinfo,v 1.13 2018/02/08 20:53:57 adam Exp $
 
-SHA1 (postgresql-9.5.10.tar.bz2) = dd0c5905ffc122cede63727c39077f185ee4bde5
-RMD160 (postgresql-9.5.10.tar.bz2) = d5f557708cacf75788fea9e89c848568b1c4289e
-SHA512 (postgresql-9.5.10.tar.bz2) = 24e31adabb0b88be882ab0440c560f0e4d5d69203be0581ca0ce22316555d92219ea0a2fd5254f12b2508bd3e58bbe0f1a7c8837228c96d9d5f00caac45af95a
-Size (postgresql-9.5.10.tar.bz2) = 18701419 bytes
+SHA1 (postgresql-9.5.11.tar.bz2) = 097f9048d013072fa5b4c04aebdc38eb26219d54
+RMD160 (postgresql-9.5.11.tar.bz2) = 73e3f5cd83aca28fb6a04145217b44dd0457eebe
+SHA512 (postgresql-9.5.11.tar.bz2) = c196709ddb953fe7ebdcee6e1d4624fc8136b83c5f0f6f010c29036a32f29f73763bdf64613dd57919d4be128e95a7f179c1c69a82f5951593c2fa0c2315fe83
+Size (postgresql-9.5.11.tar.bz2) = 18572811 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
-SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5
-SHA1 (patch-configure) = 59fe9a768caf8a5d308acac60c28bc6bb2c40632
+SHA1 (patch-config_perl.m4) = 14c9564577d0df6f82ae0027aeada2f3a6a8f07c
+SHA1 (patch-configure) = 18dd4af7f043b090beda157dfd52531b551eafd0
 SHA1 (patch-contrib_dblink_dblink.c) = a6f87ab9f2c28a72608d70267b71bd77437b0921
 SHA1 (patch-src_Makefile.global.in) = 2ab3affedc77b202f6749964287438d6179ca23a
 SHA1 (patch-src_Makefile.shlib) = a809ef756e9314723476fe7408a97d23f83a0311
@@ -16,4 +16,4 @@ SHA1 (patch-src_interfaces_ecpg_pgtypesl
 SHA1 (patch-src_interfaces_libpq_Makefile) = 61bcf84eb69b6ec9faabab0b61913766f4b20f8c
 SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0
 SHA1 (patch-src_pl_plperl_GNUmakefile) = 6ee3e431f46ce5c2a94df499504b2b8bd458bbef
-SHA1 (patch-src_pl_plperl_plperl.h) = 0e7daec79a00d7378326e56525e50cfe61cfc174
+SHA1 (patch-src_pl_plperl_plperl.h) = d31b24a953861703fe4b87d9a7d38d3c90e0411e

Index: pkgsrc/databases/postgresql95-docs/PLIST
diff -u pkgsrc/databases/postgresql95-docs/PLIST:1.10 pkgsrc/databases/postgresql95-docs/PLIST:1.11
--- pkgsrc/databases/postgresql95-docs/PLIST:1.10       Mon Nov 13 09:33:32 2017
+++ pkgsrc/databases/postgresql95-docs/PLIST    Thu Feb  8 20:53:58 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2017/11/13 09:33:32 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2018/02/08 20:53:58 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -1167,6 +1167,7 @@ share/doc/postgresql/html/release-9-3-18
 share/doc/postgresql/html/release-9-3-19.html
 share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-20.html
+share/doc/postgresql/html/release-9-3-21.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
 share/doc/postgresql/html/release-9-3-5.html
@@ -1182,6 +1183,7 @@ share/doc/postgresql/html/release-9-4-12
 share/doc/postgresql/html/release-9-4-13.html
 share/doc/postgresql/html/release-9-4-14.html
 share/doc/postgresql/html/release-9-4-15.html
+share/doc/postgresql/html/release-9-4-16.html
 share/doc/postgresql/html/release-9-4-2.html
 share/doc/postgresql/html/release-9-4-3.html
 share/doc/postgresql/html/release-9-4-4.html
@@ -1193,6 +1195,7 @@ share/doc/postgresql/html/release-9-4-9.
 share/doc/postgresql/html/release-9-4.html
 share/doc/postgresql/html/release-9-5-1.html
 share/doc/postgresql/html/release-9-5-10.html
+share/doc/postgresql/html/release-9-5-11.html
 share/doc/postgresql/html/release-9-5-2.html
 share/doc/postgresql/html/release-9-5-3.html
 share/doc/postgresql/html/release-9-5-4.html

Index: pkgsrc/databases/postgresql95-server/PLIST
diff -u pkgsrc/databases/postgresql95-server/PLIST:1.7 pkgsrc/databases/postgresql95-server/PLIST:1.8
--- pkgsrc/databases/postgresql95-server/PLIST:1.7      Mon Nov 13 09:33:32 2017
+++ pkgsrc/databases/postgresql95-server/PLIST  Thu Feb  8 20:53:58 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2017/11/13 09:33:32 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2018/02/08 20:53:58 adam Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -655,7 +655,6 @@ share/postgresql/timezone/US/Indiana-Sta
 share/postgresql/timezone/US/Michigan
 share/postgresql/timezone/US/Mountain
 share/postgresql/timezone/US/Pacific
-share/postgresql/timezone/US/Pacific-New
 share/postgresql/timezone/US/Samoa
 share/postgresql/timezone/UTC
 share/postgresql/timezone/Universal

Index: pkgsrc/databases/postgresql95/patches/patch-config_perl.m4
diff -u pkgsrc/databases/postgresql95/patches/patch-config_perl.m4:1.1 pkgsrc/databases/postgresql95/patches/patch-config_perl.m4:1.2
--- pkgsrc/databases/postgresql95/patches/patch-config_perl.m4:1.1      Thu Feb 25 21:37:35 2016
+++ pkgsrc/databases/postgresql95/patches/patch-config_perl.m4  Thu Feb  8 20:53:57 2018
@@ -1,15 +1,15 @@
-$NetBSD: patch-config_perl.m4,v 1.1 2016/02/25 21:37:35 tnn Exp $
+$NetBSD: patch-config_perl.m4,v 1.2 2018/02/08 20:53:57 adam Exp $
 
---- config/perl.m4.orig        2013-09-02 20:53:17.000000000 +0000
+--- config/perl.m4.orig        2018-02-05 21:07:03.000000000 +0000
 +++ config/perl.m4
-@@ -62,9 +62,7 @@ if test "$PORTNAME" = "win32" ; then
- perl_lib=`basename $perl_archlibexp/CORE/perl[[5-9]]*.lib .lib`
- test -e "$perl_archlibexp/CORE/$perl_lib.lib" && perl_embed_ldflags="-L$perl_archlibexp/CORE -l$perl_lib"
+@@ -100,9 +100,7 @@ if test "$PORTNAME" = "win32" ; then
+               fi
+       fi
  else
--pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
--pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
--perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e ["s/ -arch [-a-zA-Z0-9_]*//g"]`
-+perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts`
+-      pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
+-      pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
+-      perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e ["s/ -arch [-a-zA-Z0-9_]*//g"]`
++      perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts`
  fi
  AC_SUBST(perl_embed_ldflags)dnl
  if test -z "$perl_embed_ldflags" ; then
Index: pkgsrc/databases/postgresql95/patches/patch-configure
diff -u pkgsrc/databases/postgresql95/patches/patch-configure:1.1 pkgsrc/databases/postgresql95/patches/patch-configure:1.2
--- pkgsrc/databases/postgresql95/patches/patch-configure:1.1   Thu Feb 25 21:37:35 2016
+++ pkgsrc/databases/postgresql95/patches/patch-configure       Thu Feb  8 20:53:57 2018
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.1 2016/02/25 21:37:35 tnn Exp $
+$NetBSD: patch-configure,v 1.2 2018/02/08 20:53:57 adam Exp $
 
 Finally, native solaris uses -lgss for gssapi on mit-krb5.
 
---- configure.orig     2014-12-16 01:07:34.000000000 +0000
+--- configure.orig     2018-02-05 21:05:21.000000000 +0000
 +++ configure
-@@ -2852,6 +2852,7 @@ case $host_os in
+@@ -2857,6 +2857,7 @@ case $host_os in
    darwin*) template=darwin ;;
  dragonfly*) template=netbsd ;;
   freebsd*) template=freebsd ;;
@@ -12,18 +12,18 @@ Finally, native solaris uses -lgss for g
      hpux*) template=hpux ;;
   linux*|gnu*|k*bsd*-gnu)
             template=linux ;;
-@@ -7310,9 +7311,7 @@ if test "$PORTNAME" = "win32" ; then
- perl_lib=`basename $perl_archlibexp/CORE/perl[5-9]*.lib .lib`
- test -e "$perl_archlibexp/CORE/$perl_lib.lib" && perl_embed_ldflags="-L$perl_archlibexp/CORE -l$perl_lib"
+@@ -7451,9 +7452,7 @@ if test "$PORTNAME" = "win32" ; then
+               fi
+       fi
  else
--pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
--pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
--perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e "s/ -arch [-a-zA-Z0-9_]*//g"`
-+perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts`
+-      pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
+-      pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
+-      perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e "s/ -arch [-a-zA-Z0-9_]*//g"`
++      perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts`
  fi
  if test -z "$perl_embed_ldflags" ; then
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-@@ -8407,7 +8406,7 @@ return gss_init_sec_context ();
+@@ -8636,7 +8635,7 @@ return gss_init_sec_context ();
    return 0;
  }
  _ACEOF

Index: pkgsrc/databases/postgresql95/patches/patch-src_pl_plperl_plperl.h
diff -u pkgsrc/databases/postgresql95/patches/patch-src_pl_plperl_plperl.h:1.2 pkgsrc/databases/postgresql95/patches/patch-src_pl_plperl_plperl.h:1.3
--- pkgsrc/databases/postgresql95/patches/patch-src_pl_plperl_plperl.h:1.2      Sun Aug 13 19:25:18 2017
+++ pkgsrc/databases/postgresql95/patches/patch-src_pl_plperl_plperl.h  Thu Feb  8 20:53:57 2018
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_pl_plperl_plperl.h,v 1.2 2017/08/13 19:25:18 adam Exp $
+$NetBSD: patch-src_pl_plperl_plperl.h,v 1.3 2018/02/08 20:53:57 adam Exp $
 
---- src/pl/plperl/plperl.h.orig        2017-08-07 21:19:50.000000000 +0000
+--- src/pl/plperl/plperl.h.orig        2018-02-05 21:05:21.000000000 +0000
 +++ src/pl/plperl/plperl.h
-@@ -44,6 +44,10 @@
- #undef vsnprintf
+@@ -50,6 +50,10 @@
+ #define __inline__ inline
  #endif
  
 +#ifdef __sun
@@ -13,7 +13,7 @@ $NetBSD: patch-src_pl_plperl_plperl.h,v 
  
  /*
   * Get the basic Perl API.  We use PERL_NO_GET_CONTEXT mode so that our code
-@@ -62,6 +66,11 @@
+@@ -68,6 +72,11 @@
  #include "XSUB.h"
  #endif
  

Index: pkgsrc/databases/postgresql96/Makefile.common
diff -u pkgsrc/databases/postgresql96/Makefile.common:1.11 pkgsrc/databases/postgresql96/Makefile.common:1.12
--- pkgsrc/databases/postgresql96/Makefile.common:1.11  Fri Dec 15 16:52:24 2017
+++ pkgsrc/databases/postgresql96/Makefile.common       Thu Feb  8 20:53:58 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2017/12/15 16:52:24 dholland Exp $
+# $NetBSD: Makefile.common,v 1.12 2018/02/08 20:53:58 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql96-pltcl/Makefile
 # used by databases/postgresql96-server/Makefile
 
-DISTNAME=      postgresql-9.6.6
+DISTNAME=      postgresql-9.6.7
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/databases/postgresql96/distinfo
diff -u pkgsrc/databases/postgresql96/distinfo:1.8 pkgsrc/databases/postgresql96/distinfo:1.9
--- pkgsrc/databases/postgresql96/distinfo:1.8  Mon Jan 22 11:05:30 2018
+++ pkgsrc/databases/postgresql96/distinfo      Thu Feb  8 20:53:58 2018
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.8 2018/01/22 11:05:30 jperkin Exp $
+$NetBSD: distinfo,v 1.9 2018/02/08 20:53:58 adam Exp $
 
-SHA1 (postgresql-9.6.6.tar.bz2) = bd911c2a2ee25086cfebe03f3483f82c38210cdb
-RMD160 (postgresql-9.6.6.tar.bz2) = bd2c81026b226517bfe0351db253464c465c8ac8
-SHA512 (postgresql-9.6.6.tar.bz2) = ac2f0fe6ef7c4e14f85cd7592d1306d9657b7f35efa6f43a089d7785ab970b8c25aa1e66d83df056c23513d6dbac0a9f54717b3d85758560d02e7f8141914ebc
-Size (postgresql-9.6.6.tar.bz2) = 19605724 bytes
+SHA1 (postgresql-9.6.7.tar.bz2) = cac19c1c688aeaae0eacad7879a301fda4c72fb3
+RMD160 (postgresql-9.6.7.tar.bz2) = 219a2be7fc1b6a370949d015f9396479e46312e9
+SHA512 (postgresql-9.6.7.tar.bz2) = 6a66cdd5b74ea6dc95628b89bb7663555370be56b3e938f635950628ad5d77443ac8f40c747be1fc1cfc19ca8b0a27f41e52fe4db83a43c7a7bab9bb076c7844
+Size (postgresql-9.6.7.tar.bz2) = 19504886 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
-SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5
-SHA1 (patch-configure) = 59fe9a768caf8a5d308acac60c28bc6bb2c40632
+SHA1 (patch-config_perl.m4) = 14c9564577d0df6f82ae0027aeada2f3a6a8f07c
+SHA1 (patch-configure) = db34614cef013a91dc229be319e5f09c657c3f24
 SHA1 (patch-contrib_dblink_dblink.c) = a6f87ab9f2c28a72608d70267b71bd77437b0921
 SHA1 (patch-src_Makefile.global.in) = 2ab3affedc77b202f6749964287438d6179ca23a
 SHA1 (patch-src_Makefile.shlib) = c2b7008ebcee1b7bfec46b9b35e91be2eef287ae
@@ -16,4 +16,4 @@ SHA1 (patch-src_interfaces_ecpg_pgtypesl
 SHA1 (patch-src_interfaces_libpq_Makefile) = 61bcf84eb69b6ec9faabab0b61913766f4b20f8c
 SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0
 SHA1 (patch-src_pl_plperl_GNUmakefile) = 6ee3e431f46ce5c2a94df499504b2b8bd458bbef
-SHA1 (patch-src_pl_plperl_plperl.h) = 0e7daec79a00d7378326e56525e50cfe61cfc174
+SHA1 (patch-src_pl_plperl_plperl.h) = 4c9c313bbc872802c57f3efd885a2ce6335d5d79

Index: pkgsrc/databases/postgresql96-docs/PLIST
diff -u pkgsrc/databases/postgresql96-docs/PLIST:1.6 pkgsrc/databases/postgresql96-docs/PLIST:1.7
--- pkgsrc/databases/postgresql96-docs/PLIST:1.6        Mon Nov 13 09:33:33 2017
+++ pkgsrc/databases/postgresql96-docs/PLIST    Thu Feb  8 20:53:58 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2017/11/13 09:33:33 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2018/02/08 20:53:58 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -1181,6 +1181,7 @@ share/doc/postgresql/html/release-9-3-18
 share/doc/postgresql/html/release-9-3-19.html
 share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-20.html
+share/doc/postgresql/html/release-9-3-21.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
 share/doc/postgresql/html/release-9-3-5.html
@@ -1196,6 +1197,7 @@ share/doc/postgresql/html/release-9-4-12
 share/doc/postgresql/html/release-9-4-13.html
 share/doc/postgresql/html/release-9-4-14.html
 share/doc/postgresql/html/release-9-4-15.html
+share/doc/postgresql/html/release-9-4-16.html
 share/doc/postgresql/html/release-9-4-2.html
 share/doc/postgresql/html/release-9-4-3.html
 share/doc/postgresql/html/release-9-4-4.html
@@ -1207,6 +1209,7 @@ share/doc/postgresql/html/release-9-4-9.
 share/doc/postgresql/html/release-9-4.html
 share/doc/postgresql/html/release-9-5-1.html
 share/doc/postgresql/html/release-9-5-10.html
+share/doc/postgresql/html/release-9-5-11.html
 share/doc/postgresql/html/release-9-5-2.html
 share/doc/postgresql/html/release-9-5-3.html
 share/doc/postgresql/html/release-9-5-4.html
@@ -1222,6 +1225,7 @@ share/doc/postgresql/html/release-9-6-3.
 share/doc/postgresql/html/release-9-6-4.html
 share/doc/postgresql/html/release-9-6-5.html
 share/doc/postgresql/html/release-9-6-6.html
+share/doc/postgresql/html/release-9-6-7.html
 share/doc/postgresql/html/release-9-6.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/replication-origins.html

Index: pkgsrc/databases/postgresql96-server/PLIST
diff -u pkgsrc/databases/postgresql96-server/PLIST:1.4 pkgsrc/databases/postgresql96-server/PLIST:1.5
--- pkgsrc/databases/postgresql96-server/PLIST:1.4      Mon Nov 13 09:33:33 2017
+++ pkgsrc/databases/postgresql96-server/PLIST  Thu Feb  8 20:53:58 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2017/11/13 09:33:33 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2018/02/08 20:53:58 adam Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -656,7 +656,6 @@ share/postgresql/timezone/US/Indiana-Sta
 share/postgresql/timezone/US/Michigan
 share/postgresql/timezone/US/Mountain
 share/postgresql/timezone/US/Pacific
-share/postgresql/timezone/US/Pacific-New
 share/postgresql/timezone/US/Samoa
 share/postgresql/timezone/UTC
 share/postgresql/timezone/Universal

Index: pkgsrc/databases/postgresql96/patches/patch-config_perl.m4
diff -u pkgsrc/databases/postgresql96/patches/patch-config_perl.m4:1.1 pkgsrc/databases/postgresql96/patches/patch-config_perl.m4:1.2
--- pkgsrc/databases/postgresql96/patches/patch-config_perl.m4:1.1      Sat Oct 29 19:41:55 2016
+++ pkgsrc/databases/postgresql96/patches/patch-config_perl.m4  Thu Feb  8 20:53:58 2018
@@ -1,15 +1,15 @@
-$NetBSD: patch-config_perl.m4,v 1.1 2016/10/29 19:41:55 adam Exp $
+$NetBSD: patch-config_perl.m4,v 1.2 2018/02/08 20:53:58 adam Exp $
 
---- config/perl.m4.orig        2013-09-02 20:53:17.000000000 +0000
+--- config/perl.m4.orig        2018-02-05 21:07:03.000000000 +0000
 +++ config/perl.m4
-@@ -62,9 +62,7 @@ if test "$PORTNAME" = "win32" ; then
- perl_lib=`basename $perl_archlibexp/CORE/perl[[5-9]]*.lib .lib`
- test -e "$perl_archlibexp/CORE/$perl_lib.lib" && perl_embed_ldflags="-L$perl_archlibexp/CORE -l$perl_lib"
+@@ -100,9 +100,7 @@ if test "$PORTNAME" = "win32" ; then
+               fi
+       fi
  else
--pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
--pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
--perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e ["s/ -arch [-a-zA-Z0-9_]*//g"]`
-+perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts`
+-      pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
+-      pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
+-      perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e ["s/ -arch [-a-zA-Z0-9_]*//g"]`
++      perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts`
  fi
  AC_SUBST(perl_embed_ldflags)dnl
  if test -z "$perl_embed_ldflags" ; then
Index: pkgsrc/databases/postgresql96/patches/patch-configure
diff -u pkgsrc/databases/postgresql96/patches/patch-configure:1.1 pkgsrc/databases/postgresql96/patches/patch-configure:1.2
--- pkgsrc/databases/postgresql96/patches/patch-configure:1.1   Sat Oct 29 19:41:55 2016
+++ pkgsrc/databases/postgresql96/patches/patch-configure       Thu Feb  8 20:53:58 2018
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.1 2016/10/29 19:41:55 adam Exp $
+$NetBSD: patch-configure,v 1.2 2018/02/08 20:53:58 adam Exp $
 
 Finally, native solaris uses -lgss for gssapi on mit-krb5.
 
---- configure.orig     2014-12-16 01:07:34.000000000 +0000
+--- configure.orig     2018-02-05 21:03:36.000000000 +0000
 +++ configure
-@@ -2852,6 +2852,7 @@ case $host_os in
+@@ -2862,6 +2862,7 @@ case $host_os in
    darwin*) template=darwin ;;
  dragonfly*) template=netbsd ;;
   freebsd*) template=freebsd ;;
@@ -12,18 +12,18 @@ Finally, native solaris uses -lgss for g
      hpux*) template=hpux ;;
   linux*|gnu*|k*bsd*-gnu)
             template=linux ;;
-@@ -7310,9 +7311,7 @@ if test "$PORTNAME" = "win32" ; then
- perl_lib=`basename $perl_archlibexp/CORE/perl[5-9]*.lib .lib`
- test -e "$perl_archlibexp/CORE/$perl_lib.lib" && perl_embed_ldflags="-L$perl_archlibexp/CORE -l$perl_lib"
+@@ -7537,9 +7538,7 @@ if test "$PORTNAME" = "win32" ; then
+               fi
+       fi
  else
--pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
--pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
--perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e "s/ -arch [-a-zA-Z0-9_]*//g"`
-+perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts`
+-      pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
+-      pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
+-      perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e "s/ -arch [-a-zA-Z0-9_]*//g"`
++      perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts`
  fi
  if test -z "$perl_embed_ldflags" ; then
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-@@ -8407,7 +8406,7 @@ return gss_init_sec_context ();
+@@ -9470,7 +9469,7 @@ return gss_init_sec_context ();
    return 0;
  }
  _ACEOF

Index: pkgsrc/databases/postgresql96/patches/patch-src_pl_plperl_plperl.h
diff -u pkgsrc/databases/postgresql96/patches/patch-src_pl_plperl_plperl.h:1.2 pkgsrc/databases/postgresql96/patches/patch-src_pl_plperl_plperl.h:1.3
--- pkgsrc/databases/postgresql96/patches/patch-src_pl_plperl_plperl.h:1.2      Sun Aug 13 19:25:18 2017
+++ pkgsrc/databases/postgresql96/patches/patch-src_pl_plperl_plperl.h  Thu Feb  8 20:53:58 2018
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_pl_plperl_plperl.h,v 1.2 2017/08/13 19:25:18 adam Exp $
+$NetBSD: patch-src_pl_plperl_plperl.h,v 1.3 2018/02/08 20:53:58 adam Exp $
 
---- src/pl/plperl/plperl.h.orig        2017-08-07 21:19:50.000000000 +0000
+--- src/pl/plperl/plperl.h.orig        2018-02-05 21:03:36.000000000 +0000
 +++ src/pl/plperl/plperl.h
-@@ -44,6 +44,10 @@
- #undef vsnprintf
+@@ -50,6 +50,10 @@
+ #define __inline__ inline
  #endif
  
 +#ifdef __sun
@@ -13,7 +13,7 @@ $NetBSD: patch-src_pl_plperl_plperl.h,v 
  
  /*
   * Get the basic Perl API.  We use PERL_NO_GET_CONTEXT mode so that our code
-@@ -62,6 +66,11 @@
+@@ -68,6 +72,11 @@
  #include "XSUB.h"
  #endif

Prev by Date: CVS commit: pkgsrc/devel
Next by Date: CVS commit: pkgsrc/databases/postgresql93
Previous by Thread: CVS commit: pkgsrc/devel
Next by Thread: CVS commit: pkgsrc/databases/postgresql93
Indexes:

Home | Main Index | Thread Index | Old Index