Major update to PostgreSQL 11. Dump/restore or pg_upgrade needed.

11 files changed, 211 insertions, 142 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 97d079f062a2..da60f0935e01 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,65 +1,81 @@
 pkgbase = postgresql-lts
-	pkgdesc = A sophisticated object-relational DBMS
-	pkgver = 9.4.26
+	pkgdesc = Sophisticated object-relational DBMS
+	pkgver = 11.7
 	pkgrel = 1
-	url = http://www.postgresql.org/
-	arch = i686
+	url = https://www.postgresql.org/
 	arch = x86_64
 	license = custom:PostgreSQL
 	makedepends = krb5
 	makedepends = libxml2
+	makedepends = python
 	makedepends = python2
 	makedepends = perl
 	makedepends = tcl>=8.6.0
 	makedepends = openssl>=1.0.0
 	makedepends = pam
-	source = http://ftp.postgresql.org/pub/source/v9.4.26/postgresql-9.4.26.tar.bz2
+	makedepends = zlib
+	makedepends = icu
+	makedepends = systemd
+	makedepends = libldap
+	makedepends = llvm
+	makedepends = clang
+	source = https://ftp.postgresql.org/pub/source/v11.7/postgresql-11.7.tar.bz2
 	source = postgresql-run-socket.patch
-	source = postgresql.pam
-	source = postgresql.logrotate
-	source = postgresql.service
-	source = postgresql.tmpfiles.conf
+	source = postgresql-perl-rpath.patch
+	source = postgresql-lts.pam
+	source = postgresql-lts.logrotate
+	source = postgresql-lts.service
 	source = postgresql-check-db-dir
-	sha256sums = f5c014fc4a5c94e8cf11314cbadcade4d84213cfcc82081c9123e1b8847a20b9
+	source = postgresql-lts.sysusers
+	source = postgresql-lts.tmpfiles
+	sha256sums = 324ae93a8846fbb6a25d562d271bc441ffa8794654c5b2839384834de220a313
 	sha256sums = 8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9
+	sha256sums = 5f73b54ca6206bd2c469c507830261ebd167baca074698d8889d769c33f98a31
 	sha256sums = 57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5
 	sha256sums = 6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e
-	sha256sums = 456c331d10b987c2bb7b4a9b42192ffae5b6b2c72829d16b20f39c5897b79d62
-	sha256sums = 7e086d70e0dcaa6ce45693b4e826ce92d770192b3aff5642319b1ef279d88dc4
-	sha256sums = f15418433b7d9a153eea22af58cc64fda462144d7039d1083ae1e2e489cc303a
+	sha256sums = 25fb140b90345828dc01a4f286345757e700a47178bab03d217a7a5a79105b57
+	sha256sums = 2bbd8c4e51b70223d274fef3a167af096f44af3d3c41ae505ad11c606674e7c5
+	sha256sums = 7fa8f0ef3f9d40abd4749cc327c2f52478cb6dfb6e2405bd0279c95e9ff99f12
+	sha256sums = 4a4c0bb9ceb156cc47e9446d8393d1f72b4fe9ea1d39ba17213359df9211da57
 
 pkgname = postgresql-lts-libs
 	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
+	provides = postgresql-libs=11
 	conflicts = postgresql-client
 	conflicts = postgresql-libs
 
 pkgname = postgresql-lts-docs
 	pkgdesc = HTML documentation for PostgreSQL
-	arch = any
-	provides = postgresql-docs=9.4
+	provides = postgresql-docs=11
 	conflicts = postgresql-docs
 	options = docs
 
 pkgname = postgresql-lts
-	install = postgresql.install
-	depends = postgresql-lts-libs>=9.4.26
+	pkgdesc = Sophisticated object-relational DBMS
+	depends = postgresql-lts-libs>=11.7
 	depends = krb5
 	depends = libxml2
 	depends = readline>=6.0
 	depends = openssl>=1.0.0
 	depends = pam
-	optdepends = python2: for PL/Python support
+	depends = icu
+	depends = systemd-libs
+	depends = libldap
+	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-lts-old-upgrade: upgrade from previous major version using pg_upgrade
-	provides = postgresql=9.4
+	optdepends = llvm: for JIT compilation support
+	optdepends = postgresql-old-upgrade: upgrade from previous major version using pg_upgrade
+	provides = postgresql=11
 	conflicts = postgresql
 	options = staticlibs
