diff --git a/databases/postgresql/Makefile b/databases/postgresql/Makefile index b693aa1e54a..1233e9b79c5 100644 --- a/databases/postgresql/Makefile +++ b/databases/postgresql/Makefile @@ -5,16 +5,10 @@ COMMENT-contrib=PostgreSQL RDBMS contributions COMMENT-plpython=Python procedural language for PostgreSQL COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version -VERSION= 14.5 -PREV_MAJOR= 13 +VERSION= 15.1 +PREV_MAJOR= 14 DISTNAME= postgresql-${VERSION} PKGNAME-main= postgresql-client-${VERSION} -REVISION-contrib= 0 -REVISION-docs= 0 -REVISION-main= 0 -REVISION-pg_upgrade= 0 -REVISION-plpython= 1 -REVISION-server=0 DPB_PROPERTIES= parallel @@ -22,7 +16,7 @@ CATEGORIES= databases SHARED_LIBS= ecpg 7.10 \ ecpg_compat 4.10 \ pgtypes 4.9 \ - pq 6.13 + pq 6.14 HOMEPAGE= https://www.postgresql.org/ diff --git a/databases/postgresql/distinfo b/databases/postgresql/distinfo index fcf00747e4d..e3e7be10f0e 100644 --- a/databases/postgresql/distinfo +++ b/databases/postgresql/distinfo @@ -1,2 +1,2 @@ -SHA256 (postgresql-14.5.tar.gz) = kOrTk9vGVMsAdeqvDsIFjmuYZs7UeP7TzytopbwE6yQ= -SIZE (postgresql-14.5.tar.gz) = 28988974 +SHA256 (postgresql-15.1.tar.gz) = 6izwWahYgmVLmJrNB+3BIYMxZKMDQPruDTYVz3BY5mw= +SIZE (postgresql-15.1.tar.gz) = 29778341 diff --git a/databases/postgresql/patches/patch-src_bin_scripts_vacuumdb_c b/databases/postgresql/patches/patch-src_bin_scripts_vacuumdb_c index 3f0a571de6d..230d55af968 100644 --- a/databases/postgresql/patches/patch-src_bin_scripts_vacuumdb_c +++ b/databases/postgresql/patches/patch-src_bin_scripts_vacuumdb_c @@ -9,4 +9,4 @@ Index: src/bin/scripts/vacuumdb.c + #include "postgres_fe.h" - #include "catalog/pg_class_d.h" + #include diff --git a/databases/postgresql/patches/patch-src_include_storage_s_lock_h b/databases/postgresql/patches/patch-src_include_storage_s_lock_h index 88faeef35a6..3fce4b61cae 100644 --- a/databases/postgresql/patches/patch-src_include_storage_s_lock_h +++ b/databases/postgresql/patches/patch-src_include_storage_s_lock_h @@ -1,7 +1,7 @@ Index: src/include/storage/s_lock.h --- src/include/storage/s_lock.h.orig +++ src/include/storage/s_lock.h -@@ -763,6 +763,29 @@ typedef unsigned char slock_t; +@@ -802,6 +802,29 @@ tas(volatile slock_t *lock) do { __asm__ __volatile__("" : : : "memory"); *(lock) = 0; } while (0) #endif diff --git a/databases/postgresql/patches/patch-src_interfaces_libpq_Makefile b/databases/postgresql/patches/patch-src_interfaces_libpq_Makefile index c03b88c55bf..da3979b6be9 100644 --- a/databases/postgresql/patches/patch-src_interfaces_libpq_Makefile +++ b/databases/postgresql/patches/patch-src_interfaces_libpq_Makefile @@ -1,7 +1,7 @@ Index: src/interfaces/libpq/Makefile --- src/interfaces/libpq/Makefile.orig +++ src/interfaces/libpq/Makefile -@@ -18,8 +18,8 @@ PGFILEDESC = "PostgreSQL Access Library" +@@ -19,8 +19,8 @@ PGFILEDESC = "PostgreSQL Access Library" # shared library parameters NAME= pq diff --git a/databases/postgresql/pkg/PLIST-contrib b/databases/postgresql/pkg/PLIST-contrib index 37dfdad67e4..f0b25915e06 100644 --- a/databases/postgresql/pkg/PLIST-contrib +++ b/databases/postgresql/pkg/PLIST-contrib @@ -14,6 +14,8 @@ @so lib/postgresql/auth_delay.so @so lib/postgresql/auto_explain.so @so lib/postgresql/autoinc.so +@so lib/postgresql/basebackup_to_shell.so +@so lib/postgresql/basic_archive.so @so lib/postgresql/bloom.so @so lib/postgresql/bool_plperl.so @so lib/postgresql/btree_gin.so @@ -41,6 +43,7 @@ @so lib/postgresql/pg_surgery.so @so lib/postgresql/pg_trgm.so @so lib/postgresql/pg_visibility.so +@so lib/postgresql/pg_walinspect.so @so lib/postgresql/pgcrypto.so @so lib/postgresql/pgrowlocks.so @so lib/postgresql/pgstattuple.so @@ -92,6 +95,7 @@ share/postgresql/extension/btree_gist--1.2.sql share/postgresql/extension/btree_gist--1.3--1.4.sql share/postgresql/extension/btree_gist--1.4--1.5.sql share/postgresql/extension/btree_gist--1.5--1.6.sql +share/postgresql/extension/btree_gist--1.6--1.7.sql share/postgresql/extension/btree_gist.control share/postgresql/extension/citext--1.0--1.1.sql share/postgresql/extension/citext--1.1--1.2.sql @@ -178,6 +182,7 @@ share/postgresql/extension/pageinspect--1.5.sql share/postgresql/extension/pageinspect--1.6--1.7.sql share/postgresql/extension/pageinspect--1.7--1.8.sql share/postgresql/extension/pageinspect--1.8--1.9.sql +share/postgresql/extension/pageinspect--1.9--1.10.sql share/postgresql/extension/pageinspect.control share/postgresql/extension/pg_buffercache--1.0--1.1.sql share/postgresql/extension/pg_buffercache--1.1--1.2.sql @@ -202,6 +207,7 @@ share/postgresql/extension/pg_stat_statements--1.5--1.6.sql share/postgresql/extension/pg_stat_statements--1.6--1.7.sql share/postgresql/extension/pg_stat_statements--1.7--1.8.sql share/postgresql/extension/pg_stat_statements--1.8--1.9.sql +share/postgresql/extension/pg_stat_statements--1.9--1.10.sql share/postgresql/extension/pg_stat_statements.control share/postgresql/extension/pg_surgery--1.0.sql share/postgresql/extension/pg_surgery.control @@ -217,6 +223,8 @@ share/postgresql/extension/pg_visibility--1.0--1.1.sql share/postgresql/extension/pg_visibility--1.1--1.2.sql share/postgresql/extension/pg_visibility--1.1.sql share/postgresql/extension/pg_visibility.control +share/postgresql/extension/pg_walinspect--1.0.sql +share/postgresql/extension/pg_walinspect.control share/postgresql/extension/pgcrypto--1.0--1.1.sql share/postgresql/extension/pgcrypto--1.1--1.2.sql share/postgresql/extension/pgcrypto--1.2--1.3.sql diff --git a/databases/postgresql/pkg/PLIST-docs b/databases/postgresql/pkg/PLIST-docs index 919c137fcdb..b7970fc30ac 100644 --- a/databases/postgresql/pkg/PLIST-docs +++ b/databases/postgresql/pkg/PLIST-docs @@ -46,6 +46,9 @@ share/doc/postgresql/html/app-vacuumdb.html share/doc/postgresql/html/appendix-obsolete.html share/doc/postgresql/html/appendixes.html share/doc/postgresql/html/applevel-consistency.html +share/doc/postgresql/html/archive-module-callbacks.html +share/doc/postgresql/html/archive-module-init.html +share/doc/postgresql/html/archive-modules.html share/doc/postgresql/html/arrays.html share/doc/postgresql/html/auth-bsd.html share/doc/postgresql/html/auth-cert.html @@ -68,6 +71,8 @@ share/doc/postgresql/html/backup-manifest-format.html share/doc/postgresql/html/backup-manifest-toplevel.html share/doc/postgresql/html/backup-manifest-wal-ranges.html share/doc/postgresql/html/backup.html +share/doc/postgresql/html/basebackup-to-shell.html +share/doc/postgresql/html/basic-archive.html share/doc/postgresql/html/bgworker.html share/doc/postgresql/html/biblio.html share/doc/postgresql/html/bki-commands.html @@ -123,9 +128,11 @@ share/doc/postgresql/html/catalog-pg-namespace.html share/doc/postgresql/html/catalog-pg-opclass.html share/doc/postgresql/html/catalog-pg-operator.html share/doc/postgresql/html/catalog-pg-opfamily.html +share/doc/postgresql/html/catalog-pg-parameter-acl.html share/doc/postgresql/html/catalog-pg-partitioned-table.html share/doc/postgresql/html/catalog-pg-policy.html share/doc/postgresql/html/catalog-pg-proc.html +share/doc/postgresql/html/catalog-pg-publication-namespace.html share/doc/postgresql/html/catalog-pg-publication-rel.html share/doc/postgresql/html/catalog-pg-publication.html share/doc/postgresql/html/catalog-pg-range.html @@ -192,6 +199,7 @@ share/doc/postgresql/html/contrib-spi.html share/doc/postgresql/html/contrib.html share/doc/postgresql/html/creating-cluster.html share/doc/postgresql/html/cube.html +share/doc/postgresql/html/custom-rmgr.html share/doc/postgresql/html/custom-scan-execution.html share/doc/postgresql/html/custom-scan-path.html share/doc/postgresql/html/custom-scan-plan.html @@ -539,12 +547,14 @@ share/doc/postgresql/html/locale.html share/doc/postgresql/html/locking-indexes.html share/doc/postgresql/html/logfile-maintenance.html share/doc/postgresql/html/logical-replication-architecture.html +share/doc/postgresql/html/logical-replication-col-lists.html share/doc/postgresql/html/logical-replication-config.html share/doc/postgresql/html/logical-replication-conflicts.html share/doc/postgresql/html/logical-replication-monitoring.html share/doc/postgresql/html/logical-replication-publication.html share/doc/postgresql/html/logical-replication-quick-setup.html share/doc/postgresql/html/logical-replication-restrictions.html +share/doc/postgresql/html/logical-replication-row-filter.html share/doc/postgresql/html/logical-replication-security.html share/doc/postgresql/html/logical-replication-subscription.html share/doc/postgresql/html/logical-replication.html @@ -576,6 +586,7 @@ share/doc/postgresql/html/multibyte.html share/doc/postgresql/html/multivariate-statistics-examples.html share/doc/postgresql/html/mvcc-caveats.html share/doc/postgresql/html/mvcc-intro.html +share/doc/postgresql/html/mvcc-serialization-failure-handling.html share/doc/postgresql/html/mvcc.html share/doc/postgresql/html/nls-programmer.html share/doc/postgresql/html/nls-translator.html @@ -610,6 +621,7 @@ share/doc/postgresql/html/pgtrgm.html share/doc/postgresql/html/pgupgrade.html share/doc/postgresql/html/pgvisibility.html share/doc/postgresql/html/pgwaldump.html +share/doc/postgresql/html/pgwalinspect.html share/doc/postgresql/html/pgxlogdump.html share/doc/postgresql/html/planner-optimizer.html share/doc/postgresql/html/planner-stats-details.html @@ -703,12 +715,8 @@ share/doc/postgresql/html/regress-run.html share/doc/postgresql/html/regress-tap.html share/doc/postgresql/html/regress-variant.html share/doc/postgresql/html/regress.html -share/doc/postgresql/html/release-14-1.html -share/doc/postgresql/html/release-14-2.html -share/doc/postgresql/html/release-14-3.html -share/doc/postgresql/html/release-14-4.html -share/doc/postgresql/html/release-14-5.html -share/doc/postgresql/html/release-14.html +share/doc/postgresql/html/release-15.html +share/doc/postgresql/html/release-15-1.html share/doc/postgresql/html/release-prior.html share/doc/postgresql/html/release.html share/doc/postgresql/html/replication-origins.html @@ -979,6 +987,7 @@ share/doc/postgresql/html/sql-keywords-appendix.html share/doc/postgresql/html/sql-listen.html share/doc/postgresql/html/sql-load.html share/doc/postgresql/html/sql-lock.html +share/doc/postgresql/html/sql-merge.html share/doc/postgresql/html/sql-move.html share/doc/postgresql/html/sql-notify.html share/doc/postgresql/html/sql-prepare-transaction.html @@ -1018,6 +1027,7 @@ share/doc/postgresql/html/sslinfo.html share/doc/postgresql/html/sspi-auth.html share/doc/postgresql/html/storage-file-layout.html share/doc/postgresql/html/storage-fsm.html +share/doc/postgresql/html/storage-hot.html share/doc/postgresql/html/storage-init.html share/doc/postgresql/html/storage-page-layout.html share/doc/postgresql/html/storage-toast.html @@ -1099,6 +1109,7 @@ share/doc/postgresql/html/view-pg-cursors.html share/doc/postgresql/html/view-pg-file-settings.html share/doc/postgresql/html/view-pg-group.html share/doc/postgresql/html/view-pg-hba-file-rules.html +share/doc/postgresql/html/view-pg-ident-file-mappings.html share/doc/postgresql/html/view-pg-indexes.html share/doc/postgresql/html/view-pg-locks.html share/doc/postgresql/html/view-pg-matviews.html @@ -1125,6 +1136,7 @@ share/doc/postgresql/html/view-pg-user-mappings.html share/doc/postgresql/html/view-pg-user.html share/doc/postgresql/html/view-pg-views.html share/doc/postgresql/html/views-overview.html +share/doc/postgresql/html/views.html share/doc/postgresql/html/wal-async-commit.html share/doc/postgresql/html/wal-configuration.html share/doc/postgresql/html/wal-internals.html diff --git a/databases/postgresql/pkg/PLIST-main b/databases/postgresql/pkg/PLIST-main index 54a39a58bfb..99c73893f35 100644 --- a/databases/postgresql/pkg/PLIST-main +++ b/databases/postgresql/pkg/PLIST-main @@ -29,6 +29,7 @@ include/postgresql/informix/esql/decimal.h include/postgresql/informix/esql/sqltypes.h include/postgresql/internal/ include/postgresql/internal/c.h +include/postgresql/internal/fe-auth-sasl.h include/postgresql/internal/libpq/ include/postgresql/internal/libpq-int.h include/postgresql/internal/libpq/pqcomm.h @@ -337,6 +338,7 @@ lib/postgresql/pgxs/src/test/regress/ @man man/man7/LISTEN.7 @man man/man7/LOAD.7 @man man/man7/LOCK.7 +@man man/man7/MERGE.7 @man man/man7/MOVE.7 @man man/man7/NOTIFY.7 @man man/man7/PREPARE.7 diff --git a/databases/postgresql/pkg/PLIST-plpython b/databases/postgresql/pkg/PLIST-plpython index 19f4f5ebb8c..ba3efa2d42f 100644 --- a/databases/postgresql/pkg/PLIST-plpython +++ b/databases/postgresql/pkg/PLIST-plpython @@ -4,23 +4,11 @@ include/postgresql/server/plpython.h @so lib/postgresql/jsonb_plpython3.so @so lib/postgresql/ltree_plpython3.so @so lib/postgresql/plpython3.so -share/postgresql/extension/hstore_plpython2u--1.0.sql -share/postgresql/extension/hstore_plpython2u.control share/postgresql/extension/hstore_plpython3u--1.0.sql share/postgresql/extension/hstore_plpython3u.control -share/postgresql/extension/hstore_plpythonu--1.0.sql -share/postgresql/extension/hstore_plpythonu.control -share/postgresql/extension/jsonb_plpython2u--1.0.sql -share/postgresql/extension/jsonb_plpython2u.control share/postgresql/extension/jsonb_plpython3u--1.0.sql share/postgresql/extension/jsonb_plpython3u.control -share/postgresql/extension/jsonb_plpythonu--1.0.sql -share/postgresql/extension/jsonb_plpythonu.control -share/postgresql/extension/ltree_plpython2u--1.0.sql -share/postgresql/extension/ltree_plpython2u.control share/postgresql/extension/ltree_plpython3u--1.0.sql share/postgresql/extension/ltree_plpython3u.control -share/postgresql/extension/ltree_plpythonu--1.0.sql -share/postgresql/extension/ltree_plpythonu.control share/postgresql/extension/plpython3u--1.0.sql share/postgresql/extension/plpython3u.control diff --git a/databases/postgresql/pkg/PLIST-server b/databases/postgresql/pkg/PLIST-server index ce5e0557247..cec5494c9a4 100644 --- a/databases/postgresql/pkg/PLIST-server +++ b/databases/postgresql/pkg/PLIST-server @@ -111,8 +111,11 @@ include/postgresql/server/access/xlog_internal.h include/postgresql/server/access/xlogarchive.h include/postgresql/server/access/xlogdefs.h include/postgresql/server/access/xloginsert.h +include/postgresql/server/access/xlogprefetcher.h include/postgresql/server/access/xlogreader.h include/postgresql/server/access/xlogrecord.h +include/postgresql/server/access/xlogrecovery.h +include/postgresql/server/access/xlogstats.h include/postgresql/server/access/xlogutils.h include/postgresql/server/bootstrap/ include/postgresql/server/bootstrap/bootstrap.h @@ -199,6 +202,8 @@ include/postgresql/server/catalog/pg_operator.h include/postgresql/server/catalog/pg_operator_d.h include/postgresql/server/catalog/pg_opfamily.h include/postgresql/server/catalog/pg_opfamily_d.h +include/postgresql/server/catalog/pg_parameter_acl.h +include/postgresql/server/catalog/pg_parameter_acl_d.h include/postgresql/server/catalog/pg_partitioned_table.h include/postgresql/server/catalog/pg_partitioned_table_d.h include/postgresql/server/catalog/pg_policy.h @@ -207,6 +212,8 @@ include/postgresql/server/catalog/pg_proc.h include/postgresql/server/catalog/pg_proc_d.h include/postgresql/server/catalog/pg_publication.h include/postgresql/server/catalog/pg_publication_d.h +include/postgresql/server/catalog/pg_publication_namespace.h +include/postgresql/server/catalog/pg_publication_namespace_d.h include/postgresql/server/catalog/pg_publication_rel.h include/postgresql/server/catalog/pg_publication_rel_d.h include/postgresql/server/catalog/pg_range.h @@ -301,6 +308,7 @@ include/postgresql/server/common/ include/postgresql/server/common/archive.h include/postgresql/server/common/base64.h include/postgresql/server/common/checksum_helper.h +include/postgresql/server/common/compression.h include/postgresql/server/common/config_info.h include/postgresql/server/common/connect.h include/postgresql/server/common/controldata_utils.h @@ -321,6 +329,7 @@ include/postgresql/server/common/logging.h include/postgresql/server/common/md5.h include/postgresql/server/common/openssl.h include/postgresql/server/common/pg_lzcompress.h +include/postgresql/server/common/pg_prng.h include/postgresql/server/common/relpath.h include/postgresql/server/common/restricted_token.h include/postgresql/server/common/saslprep.h @@ -330,6 +339,7 @@ include/postgresql/server/common/sha2.h include/postgresql/server/common/shortest_dec.h include/postgresql/server/common/string.h include/postgresql/server/common/unicode_combining_table.h +include/postgresql/server/common/unicode_east_asian_fw_table.h include/postgresql/server/common/unicode_norm.h include/postgresql/server/common/unicode_norm_hashfunc.h include/postgresql/server/common/unicode_norm_table.h @@ -463,6 +473,7 @@ include/postgresql/server/libpq/pqcomm.h include/postgresql/server/libpq/pqformat.h include/postgresql/server/libpq/pqmq.h include/postgresql/server/libpq/pqsignal.h +include/postgresql/server/libpq/sasl.h include/postgresql/server/libpq/scram.h include/postgresql/server/mb/ include/postgresql/server/mb/pg_wchar.h @@ -531,6 +542,7 @@ include/postgresql/server/parser/parse_cte.h include/postgresql/server/parser/parse_enr.h include/postgresql/server/parser/parse_expr.h include/postgresql/server/parser/parse_func.h +include/postgresql/server/parser/parse_merge.h include/postgresql/server/parser/parse_node.h include/postgresql/server/parser/parse_oper.h include/postgresql/server/parser/parse_param.h @@ -621,6 +633,7 @@ include/postgresql/server/port/solaris.h @comment include/postgresql/server/port/win32_msvc/unistd.h @comment include/postgresql/server/port/win32_msvc/utime.h @comment include/postgresql/server/port/win32_port.h +include/postgresql/server/port/win32ntdll.h include/postgresql/server/portability/ include/postgresql/server/portability/instr_time.h include/postgresql/server/portability/mem.h @@ -629,6 +642,7 @@ include/postgresql/server/postgres_ext.h include/postgresql/server/postgres_fe.h include/postgresql/server/postmaster/ include/postgresql/server/postmaster/autovacuum.h +include/postgresql/server/postmaster/auxprocess.h include/postgresql/server/postmaster/bgworker.h include/postgresql/server/postmaster/bgworker_internals.h include/postgresql/server/postmaster/bgwriter.h @@ -647,8 +661,6 @@ include/postgresql/server/regex/regex.h include/postgresql/server/regex/regexport.h include/postgresql/server/regex/regguts.h include/postgresql/server/replication/ -include/postgresql/server/replication/backup_manifest.h -include/postgresql/server/replication/basebackup.h include/postgresql/server/replication/decode.h include/postgresql/server/replication/logical.h include/postgresql/server/replication/logicallauncher.h @@ -749,6 +761,7 @@ include/postgresql/server/storage/copydir.h include/postgresql/server/storage/dsm.h include/postgresql/server/storage/dsm_impl.h include/postgresql/server/storage/fd.h +include/postgresql/server/storage/fileset.h include/postgresql/server/storage/freespace.h include/postgresql/server/storage/fsm_internals.h include/postgresql/server/storage/indexfsm.h @@ -844,7 +857,6 @@ include/postgresql/server/utils/help_config.h include/postgresql/server/utils/hsearch.h include/postgresql/server/utils/index_selfuncs.h include/postgresql/server/utils/inet.h -include/postgresql/server/utils/int8.h include/postgresql/server/utils/inval.h include/postgresql/server/utils/json.h include/postgresql/server/utils/jsonb.h @@ -863,6 +875,7 @@ include/postgresql/server/utils/pg_crc.h include/postgresql/server/utils/pg_locale.h include/postgresql/server/utils/pg_lsn.h include/postgresql/server/utils/pg_rusage.h +include/postgresql/server/utils/pgstat_internal.h include/postgresql/server/utils/pidfile.h include/postgresql/server/utils/plancache.h include/postgresql/server/utils/portal.h @@ -917,9 +930,6 @@ include/postgresql/server/windowapi.h @so lib/postgresql/latin_and_mic.so @so lib/postgresql/libpqwalreceiver.so @so lib/postgresql/pgoutput.so -lib/postgresql/pgxs/src/pl/ -lib/postgresql/pgxs/src/pl/plpython/ -lib/postgresql/pgxs/src/pl/plpython/regress-python3-mangle.mk lib/postgresql/pgxs/src/test/isolation/ @bin lib/postgresql/pgxs/src/test/isolation/isolationtester @bin lib/postgresql/pgxs/src/test/isolation/pg_isolation_regress