diff options
31 files changed, 392 insertions, 313 deletions
diff --git a/databases/postgresql10-server/Makefile b/databases/postgresql10-server/Makefile index 05d68be9d8d1..40ade7764e2b 100644 --- a/databases/postgresql10-server/Makefile +++ b/databases/postgresql10-server/Makefile @@ -1,11 +1,52 @@ # Created by: Marc G. Fournier <scrappy@FreeBSD.org> # $FreeBSD$ -DISTVERSION?= 10.1 +PORTNAME?= postgresql +DISTVERSION?= 10.2 +PORTREVISION?= 0 +CATEGORIES?= databases +MASTER_SITES= PGSQL/source/v${DISTVERSION} PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT} -PORTREVISION?= 1 MAINTAINER?= pgsql@FreeBSD.org +COMMENT?= PostgreSQL is the most advanced open-source database available anywhere + +LICENSE= PostgreSQL + +.if ${DISTVERSION:C/([0-9]*).*/\1/} == 10 +CONFLICTS+= ${PORTNAME}*-9.* +.else +CONFLICTS+= ${PORTNAME}*-9.[^${PORTVERSION:R:E}].* ${PORTNAME}10* +.endif + +WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION} +DIST_SUBDIR= postgresql + +OPTIONS_SUB= yes + +PKGINSTALL?= ${PKGDIR}/pkg-install${COMPONENT} +USES+= tar:bzip2 cpe +.if !defined(NO_BUILD) +USES+= gmake +GNU_CONFIGURE= yes +LLD_UNSAFE= yes +.endif + +PG_USER?= postgres +PG_GROUP?= postgres +PG_UID?= 770 + +LDFLAGS+= -L${LOCALBASE}/lib +INCLUDES+= -I${LOCALBASE}/include +CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ + --with-includes=${PREFIX}/include \ + --enable-thread-safety +CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \ + PTHREAD_LIBS="-lpthread" \ + LDFLAGS_SL="${LDFLAGS_SL}" +LDFLAGS+= -lpthread + +PLIST= ${PKGDIR}/pkg-plist${COMPONENT} INSTALL_DIRS?= src/common src/timezone src/backend \ src/backend/utils/mb/conversion_procs \ @@ -18,8 +59,229 @@ INSTALL_DIRS?= src/common src/timezone src/backend \ 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 +BUILD_DIRS?= src/port ${INSTALL_DIRS} +INSTALL_TARGET?=install-strip + +.if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY) +SERVER_ONLY= yes +COMPONENT= -server +USE_RC_SUBR= postgresql +USES+= pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g} +USERS= ${PG_USER} +GROUPS= ${PG_GROUP} +SUB_FILES+= 502.pgsql +.endif + +.if defined(CLIENT_ONLY) +OPTIONS_DEFINE+=LIBEDIT +LIBEDIT_DESC= Use non-GPL libedit instead of readline +USES+= perl5 +.else +MAKE_ENV= PATH=${PREFIX}/bin:${PATH} +CONFIGURE_ENV+= PATH=${PREFIX}/bin:${PATH} +.endif + +.if defined(SERVER_ONLY) +OPTIONS_DEFINE= DTRACE LDAP INTDATE TZDATA XML +LDAP_DESC= Build with LDAP authentication support +DTRACE_DESC= Build with DTrace probes +TZDATA_DESC= Use internal timezone database +XML_DESC= Build with XML data type + +.if ${DISTVERSION:C/([0-9]*).*/\1/} != 10 +# See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info +OPTIONS_DEFINE+= ICU +ICU_DESC= Use ICU for unicode collation +.else +CONFIGURE_ARGS+=--with-icu +LIB_DEPENDS+= libicudata.so:devel/icu +USES+= pkgconfig +.endif + +# 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+= XML TZDATA INTDATE DTRACE +.endif + +.if !defined(SLAVE_ONLY) +OPTIONS_DEFINE+= NLS PAM GSSAPI OPTIMIZED_CFLAGS DEBUG +. if ${DISTVERSION:R} == 9.2 || ${DISTVERSION:R} == 9.3 + OPTIONS_RADIO= KRB5 + OPTIONS_RADIO_KRB5= MIT_KRB5 HEIMDAL_KRB5 +. endif + +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 +.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_USE= OPENLDAP=yes + +OPTIMIZED_CFLAGS_CFLAGS= -O3 -funroll-loops + +DEBUG_CONFIGURE_ENABLE= debug + +PLIST_SUB+= PG_USER=${PG_USER} \ + PG_GROUP=${PG_GROUP} +SUB_LIST+= PG_GROUP=${PG_GROUP} \ + PG_USER=${PG_USER} \ + PG_UID=${PG_UID} + +.include <bsd.port.options.mk> + +.if !defined(SLAVE_ONLY) +.if ${DISTVERSION:C/([0-9]*).*/\1/} != 10 +. if ( defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU} ) || make(makesum) +USES+= autoreconf +CONFIGURE_ARGS+=--with-icu +PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu +PATCHFILES+= ${ICU_PATCHFILE}:icu +LIB_DEPENDS+= libicudata.so:devel/icu +. endif +.endif # not version 10 +.endif # !SLAVE_ONLY + +.if !defined(SLAVE_ONLY) + +PATCH_DIST_STRIP=-p1 + +. if ${PORT_OPTIONS:MDTRACE} +CONFIGURE_ARGS+=--enable-dtrace +LDFLAGS+=-lelf +INSTALL_TARGET=install +. endif + +.if ${PORT_OPTIONS:MGSSAPI} +CONFIGURE_ARGS+=--with-gssapi +.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 +.else +CONFIGURE_ARGS+=--without-gssapi +.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 <bsd.port.pre.mk> + +.if ${PORT_OPTIONS:MSSL} && ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= Does not build with openssl-devel +.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} symlinks + @ 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} +PLIST_SUB+= PG_USER=${PG_USER} +. endif + +post-patch: +. if defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU} + @${REINPLACE_CMD} \ + -e '/m4_PACKAGE_VERSION/s/\[2\.6[0-9]\]/m4_defn([m4_PACKAGE_VERSION])/' \ + -e '/icu/s/_57//' \ + ${WRKSRC}/configure.in +. 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 "${.CURDIR}/../postgresql92-server/Makefile" +.include <bsd.port.post.mk> diff --git a/databases/postgresql10-server/distinfo b/databases/postgresql10-server/distinfo index faf4c5096956..fac6cf7215da 100644 --- a/databases/postgresql10-server/distinfo +++ b/databases/postgresql10-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1510172180 -SHA256 (postgresql/postgresql-10.1.tar.bz2) = 3ccb4e25fe7a7ea6308dea103cac202963e6b746697366d72ec2900449a5e713 -SIZE (postgresql/postgresql-10.1.tar.bz2) = 19669989 +TIMESTAMP = 1518110073 +SHA256 (postgresql/postgresql-10.2.tar.bz2) = fe32009b62ddb97f7f014307ce9d0edb6972f5a698e63cb531088e147d145bad +SIZE (postgresql/postgresql-10.2.tar.bz2) = 19901836 diff --git a/databases/postgresql10-server/files/pkg-message-server.in b/databases/postgresql10-server/files/pkg-message-server.in index d161fcb82f66..8df5b8198903 100644 --- a/databases/postgresql10-server/files/pkg-message-server.in +++ b/databases/postgresql10-server/files/pkg-message-server.in @@ -50,6 +50,13 @@ For postmaster settings, see ~pgsql/data/postgresql.conf NB. FreeBSD's PostgreSQL port logs to syslog by default See ~pgsql/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 + for more info and make sure you understand the performance + implications. + ====================================================================== To run PostgreSQL at startup, add diff --git a/databases/postgresql10-server/files/postgresql.in b/databases/postgresql10-server/files/postgresql.in index 408d933ec4c1..df4384e6eba2 100644 --- a/databases/postgresql10-server/files/postgresql.in +++ b/databases/postgresql10-server/files/postgresql.in @@ -50,6 +50,8 @@ status_cmd="postgresql_command status" initdb_cmd="postgresql_initdb" +su_cmd="/usr/bin/su" + if [ -n "$2" ]; then profile="$2" if [ "x${postgresql_profiles}" != "x" ]; then @@ -103,12 +105,12 @@ command_args="-D ${postgresql_data} ${postgresql_flags}" postgresql_command() { - su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" + ${su_cmd} -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" } postgresql_initdb() { - su -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_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/postgresql10-server/pkg-plist-client b/databases/postgresql10-server/pkg-plist-client index 36143451268e..80bebac22052 100644 --- a/databases/postgresql10-server/pkg-plist-client +++ b/databases/postgresql10-server/pkg-plist-client @@ -639,6 +639,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 @@ -1087,7 +1088,9 @@ man/man7/WITH.7.gz %%NLS%%share/locale/ta/LC_MESSAGES/pg_config-10.mo %%NLS%%share/locale/tr/LC_MESSAGES/ecpg-10.mo %%NLS%%share/locale/tr/LC_MESSAGES/ecpglib6-10.mo +%%NLS%%share/locale/tr/LC_MESSAGES/libpq5-10.mo %%NLS%%share/locale/tr/LC_MESSAGES/pg_config-10.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_dump-10.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpg-10.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpglib6-10.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/libpq5-10.mo diff --git a/databases/postgresql10-server/pkg-plist-server b/databases/postgresql10-server/pkg-plist-server index d4e6f89858a9..a125d0bf0fa5 100644 --- a/databases/postgresql10-server/pkg-plist-server +++ b/databases/postgresql10-server/pkg-plist-server @@ -174,6 +174,13 @@ lib/libpgcommon.a %%NLS%%share/locale/sv/LC_MESSAGES/pg_upgrade-10.mo %%NLS%%share/locale/sv/LC_MESSAGES/pg_waldump-10.mo %%NLS%%share/locale/sv/LC_MESSAGES/plpgsql-10.mo +%%NLS%%share/locale/sv/LC_MESSAGES/postgres-10.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_archivecleanup-10.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_basebackup-10.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_test_fsync-10.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_upgrade-10.mo +%%NLS%%share/locale/tr/LC_MESSAGES/pg_waldump-10.mo +%%NLS%%share/locale/tr/LC_MESSAGES/postgres-10.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/initdb-10.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_controldata-10.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_ctl-10.mo @@ -769,7 +776,6 @@ lib/libpgcommon.a %%TZDATA%%%%DATADIR%%/timezone/US/Michigan %%TZDATA%%%%DATADIR%%/timezone/US/Mountain %%TZDATA%%%%DATADIR%%/timezone/US/Pacific -%%TZDATA%%%%DATADIR%%/timezone/US/Pacific-New %%TZDATA%%%%DATADIR%%/timezone/US/Samoa %%TZDATA%%%%DATADIR%%/timezone/UTC %%TZDATA%%%%DATADIR%%/timezone/Universal diff --git a/databases/postgresql92-client/Makefile b/databases/postgresql92-client/Makefile index e3c5ee93b7a7..b4f402da8a0d 100644 --- a/databases/postgresql92-client/Makefile +++ b/databases/postgresql92-client/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= postgresql -PORTREVISION= 0 COMMENT= PostgreSQL database (client) diff --git a/databases/postgresql92-contrib/Makefile b/databases/postgresql92-contrib/Makefile index 1d2d15e3f5e3..8e0fbe5f1fef 100644 --- a/databases/postgresql92-contrib/Makefile +++ b/databases/postgresql92-contrib/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= postgresql -PORTREVISION= 0 CATEGORIES= databases PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT} diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile index 7af26c29e519..bd6aad926d2f 100644 --- a/databases/postgresql92-server/Makefile +++ b/databases/postgresql92-server/Makefile @@ -1,53 +1,13 @@ # Created by: Marc G. Fournier <scrappy@FreeBSD.org> # $FreeBSD$ -PORTNAME?= postgresql DISTVERSION?= 9.2.24 -PORTREVISION?= 0 -CATEGORIES?= databases -MASTER_SITES= PGSQL/source/v${DISTVERSION} +PORTREVISION?= 1 PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}${COMPONENT} MAINTAINER?= pgsql@FreeBSD.org -COMMENT?= PostgreSQL is the most advanced open-source database available anywhere -LICENSE= PostgreSQL - -CONFLICTS?= ${PORTNAME}[^${PORTVERSION:R:R}]?-client* \ - ${PORTNAME}${COMPONENT}-[^${PORTVERSION:R:R}].* \ - ${PORTNAME}9[^${PORTVERSION:R:E}]-client* \ - ${PORTNAME}${COMPONENT}-9.[^${PORTVERSION:R:E}].* - -WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION} -DIST_SUBDIR= postgresql - -ICU_PATCHFILE?= pg-9218-icu-2016-08-10.diff.gz - -OPTIONS_SUB= yes - -PKGINSTALL?= ${PKGDIR}/pkg-install${COMPONENT} -USES+= tar:bzip2 cpe -.if !defined(NO_BUILD) -USES+= gmake -GNU_CONFIGURE= yes -LLD_UNSAFE= yes -.endif - -PG_USER?= pgsql -PG_GROUP?= pgsql -PG_UID?= 70 - -LDFLAGS+= -L${LOCALBASE}/lib -INCLUDES+= -I${LOCALBASE}/include -CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ - --with-includes=${PREFIX}/include \ - --enable-thread-safety -CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \ - PTHREAD_LIBS="-lpthread" \ - LDFLAGS_SL="${LDFLAGS_SL}" -LDFLAGS+= -lpthread - -PLIST= ${PKGDIR}/pkg-plist${COMPONENT} +ICU_PATCHFILE= pg-9218-icu-2016-08-10.diff.gz INSTALL_DIRS?= src/timezone src/backend \ src/backend/utils/mb/conversion_procs \ @@ -55,227 +15,12 @@ INSTALL_DIRS?= src/timezone src/backend \ src/bin/initdb src/bin/pg_ctl \ src/bin/pg_controldata src/bin/pg_resetxlog src/pl \ src/bin/pg_basebackup -BUILD_DIRS?= src/port ${INSTALL_DIRS} -INSTALL_TARGET?=install-strip - -.if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY) -SERVER_ONLY= yes -COMPONENT= -server -USE_RC_SUBR= postgresql -USES+= pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g} -USERS= ${PG_USER} -GROUPS= ${PG_GROUP} -SUB_FILES+= 502.pgsql -.endif - -.if defined(CLIENT_ONLY) -OPTIONS_DEFINE+=LIBEDIT -LIBEDIT_DESC= Use non-GPL libedit instead of readline -USES+= perl5 -.else -MAKE_ENV= PATH=${PREFIX}/bin:${PATH} -CONFIGURE_ENV+= PATH=${PREFIX}/bin:${PATH} -.endif - -.if defined(SERVER_ONLY) -OPTIONS_DEFINE= DTRACE LDAP INTDATE TZDATA XML -LDAP_DESC= Build with LDAP authentication support -DTRACE_DESC= Build with DTrace probes -TZDATA_DESC= Use internal timezone database -XML_DESC= Build with XML data type - -.if ${DISTVERSION:C/([0-9]*).*/\1/} != 10 -# See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info -OPTIONS_DEFINE+= ICU -ICU_DESC= Use ICU for unicode collation -.else -CONFIGURE_ARGS+=--with-icu -LIB_DEPENDS+= libicudata.so:devel/icu -USES+= pkgconfig -.endif - -# 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+= XML TZDATA INTDATE -.endif - -.if !defined(SLAVE_ONLY) -OPTIONS_DEFINE+= NLS PAM GSSAPI OPTIMIZED_CFLAGS DEBUG -. if ${DISTVERSION:R} == 9.2 || ${DISTVERSION:R} == 9.3 - OPTIONS_RADIO= KRB5 - OPTIONS_RADIO_KRB5= MIT_KRB5 HEIMDAL_KRB5 -. endif - -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 -.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 +DEPRECATED= PostgreSQL 9.2 support has reached End-of-line. Please upgrade to a later version. +EXPIRATION_DATE=2017-04-05 -NLS_CONFIGURE_ENABLE= nls -NLS_USES= gettext - -LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes - -OPTIMIZED_CFLAGS_CFLAGS= -O3 -funroll-loops - -DEBUG_CONFIGURE_ENABLE= debug - -PLIST_SUB+= PG_USER=${PG_USER} \ - PG_GROUP=${PG_GROUP} -SUB_LIST+= PG_GROUP=${PG_GROUP} \ - PG_USER=${PG_USER} \ - PG_UID=${PG_UID} - -.include <bsd.port.options.mk> - -.if !defined(SLAVE_ONLY) -. if ( defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU} ) || make(makesum) -USES+= autoreconf -CONFIGURE_ARGS+=--with-icu -PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu -PATCHFILES+= ${ICU_PATCHFILE}:icu -LIB_DEPENDS+= libicudata.so:devel/icu -. endif -.endif # !SLAVE_ONLY - -.if !defined(SLAVE_ONLY) - -PATCH_DIST_STRIP=-p1 - -. if ${PORT_OPTIONS:MDTRACE} -CONFIGURE_ARGS+=--enable-dtrace -LDFLAGS+=-lelf -INSTALL_TARGET=install -. endif - -.if ${PORT_OPTIONS:MGSSAPI} -CONFIGURE_ARGS+=--with-gssapi -.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 -.else -CONFIGURE_ARGS+=--without-gssapi -.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 <bsd.port.pre.mk> - -.if ${PORT_OPTIONS:MSSL} && ${SSL_DEFAULT:Mopenssl-devel} -BROKEN= Does not build with openssl-devel -.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} symlinks - @ 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} -PLIST_SUB+= PG_USER=${PG_USER} -. endif - -post-patch: -. if defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU} - @${REINPLACE_CMD} \ - -e '/m4_PACKAGE_VERSION/s/\[2\.6[0-9]\]/m4_defn([m4_PACKAGE_VERSION])/' \ - -e '/icu/s/_57//' \ - ${WRKSRC}/configure.in -. 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 +PG_USER?= pgsql +PG_GROUP?= pgsql +PG_UID?= 70 -.include <bsd.port.post.mk> +.include "${.CURDIR}/../postgresql10-server/Makefile" diff --git a/databases/postgresql92-server/files/pkg-message-server.in b/databases/postgresql92-server/files/pkg-message-server.in index 3650316fba7b..ae43d123e1af 100644 --- a/databases/postgresql92-server/files/pkg-message-server.in +++ b/databases/postgresql92-server/files/pkg-message-server.in @@ -63,6 +63,13 @@ For postmaster settings, see ~pgsql/data/postgresql.conf NB. FreeBSD's PostgreSQL port logs to syslog by default See ~pgsql/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 + for more info and make sure you understand the performance + implications. + ====================================================================== To run PostgreSQL at startup, add diff --git a/databases/postgresql92-server/files/postgresql.in b/databases/postgresql92-server/files/postgresql.in index b6724571bd29..f6ea340f7f0f 100644 --- a/databases/postgresql92-server/files/postgresql.in +++ b/databases/postgresql92-server/files/postgresql.in @@ -50,6 +50,8 @@ status_cmd="postgresql_command status" initdb_cmd="postgresql_initdb" +su_cmd="/usr/bin/su" + if [ -n "$2" ]; then profile="$2" if [ "x${postgresql_profiles}" != "x" ]; then @@ -103,12 +105,12 @@ command_args="-D ${postgresql_data} ${postgresql_flags}" postgresql_command() { - su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" + ${su_cmd} -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" } postgresql_initdb() { - su -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_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/postgresql93-server/Makefile b/databases/postgresql93-server/Makefile index fa0b57bf8891..3f44456fa9ca 100644 --- a/databases/postgresql93-server/Makefile +++ b/databases/postgresql93-server/Makefile @@ -1,7 +1,7 @@ # Created by: Marc G. Fournier <scrappy@FreeBSD.org> # $FreeBSD$ -DISTVERSION?= 9.3.20 +DISTVERSION?= 9.3.21 PORTREVISION= 0 PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT} @@ -14,6 +14,10 @@ INSTALL_DIRS?= src/common src/timezone src/backend \ src/bin/pg_controldata src/bin/pg_resetxlog src/pl \ src/bin/pg_basebackup -ICU_PATCHFILE?= pg-9314-icu-2016-08-10.diff.gz +ICU_PATCHFILE= pg-9314-icu-2016-08-10.diff.gz -.include "${.CURDIR}/../postgresql92-server/Makefile" +PG_USER?= pgsql +PG_GROUP?= pgsql +PG_UID?= 70 + +.include "${.CURDIR}/../postgresql10-server/Makefile" diff --git a/databases/postgresql93-server/distinfo b/databases/postgresql93-server/distinfo index 26b1ea54a492..72361e89dea2 100644 --- a/databases/postgresql93-server/distinfo +++ b/databases/postgresql93-server/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1510172181 -SHA256 (postgresql/postgresql-9.3.20.tar.bz2) = eb138ad67075b8acb4fae56e98ca7be5d85f3da0ba658fc48206834598a2e6ca -SIZE (postgresql/postgresql-9.3.20.tar.bz2) = 17197360 +TIMESTAMP = 1517868536 +SHA256 (postgresql/postgresql-9.3.21.tar.bz2) = b9babc5148188a410e023d7178a5678e989ec2e276498de6cd0028bc331a40e0 +SIZE (postgresql/postgresql-9.3.21.tar.bz2) = 17014472 SHA256 (postgresql/pg-9314-icu-2016-08-10.diff.gz) = 4be31ad9899d5caf9f57ad7ebfc0d14f0fcf58ad539c82fb353b016fb76c0c30 SIZE (postgresql/pg-9314-icu-2016-08-10.diff.gz) = 5583 diff --git a/databases/postgresql93-server/files/pkg-message-server.in b/databases/postgresql93-server/files/pkg-message-server.in index d161fcb82f66..8df5b8198903 100644 --- a/databases/postgresql93-server/files/pkg-message-server.in +++ b/databases/postgresql93-server/files/pkg-message-server.in @@ -50,6 +50,13 @@ For postmaster settings, see ~pgsql/data/postgresql.conf NB. FreeBSD's PostgreSQL port logs to syslog by default See ~pgsql/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 + for more info and make sure you understand the performance + implications. + ====================================================================== To run PostgreSQL at startup, add diff --git a/databases/postgresql93-server/files/postgresql.in b/databases/postgresql93-server/files/postgresql.in index b6724571bd29..f6ea340f7f0f 100644 --- a/databases/postgresql93-server/files/postgresql.in +++ b/databases/postgresql93-server/files/postgresql.in @@ -50,6 +50,8 @@ status_cmd="postgresql_command status" initdb_cmd="postgresql_initdb" +su_cmd="/usr/bin/su" + if [ -n "$2" ]; then profile="$2" if [ "x${postgresql_profiles}" != "x" ]; then @@ -103,12 +105,12 @@ command_args="-D ${postgresql_data} ${postgresql_flags}" postgresql_command() { - su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" + ${su_cmd} -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" } postgresql_initdb() { - su -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_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/postgresql93-server/pkg-plist-server b/databases/postgresql93-server/pkg-plist-server index 37df7ad46aac..35a801c19031 100644 --- a/databases/postgresql93-server/pkg-plist-server +++ b/databases/postgresql93-server/pkg-plist-server @@ -714,7 +714,6 @@ lib/libpgcommon.a %%TZDATA%%%%DATADIR%%/timezone/US/Michigan %%TZDATA%%%%DATADIR%%/timezone/US/Mountain %%TZDATA%%%%DATADIR%%/timezone/US/Pacific -%%TZDATA%%%%DATADIR%%/timezone/US/Pacific-New %%TZDATA%%%%DATADIR%%/timezone/US/Samoa %%TZDATA%%%%DATADIR%%/timezone/UTC %%TZDATA%%%%DATADIR%%/timezone/Universal diff --git a/databases/postgresql94-server/Makefile b/databases/postgresql94-server/Makefile index 492c55accd36..fcf80ada35fe 100644 --- a/databases/postgresql94-server/Makefile +++ b/databases/postgresql94-server/Makefile @@ -1,8 +1,9 @@ # Created by: Marc G. Fournier <scrappy@FreeBSD.org> # $FreeBSD$ -DISTVERSION?= 9.4.15 +DISTVERSION?= 9.4.16 PORTREVISION= 0 +PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}${COMPONENT} MAINTAINER?= pgsql@FreeBSD.org @@ -15,4 +16,8 @@ INSTALL_DIRS?= src/common src/timezone src/backend \ ICU_PATCHFILE= pg-949-icu-2016-10-02.diff.gz -.include "${.CURDIR}/../postgresql92-server/Makefile" +PG_USER?= pgsql +PG_GROUP?= pgsql +PG_UID?= 70 + +.include "${.CURDIR}/../postgresql10-server/Makefile" diff --git a/databases/postgresql94-server/distinfo b/databases/postgresql94-server/distinfo index b1aea789a0ba..db1c428b6108 100644 --- a/databases/postgresql94-server/distinfo +++ b/databases/postgresql94-server/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1510172182 -SHA256 (postgresql/postgresql-9.4.15.tar.bz2) = 12bfb3c7e8e45515ef921ad365e122682a5c4935dcc0032644433af2de31acc4 -SIZE (postgresql/postgresql-9.4.15.tar.bz2) = 17921677 +TIMESTAMP = 1517868536 +SHA256 (postgresql/postgresql-9.4.16.tar.bz2) = dcbc62b621e4d8a445c2f33750f7d96257c38103cccebeb934e6913a3c135e81 +SIZE (postgresql/postgresql-9.4.16.tar.bz2) = 17778763 SHA256 (postgresql/pg-949-icu-2016-10-02.diff.gz) = 34612e685a79874db04bc6b66c700bfc6412042840c532eef0da7832d1f70d43 SIZE (postgresql/pg-949-icu-2016-10-02.diff.gz) = 5289 diff --git a/databases/postgresql94-server/files/pkg-message-server.in b/databases/postgresql94-server/files/pkg-message-server.in index d161fcb82f66..8df5b8198903 100644 --- a/databases/postgresql94-server/files/pkg-message-server.in +++ b/databases/postgresql94-server/files/pkg-message-server.in @@ -50,6 +50,13 @@ For postmaster settings, see ~pgsql/data/postgresql.conf NB. FreeBSD's PostgreSQL port logs to syslog by default See ~pgsql/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 + for more info and make sure you understand the performance + implications. + ====================================================================== To run PostgreSQL at startup, add diff --git a/databases/postgresql94-server/files/postgresql.in b/databases/postgresql94-server/files/postgresql.in index b6724571bd29..f6ea340f7f0f 100644 --- a/databases/postgresql94-server/files/postgresql.in +++ b/databases/postgresql94-server/files/postgresql.in @@ -50,6 +50,8 @@ status_cmd="postgresql_command status" initdb_cmd="postgresql_initdb" +su_cmd="/usr/bin/su" + if [ -n "$2" ]; then profile="$2" if [ "x${postgresql_profiles}" != "x" ]; then @@ -103,12 +105,12 @@ command_args="-D ${postgresql_data} ${postgresql_flags}" postgresql_command() { - su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" + ${su_cmd} -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" } postgresql_initdb() { - su -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_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/postgresql94-server/pkg-plist-server b/databases/postgresql94-server/pkg-plist-server index 5198fb88c098..2445a36db1bf 100644 --- a/databases/postgresql94-server/pkg-plist-server +++ b/databases/postgresql94-server/pkg-plist-server @@ -715,7 +715,6 @@ lib/libpgcommon.a %%TZDATA%%%%DATADIR%%/timezone/US/Michigan %%TZDATA%%%%DATADIR%%/timezone/US/Mountain %%TZDATA%%%%DATADIR%%/timezone/US/Pacific -%%TZDATA%%%%DATADIR%%/timezone/US/Pacific-New %%TZDATA%%%%DATADIR%%/timezone/US/Samoa %%TZDATA%%%%DATADIR%%/timezone/UTC %%TZDATA%%%%DATADIR%%/timezone/Universal diff --git a/databases/postgresql95-server/Makefile b/databases/postgresql95-server/Makefile index 879e7bdd63c5..06ce296829e7 100644 --- a/databases/postgresql95-server/Makefile +++ b/databases/postgresql95-server/Makefile @@ -1,8 +1,9 @@ # Created by: Marc G. Fournier <scrappy@FreeBSD.org> # $FreeBSD$ -DISTVERSION?= 9.5.10 +DISTVERSION?= 9.5.11 PORTREVISION= 0 +PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}${COMPONENT} MAINTAINER?= pgsql@FreeBSD.org @@ -18,4 +19,8 @@ INSTALL_DIRS?= src/common src/timezone src/backend \ ICU_PATCHFILE= pg-954-icu-2016-08-10.diff.gz -.include "${.CURDIR}/../postgresql92-server/Makefile" +PG_USER?= pgsql +PG_GROUP?= pgsql +PG_UID?= 70 + +.include "${.CURDIR}/../postgresql10-server/Makefile" diff --git a/databases/postgresql95-server/distinfo b/databases/postgresql95-server/distinfo index 7455e3ba1cff..18f0e80dc7a4 100644 --- a/databases/postgresql95-server/distinfo +++ b/databases/postgresql95-server/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1510172182 -SHA256 (postgresql/postgresql-9.5.10.tar.bz2) = 945d7ade094dded6b95495d8f1561a12ac9608276858ed30adf3c3658275f281 -SIZE (postgresql/postgresql-9.5.10.tar.bz2) = 18701419 +TIMESTAMP = 1517868536 +SHA256 (postgresql/postgresql-9.5.11.tar.bz2) = 8182cd74e27a75ae39166b2603b5014f4272855b4101b40819761b853a77c8dd +SIZE (postgresql/postgresql-9.5.11.tar.bz2) = 18572811 SHA256 (postgresql/pg-954-icu-2016-08-10.diff.gz) = 5fa083ec38087d6a0961642208f012e902221270708b919b92e9eedaa755e365 SIZE (postgresql/pg-954-icu-2016-08-10.diff.gz) = 5952 diff --git a/databases/postgresql95-server/files/pkg-message-server.in b/databases/postgresql95-server/files/pkg-message-server.in index d161fcb82f66..8df5b8198903 100644 --- a/databases/postgresql95-server/files/pkg-message-server.in +++ b/databases/postgresql95-server/files/pkg-message-server.in @@ -50,6 +50,13 @@ For postmaster settings, see ~pgsql/data/postgresql.conf NB. FreeBSD's PostgreSQL port logs to syslog by default See ~pgsql/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 + for more info and make sure you understand the performance + implications. + ====================================================================== To run PostgreSQL at startup, add diff --git a/databases/postgresql95-server/files/postgresql.in b/databases/postgresql95-server/files/postgresql.in index b6724571bd29..f6ea340f7f0f 100644 --- a/databases/postgresql95-server/files/postgresql.in +++ b/databases/postgresql95-server/files/postgresql.in @@ -50,6 +50,8 @@ status_cmd="postgresql_command status" initdb_cmd="postgresql_initdb" +su_cmd="/usr/bin/su" + if [ -n "$2" ]; then profile="$2" if [ "x${postgresql_profiles}" != "x" ]; then @@ -103,12 +105,12 @@ command_args="-D ${postgresql_data} ${postgresql_flags}" postgresql_command() { - su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" + ${su_cmd} -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" } postgresql_initdb() { - su -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_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/postgresql95-server/pkg-plist-server b/databases/postgresql95-server/pkg-plist-server index aa4288cb155a..7137a16e8a67 100644 --- a/databases/postgresql95-server/pkg-plist-server +++ b/databases/postgresql95-server/pkg-plist-server @@ -110,7 +110,7 @@ lib/libpgcommon.a %%NLS%%share/locale/ko/LC_MESSAGES/pg_ctl-9.5.mo %%NLS%%share/locale/ko/LC_MESSAGES/pg_resetxlog-9.5.mo %%NLS%%share/locale/ko/LC_MESSAGES/pg_rewind-9.5.mo -%%NLS%%share/locale/ko/LC_MESSAGES/pl%%PG_USER%%-9.5.mo +%%NLS%%share/locale/ko/LC_MESSAGES/plpgsql-9.5.mo %%NLS%%share/locale/pl/LC_MESSAGES/initdb-9.5.mo %%NLS%%share/locale/pl/LC_MESSAGES/pg_basebackup-9.5.mo %%NLS%%share/locale/pl/LC_MESSAGES/pg_controldata-9.5.mo @@ -736,7 +736,6 @@ lib/libpgcommon.a %%TZDATA%%%%DATADIR%%/timezone/US/Michigan %%TZDATA%%%%DATADIR%%/timezone/US/Mountain %%TZDATA%%%%DATADIR%%/timezone/US/Pacific -%%TZDATA%%%%DATADIR%%/timezone/US/Pacific-New %%TZDATA%%%%DATADIR%%/timezone/US/Samoa %%TZDATA%%%%DATADIR%%/timezone/UTC %%TZDATA%%%%DATADIR%%/timezone/Universal diff --git a/databases/postgresql96-server/Makefile b/databases/postgresql96-server/Makefile index 3f057b8d0814..5b4228029885 100644 --- a/databases/postgresql96-server/Makefile +++ b/databases/postgresql96-server/Makefile @@ -1,8 +1,9 @@ # Created by: Marc G. Fournier <scrappy@FreeBSD.org> # $FreeBSD$ -DISTVERSION?= 9.6.6 +DISTVERSION?= 9.6.7 PORTREVISION?= 0 +PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}${COMPONENT} MAINTAINER?= pgsql@FreeBSD.org @@ -23,4 +24,4 @@ PG_UID?= 770 ICU_PATCHFILE= pg-96b4-icu-2016-10-02.diff.gz OPTIONS_DEFAULT+=ICU -.include "${.CURDIR}/../postgresql92-server/Makefile" +.include "${.CURDIR}/../postgresql10-server/Makefile" diff --git a/databases/postgresql96-server/distinfo b/databases/postgresql96-server/distinfo index e5573bad581a..b9156bf12016 100644 --- a/databases/postgresql96-server/distinfo +++ b/databases/postgresql96-server/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1510172182 -SHA256 (postgresql/postgresql-9.6.6.tar.bz2) = 399cdffcb872f785ba67e25d275463d74521566318cfef8fe219050d063c8154 -SIZE (postgresql/postgresql-9.6.6.tar.bz2) = 19605724 +TIMESTAMP = 1517868545 +SHA256 (postgresql/postgresql-9.6.7.tar.bz2) = 2ebe3df3c1d1eab78023bdc3ffa55a154aa84300416b075ef996598d78a624c6 +SIZE (postgresql/postgresql-9.6.7.tar.bz2) = 19504886 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 d161fcb82f66..8df5b8198903 100644 --- a/databases/postgresql96-server/files/pkg-message-server.in +++ b/databases/postgresql96-server/files/pkg-message-server.in @@ -50,6 +50,13 @@ For postmaster settings, see ~pgsql/data/postgresql.conf NB. FreeBSD's PostgreSQL port logs to syslog by default See ~pgsql/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 + for more info and make sure you understand the performance + implications. + ====================================================================== To run PostgreSQL at startup, add diff --git a/databases/postgresql96-server/files/postgresql.in b/databases/postgresql96-server/files/postgresql.in index 6aec93149077..9a9090b74947 100644 --- a/databases/postgresql96-server/files/postgresql.in +++ b/databases/postgresql96-server/files/postgresql.in @@ -50,6 +50,8 @@ status_cmd="postgresql_command status" initdb_cmd="postgresql_initdb" +su_cmd="/usr/bin/su" + if [ -n "$2" ]; then profile="$2" if [ "x${postgresql_profiles}" != "x" ]; then @@ -103,12 +105,12 @@ command_args="-D ${postgresql_data} ${postgresql_flags}" postgresql_command() { - su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" + ${su_cmd} -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" } postgresql_initdb() { - su -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_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/postgresql96-server/pkg-plist-server b/databases/postgresql96-server/pkg-plist-server index e96331064aec..0175109a9ba2 100644 --- a/databases/postgresql96-server/pkg-plist-server +++ b/databases/postgresql96-server/pkg-plist-server @@ -739,7 +739,6 @@ lib/libpgcommon.a %%TZDATA%%%%DATADIR%%/timezone/US/Michigan %%TZDATA%%%%DATADIR%%/timezone/US/Mountain %%TZDATA%%%%DATADIR%%/timezone/US/Pacific -%%TZDATA%%%%DATADIR%%/timezone/US/Pacific-New %%TZDATA%%%%DATADIR%%/timezone/US/Samoa %%TZDATA%%%%DATADIR%%/timezone/UTC %%TZDATA%%%%DATADIR%%/timezone/Universal |