-	backup = etc/pam.d/postgresql
-	backup = etc/logrotate.d/postgresql
+	backup = etc/pam.d/postgresql-lts
+	backup = etc/logrotate.d/postgresql-lts
 
diff --git a/PKGBUILD b/PKGBUILD
index d6b8e0271c43..f50b54e75de9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,103 +1,154 @@
+# Contributor: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Dan McGee <dan@archlinux.org>
 # Maintainer: Ariel Popper <a@arielp.com>
 
 pkgbase=postgresql-lts
 pkgname=('postgresql-lts-libs' 'postgresql-lts-docs' 'postgresql-lts')
-pkgver=9.4.26
+pkgver=11.7
 _majorver=${pkgver%.*}
 pkgrel=1
-pkgdesc="A sophisticated object-relational DBMS"
-arch=('i686' 'x86_64')
-url="http://www.postgresql.org/"
+pkgdesc='Sophisticated object-relational DBMS'
+url='https://www.postgresql.org/'
+arch=('x86_64')
 license=('custom:PostgreSQL')
-makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl>=8.6.0'
-             'openssl>=1.0.0' 'pam')
-source=(http://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=('f5c014fc4a5c94e8cf11314cbadcade4d84213cfcc82081c9123e1b8847a20b9'
+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-perl-rpath.patch
+        postgresql-lts.pam
+        postgresql-lts.logrotate
+        postgresql-lts.service
+        postgresql-check-db-dir
+        postgresql-lts.sysusers
+        postgresql-lts.tmpfiles)
+sha256sums=('324ae93a8846fbb6a25d562d271bc441ffa8794654c5b2839384834de220a313'
             '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9'
+            'fa7cc63936bce336fedf8ce8d11c8a0e051d6424a10570b991164386e96058cb'
             '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
             '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e'
-            '456c331d10b987c2bb7b4a9b42192ffae5b6b2c72829d16b20f39c5897b79d62'
-            '7e086d70e0dcaa6ce45693b4e826ce92d770192b3aff5642319b1ef279d88dc4'
-            'f15418433b7d9a153eea22af58cc64fda462144d7039d1083ae1e2e489cc303a')
+            '25fb140b90345828dc01a4f286345757e700a47178bab03d217a7a5a79105b57'
+            '2bbd8c4e51b70223d274fef3a167af096f44af3d3c41ae505ad11c606674e7c5'
+            '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
+  cd postgresql-${pkgver}
+  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
+  )
+
+  # only build plpython3 for now
+  ./configure ${options[@]} \
+    PYTHON=/usr/bin/python
+  make -C src/pl/plpython all
+  make -C contrib/hstore_plpython all
+  make -C contrib/ltree_plpython all
+
+  # save plpython3 build and Makefile.global
+  cp -a src/pl/plpython{,3}
+  cp -a contrib/hstore_plpython{,3}
+  cp -a contrib/ltree_plpython{,3}
+  cp -a src/Makefile.global{,.python3}
+  make distclean
+
+  # regular build with everything
+  ./configure ${options[@]} \
+    PYTHON=/usr/bin/python2
+  make world
+}
 
-  ./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
+_postgres_check() {
+  make "${1}" || (find . -name regression.diffs | \
+    while read -r line; do
+      error "make ${1} failure: ${line}"
+      cat "${line}"
+    done; exit 1)
+}
 
