diff --git a/databases/postgresql12-server/Makefile b/databases/postgresql12-server/Makefile index 9a8fc4370856..6ba84eb2c9c6 100644 --- a/databases/postgresql12-server/Makefile +++ b/databases/postgresql12-server/Makefile @@ -1,24 +1,24 @@ -DISTVERSION?= 12.18 +DISTVERSION?= 12.19 # 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?= 0 MAINTAINER?= pgsql@FreeBSD.org INSTALL_DIRS?= src/common src/timezone src/backend \ src/backend/utils/mb/conversion_procs \ src/backend/snowball src/backend/replication/libpqwalreceiver \ src/backend/replication/pgoutput \ src/bin/initdb src/bin/pg_ctl \ src/bin/pg_archivecleanup src/bin/pg_basebackup \ src/bin/pg_checksums \ src/bin/pg_controldata src/bin/pg_resetwal src/pl \ src/bin/pg_rewind \ src/bin/pg_test_fsync src/bin/pg_test_timing \ src/bin/pg_waldump src/bin/pg_upgrade PG_USER?= postgres PG_GROUP?= postgres PG_UID?= 770 .include "${.CURDIR}/../postgresql16-server/Makefile" diff --git a/databases/postgresql12-server/distinfo b/databases/postgresql12-server/distinfo index 3c9545cf422b..a9c254216026 100644 --- a/databases/postgresql12-server/distinfo +++ b/databases/postgresql12-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1707301238 -SHA256 (postgresql/postgresql-12.18.tar.bz2) = 4f9919725d941ce9868e07fe1ed1d3a86748599b483386547583928b74c3918a -SIZE (postgresql/postgresql-12.18.tar.bz2) = 21208935 +TIMESTAMP = 1715095959 +SHA256 (postgresql/postgresql-12.19.tar.bz2) = 617e3de52c22e822f4f57d01d5b2240503e198a9eccaf598a851109bd18e6fbb +SIZE (postgresql/postgresql-12.19.tar.bz2) = 21218699 diff --git a/databases/postgresql12-server/files/pkg-message-contrib.in b/databases/postgresql12-server/files/pkg-message-contrib.in index 2d9f3d86e71c..006f700a3ae1 100644 --- a/databases/postgresql12-server/files/pkg-message-contrib.in +++ b/databases/postgresql12-server/files/pkg-message-contrib.in @@ -1,9 +1,9 @@ [ { type: install message: <materialize()) - elog(FATAL, "failed to materialize metadata"); - -+ /* -+ * Don't inline functions with thread-local variables until -+ * related crashes are investigated (see BUG #16696) -+ */ -+ if (rv->isThreadLocal()) { -+ ilog(DEBUG1, "cannot inline %s due to thread-local variable %s", -+ F.getName().data(), rv->getName().data()); -+ return false; -+ } -+ - /* - * Never want to inline externally visible vars, cheap enough to - * reference. diff --git a/databases/postgresql13-server/files/pkg-message-contrib.in b/databases/postgresql13-server/files/pkg-message-contrib.in index 2d9f3d86e71c..006f700a3ae1 100644 --- a/databases/postgresql13-server/files/pkg-message-contrib.in +++ b/databases/postgresql13-server/files/pkg-message-contrib.in @@ -1,9 +1,9 @@ [ { type: install message: <materialize()) - elog(FATAL, "failed to materialize metadata"); - -+ /* -+ * Don't inline functions with thread-local variables until -+ * related crashes are investigated (see BUG #16696) -+ */ -+ if (rv->isThreadLocal()) { -+ ilog(DEBUG1, "cannot inline %s due to thread-local variable %s", -+ F.getName().data(), rv->getName().data()); -+ return false; -+ } -+ - /* - * Never want to inline externally visible vars, cheap enough to - * reference. diff --git a/databases/postgresql14-server/files/pkg-message-contrib.in b/databases/postgresql14-server/files/pkg-message-contrib.in index 2d9f3d86e71c..006f700a3ae1 100644 --- a/databases/postgresql14-server/files/pkg-message-contrib.in +++ b/databases/postgresql14-server/files/pkg-message-contrib.in @@ -1,9 +1,9 @@ [ { type: install message: <materialize()) - elog(FATAL, "failed to materialize metadata"); - -+ /* -+ * Don't inline functions with thread-local variables until -+ * related crashes are investigated (see BUG #16696) -+ */ -+ if (rv->isThreadLocal()) { -+ ilog(DEBUG1, "cannot inline %s due to thread-local variable %s", -+ F.getName().data(), rv->getName().data()); -+ return false; -+ } -+ - /* - * Never want to inline externally visible vars, cheap enough to - * reference. diff --git a/databases/postgresql15-server/files/pkg-message-contrib.in b/databases/postgresql15-server/files/pkg-message-contrib.in index 2d9f3d86e71c..006f700a3ae1 100644 --- a/databases/postgresql15-server/files/pkg-message-contrib.in +++ b/databases/postgresql15-server/files/pkg-message-contrib.in @@ -1,9 +1,9 @@ [ { type: install message: <= 14 OPTIONS_DEFINE+= LZ4 OPTIONS_DEFAULT+= LZ4 LZ4_DESC= Build with LZ4 compression support LZ4_CONFIGURE_WITH= lz4 LZ4_LIB_DEPENDS+= liblz4.so:archivers/liblz4 . endif . if ${DISTVERSION:C/([0-9][0-9]).*/\1/g} >= 15 OPTIONS_DEFINE+= ZSTD OPTIONS_DEFAULT+= ZSTD ZSTD_DESC= Build with ZSTD compression support ZSTD_CONFIGURE_WITH= zstd ZSTD_LIB_DEPENDS+= libzstd.so:archivers/zstd . endif OPTIONS_DEFINE+= LLVM OPTIONS_DEFAULT+= LLVM LLVM_DESC= Build with support for JIT-compiling expressions LLVM_CONFIGURE_WITH= llvm LLVM_CONFIGURE_ENV= LLVM_CONFIG=${LLVM_CONFIG} \ CLANG=${LOCALBASE}/bin/clang${LLVM_VERSION} LLVM_USES= llvm:max=15,min=11,lib -# See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info -# (requires dump/restore if modified.) -OPTIONS_DEFINE+= INTDATE -INTDATE_DESC= Builds with 64-bit date/time type -OPTIONS_DEFAULT+= INTDATE - CONFIGURE_ARGS+= --with-icu LIB_DEPENDS+= libicudata.so:devel/icu USES+= pkgconfig .else CONFIGURE_ARGS+= --without-icu .endif .if !defined(SLAVE_ONLY) OPTIONS_DEFINE+= NLS PAM GSSAPI OPTIMIZED_CFLAGS DEBUG DOCS KRB5_DESC= Build with kerberos provider support NLS_DESC= Use internationalized messages PAM_DESC= Build with PAM Support MIT_KRB5_DESC= Build with MIT kerberos support HEIMDAL_KRB5_DESC= Builds with Heimdal kerberos GSSAPI_DESC= Build with GSSAPI support OPTIMIZED_CFLAGS_DESC= Builds with compiler optimizations (-O3) OPTIONS_DEFINE+= SSL SSL_DESC= Build with OpenSSL support OPTIONS_DEFAULT+= SSL GSSAPI_CONFIGURE_WITH= gssapi .endif # !SLAVE_ONLY .if defined(CLIENT_ONLY) LIBEDIT_CONFIGURE_ON+=--with-libedit-preferred LIBEDIT_USES= libedit LIBEDIT_USES_OFF= readline .endif # CLIENT_ONLY SSL_USES= ssl SSL_CONFIGURE_WITH= openssl PAM_CONFIGURE_WITH= pam XML_CONFIGURE_WITH= libxml XML_LIB_DEPENDS= libxml2.so:textproc/libxml2 TZDATA_CONFIGURE_OFF= --with-system-tzdata=/usr/share/zoneinfo -INTDATE_CONFIGURE_OFF= --disable-integer-datetimes - NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext LDAP_CONFIGURE_WITH= ldap LDAP_USES= ldap OPTIMIZED_CFLAGS_CFLAGS=-O3 -funroll-loops DEBUG_CONFIGURE_ENABLE= debug PLIST_SUB+= PG_VERSION=${PORTVERSION:R} \ PG_USER=${PG_USER} \ PG_USER_regex=[[:<:]]${PG_USER}[[:>:]] \ PG_GROUP=${PG_GROUP} \ PG_GROUP_regex=[[:<:]]${PG_GROUP}[[:>:]] SUB_LIST+= PG_VERSION=${PORTVERSION:R} \ PG_GROUP=${PG_GROUP} \ PG_USER=${PG_USER} \ PG_UID=${PG_UID} .include # i386 older than Pentium lacks SSE2 so the binary will not run if we build with clang -msse2 # For such ancient CPUs, gcc must be used to build PostgreSQL. # https://www.postgresql.org/message-id/20190307140421.GA8362%40gate.oper.dinoex.org .if ${ARCH} == "i386" CFLAGS+= -msse2 .endif .if !defined(SLAVE_ONLY) PATCH_DIST_STRIP=-p1 .if ${PORT_OPTIONS:MGSSAPI} .if empty(PORT_OPTIONS:MMIT_KRB5) && empty(PORT_OPTIONS:MHEIMDAL_KRB5) # Kerberos libraries will pull the proper GSSAPI library # via linker dependencies, but otherwise we must specify # it explicitely: ld --as-needed is used for compilation, # so configure's -lgssapi_krb5 won't go. LDFLAGS+= -lgssapi LDFLAGS_SL+= -lgssapi .endif .endif . if ${PORT_OPTIONS:MMIT_KRB5} . if defined(IGNORE_WITH_SRC_KRB5) && (exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config)) IGNORE= requires that you remove heimdal\'s /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/src.conf to build successfully with MIT-KRB . else CONFIGURE_ARGS+=--with-krb5 # Allow defining a home built MIT Kerberos by setting KRB5_HOME . if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config) LIB_DEPENDS+= libkrb5.so.3:security/krb5 . endif . endif . endif . if ${PORT_OPTIONS:MHEIMDAL_KRB5} CONFIGURE_ARGS+=--with-krb5 . endif .endif # !SLAVE_ONLY # For testing files in FILESDIR .include .if ${PORT_OPTIONS:MLLVM} INSTALL_DIRS+= src/backend/jit/llvm .endif .if defined(SERVER_ONLY) pre-build: @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL .endif .if !defined(NO_BUILD) && !target(do-build) do-build: @ cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} generated-headers @ for dir in ${BUILD_DIRS}; do \ cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ; \ done . if exists(${FILESDIR}/pkg-message${COMPONENT}.in) SUB_FILES+= pkg-message${COMPONENT} PKGMESSAGE= ${WRKSRC}/pkg-message${COMPONENT} . endif . if exists(${FILESDIR}/pkg-install${COMPONENT}.in) SUB_FILES+= pkg-install${COMPONENT} . endif post-patch: . if defined(CLIENT_ONLY) && !defined(OPENSSL_PORT) @${REINPLACE_CMD} \ -e '/^PKG_CONFIG_REQUIRES_PRIVATE = libssl libcrypto/d' \ ${WRKSRC}/src/interfaces/libpq/Makefile . endif do-install: @for dir in ${INSTALL_DIRS}; do \ cd ${WRKSRC}/$${dir} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${INSTALL_TARGET}; \ done . if defined(SERVER_ONLY) @ ${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql ;\ ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ;\ ${INSTALL_SCRIPT} ${WRKDIR}/502.pgsql \ ${STAGEDIR}${PREFIX}/etc/periodic/daily . endif # SERVER_ONLY . if defined(CLIENT_ONLY) @ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local . endif @ if [ -r ${PKGMESSAGE} ]; then \ ${MKDIR} ${STAGEDIR}${DOCSDIR} ;\ ${INSTALL_DATA} ${PKGMESSAGE} ${STAGEDIR}${DOCSDIR}/README${COMPONENT} ;\ fi .endif # !NO_BUILD .if defined(SERVER_ONLY) check: @if [ `id -u` != 0 ] ; then \ ${ECHO} "Running postgresql regressions tests" ;\ cd ${WRKSRC}; ${MAKE_CMD} check ;\ else \ ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \ ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\ fi .endif .include diff --git a/databases/postgresql16-server/distinfo b/databases/postgresql16-server/distinfo index bb2283ecf3ea..a5b9b692f324 100644 --- a/databases/postgresql16-server/distinfo +++ b/databases/postgresql16-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1707301242 -SHA256 (postgresql/postgresql-16.2.tar.bz2) = 446e88294dbc2c9085ab4b7061a646fa604b4bec03521d5ea671c2e5ad9b2952 -SIZE (postgresql/postgresql-16.2.tar.bz2) = 24711703 +TIMESTAMP = 1715095963 +SHA256 (postgresql/postgresql-16.3.tar.bz2) = 331963d5d3dc4caf4216a049fa40b66d6bcb8c730615859411b9518764e60585 +SIZE (postgresql/postgresql-16.3.tar.bz2) = 24737644 diff --git a/databases/postgresql16-server/files/patch-disable-llvm-jit-inlining-with-tls b/databases/postgresql16-server/files/patch-disable-llvm-jit-inlining-with-tls deleted file mode 100644 index 02686061ce99..000000000000 --- a/databases/postgresql16-server/files/patch-disable-llvm-jit-inlining-with-tls +++ /dev/null @@ -1,24 +0,0 @@ -Do not inline functions which access TLS in LLVM JIT, as -this leads to crashes with unsupported relocation error - -diff --git src/backend/jit/llvm/llvmjit_inline.cpp src/backend/jit/llvm/llvmjit_inline.cpp -index 2617a46..a063edb 100644 ---- src/backend/jit/llvm/llvmjit_inline.cpp -+++ src/backend/jit/llvm/llvmjit_inline.cpp -@@ -608,6 +608,16 @@ function_inlinable(llvm::Function &F, - if (rv->materialize()) - elog(FATAL, "failed to materialize metadata"); - -+ /* -+ * Don't inline functions with thread-local variables until -+ * related crashes are investigated (see BUG #16696) -+ */ -+ if (rv->isThreadLocal()) { -+ ilog(DEBUG1, "cannot inline %s due to thread-local variable %s", -+ F.getName().data(), rv->getName().data()); -+ return false; -+ } -+ - /* - * Never want to inline externally visible vars, cheap enough to - * reference. diff --git a/databases/postgresql16-server/files/pkg-message-contrib.in b/databases/postgresql16-server/files/pkg-message-contrib.in index 2d9f3d86e71c..006f700a3ae1 100644 --- a/databases/postgresql16-server/files/pkg-message-contrib.in +++ b/databases/postgresql16-server/files/pkg-message-contrib.in @@ -1,9 +1,9 @@ [ { type: install message: <