From owner-dev-commits-ports-all@freebsd.org Sat May 15 09:12:57 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 702B163F8D5; Sat, 15 May 2021 09:12:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fj06d18mSz3NK5; Sat, 15 May 2021 09:12:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E66A022DA5; Sat, 15 May 2021 09:12:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14F9CuqN059118; Sat, 15 May 2021 09:12:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14F9Cu38059117; Sat, 15 May 2021 09:12:56 GMT (envelope-from git) Date: Sat, 15 May 2021 09:12:56 GMT Message-Id: <202105150912.14F9Cu38059117@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Palle Girgensohn Subject: git: ab83f2b4bb78 - main - databases/postgresql??-*: Upgrade to latest version MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: girgen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ab83f2b4bb78a718efa5c43247ba1e1d207f99b6 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 May 2021 09:12:57 -0000 The branch main has been updated by girgen: URL: https://cgit.FreeBSD.org/ports/commit/?id=ab83f2b4bb78a718efa5c43247ba1e1d207f99b6 commit ab83f2b4bb78a718efa5c43247ba1e1d207f99b6 Author: Palle Girgensohn AuthorDate: 2021-05-15 09:11:12 +0000 Commit: Palle Girgensohn CommitDate: 2021-05-15 09:12:17 +0000 databases/postgresql??-*: Upgrade to latest version PostgreSQL 13.3, 12.7, 11.12, 10.17, and 9.6.22 Released! The PostgreSQL Global Development Group has released an update to all supported versions of our database system, including 13.3, 12.7, 11.12, 10.17, and 9.6.22. This release closes three security vulnerabilities and fixes over 45 bugs reported over the last three months. Security fixes in this release: CVE-2021-32027: Buffer overrun from integer overflow in array subscripting calculations CVE-2021-32028: Memory disclosure in INSERT ... ON CONFLICT ... DO UPDATE CVE-2021-32029: Memory disclosure in partitioned-table UPDATE ... RETURNING Also plenty of bug fixes. See the release note for details. Changes to the port: Make sure we use the matching version of llvm. This fixes a problem with the llvm version string not being monotonically increasing with the version number. [1] Better pkg message about checksums for postgresql 12+. [2] [4] Adjust login class parameter to adhere to the documentation in rc.subr(8) [3]: The rc.conf parameter for the login class of the postgresql daemon has changed name from postgresql_class to postgresql_login_class, since rc.subr(8) states that the parameter should be named ${name}_login_class. Allow parallel builds. [5] Correct the directory name for the user postgres in pkg message. [6] PR: 250824 [1], 253558 [2], 236060 [3], 233106 [4], 230656 [5] PR: 226674 [6] Submitted by: Michael Zhilin [2], Michael Zhilin [3], Dmitry Chestnykh [4] Submitted by: Steve Wills [5], knezour [6] Security: 76e0bb86-b4cb-11eb-b9c9-6cc21735f730 Security: 62da9702-b4cc-11eb-b9c9-6cc21735f730 Release notes: https://www.postgresql.org/docs/release/ --- UPDATING | 8 ++++++ databases/postgresql10-server/Makefile | 4 +-- databases/postgresql10-server/distinfo | 6 ++--- .../files/pkg-message-server.in | 8 +++--- databases/postgresql10-server/files/postgresql.in | 8 +++--- databases/postgresql11-server/Makefile | 4 +-- databases/postgresql11-server/distinfo | 6 ++--- .../files/pkg-message-server.in | 8 +++--- databases/postgresql11-server/files/postgresql.in | 8 +++--- databases/postgresql12-server/Makefile | 4 +-- databases/postgresql12-server/distinfo | 6 ++--- .../files/pkg-message-server.in | 14 +++++----- databases/postgresql12-server/files/postgresql.in | 8 +++--- databases/postgresql13-server/Makefile | 31 +++++++++++++++------- databases/postgresql13-server/distinfo | 6 ++--- .../files/pkg-message-server.in | 14 +++++----- databases/postgresql13-server/files/postgresql.in | 8 +++--- databases/postgresql13-server/pkg-plist-client | 1 + databases/postgresql13-server/pkg-plist-server | 8 ++++++ .../files/pkg-message-server.in | 8 +++--- databases/postgresql96-server/Makefile | 4 +-- databases/postgresql96-server/distinfo | 6 ++--- .../files/pkg-message-server.in | 8 +++--- databases/postgresql96-server/files/postgresql.in | 8 +++--- 24 files changed, 112 insertions(+), 82 deletions(-) diff --git a/UPDATING b/UPDATING index 273efd0be4ea..779b746347a8 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,14 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20210515: + AFFETS: users of databases/postgresql??-server + AUTHOR: girgen@FreeBSD.org + + The rc.conf parameter for the login class of the postgresql daemon has + changed name from postgresql_class to postgresql_login_class. + rc.subr(8) states that the parameter should be named ${name}_login_class. + 20200512: AFFECTS: users of sysutils/ansible* AUTHOR: 0mp@FreeBSD.org diff --git a/databases/postgresql10-server/Makefile b/databases/postgresql10-server/Makefile index 410592e824b6..ab8ff8d6c370 100644 --- a/databases/postgresql10-server/Makefile +++ b/databases/postgresql10-server/Makefile @@ -1,9 +1,9 @@ # Created by: Marc G. Fournier -DISTVERSION?= 10.16 +DISTVERSION?= 10.17 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and # not their own. Probably best to keep it at ?=0 when reset here too. -PORTREVISION?= 1 +PORTREVISION?= 0 MAINTAINER?= pgsql@FreeBSD.org diff --git a/databases/postgresql10-server/distinfo b/databases/postgresql10-server/distinfo index 1d549b23ede6..aa0b98427f3f 100644 --- a/databases/postgresql10-server/distinfo +++ b/databases/postgresql10-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1612956692 -SHA256 (postgresql/postgresql-10.16.tar.bz2) = a35c718b1b6690e01c69626d467edb933784f8d1d6741e21fe6cce0738467bb3 -SIZE (postgresql/postgresql-10.16.tar.bz2) = 19140221 +TIMESTAMP = 1620992064 +SHA256 (postgresql/postgresql-10.17.tar.bz2) = 5af28071606c9cd82212c19ba584657a9d240e1c4c2da28fc1f3998a2754b26c +SIZE (postgresql/postgresql-10.17.tar.bz2) = 19153278 diff --git a/databases/postgresql10-server/files/pkg-message-server.in b/databases/postgresql10-server/files/pkg-message-server.in index 84a13f7cb47c..e2407c1d964f 100644 --- a/databases/postgresql10-server/files/pkg-message-server.in +++ b/databases/postgresql10-server/files/pkg-message-server.in @@ -14,7 +14,7 @@ is a periodic script, %%PREFIX%%/etc/periodic/daily/502.pgsql, that you may find useful. You can use it to backup and perform vacuum on all databases nightly. Per default, it performs `vacuum analyze'. See the script for instructions. For autovacuum settings, please review -~pgsql/data/postgresql.conf. +~postgres/data/postgresql.conf. If you plan to access your PostgreSQL server using ODBC, please consider running the SQL script %%PREFIX%%/share/postgresql/odbc.sql @@ -48,15 +48,15 @@ You can then start PostgreSQL by running: %%PREFIX%%/etc/rc.d/postgresql start -For postmaster settings, see ~pgsql/data/postgresql.conf +For postmaster settings, see ~postgres/data/postgresql.conf NB. FreeBSD's PostgreSQL port logs to syslog by default - See ~pgsql/data/postgresql.conf for more info + See ~postgres/data/postgresql.conf for more info NB. If you're not using a checksumming filesystem like ZFS, you might wish to enable data checksumming. It can only be enabled during the initdb phase, by adding the "--data-checksums" flag to - the postgres_initdb_flags rcvar. Check the initdb(1) manpage + the postgresql_initdb_flags rcvar. Check the initdb(1) manpage for more info and make sure you understand the performance implications. diff --git a/databases/postgresql10-server/files/postgresql.in b/databases/postgresql10-server/files/postgresql.in index 4f64ebb7f271..88ace679b95c 100644 --- a/databases/postgresql10-server/files/postgresql.in +++ b/databases/postgresql10-server/files/postgresql.in @@ -1,7 +1,7 @@ #!/bin/sh # PROVIDE: postgresql -# REQUIRE: sshd +# REQUIRE: SERVERS # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable PostgreSQL: @@ -11,7 +11,7 @@ # postgresql_data="/var/db/%%PG_USER%%/data10" # postgresql_flags="-w -s -m fast" # postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C" -# postgresql_class="default" +# postgresql_login_class="default" # postgresql_profiles="" # # See %%PREFIX%%/share/doc/postgresql/README-server for more info @@ -33,7 +33,7 @@ postgresql_enable=${postgresql_enable:-"NO"} postgresql_flags=${postgresql_flags:-"-w -s -m fast"} postgresql_user=${postgresql_user:-"%%PG_USER%%"} eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data10"} -postgresql_class=${postgresql_class:-"default"} +postgresql_login_class=${postgresql_login_class:-"default"} postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"} name=postgresql @@ -109,7 +109,7 @@ postgresql_command() postgresql_initdb() { - ${su_cmd} -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" + ${su_cmd} -l -c ${postgresql_login_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" } run_rc_command "$1" diff --git a/databases/postgresql11-server/Makefile b/databases/postgresql11-server/Makefile index 516bc79d9627..8c6a07727012 100644 --- a/databases/postgresql11-server/Makefile +++ b/databases/postgresql11-server/Makefile @@ -1,9 +1,9 @@ # Created by: Marc G. Fournier -DISTVERSION?= 11.11 +DISTVERSION?= 11.12 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and # not their own. Probably best to keep it at ?=0 when reset here too. -PORTREVISION?= 1 +PORTREVISION?= 0 MAINTAINER?= pgsql@FreeBSD.org diff --git a/databases/postgresql11-server/distinfo b/databases/postgresql11-server/distinfo index 1f46b5a4f2ab..3a87e1b91719 100644 --- a/databases/postgresql11-server/distinfo +++ b/databases/postgresql11-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1612956693 -SHA256 (postgresql/postgresql-11.11.tar.bz2) = 40607b7fa15b7d63f5075a7277daf7b3412486aa5db3aedffdb7768b9298186c -SIZE (postgresql/postgresql-11.11.tar.bz2) = 20054359 +TIMESTAMP = 1620991922 +SHA256 (postgresql/postgresql-11.12.tar.bz2) = 87f9d8b16b2b8ef71586f2ec76beac844819f64734b07fa33986755c2f53cb04 +SIZE (postgresql/postgresql-11.12.tar.bz2) = 20075485 diff --git a/databases/postgresql11-server/files/pkg-message-server.in b/databases/postgresql11-server/files/pkg-message-server.in index 84a13f7cb47c..e2407c1d964f 100644 --- a/databases/postgresql11-server/files/pkg-message-server.in +++ b/databases/postgresql11-server/files/pkg-message-server.in @@ -14,7 +14,7 @@ is a periodic script, %%PREFIX%%/etc/periodic/daily/502.pgsql, that you may find useful. You can use it to backup and perform vacuum on all databases nightly. Per default, it performs `vacuum analyze'. See the script for instructions. For autovacuum settings, please review -~pgsql/data/postgresql.conf. +~postgres/data/postgresql.conf. If you plan to access your PostgreSQL server using ODBC, please consider running the SQL script %%PREFIX%%/share/postgresql/odbc.sql @@ -48,15 +48,15 @@ You can then start PostgreSQL by running: %%PREFIX%%/etc/rc.d/postgresql start -For postmaster settings, see ~pgsql/data/postgresql.conf +For postmaster settings, see ~postgres/data/postgresql.conf NB. FreeBSD's PostgreSQL port logs to syslog by default - See ~pgsql/data/postgresql.conf for more info + See ~postgres/data/postgresql.conf for more info NB. If you're not using a checksumming filesystem like ZFS, you might wish to enable data checksumming. It can only be enabled during the initdb phase, by adding the "--data-checksums" flag to - the postgres_initdb_flags rcvar. Check the initdb(1) manpage + the postgresql_initdb_flags rcvar. Check the initdb(1) manpage for more info and make sure you understand the performance implications. diff --git a/databases/postgresql11-server/files/postgresql.in b/databases/postgresql11-server/files/postgresql.in index bcb1d006c908..080d3e40cd6f 100644 --- a/databases/postgresql11-server/files/postgresql.in +++ b/databases/postgresql11-server/files/postgresql.in @@ -1,7 +1,7 @@ #!/bin/sh # PROVIDE: postgresql -# REQUIRE: sshd +# REQUIRE: SERVERS # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable PostgreSQL: @@ -11,7 +11,7 @@ # postgresql_data="/var/db/%%PG_USER%%/data11" # postgresql_flags="-w -s -m fast" # postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C" -# postgresql_class="default" +# postgresql_login_class="default" # postgresql_profiles="" # # See %%PREFIX%%/share/doc/postgresql/README-server for more info @@ -33,7 +33,7 @@ postgresql_enable=${postgresql_enable:-"NO"} postgresql_flags=${postgresql_flags:-"-w -s -m fast"} postgresql_user=${postgresql_user:-"%%PG_USER%%"} eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data11"} -postgresql_class=${postgresql_class:-"default"} +postgresql_login_class=${postgresql_login_class:-"default"} postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"} name=postgresql @@ -109,7 +109,7 @@ postgresql_command() postgresql_initdb() { - ${su_cmd} -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" + ${su_cmd} -l -c ${postgresql_login_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" } run_rc_command "$1" diff --git a/databases/postgresql12-server/Makefile b/databases/postgresql12-server/Makefile index a47f1cca3b23..8998336755d0 100644 --- a/databases/postgresql12-server/Makefile +++ b/databases/postgresql12-server/Makefile @@ -1,9 +1,9 @@ # Created by: Marc G. Fournier -DISTVERSION?= 12.6 +DISTVERSION?= 12.7 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and # not their own. Probably best to keep it at ?=0 when reset here too. -PORTREVISION?= 1 +PORTREVISION?= 0 MAINTAINER?= pgsql@FreeBSD.org diff --git a/databases/postgresql12-server/distinfo b/databases/postgresql12-server/distinfo index 743b3b32c5f1..76b4c494e32f 100644 --- a/databases/postgresql12-server/distinfo +++ b/databases/postgresql12-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1612956694 -SHA256 (postgresql/postgresql-12.6.tar.bz2) = df7dd98d5ccaf1f693c7e1d0d084e9fed7017ee248bba5be0167c42ad2d70a09 -SIZE (postgresql/postgresql-12.6.tar.bz2) = 20771172 +TIMESTAMP = 1620992107 +SHA256 (postgresql/postgresql-12.7.tar.bz2) = 8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995 +SIZE (postgresql/postgresql-12.7.tar.bz2) = 20819005 diff --git a/databases/postgresql12-server/files/pkg-message-server.in b/databases/postgresql12-server/files/pkg-message-server.in index 84a13f7cb47c..9bfbcc7b4a83 100644 --- a/databases/postgresql12-server/files/pkg-message-server.in +++ b/databases/postgresql12-server/files/pkg-message-server.in @@ -14,7 +14,7 @@ is a periodic script, %%PREFIX%%/etc/periodic/daily/502.pgsql, that you may find useful. You can use it to backup and perform vacuum on all databases nightly. Per default, it performs `vacuum analyze'. See the script for instructions. For autovacuum settings, please review -~pgsql/data/postgresql.conf. +~postgres/data/postgresql.conf. If you plan to access your PostgreSQL server using ODBC, please consider running the SQL script %%PREFIX%%/share/postgresql/odbc.sql @@ -48,17 +48,17 @@ You can then start PostgreSQL by running: %%PREFIX%%/etc/rc.d/postgresql start -For postmaster settings, see ~pgsql/data/postgresql.conf +For postmaster settings, see ~postgres/data/postgresql.conf NB. FreeBSD's PostgreSQL port logs to syslog by default - See ~pgsql/data/postgresql.conf for more info + See ~postgres/data/postgresql.conf for more info NB. If you're not using a checksumming filesystem like ZFS, you might - wish to enable data checksumming. It can only be enabled during + wish to enable data checksumming. It can be enabled during the initdb phase, by adding the "--data-checksums" flag to - the postgres_initdb_flags rcvar. Check the initdb(1) manpage - for more info and make sure you understand the performance - implications. + the postgresql_initdb_flags rcvar. Otherwise you can enable it later by + pg_checksums. Check the initdb(1) manpage for more info + and make sure you understand the performance implications. ====================================================================== diff --git a/databases/postgresql12-server/files/postgresql.in b/databases/postgresql12-server/files/postgresql.in index 3bc6575148e9..cd3f5620e0a4 100644 --- a/databases/postgresql12-server/files/postgresql.in +++ b/databases/postgresql12-server/files/postgresql.in @@ -1,7 +1,7 @@ #!/bin/sh # PROVIDE: postgresql -# REQUIRE: sshd +# REQUIRE: SERVERS # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable PostgreSQL: @@ -11,7 +11,7 @@ # postgresql_data="/var/db/%%PG_USER%%/data12" # postgresql_flags="-w -s -m fast" # postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C" -# postgresql_class="default" +# postgresql_login_class="default" # postgresql_profiles="" # # See %%PREFIX%%/share/doc/postgresql/README-server for more info @@ -33,7 +33,7 @@ postgresql_enable=${postgresql_enable:-"NO"} postgresql_flags=${postgresql_flags:-"-w -s -m fast"} postgresql_user=${postgresql_user:-"%%PG_USER%%"} eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data12"} -postgresql_class=${postgresql_class:-"default"} +postgresql_login_class=${postgresql_login_class:-"default"} postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"} name=postgresql @@ -109,7 +109,7 @@ postgresql_command() postgresql_initdb() { - ${su_cmd} -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" + ${su_cmd} -l -c ${postgresql_login_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" } run_rc_command "$1" diff --git a/databases/postgresql13-server/Makefile b/databases/postgresql13-server/Makefile index 4305a5ed4d55..a480ca004546 100644 --- a/databases/postgresql13-server/Makefile +++ b/databases/postgresql13-server/Makefile @@ -1,10 +1,10 @@ # Created by: Marc G. Fournier PORTNAME?= postgresql -DISTVERSION?= 13.2 +DISTVERSION?= 13.3 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and # not their own. Probably best to keep it at ?=0 when reset here too. -PORTREVISION?= 1 +PORTREVISION?= 0 CATEGORIES?= databases MASTER_SITES= PGSQL/source/v${DISTVERSION} PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT} @@ -240,26 +240,39 @@ RUN_DEPENDS+= llvm-config${PG_LLVM_VERSION}:devel/llvm${PG_LLVM_VERSION} CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${PG_LLVM_VERSION} .endif +# Convert LLVM_DEFAULT to COMPILER_VERSION format to make it +# suitable for version comparison. +.if ${LLVM_DEFAULT} >= 70 && ${LLVM_DEFAULT} <= 90 +LLVM_DEFAULT_VERSION= ${LLVM_DEFAULT} +.else +LLVM_DEFAULT_VERSION= ${LLVM_DEFAULT}0 +.endif + +# Convert COMPILER_VERSION to LLVM_DEFAULT format to make it +# suitable for LLVM port name. +# All supported FreeBSD versions have Clang 10.0.1 or later. +LLVM_PORT_SUFFIX= ${COMPILER_VERSION:C/.$//} + # sync LLVM to the preferred compiler if possible # or else use a lower version compiler that is compatible -.if ${COMPILER_VERSION} > ${LLVM_DEFAULT} +.if ${COMPILER_VERSION} > ${LLVM_DEFAULT_VERSION} # Highest LLVM version in ports: -. if ${COMPILER_VERSION} <= 11 -PG_LLVM_VERSION=${COMPILER_VERSION} -PG_COMPILER_VERSION=${COMPILER_VERSION} +. if ${LLVM_PORT_SUFFIX} <= 11 +PG_LLVM_VERSION=${LLVM_PORT_SUFFIX} +PG_COMPILER_VERSION=${LLVM_PORT_SUFFIX} . else PG_LLVM_VERSION=11 PG_COMPILER_VERSION=11 . endif .else -PG_COMPILER_VERSION=${COMPILER_VERSION} PG_LLVM_VERSION=${LLVM_DEFAULT} +PG_COMPILER_VERSION=${LLVM_PORT_SUFFIX} .endif .if ${DISTVERSION:C/([0-9]*).*/\1/} >= 11 . if defined(SERVER_ONLY) && ${PORT_OPTIONS:MLLVM} INSTALL_DIRS+= src/backend/jit/llvm -. if ${COMPILER_VERSION} != ${PG_COMPILER_VERSION} +. if ${LLVM_PORT_SUFFIX} != ${PG_COMPILER_VERSION} LLVM_CONFIGURE_ARGS?= CC=${LOCALBASE}/bin/clang${PG_COMPILER_VERSION} . endif . endif @@ -275,7 +288,7 @@ pre-build: do-build: @ cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks @ for dir in ${BUILD_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}; \ + cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS}; \ done . if exists(${FILESDIR}/pkg-message${COMPONENT}.in) diff --git a/databases/postgresql13-server/distinfo b/databases/postgresql13-server/distinfo index 4daa9fa2e5a1..9ac2c3dbf1f6 100644 --- a/databases/postgresql13-server/distinfo +++ b/databases/postgresql13-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1612956695 -SHA256 (postgresql/postgresql-13.2.tar.bz2) = 5fd7fcd08db86f5b2aed28fcfaf9ae0aca8e9428561ac547764c2a2b0f41adfc -SIZE (postgresql/postgresql-13.2.tar.bz2) = 21057276 +TIMESTAMP = 1620992128 +SHA256 (postgresql/postgresql-13.3.tar.bz2) = 3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1 +SIZE (postgresql/postgresql-13.3.tar.bz2) = 21119109 diff --git a/databases/postgresql13-server/files/pkg-message-server.in b/databases/postgresql13-server/files/pkg-message-server.in index 84a13f7cb47c..9bfbcc7b4a83 100644 --- a/databases/postgresql13-server/files/pkg-message-server.in +++ b/databases/postgresql13-server/files/pkg-message-server.in @@ -14,7 +14,7 @@ is a periodic script, %%PREFIX%%/etc/periodic/daily/502.pgsql, that you may find useful. You can use it to backup and perform vacuum on all databases nightly. Per default, it performs `vacuum analyze'. See the script for instructions. For autovacuum settings, please review -~pgsql/data/postgresql.conf. +~postgres/data/postgresql.conf. If you plan to access your PostgreSQL server using ODBC, please consider running the SQL script %%PREFIX%%/share/postgresql/odbc.sql @@ -48,17 +48,17 @@ You can then start PostgreSQL by running: %%PREFIX%%/etc/rc.d/postgresql start -For postmaster settings, see ~pgsql/data/postgresql.conf +For postmaster settings, see ~postgres/data/postgresql.conf NB. FreeBSD's PostgreSQL port logs to syslog by default - See ~pgsql/data/postgresql.conf for more info + See ~postgres/data/postgresql.conf for more info NB. If you're not using a checksumming filesystem like ZFS, you might - wish to enable data checksumming. It can only be enabled during + wish to enable data checksumming. It can be enabled during the initdb phase, by adding the "--data-checksums" flag to - the postgres_initdb_flags rcvar. Check the initdb(1) manpage - for more info and make sure you understand the performance - implications. + the postgresql_initdb_flags rcvar. Otherwise you can enable it later by + pg_checksums. Check the initdb(1) manpage for more info + and make sure you understand the performance implications. ====================================================================== diff --git a/databases/postgresql13-server/files/postgresql.in b/databases/postgresql13-server/files/postgresql.in index a123816264b8..d04d3c3fd1a8 100644 --- a/databases/postgresql13-server/files/postgresql.in +++ b/databases/postgresql13-server/files/postgresql.in @@ -1,7 +1,7 @@ #!/bin/sh # PROVIDE: postgresql -# REQUIRE: sshd +# REQUIRE: SERVERS # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable PostgreSQL: @@ -11,7 +11,7 @@ # postgresql_data="/var/db/%%PG_USER%%/data13" # postgresql_flags="-w -s -m fast" # postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C" -# postgresql_class="default" +# postgresql_login_class="default" # postgresql_profiles="" # # See %%PREFIX%%/share/doc/postgresql/README-server for more info @@ -33,7 +33,7 @@ postgresql_enable=${postgresql_enable:-"NO"} postgresql_flags=${postgresql_flags:-"-w -s -m fast"} postgresql_user=${postgresql_user:-"%%PG_USER%%"} eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data13"} -postgresql_class=${postgresql_class:-"default"} +postgresql_login_class=${postgresql_login_class:-"default"} postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"} name=postgresql @@ -109,7 +109,7 @@ postgresql_command() postgresql_initdb() { - ${su_cmd} -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" + ${su_cmd} -l -c ${postgresql_login_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" } run_rc_command "$1" diff --git a/databases/postgresql13-server/pkg-plist-client b/databases/postgresql13-server/pkg-plist-client index 0a4ef08da6be..08e9bf92fc5b 100644 --- a/databases/postgresql13-server/pkg-plist-client +++ b/databases/postgresql13-server/pkg-plist-client @@ -1192,6 +1192,7 @@ man/man7/WITH.7.gz %%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpg-13.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-13.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_config-13.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/pgscripts-13.mo %%NLS%%share/locale/ru/LC_MESSAGES/ecpg-13.mo %%NLS%%share/locale/ru/LC_MESSAGES/ecpglib6-13.mo %%NLS%%share/locale/ru/LC_MESSAGES/libpq5-13.mo diff --git a/databases/postgresql13-server/pkg-plist-server b/databases/postgresql13-server/pkg-plist-server index ef2256fa8ec2..6dd25fc3fcdf 100644 --- a/databases/postgresql13-server/pkg-plist-server +++ b/databases/postgresql13-server/pkg-plist-server @@ -827,6 +827,14 @@ lib/postgresql/utf8_and_win.so %%NLS%%share/locale/pl/LC_MESSAGES/pg_test_fsync-13.mo %%NLS%%share/locale/pl/LC_MESSAGES/pg_test_timing-13.mo %%NLS%%share/locale/pl/LC_MESSAGES/plpgsql-13.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/initdb-13.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_archivecleanup-13.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_checksums-13.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-13.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-13.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_resetwal-13.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_test_fsync-13.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_test_timing-13.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/plpgsql-13.mo %%NLS%%share/locale/ru/LC_MESSAGES/initdb-13.mo %%NLS%%share/locale/ru/LC_MESSAGES/pg_archivecleanup-13.mo diff --git a/databases/postgresql95-server/files/pkg-message-server.in b/databases/postgresql95-server/files/pkg-message-server.in index 84a13f7cb47c..e2407c1d964f 100644 --- a/databases/postgresql95-server/files/pkg-message-server.in +++ b/databases/postgresql95-server/files/pkg-message-server.in @@ -14,7 +14,7 @@ is a periodic script, %%PREFIX%%/etc/periodic/daily/502.pgsql, that you may find useful. You can use it to backup and perform vacuum on all databases nightly. Per default, it performs `vacuum analyze'. See the script for instructions. For autovacuum settings, please review -~pgsql/data/postgresql.conf. +~postgres/data/postgresql.conf. If you plan to access your PostgreSQL server using ODBC, please consider running the SQL script %%PREFIX%%/share/postgresql/odbc.sql @@ -48,15 +48,15 @@ You can then start PostgreSQL by running: %%PREFIX%%/etc/rc.d/postgresql start -For postmaster settings, see ~pgsql/data/postgresql.conf +For postmaster settings, see ~postgres/data/postgresql.conf NB. FreeBSD's PostgreSQL port logs to syslog by default - See ~pgsql/data/postgresql.conf for more info + See ~postgres/data/postgresql.conf for more info NB. If you're not using a checksumming filesystem like ZFS, you might wish to enable data checksumming. It can only be enabled during the initdb phase, by adding the "--data-checksums" flag to - the postgres_initdb_flags rcvar. Check the initdb(1) manpage + the postgresql_initdb_flags rcvar. Check the initdb(1) manpage for more info and make sure you understand the performance implications. diff --git a/databases/postgresql96-server/Makefile b/databases/postgresql96-server/Makefile index 26547ba1f682..7d2e6ee38aae 100644 --- a/databases/postgresql96-server/Makefile +++ b/databases/postgresql96-server/Makefile @@ -1,9 +1,9 @@ # Created by: Marc G. Fournier -DISTVERSION?= 9.6.21 +DISTVERSION?= 9.6.22 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and # not their own. Probably best to keep it at ?=0 when reset here too. -PORTREVISION?= 1 +PORTREVISION?= 0 PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}${COMPONENT} MAINTAINER?= pgsql@FreeBSD.org diff --git a/databases/postgresql96-server/distinfo b/databases/postgresql96-server/distinfo index f1955a9de49c..70f9d8efd3f7 100644 --- a/databases/postgresql96-server/distinfo +++ b/databases/postgresql96-server/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1612956697 -SHA256 (postgresql/postgresql-9.6.21.tar.bz2) = 930feaef28885c97ec40c26ab6221903751eeb625de92b22602706d7d47d1634 -SIZE (postgresql/postgresql-9.6.21.tar.bz2) = 18990266 +TIMESTAMP = 1620992041 +SHA256 (postgresql/postgresql-9.6.22.tar.bz2) = 3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930 +SIZE (postgresql/postgresql-9.6.22.tar.bz2) = 19003741 SHA256 (postgresql/pg-96b4-icu-2016-10-02.diff.gz) = 85f81baa0fc8f692bcf802c8645196d9e3afdef4f760cef712d940b87655486e SIZE (postgresql/pg-96b4-icu-2016-10-02.diff.gz) = 5998 diff --git a/databases/postgresql96-server/files/pkg-message-server.in b/databases/postgresql96-server/files/pkg-message-server.in index 84a13f7cb47c..e2407c1d964f 100644 --- a/databases/postgresql96-server/files/pkg-message-server.in +++ b/databases/postgresql96-server/files/pkg-message-server.in @@ -14,7 +14,7 @@ is a periodic script, %%PREFIX%%/etc/periodic/daily/502.pgsql, that you may find useful. You can use it to backup and perform vacuum on all databases nightly. Per default, it performs `vacuum analyze'. See the script for instructions. For autovacuum settings, please review -~pgsql/data/postgresql.conf. +~postgres/data/postgresql.conf. If you plan to access your PostgreSQL server using ODBC, please consider running the SQL script %%PREFIX%%/share/postgresql/odbc.sql @@ -48,15 +48,15 @@ You can then start PostgreSQL by running: %%PREFIX%%/etc/rc.d/postgresql start -For postmaster settings, see ~pgsql/data/postgresql.conf +For postmaster settings, see ~postgres/data/postgresql.conf NB. FreeBSD's PostgreSQL port logs to syslog by default - See ~pgsql/data/postgresql.conf for more info + See ~postgres/data/postgresql.conf for more info NB. If you're not using a checksumming filesystem like ZFS, you might wish to enable data checksumming. It can only be enabled during the initdb phase, by adding the "--data-checksums" flag to - the postgres_initdb_flags rcvar. Check the initdb(1) manpage + the postgresql_initdb_flags rcvar. Check the initdb(1) manpage for more info and make sure you understand the performance implications. diff --git a/databases/postgresql96-server/files/postgresql.in b/databases/postgresql96-server/files/postgresql.in index 972b61600ce3..f9bd89ffa3df 100644 --- a/databases/postgresql96-server/files/postgresql.in +++ b/databases/postgresql96-server/files/postgresql.in @@ -1,7 +1,7 @@ #!/bin/sh # PROVIDE: postgresql -# REQUIRE: sshd +# REQUIRE: SERVERS # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable PostgreSQL: @@ -11,7 +11,7 @@ # postgresql_data="/var/db/%%PG_USER%%/data96" # postgresql_flags="-w -s -m fast" # postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C" -# postgresql_class="default" +# postgresql_login_class="default" # postgresql_profiles="" # # See %%PREFIX%%/share/doc/postgresql/README-server for more info @@ -33,7 +33,7 @@ postgresql_enable=${postgresql_enable:-"NO"} postgresql_flags=${postgresql_flags:-"-w -s -m fast"} postgresql_user=${postgresql_user:-"%%PG_USER%%"} eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data96"} -postgresql_class=${postgresql_class:-"default"} +postgresql_login_class=${postgresql_login_class:-"default"} postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"} name=postgresql @@ -109,7 +109,7 @@ postgresql_command() postgresql_initdb() { - ${su_cmd} -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" + ${su_cmd} -l -c ${postgresql_login_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" } run_rc_command "$1"