-  make world
+check() {
+  cd postgresql-${pkgver}
+  _postgres_check check
+  _postgres_check check-world
 }
 
 package_postgresql-lts-libs() {
   pkgdesc="Libraries for use with PostgreSQL"
-  depends=('krb5' 'openssl>=1.0.0' 'readline>=6.0')
+  depends=('krb5' 'openssl>=1.0.0' 'readline>=6.0' 'zlib' 'libldap')
   provides=('postgresql-client' "postgresql-libs=$_majorver")
   conflicts=('postgresql-client' 'postgresql-libs')
 
-  cd "${srcdir}/postgresql-${pkgver}"
+  cd postgresql-${pkgver}
 
   # install license
-  install -D -m644 COPYRIGHT \
-    "${pkgdir}/usr/share/licenses/${pkgbase}-libs/LICENSE"
+  install -Dm 644 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
+  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 createlang createuser dropdb droplang dropuser \
-              pg_isready reindexdb vacuumdb; do
-    install -D -m644 doc/src/sgml/man1/${util}.1 \
-      "${pkgdir}"/usr/share/man/man1/${util}.1
+  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
 
-  mkdir -p "${pkgdir}"/usr/include/{libpq,postgresql/internal/libpq}
+  install -d "${pkgdir}"/usr/include/{libpq,postgresql/internal/libpq}
 
   # these headers are needed by the public headers of the interfaces
-  install -m644 pg_config.h "${pkgdir}/usr/include/"
-  install -m644 pg_config_os.h "${pkgdir}/usr/include/"
-  install -m644 pg_config_ext.h "${pkgdir}/usr/include/"
-  install -m644 postgres_ext.h "${pkgdir}/usr/include/"
-  install -m644 libpq/libpq-fs.h "${pkgdir}/usr/include/libpq/"
-  install -m644 pg_config_manual.h "${pkgdir}/usr/include/"
-
-  # these headers are needed by the not-so-public headers of the interfaces
-  install -m644 c.h "${pkgdir}/usr/include/postgresql/internal/"
-  install -m644 port.h "${pkgdir}/usr/include/postgresql/internal/"
-  install -m644 postgres_fe.h "${pkgdir}/usr/include/postgresql/internal/"
-  install -m644 libpq/pqcomm.h "${pkgdir}/usr/include/postgresql/internal/libpq/"
+  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-lts-docs() {
   pkgdesc="HTML documentation for PostgreSQL"
-  arch=('any')
   provides=("postgresql-docs=${_majorver}")
   conflicts=('postgresql-docs')
   options=('docs')
 
-  cd "${srcdir}/postgresql-${pkgver}"
+  cd postgresql-${pkgver}
 
-  # install license
-  install -D -m644 COPYRIGHT \
-    "${pkgdir}/usr/share/licenses/${pkgbase}-docs/LICENSE"
+  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/"
+  chown -R root:root "${pkgdir}/usr/share/doc/postgresql/html"
 
   # clean up
   rmdir "${pkgdir}"/usr/share/man/man{1,3,7}
@@ -105,59 +156,60 @@ package_postgresql-lts-docs() {
 }
 
 package_postgresql-lts() {
-  #pkgdesc=""  ##Set at top so namcap will just shut the hell up already!
+  pkgdesc='Sophisticated object-relational DBMS'
+  backup=("etc/pam.d/${pkgname}" "etc/logrotate.d/${pkgname}")
   provides=("postgresql=$_majorver")
   conflicts=("postgresql")
-  backup=('etc/pam.d/postgresql' 'etc/logrotate.d/postgresql')
-  depends=("postgresql-lts-libs>=${pkgver}" 'krb5' 'libxml2' \
-           'readline>=6.0' 'openssl>=1.0.0' 'pam')
-  optdepends=('python2: for PL/Python support'
+  depends=("postgresql-lts-libs>=${pkgver}" 'krb5' 'libxml2' 'readline>=6.0' 'openssl>=1.0.0' 'pam' 'icu' 'systemd-libs' 'libldap')
+  optdepends=('python2: for PL/Python 2 support'
+              'python: for PL/Python 3 support'
               'perl: for PL/Perl support'
               'tcl: for PL/Tcl support'
-              'postgresql-lts-old-upgrade: upgrade from previous major version using pg_upgrade')
+              'llvm: for JIT compilation support'
+              'postgresql-old-upgrade: upgrade from previous major version using pg_upgrade')
   options=('staticlibs')
-  install=postgresql.install
 
-  cd "${srcdir}/postgresql-${pkgver}"
+  cd postgresql-${pkgver}
 
   # install
   make DESTDIR="${pkgdir}" install
   make -C contrib DESTDIR="${pkgdir}" install
   make -C doc/src/sgml DESTDIR="${pkgdir}" install-man
 
+  # install plpython3
+  mv src/Makefile.global src/Makefile.global.save
+  cp src/Makefile.global.python3 src/Makefile.global
+  touch -r src/Makefile.global.save src/Makefile.global
+  make -C src/pl/plpython3 DESTDIR="${pkgdir}" install
+  make -C contrib/hstore_plpython3 DESTDIR="${pkgdir}" install
+  make -C contrib/ltree_plpython3 DESTDIR="${pkgdir}" install
+
   # 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
+  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 createlang createuser dropdb droplang dropuser \
-              pg_isready reindexdb vacuumdb; do
+  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 license
-  install -D -m644 COPYRIGHT \
-    "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE"
+  install -Dm 644 COPYRIGHT -t "${pkgdir}/usr/share/licenses/${pkgname}"
+
+  cd "${srcdir}"
+  install -Dm 755 postgresql-check-db-dir -t "${pkgdir}/usr/bin"
+
+  install -Dm 644 ${pkgname}.pam "${pkgdir}/etc/pam.d/${pkgname}"
+  install -Dm 644 ${pkgname}.logrotate "${pkgdir}/etc/logrotate.d/${pkgname}"
+
+  install -Dm 644 ${pkgname}.service -t "${pkgdir}/usr/lib/systemd/system"
+  install -Dm 644 ${pkgname}.sysusers "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
+  install -Dm 644 ${pkgname}.tmpfiles "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.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"
-
-  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"
-
-  install -D -m644 "${srcdir}/postgresql.pam" \
-    "${pkgdir}/etc/pam.d/postgresql"
-
-  install -D -m644 "${srcdir}/postgresql.logrotate" \
-    "${pkgdir}/etc/logrotate.d/postgresql"
 }
 
-
+# vim: ts=2 sw=2 et:
diff --git a/postgresql-check-db-dir b/postgresql-check-db-dir
index 540f1780643e..fabca97e2c49 100644
--- a/postgresql-check-db-dir
+++ b/postgresql-check-db-dir
@@ -16,9 +16,9 @@ then
 fi
 
 # PGMAJORVERSION is major version
-PGMAJORVERSION=9.4
-# PREVMAJORVERSION is the previous major version, e.g., 8.4, for upgrades
-PREVMAJORVERSION=9.3
+PGMAJORVERSION=11
+# PREVMAJORVERSION is the previous major version
+PREVMAJORVERSION=10
 
 # Check for the PGDATA structure
 if [ -f "$PGDATA/PG_VERSION" ] && [ -d "$PGDATA/base" ]
diff --git a/postgresql.logrotate b/postgresql-lts.logrotate
index 9c36918be5e5..9c36918be5e5 100644
--- a/postgresql.logrotate
+++ b/postgresql-lts.logrotate
diff --git a/postgresql.pam b/postgresql-lts.pam
index 53724d1f86a7..53724d1f86a7 100644
--- a/postgresql.pam
+++ b/postgresql-lts.pam
diff --git a/postgresql.service b/postgresql-lts.service
index f4a871ad61a1..dcef95a9c103 100644
--- a/postgresql.service
+++ b/postgresql-lts.service
@@ -3,7 +3,7 @@ Description=PostgreSQL database server
 After=network.target
 
 [Service]
-Type=forking
+Type=notify
 TimeoutSec=120
 User=postgres
 Group=postgres
@@ -12,11 +12,14 @@ 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
@@ -24,8 +27,17 @@ 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-lts.sysusers b/postgresql-lts.sysusers
new file mode 100644
index 000000000000..a1711b1cc3df
--- /dev/null
+++ b/postgresql-lts.sysusers
@@ -0,0 +1 @@
+u postgres - "PostgreSQL user" /var/lib/postgres /bin/bash
diff --git a/postgresql-lts.tmpfiles b/postgresql-lts.tmpfiles
new file mode 100644
index 000000000000..e618918018ac
--- /dev/null
+++ b/postgresql-lts.tmpfiles
@@ -0,0 +1,2 @@
+d /var/lib/postgres/data 700 postgres postgres
+h /var/lib/postgres/data -   -        -        - +C
diff --git a/postgresql-perl-rpath.patch b/postgresql-perl-rpath.patch
new file mode 100644
index 000000000000..2920d363a3b5
--- /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
deleted file mode 100644
index c8302dcecb50..000000000000
--- a/postgresql.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-  if [ ! -d '/var/lib/postgres' ]; then
-    mkdir -p '/var/lib/postgres'
-  fi
-  if ! getent group postgres >/dev/null; then
-    groupadd -g 88 postgres
-  fi
-  if ! getent passwd postgres >/dev/null; then
-    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'
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-  # FS#23858, fix postgres user shell issue
-  postgres_shell=$(getent passwd postgres | cut -d: -f7)
-  if [ "$postgres_shell" = "/sbin/nologin" ]; then
-    chsh -s /bin/bash postgres
-  fi
-}
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 -