Updated: 9.4.26

8 files changed, 256 insertions, 101 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cde95eb1626a..6ccca5fa41b4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,44 +1,83 @@
 pkgbase = postgresql-9.4
-	pkgdesc = A powerful, open source object-relational database system
-	pkgver = 9.4.20
-	pkgrel = 2
-	url = http://www.postgresql.org/
-	install = postgresql.install
+	pkgdesc = Sophisticated object-relational DBMS
+	pkgver = 9.4.26
+	pkgrel = 1
+	url = https://www.postgresql.org/
 	arch = i686
 	arch = x86_64
 	license = custom:PostgreSQL
+	makedepends = krb5
+	makedepends = libxml2
+	makedepends = python
 	makedepends = python2
 	makedepends = perl
 	makedepends = tcl>=8.6.0
-	depends = libxml2
-	depends = krb5
-	depends = openssl>=1.0.0
-	depends = readline>=6.0
-	optdepends = python2: for PL/Python support
-	optdepends = perl: for PL/Perl support
-	optdepends = tcl: for PL/Tcl support
-	optdepends = postgresql-old-upgrade: upgrade from previous major version using pg_upgrade
-	provides = postgresql=9.4.20
-	provides = postgresql-libs=9.4.20
-	provides = postgresql-client=9.4.20
-	conflicts = postgresql
-	conflicts = postgresql-libs
-	conflicts = postgresql-testing
-	conflicts = postgresql-client
-	source = https://ftp.postgresql.org/pub/source/v9.4.20/postgresql-9.4.20.tar.bz2
+	makedepends = openssl>=1.0.0
+	makedepends = pam
+	makedepends = zlib
+	makedepends = icu
+	makedepends = systemd
+	makedepends = libldap
+	makedepends = llvm
+	makedepends = clang
+	source = https://ftp.postgresql.org/pub/source/v9.4.26/postgresql-9.4.26.tar.bz2
 	source = postgresql-run-socket.patch
+	source = postgresql-perl-rpath.patch
 	source = postgresql.pam
 	source = postgresql.logrotate
 	source = postgresql.service
-	source = postgresql.tmpfiles.conf
 	source = postgresql-check-db-dir
-	sha256sums = eeb1d8ddb2854c9e4d8b5cbd65665260c0ae8cbcb911003f24c2d82ccb97f87f
+	source = postgresql.sysusers
+	source = postgresql.tmpfiles
+	sha256sums = f5c014fc4a5c94e8cf11314cbadcade4d84213cfcc82081c9123e1b8847a20b9
 	sha256sums = 8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9
+	sha256sums = 5f73b54ca6206bd2c469c507830261ebd167baca074698d8889d769c33f98a31
 	sha256sums = 57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5
 	sha256sums = 6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e
-	sha256sums = c69b614731fdd3f4e127540814f5999f423363523c5209e252e19b1d4362ad68
-	sha256sums = 7e086d70e0dcaa6ce45693b4e826ce92d770192b3aff5642319b1ef279d88dc4
+	sha256sums = 25fb140b90345828dc01a4f286345757e700a47178bab03d217a7a5a79105b57
 	sha256sums = f15418433b7d9a153eea22af58cc64fda462144d7039d1083ae1e2e489cc303a
+	sha256sums = 7fa8f0ef3f9d40abd4749cc327c2f52478cb6dfb6e2405bd0279c95e9ff99f12
+	sha256sums = 4a4c0bb9ceb156cc47e9446d8393d1f72b4fe9ea1d39ba17213359df9211da57
+
+pkgname = postgresql-libs-9.4
+	pkgdesc = Libraries for use with PostgreSQL
+	depends = krb5
+	depends = openssl>=1.0.0
+	depends = readline>=6.0
+	depends = zlib
+	depends = libldap
+	provides = postgresql-client
+	provides = postgresql-libs=9.4.26
+	conflicts = postgresql-client
+	conflicts = postgresql-libs
+
+pkgname = postgresql-docs-9.4
+	pkgdesc = HTML documentation for PostgreSQL
+	provides = postgresql-docs=9.4.26
+	conflicts = postgresql-docs
+	options = docs
 
 pkgname = postgresql-9.4
