From d26b3f58504a123a3a38c0f39ea5036031957693 Mon Sep 17 00:00:00 2001
From: girgen <girgen@FreeBSD.org>
Date: Fri, 11 May 2018 13:10:52 +0000
Subject: Up

The PostgreSQL Global Development Group has released an update to all supported
versions of our database system, including 10.4, 9.6.9, 9.5.13, 9.4.18, 9.3.23.
This release fixes one security issue as well as several bugs reported over the
last three months. Users should plan to update at the next convenient downtime.

Please see the "Updating" section for post-installation steps for the security
fix and the "incorrect volatility and parallel-safety markings" fix.

Releasenotes:	https://www.postgresql.org/about/news/1851/
Security:	CVE-2018-1115 Too-permissive access control list on function pg_logfile_rotate()

FreeBSD's port of PostgreSQL uses syslog by default, so the above security
problem is only a problem if you changed the logging configuration. Please
visit the releasenotes linked above and take the actions needed.
---
 databases/postgresql10-server/Makefile          | 4 ++--
 databases/postgresql10-server/distinfo          | 6 +++---
 databases/postgresql10-server/pkg-plist-client  | 1 +
 databases/postgresql10-server/pkg-plist-contrib | 1 +
 databases/postgresql10-server/pkg-plist-server  | 1 +
 5 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'databases/postgresql10-server')

diff --git a/databases/postgresql10-server/Makefile b/databases/postgresql10-server/Makefile
index 7d5adc31e28f..0efb39e759b9 100644
--- a/databases/postgresql10-server/Makefile
+++ b/databases/postgresql10-server/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME?=	postgresql
-DISTVERSION?=	10.3
-PORTREVISION?=	1
+DISTVERSION?=	10.4
+PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL/source/v${DISTVERSION}
 PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT}
diff --git a/databases/postgresql10-server/distinfo b/databases/postgresql10-server/distinfo
index cb3f2db9121f..a8361ed829aa 100644
--- a/databases/postgresql10-server/distinfo
+++ b/databases/postgresql10-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519720433
-SHA256 (postgresql/postgresql-10.3.tar.bz2) = 6ea268780ee35e88c65cdb0af7955ad90b7d0ef34573867f223f14e43467931a
-SIZE (postgresql/postgresql-10.3.tar.bz2) = 19959653
+TIMESTAMP = 1525980865
+SHA256 (postgresql/postgresql-10.4.tar.bz2) = 1b60812310bd5756c62d93a9f93de8c28ea63b0df254f428cd1cf1a4d9020048
+SIZE (postgresql/postgresql-10.4.tar.bz2) = 20201838
diff --git a/databases/postgresql10-server/pkg-plist-client b/databases/postgresql10-server/pkg-plist-client
index 21a53cc8f467..e841064f5553 100644
--- a/databases/postgresql10-server/pkg-plist-client
+++ b/databases/postgresql10-server/pkg-plist-client
@@ -1094,6 +1094,7 @@ man/man7/WITH.7.gz
 %%NLS%%share/locale/tr/LC_MESSAGES/pg_config-10.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/pg_dump-10.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/pgscripts-10.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/psql-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-contrib b/databases/postgresql10-server/pkg-plist-contrib
index 7601a91becac..75ebba80b9a7 100644
--- a/databases/postgresql10-server/pkg-plist-contrib
+++ b/databases/postgresql10-server/pkg-plist-contrib
@@ -56,6 +56,7 @@ lib/postgresql/uuid-ossp.so
 %%PORTDOCS%%%%DOCSDIR%%/extension/moddatetime.example
 %%PORTDOCS%%%%DOCSDIR%%/extension/refint.example
 %%PORTDOCS%%%%DOCSDIR%%/extension/timetravel.example
+%%DATADIR%%/extension/adminpack--1.0--1.1.sql
 %%DATADIR%%/extension/adminpack--1.0.sql
 %%DATADIR%%/extension/adminpack.control
 %%DATADIR%%/extension/amcheck--1.0.sql
diff --git a/databases/postgresql10-server/pkg-plist-server b/databases/postgresql10-server/pkg-plist-server
index 62f8a27e1cdd..bf471953e67a 100644
--- a/databases/postgresql10-server/pkg-plist-server
+++ b/databases/postgresql10-server/pkg-plist-server
@@ -125,6 +125,7 @@ lib/libpgcommon.a
 %%NLS%%share/locale/ja/LC_MESSAGES/pg_upgrade-10.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/pg_waldump-10.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/plpgsql-10.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/postgres-10.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/initdb-10.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/pg_archivecleanup-10.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/pg_basebackup-10.mo
-- 
cgit