diff options
| author | adam <adam@pkgsrc.org> | 2018-02-08 20:53:56 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2018-02-08 20:53:56 +0000 |
| commit | dad0d5770e13fdee814da7c7aaadc43fbee9d536 (patch) | |
| tree | c9f2f43a16a703ff2286f3e13905031975bf29c0 | |
| parent | 0a282a37c50158d6abc84ad76e2cf9c9d91b8a17 (diff) | |
| download | pkgsrc-dad0d5770e13fdee814da7c7aaadc43fbee9d536.tar.gz | |
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
43 files changed, 218 insertions, 205 deletions
diff --git a/databases/postgresql10-client/PLIST b/databases/postgresql10-client/PLIST index fa2c69578e9..6fa5bea57ac 100644 --- a/databases/postgresql10-client/PLIST +++ b/databases/postgresql10-client/PLIST @@ -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.h 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 diff --git a/databases/postgresql10-docs/PLIST b/databases/postgresql10-docs/PLIST index 846601e2825..ea337fdd3c1 100644 --- a/databases/postgresql10-docs/PLIST +++ b/databases/postgresql10-docs/PLIST @@ -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.html 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.html 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.html 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.html 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.html 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 diff --git a/databases/postgresql10-server/PLIST b/databases/postgresql10-server/PLIST index 104b20eb03a..18fa3397d5e 100644 --- a/databases/postgresql10-server/PLIST +++ b/databases/postgresql10-server/PLIST @@ -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.mo 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-Starke 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 diff --git a/databases/postgresql10/Makefile.common b/databases/postgresql10/Makefile.common index 19d0dcab541..aedcdcb47c3 100644 --- a/databases/postgresql10/Makefile.common +++ b/databases/postgresql10/Makefile.common @@ -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 diff --git a/databases/postgresql10/distinfo b/databases/postgresql10/distinfo index becc95dc256..8cc51f463d1 100644 --- a/databases/postgresql10/distinfo +++ b/databases/postgresql10/distinfo @@ -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_pgtypeslib_interval.c) = a15012ae34d4ecd1eb2bc29 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 diff --git a/databases/postgresql10/patches/patch-config_perl.m4 b/databases/postgresql10/patches/patch-config_perl.m4 index 6662d1036f2..7ed640fde4d 100644 --- a/databases/postgresql10/patches/patch-config_perl.m4 +++ b/databases/postgresql10/patches/patch-config_perl.m4 @@ -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 diff --git a/databases/postgresql10/patches/patch-configure b/databases/postgresql10/patches/patch-configure index cc8fadae207..f407620a943 100644 --- a/databases/postgresql10/patches/patch-configure +++ b/databases/postgresql10/patches/patch-configure @@ -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 gssapi on mit-krb5. 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 diff --git a/databases/postgresql10/patches/patch-src_pl_plperl_plperl.h b/databases/postgresql10/patches/patch-src_pl_plperl_plperl.h index b10cbb5d60f..c4cd04a47fc 100644 --- a/databases/postgresql10/patches/patch-src_pl_plperl_plperl.h +++ b/databases/postgresql10/patches/patch-src_pl_plperl_plperl.h @@ -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 1.1 2017/10/23 20:33:49 adam Exp $ /* * 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 diff --git a/databases/postgresql93-client/Makefile b/databases/postgresql93-client/Makefile index 13c2e264b52..d76d743ec32 100644 --- a/databases/postgresql93-client/Makefile +++ b/databases/postgresql93-client/Makefile @@ -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" diff --git a/databases/postgresql93-contrib/Makefile b/databases/postgresql93-contrib/Makefile index 5111edc03bb..28bc9f4324d 100644 --- a/databases/postgresql93-contrib/Makefile +++ b/databases/postgresql93-contrib/Makefile @@ -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" diff --git a/databases/postgresql93-docs/Makefile b/databases/postgresql93-docs/Makefile index 71b28a595b0..0dcfa8d5ebc 100644 --- a/databases/postgresql93-docs/Makefile +++ b/databases/postgresql93-docs/Makefile @@ -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" diff --git a/databases/postgresql93-docs/PLIST b/databases/postgresql93-docs/PLIST index d73484d5ac7..8142e70c8f0 100644 --- a/databases/postgresql93-docs/PLIST +++ b/databases/postgresql93-docs/PLIST @@ -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.html 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 diff --git a/databases/postgresql93-plperl/Makefile b/databases/postgresql93-plperl/Makefile index 1d4a84431a3..4b7bbe55d34 100644 --- a/databases/postgresql93-plperl/Makefile +++ b/databases/postgresql93-plperl/Makefile @@ -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 diff --git a/databases/postgresql93-plpython/Makefile b/databases/postgresql93-plpython/Makefile index 84997bedfe5..4a1e46dc2f1 100644 --- a/databases/postgresql93-plpython/Makefile +++ b/databases/postgresql93-plpython/Makefile @@ -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 diff --git a/databases/postgresql93-pltcl/Makefile b/databases/postgresql93-pltcl/Makefile index cac2ed12184..3ee3d684fed 100644 --- a/databases/postgresql93-pltcl/Makefile +++ b/databases/postgresql93-pltcl/Makefile @@ -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 diff --git a/databases/postgresql93-server/Makefile b/databases/postgresql93-server/Makefile index 0b5e13144a0..7a0a0795d0a 100644 --- a/databases/postgresql93-server/Makefile +++ b/databases/postgresql93-server/Makefile @@ -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 diff --git a/databases/postgresql93-server/PLIST b/databases/postgresql93-server/PLIST index ecefad31f5a..7aac11ffcb3 100644 --- a/databases/postgresql93-server/PLIST +++ b/databases/postgresql93-server/PLIST @@ -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-Starke 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 diff --git a/databases/postgresql93/Makefile.common b/databases/postgresql93/Makefile.common index 441bb01401a..8bc50177f52 100644 --- a/databases/postgresql93/Makefile.common +++ b/databases/postgresql93/Makefile.common @@ -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 diff --git a/databases/postgresql93/distinfo b/databases/postgresql93/distinfo index a5a15fc8234..cb561d00fa9 100644 --- a/databases/postgresql93/distinfo +++ b/databases/postgresql93/distinfo @@ -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_pgtypeslib_interval.c) = 98a49b9fc6677c4c930b574 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 diff --git a/databases/postgresql93/patches/patch-config_perl.m4 b/databases/postgresql93/patches/patch-config_perl.m4 index 319f0a075a1..263dcc74639 100644 --- a/databases/postgresql93/patches/patch-config_perl.m4 +++ b/databases/postgresql93/patches/patch-config_perl.m4 @@ -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 diff --git a/databases/postgresql93/patches/patch-configure b/databases/postgresql93/patches/patch-configure index 5408d0e0c61..8632f2f9360 100644 --- a/databases/postgresql93/patches/patch-configure +++ b/databases/postgresql93/patches/patch-configure @@ -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 gssapi on mit-krb5. 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 diff --git a/databases/postgresql93/patches/patch-src_pl_plperl_plperl.h b/databases/postgresql93/patches/patch-src_pl_plperl_plperl.h index 56d5cb59bf2..4b387ee026a 100644 --- a/databases/postgresql93/patches/patch-src_pl_plperl_plperl.h +++ b/databases/postgresql93/patches/patch-src_pl_plperl_plperl.h @@ -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 1.2 2017/08/13 19:25:17 adam Exp $ /* * 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 diff --git a/databases/postgresql94-docs/PLIST b/databases/postgresql94-docs/PLIST index cd7b88184ba..3b2dbdd741f 100644 --- a/databases/postgresql94-docs/PLIST +++ b/databases/postgresql94-docs/PLIST @@ -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.html 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.html 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 diff --git a/databases/postgresql94-server/PLIST b/databases/postgresql94-server/PLIST index 46d4a08d945..c364fa49304 100644 --- a/databases/postgresql94-server/PLIST +++ b/databases/postgresql94-server/PLIST @@ -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-Starke 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 diff --git a/databases/postgresql94/Makefile.common b/databases/postgresql94/Makefile.common index 2e0055fe5d7..726ec4fa8a2 100644 --- a/databases/postgresql94/Makefile.common +++ b/databases/postgresql94/Makefile.common @@ -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 diff --git a/databases/postgresql94/distinfo b/databases/postgresql94/distinfo index 2f49db32036..769b92a4deb 100644 --- a/databases/postgresql94/distinfo +++ b/databases/postgresql94/distinfo @@ -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_pgtypeslib_interval.c) = af0971de415b6b44ae3520c 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 diff --git a/databases/postgresql94/patches/patch-config_perl.m4 b/databases/postgresql94/patches/patch-config_perl.m4 index 683f03acdd1..14f8d92137f 100644 --- a/databases/postgresql94/patches/patch-config_perl.m4 +++ b/databases/postgresql94/patches/patch-config_perl.m4 @@ -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 diff --git a/databases/postgresql94/patches/patch-configure b/databases/postgresql94/patches/patch-configure index 5a74a091c2d..5b8bdd34726 100644 --- a/databases/postgresql94/patches/patch-configure +++ b/databases/postgresql94/patches/patch-configure @@ -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 gssapi on mit-krb5. 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 diff --git a/databases/postgresql94/patches/patch-src_pl_plperl_plperl.h b/databases/postgresql94/patches/patch-src_pl_plperl_plperl.h index 56d5cb59bf2..d2f8af6549f 100644 --- a/databases/postgresql94/patches/patch-src_pl_plperl_plperl.h +++ b/databases/postgresql94/patches/patch-src_pl_plperl_plperl.h @@ -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 1.2 2017/08/13 19:25:17 adam Exp $ /* * 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 diff --git a/databases/postgresql95-docs/PLIST b/databases/postgresql95-docs/PLIST index 839d3a3bdb1..424fc08aa87 100644 --- a/databases/postgresql95-docs/PLIST +++ b/databases/postgresql95-docs/PLIST @@ -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.html 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.html 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.html 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 diff --git a/databases/postgresql95-server/PLIST b/databases/postgresql95-server/PLIST index 4e3dc7da170..768489289d2 100644 --- a/databases/postgresql95-server/PLIST +++ b/databases/postgresql95-server/PLIST @@ -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-Starke 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 diff --git a/databases/postgresql95/Makefile.common b/databases/postgresql95/Makefile.common index 0650a26044d..68f4452c24c 100644 --- a/databases/postgresql95/Makefile.common +++ b/databases/postgresql95/Makefile.common @@ -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 diff --git a/databases/postgresql95/distinfo b/databases/postgresql95/distinfo index 64e3cadaf32..ac8328bd5f0 100644 --- a/databases/postgresql95/distinfo +++ b/databases/postgresql95/distinfo @@ -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_pgtypeslib_interval.c) = a15012ae34d4ecd1eb2bc29 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 diff --git a/databases/postgresql95/patches/patch-config_perl.m4 b/databases/postgresql95/patches/patch-config_perl.m4 index a6226865895..14f8d92137f 100644 --- a/databases/postgresql95/patches/patch-config_perl.m4 +++ b/databases/postgresql95/patches/patch-config_perl.m4 @@ -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 diff --git a/databases/postgresql95/patches/patch-configure b/databases/postgresql95/patches/patch-configure index 14bae95281c..218d0b68214 100644 --- a/databases/postgresql95/patches/patch-configure +++ b/databases/postgresql95/patches/patch-configure @@ -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 gssapi on mit-krb5. 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 diff --git a/databases/postgresql95/patches/patch-src_pl_plperl_plperl.h b/databases/postgresql95/patches/patch-src_pl_plperl_plperl.h index 3747378f2be..1e05b3f85ac 100644 --- a/databases/postgresql95/patches/patch-src_pl_plperl_plperl.h +++ b/databases/postgresql95/patches/patch-src_pl_plperl_plperl.h @@ -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 1.2 2017/08/13 19:25:18 adam Exp $ /* * 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 diff --git a/databases/postgresql96-docs/PLIST b/databases/postgresql96-docs/PLIST index 9bdab41546f..4736869b611 100644 --- a/databases/postgresql96-docs/PLIST +++ b/databases/postgresql96-docs/PLIST @@ -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.html 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.html 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.html 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.html 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 diff --git a/databases/postgresql96-server/PLIST b/databases/postgresql96-server/PLIST index 23ddc658338..4987b087169 100644 --- a/databases/postgresql96-server/PLIST +++ b/databases/postgresql96-server/PLIST @@ -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-Starke 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 diff --git a/databases/postgresql96/Makefile.common b/databases/postgresql96/Makefile.common index 8afd3d86aa1..8cdcb484414 100644 --- a/databases/postgresql96/Makefile.common +++ b/databases/postgresql96/Makefile.common @@ -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 diff --git a/databases/postgresql96/distinfo b/databases/postgresql96/distinfo index 6c80ebecfc6..fde0c0d968d 100644 --- a/databases/postgresql96/distinfo +++ b/databases/postgresql96/distinfo @@ -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_pgtypeslib_interval.c) = a15012ae34d4ecd1eb2bc29 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 diff --git a/databases/postgresql96/patches/patch-config_perl.m4 b/databases/postgresql96/patches/patch-config_perl.m4 index dec81e54660..bc9700584aa 100644 --- a/databases/postgresql96/patches/patch-config_perl.m4 +++ b/databases/postgresql96/patches/patch-config_perl.m4 @@ -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 diff --git a/databases/postgresql96/patches/patch-configure b/databases/postgresql96/patches/patch-configure index 363d2f39b9c..963b7adfb3a 100644 --- a/databases/postgresql96/patches/patch-configure +++ b/databases/postgresql96/patches/patch-configure @@ -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 gssapi on mit-krb5. 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 diff --git a/databases/postgresql96/patches/patch-src_pl_plperl_plperl.h b/databases/postgresql96/patches/patch-src_pl_plperl_plperl.h index 3747378f2be..ce621cfaa6b 100644 --- a/databases/postgresql96/patches/patch-src_pl_plperl_plperl.h +++ b/databases/postgresql96/patches/patch-src_pl_plperl_plperl.h @@ -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 1.2 2017/08/13 19:25:18 adam Exp $ /* * 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 |