+	pkgdesc = Sophisticated object-relational DBMS
+	install = postgresql.install
+	depends = postgresql-libs>=9.4.26
+	depends = krb5
+	depends = libxml2
+	depends = readline>=6.0
+	depends = openssl>=1.0.0
+	depends = pam
+	depends = icu
+	depends = systemd-libs
+	depends = libldap
+	depends = llvm-libs
+	optdepends = python2: for PL/Python 2 support
+	optdepends = python: for PL/Python 3 support
+	optdepends = perl: for PL/Perl support
+	optdepends = tcl: for PL/Tcl support
+	optdepends = postgresql-old-upgrade: upgrade from previous major version using pg_upgrade
+	provides = postgresql=9.4.26
+	conflicts = postgresql
+	options = staticlibs
+	backup = etc/pam.d/postgresql
+	backup = etc/logrotate.d/postgresql
 
diff --git a/PKGBUILD b/PKGBUILD
index 71798077bd52..ef3324ba265b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,81 +1,180 @@
-# Maintainer: Tim Sharpe <tim@sharpe.id.au>
+# Maintainer: Felix Golatofski <contact@xdfr.de>
+# Contributor: Tim Sharpe <tim@sharpe.id.au>
 # Contributor: Matthew Carter <m@ahungry.com>
 
-# Modified from postgresql-9.3 package provided by:
-# Ariel Popper <a@arielp.com>
-
-pkgname=postgresql-9.4
-pkgver=9.4.20
-pkgrel=2
+pkgbase=postgresql-9.4
+pkgname=('postgresql-libs-9.4' 'postgresql-docs-9.4' 'postgresql-9.4')
+pkgver=9.4.26
+pkgrel=1
+pkgdesc='Sophisticated object-relational DBMS'
+url="https://www.postgresql.org/"
 arch=('i686' 'x86_64')
-url="http://www.postgresql.org/"
-pkgdesc="A powerful, open source object-relational database system"
 license=('custom:PostgreSQL')
-conflicts=('postgresql' 'postgresql-libs' 'postgresql-testing' 'postgresql-client')
-provides=("postgresql=$pkgver" "postgresql-libs=$pkgver" "postgresql-client=$pkgver")
-depends=('libxml2' 'krb5' 'openssl>=1.0.0' 'readline>=6.0')
-makedepends=('python2' 'perl' 'tcl>=8.6.0')
-optdepends=('python2: for PL/Python support'
-            'perl: for PL/Perl support'
-            'tcl: for PL/Tcl support'
-            'postgresql-old-upgrade: upgrade from previous major version using pg_upgrade')
-install=postgresql.install
+makedepends=('krb5' 'libxml2' 'python' 'python2' 'perl' 'tcl>=8.6.0' 'openssl>=1.0.0'
+             'pam' 'zlib' 'icu' 'systemd' 'libldap' 'llvm' 'clang')
 source=(https://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2
         postgresql-run-socket.patch
-        postgresql.pam postgresql.logrotate
-        postgresql.service postgresql.tmpfiles.conf postgresql-check-db-dir)
-sha256sums=('eeb1d8ddb2854c9e4d8b5cbd65665260c0ae8cbcb911003f24c2d82ccb97f87f'
+	postgresql-perl-rpath.patch
+        postgresql.pam
+	postgresql.logrotate
+        postgresql.service
+	postgresql-check-db-dir
+	postgresql.sysusers
+	postgresql.tmpfiles)
+sha256sums=('f5c014fc4a5c94e8cf11314cbadcade4d84213cfcc82081c9123e1b8847a20b9'
             '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9'
+            '5f73b54ca6206bd2c469c507830261ebd167baca074698d8889d769c33f98a31'
             '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
             '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e'
-            'c69b614731fdd3f4e127540814f5999f423363523c5209e252e19b1d4362ad68'
-            '7e086d70e0dcaa6ce45693b4e826ce92d770192b3aff5642319b1ef279d88dc4'
-            'f15418433b7d9a153eea22af58cc64fda462144d7039d1083ae1e2e489cc303a')
+            '25fb140b90345828dc01a4f286345757e700a47178bab03d217a7a5a79105b57'
+            'f15418433b7d9a153eea22af58cc64fda462144d7039d1083ae1e2e489cc303a'
+            '7fa8f0ef3f9d40abd4749cc327c2f52478cb6dfb6e2405bd0279c95e9ff99f12'
+            '4a4c0bb9ceb156cc47e9446d8393d1f72b4fe9ea1d39ba17213359df9211da57')
+
+prepare() {
+  cd postgresql-${pkgver}
+  patch -p1 < ../postgresql-run-socket.patch
+  patch -p1 < ../postgresql-perl-rpath.patch
+}
 
 build() {
   cd "${srcdir}/postgresql-${pkgver}"
 
-  patch -Np1 < ../postgresql-run-socket.patch
-
-  ./configure --prefix=/usr \
-  --mandir=/usr/share/man \
-  --datadir=/usr/share/postgresql \
-  --sysconfdir=/etc \
-  --with-gssapi \
-  --with-libxml \
-  --with-openssl \
-  --with-perl \
-  --with-python PYTHON=/usr/bin/python2 \
-  --with-tcl \
-  --with-pam \
-  --with-system-tzdata=/usr/share/zoneinfo \
-  --with-uuid=e2fs \
-  --enable-nls \
-  --enable-thread-safety
-
-  make
-  make -C contrib
+  local options=(
+    --prefix=/usr
+    --mandir=/usr/share/man
+    --datadir=/usr/share/postgresql
+    --sysconfdir=/etc
+    --with-gssapi
+    --with-libxml
+    --with-openssl
+    --with-perl
+    --with-python
+    --with-tcl
+    --with-pam
+    --with-system-tzdata=/usr/share/zoneinfo
+    --with-uuid=e2fs
+    --with-icu
+    --with-systemd
+    --with-ldap
+    --with-llvm
+    --enable-nls
+    --enable-thread-safety
+    --disable-rpath
+  )
+
+  # regular build with everything
+  ./configure ${options[@]} \
+    PYTHON=/usr/bin/python2
+  make world
 }
 
-package() {
+package_postgresql-libs-9.4() {
+  pkgdesc="Libraries for use with PostgreSQL"
+  depends=('krb5' 'openssl>=1.0.0' 'readline>=6.0' 'zlib' 'libldap')
+  provides=('postgresql-client' "postgresql-libs=$pkgver")
+  conflicts=('postgresql-client' 'postgresql-libs')
+
   cd "${srcdir}/postgresql-${pkgver}"
 
   # install license
-  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -D -m644 COPYRIGHT -t "${pkgdir}/usr/share/licenses/${pkgname}"
+
+  # install libs and non-server binaries
+  for dir in src/interfaces src/bin/pg_config src/bin/pg_dump src/bin/psql src/bin/scripts; do
+    make -C ${dir} DESTDIR="${pkgdir}" install
+  done
+
+  for util in pg_config pg_dump pg_dumpall pg_restore psql \
+      clusterdb createdb createuser dropdb dropuser pg_isready reindexdb vacuumdb; do
+    install -Dm 644 doc/src/sgml/man1/${util}.1 "${pkgdir}"/usr/share/man/man1/${util}.1
+  done
+
+  cd src/include
+
+  install -d "${pkgdir}"/usr/include/{libpq,postgresql/internal/libpq}
+
+  # these headers are needed by the public headers of the interfaces
+  install -m 644 pg_config.h "${pkgdir}/usr/include"
+  install -m 644 pg_config_os.h "${pkgdir}/usr/include"
+  install -m 644 pg_config_ext.h "${pkgdir}/usr/include"
+  install -m 644 postgres_ext.h "${pkgdir}/usr/include"
+  install -m 644 libpq/libpq-fs.h "${pkgdir}/usr/include/libpq"
+  install -m 644 pg_config_manual.h "${pkgdir}/usr/include"
+
+  # these he aders are needed by the not-so-public headers of the interfaces
+  install -m 644 c.h "${pkgdir}/usr/include/postgresql/internal"
+  install -m 644 port.h "${pkgdir}/usr/include/postgresql/internal"
+  install -m 644 postgres_fe.h "${pkgdir}/usr/include/postgresql/internal"
+  install -m 644 libpq/pqcomm.h "${pkgdir}/usr/include/postgresql/internal/libpq"
+}
+
+package_postgresql-docs-9.4() {
+  pkgdesc="HTML documentation for PostgreSQL"
+  options=('docs')
+  provides=("postgresql-docs=$pkgver")
+  conflicts=('postgresql-docs')
 
+  cd postgresql-${pkgver}
+
+  install -Dm 644 COPYRIGHT -t "${pkgdir}/usr/share/licenses/${pkgname}"
+
+  make -C doc/src/sgml DESTDIR="${pkgdir}" install-html
+  chown -R root:root "${pkgdir}/usr/share/doc/postgresql/html"
+
+  # clean up
+  rmdir "${pkgdir}"/usr/share/man/man{1,3,7}
+  rmdir "${pkgdir}"/usr/share/man
+}
+
+package_postgresql-9.4() {
+  pkgdesc='Sophisticated object-relational DBMS'
+  backup=('etc/pam.d/postgresql' 'etc/logrotate.d/postgresql')
+  depends=("postgresql-libs>=${pkgver}" 'krb5' 'libxml2' 'readline>=6.0' 'openssl>=1.0.0' 'pam' 'icu' 'systemd-libs' 'libldap' 'llvm-libs')
+  optdepends=('python2: for PL/Python 2 support'
+              'python: for PL/Python 3 support'
+              'perl: for PL/Perl support'
+              'tcl: for PL/Tcl support'
+              'postgresql-old-upgrade: upgrade from previous major version using pg_upgrade')
+  provides=("postgresql=$pkgver")
+  conflicts=('postgresql')
+  options=('staticlibs')
+  install=postgresql.install
+
+  cd postgresql-${pkgver}
+
+  # install
   make DESTDIR="${pkgdir}" install
   make -C contrib DESTDIR="${pkgdir}" install
+  make -C doc/src/sgml DESTDIR="${pkgdir}" install-man
+
+  # we don't want these, they are in the -libs package
+  for dir in src/interfaces src/bin/pg_config src/bin/pg_dump src/bin/psql src/bin/scripts; do
+    make -C ${dir} DESTDIR="${pkgdir}" uninstall
+  done
+  for util in pg_config pg_dump pg_dumpall pg_restore psql \
+      clusterdb createdb createuser dropdb dropuser pg_isready reindexdb vacuumdb; do
+    rm "${pkgdir}"/usr/share/man/man1/${util}.1
+  done
+
+  install -Dm 644 COPYRIGHT -t "${pkgdir}/usr/share/licenses/${pkgname}"
 
-  install -D -m644 "${srcdir}/postgresql.tmpfiles.conf" \
-    "${pkgdir}/usr/lib/tmpfiles.d/postgresql.conf"
-  install -D -m644 "${srcdir}/postgresql.service" \
-    "${pkgdir}/usr/lib/systemd/system/postgresql.service"
-  install -D -m755 "${srcdir}/postgresql-check-db-dir" \
-    "${pkgdir}/usr/bin/postgresql-check-db-dir"
+  cd "${srcdir}"
+  install -Dm 755 postgresql-check-db-dir -t "${pkgdir}/usr/bin"
 
-  install -D -m644 "${srcdir}/postgresql.pam" \
-    "${pkgdir}/etc/pam.d/postgresql"
+  install -Dm 644 postgresql.pam "${pkgdir}/etc/pam.d/postgresql"
+  install -Dm 644 postgresql.logrotate "${pkgdir}/etc/logrotate.d/postgresql"
 
-  install -D -m644 "${srcdir}/postgresql.logrotate" \
-    "${pkgdir}/etc/logrotate.d/postgresql"
+  install -Dm 644 postgresql.service -t "${pkgdir}/usr/lib/systemd/system"
+  install -Dm 644 postgresql.sysusers "${pkgdir}/usr/lib/sysusers.d/postgresql.conf"
+  install -Dm 644 postgresql.tmpfiles "${pkgdir}/usr/lib/tmpfiles.d/postgresql.conf"
+
+  # clean up unneeded installed items
+  rm -rf "${pkgdir}/usr/include/postgresql/internal"
+  rm -rf "${pkgdir}/usr/include/libpq"
+  find "${pkgdir}/usr/include" -maxdepth 1 -type f -execdir rm {} +
+  rmdir "${pkgdir}/usr/share/doc/postgresql/html"
 }
+
+# vim: ts=2 sw=2 et:
+
diff --git a/postgresql-perl-rpath.patch b/postgresql-perl-rpath.patch
new file mode 100644
index 000000000000..c4c4fdad2898
--- /dev/null
+++ b/postgresql-perl-rpath.patch
@@ -0,0 +1,13 @@
+diff -Naur postgresql-9.1.5.orig/src/pl/plperl/GNUmakefile postgresql-9.1.5/src/pl/plperl/GNUmakefile
+--- postgresql-9.1.5.orig/src/pl/plperl/GNUmakefile	2012-08-14 18:41:04.000000000 -0400
++++ postgresql-9.1.5/src/pl/plperl/GNUmakefile	2012-08-17 11:15:09.457116708 -0400
+@@ -43,6 +43,9 @@
+ 
+ SHLIB_LINK = $(perl_embed_ldflags)
+ 
++# Force rpath to be used even though we disable it everywhere else
++SHLIB_LINK += $(rpath)
++
+ REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-extension=plperl  --load-extension=plperlu
+ REGRESS = plperl plperl_lc plperl_trigger plperl_shared plperl_elog plperl_util plperl_init plperlu plperl_array
+ # if Perl can support two interpreters in one backend,
diff --git a/postgresql.install b/postgresql.install
index d0978faa9645..0d23d474a0c2 100644
--- a/postgresql.install
+++ b/postgresql.install
@@ -9,11 +9,9 @@ post_install() {
     useradd -c 'PostgreSQL user' -u 88 -g postgres -d '/var/lib/postgres' -s /bin/bash postgres
     passwd -l postgres >/dev/null
   fi
-  systemd-tmpfiles --create postgresql.conf
   if [ ! -d '/var/lib/postgres/data' ]; then
     mkdir -p '/var/lib/postgres/data'
     chown postgres:postgres '/var/lib/postgres/data'
-    sudo -u postgres initdb -D '/var/lib/postgres/data'
   fi
 }
 
@@ -24,17 +22,4 @@ post_upgrade() {
   if [ "$postgres_shell" = "/sbin/nologin" ]; then
     chsh -s /bin/bash postgres
   fi
-  if [ $(vercmp $2 '9.2.1-2') -lt 0 ]; then
-    echo "Note: The Unix domain socket location has changed; be sure to"
-    echo "      restart any local applications using libpq.so."
-  fi
-}
-
-post_remove() {
-  if getent passwd postgres >/dev/null; then
-    userdel postgres
-  fi
-  if getent group postgres >/dev/null; then
-    groupdel postgres
-  fi
 }
diff --git a/postgresql.service b/postgresql.service
index 294b66e8f2c2..dcef95a9c103 100644
--- a/postgresql.service
+++ b/postgresql.service
@@ -3,7 +3,7 @@ Description=PostgreSQL database server
 After=network.target
 
 [Service]
-Type=forking
+Type=notify
 TimeoutSec=120
 User=postgres
 Group=postgres
@@ -12,15 +12,32 @@ Environment=PGROOT=/var/lib/postgres
 
 SyslogIdentifier=postgres
 PIDFile=/var/lib/postgres/data/postmaster.pid
+RuntimeDirectory=postgresql
+RuntimeDirectoryMode=755
 
 ExecStartPre=/usr/bin/postgresql-check-db-dir ${PGROOT}/data
-ExecStart= /usr/bin/pg_ctl -s -D ${PGROOT}/data start -w -t 120
-ExecReload=/usr/bin/pg_ctl -s -D ${PGROOT}/data reload
-ExecStop=  /usr/bin/pg_ctl -s -D ${PGROOT}/data stop -m fast
+ExecStart=/usr/bin/postgres -D ${PGROOT}/data
+ExecReload=/bin/kill -HUP ${MAINPID}
+KillMode=mixed
+KillSignal=SIGINT
 
 # Due to PostgreSQL's use of shared memory, OOM killer is often overzealous in
 # killing Postgres, so adjust it downward
 OOMScoreAdjust=-200
 
+# Additional security-related features
+PrivateTmp=true
+ProtectHome=true
+ProtectSystem=full
+NoNewPrivileges=true
+ProtectControlGroups=true
+ProtectKernelModules=true
+ProtectKernelTunables=true
+PrivateDevices=true
+RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
+RestrictNamespaces=true
+RestrictRealtime=true
+SystemCallArchitectures=native
+
 [Install]
 WantedBy=multi-user.target
diff --git a/postgresql.sysusers b/postgresql.sysusers
new file mode 100644
index 000000000000..a1711b1cc3df
--- /dev/null
+++ b/postgresql.sysusers
@@ -0,0 +1 @@
+u postgres - "PostgreSQL user" /var/lib/postgres /bin/bash
diff --git a/postgresql.tmpfiles b/postgresql.tmpfiles
new file mode 100644
index 000000000000..e618918018ac
--- /dev/null
+++ b/postgresql.tmpfiles
@@ -0,0 +1,2 @@
+d /var/lib/postgres/data 700 postgres postgres
+h /var/lib/postgres/data -   -        -        - +C
diff --git a/postgresql.tmpfiles.conf b/postgresql.tmpfiles.conf
deleted file mode 100644
index c2e0747dae63..000000000000
--- a/postgresql.tmpfiles.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /run/postgresql 0775 postgres postgres -