9.3.4-1

7 files changed, 57 insertions, 155 deletions

diff --git a/.SRCINFO b/.SRCINFO
index feb80400c9d2..f7ae8e13563c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,45 +1,39 @@
 # Generated by mksrcinfo v8
-# Wed Jan 20 18:18:35 UTC 2016
+# Wed Jan 20 18:22:09 UTC 2016
 pkgbase = binx32-postgresql
-	pkgver = 9.2.2
-	pkgrel = 1.1
+	pkgver = 9.3.4
+	pkgrel = 1
 	url = http://www.postgresql.org/
 	arch = x86_64
 	license = custom:PostgreSQL
 	makedepends = libx32-krb5
 	makedepends = libx32-libxml2
-	makedepends = binx32-python2
-	makedepends = binx32-perl
-	makedepends = binx32-tcl
 	makedepends = libx32-openssl>=1.0.0
 	makedepends = libx32-pam
-	source = http://ftp.postgresql.org/pub/source/v9.2.2/postgresql-9.2.2.tar.bz2
+	source = http://ftp.postgresql.org/pub/source/v9.3.4/postgresql-9.3.4.tar.bz2
 	source = x32.patch
 	source = postgresql-run-socket.patch
-	source = postgresql.rcd
-	source = postgresql.confd
+	source = postgresql.pam
 	source = postgresql.logrotate
 	source = postgresql.service
 	source = postgresql.tmpfiles.conf
 	source = postgresql-check-db-dir
-	md5sums = 1cc388988e69bf75c6b55d59070100f6
+	md5sums = d0a41f54c377b2d2fab4a003b0dac762
 	md5sums = e7fcec0b799f776e06c7400fab13302a
 	md5sums = 170486b408ad3b6b24ae91b9196cb004
-	md5sums = df507dd37a17a9cb42c1c87056b967a6
-	md5sums = 0c0bb88e00672c379e1bf4fad362b95f
+	md5sums = 96f82c38f3f540b53f3e5144900acf17
 	md5sums = 951d1306d84450d603c47318833bb99d
 	md5sums = 22809c2ab5f733b51abcef82f315b31c
-	md5sums = 1201fbe01866d7fd137158c3dbc5f99d
-	md5sums = f138ddd82028bfe93f53bcbb3b089fd2
-	sha256sums = e1a7a854a98896cb7fcd1696a76fca6f3bcac94d75e68a6154ffe2b69184f7f3
+	md5sums = 4ad974e4659d4474a40c54995ed5a809
+	md5sums = 2511a2d467e032080c22e20c43a17a7d
+	sha256sums = 9ee819574dfc8798a448dc23a99510d2d8924c2f8b49f8228cd77e4efc8a6621
 	sha256sums = 15e068dd4896f56eaafd405945c5b57d0b9812e790328d8fc96dc1cbcb3cb10e
 	sha256sums = f8c444140755e99b1ffd808404bda77c360c2843d13f6270b8dbd067d129b33a
-	sha256sums = ddc9c2bc96efc5cb1a33875081446a71a0701bcbe0ebdbfc1aa3331563633687
-	sha256sums = 343abe98c77e6be000d3996a1312cb6b0b00f3b83c84d3f1c753c6a5a86f9fec
+	sha256sums = 57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5
 	sha256sums = cc766679b3f1dd1e1fe1d4428b747ab44b8778c4127dc011cafd491842756e41
 	sha256sums = 89b061802eee198218c2936ca02ac61be90c46a3e76ebbe2ffa2f60c1cf07cba
-	sha256sums = 3915be673f6f19f8c60e0df3405ca765addceac44e6da144db604efcbf0f4d04
-	sha256sums = f0f3da47778bae1030986441c63f1b2a7f053d63820e13955ab5664086c92e13
+	sha256sums = 27f3ef84f59a008ee9a2324730386e11f68a9b10bbcd7ee4bbdbf4693b08d00d
+	sha256sums = 745182b5977aff117109705a84558c1ce7d83bd369949c4138da71cd039de492
 
 pkgname = libx32-postgresql-libs
 	pkgdesc = Libraries for use with PostgreSQL (x32 ABI)
@@ -52,16 +46,14 @@ pkgname = libx32-postgresql-libs
 pkgname = binx32-postgresql
 	pkgdesc = A sophisticated object-relational DBMS (x32 ABI)
 	install = postgresql.install
-	depends = libx32-postgresql-libs>=9.2.2
+	depends = libx32-postgresql-libs>=9.3.4
 	depends = libx32-krb5
 	depends = libx32-libxml2
 	depends = libx32-readline>=6.0
 	depends = libx32-openssl>=1.0.0
-	depends = postgresql>=9.2
-	optdepends = binx32-python2: for PL/Python support
-	optdepends = binx32-perl: for PL/Perl support
-	optdepends = binx32-tcl: for PL/Tcl support
+	depends = postgresql>=9.3
 	optdepends = postgresql-old-upgrade: upgrade from previous major version using pg_upgrade
-	backup = etc/conf.d/postgresql-x32
+	options = staticlibs
+	backup = etc/pam.d/postgresql-x32
 	backup = etc/logrotate.d/postgresql-x32
 
diff --git a/PKGBUILD b/PKGBUILD
index 6519d1fa6055..2c19bc875b72 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 172926 2012-12-06 22:03:52Z dan $
+# $Id: PKGBUILD 208312 2014-03-20 14:12:59Z dan $
 # Upstream Maintainer: Dan McGee <dan@archlinux.org>
 # Maintainer: Fantix King <fantix.king at gmail.com>
 
@@ -6,43 +6,41 @@ _pkgbase=postgresql
 pkgbase=binx32-postgresql
 pkgname='binx32-postgresql'
 true && pkgname=('libx32-postgresql-libs' 'binx32-postgresql')
-pkgver=9.2.2
+pkgver=9.3.4
 _majorver=${pkgver%.*}
-pkgrel=1.1
+pkgrel=1
 arch=('x86_64')
 url="http://www.postgresql.org/"
 license=('custom:PostgreSQL')
-makedepends=('libx32-krb5' 'libx32-libxml2' 'binx32-python2' 'binx32-perl' 'binx32-tcl' 'libx32-openssl>=1.0.0' 'libx32-pam')
+makedepends=('libx32-krb5' 'libx32-libxml2' 'libx32-openssl>=1.0.0' 'libx32-pam')
+#makedepends=('libx32-krb5' 'libx32-libxml2' 'binx32-python2' 'binx32-perl' 'binx32-tcl>=8.6.0' 'libx32-openssl>=1.0.0' 'libx32-pam')
 source=(http://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2
         x32.patch
         postgresql-run-socket.patch
-        postgresql.rcd postgresql.confd postgresql.logrotate
+        postgresql.pam postgresql.logrotate
         postgresql.service postgresql.tmpfiles.conf postgresql-check-db-dir)
-md5sums=('1cc388988e69bf75c6b55d59070100f6'
+md5sums=('d0a41f54c377b2d2fab4a003b0dac762'
          'e7fcec0b799f776e06c7400fab13302a'
          '170486b408ad3b6b24ae91b9196cb004'
-         'df507dd37a17a9cb42c1c87056b967a6'
-         '0c0bb88e00672c379e1bf4fad362b95f'
+         '96f82c38f3f540b53f3e5144900acf17'
          '951d1306d84450d603c47318833bb99d'
          '22809c2ab5f733b51abcef82f315b31c'
-         '1201fbe01866d7fd137158c3dbc5f99d'
-         'f138ddd82028bfe93f53bcbb3b089fd2')
-sha256sums=('e1a7a854a98896cb7fcd1696a76fca6f3bcac94d75e68a6154ffe2b69184f7f3'
+         '4ad974e4659d4474a40c54995ed5a809'
+         '2511a2d467e032080c22e20c43a17a7d')
+sha256sums=('9ee819574dfc8798a448dc23a99510d2d8924c2f8b49f8228cd77e4efc8a6621'
             '15e068dd4896f56eaafd405945c5b57d0b9812e790328d8fc96dc1cbcb3cb10e'
             'f8c444140755e99b1ffd808404bda77c360c2843d13f6270b8dbd067d129b33a'
-            'ddc9c2bc96efc5cb1a33875081446a71a0701bcbe0ebdbfc1aa3331563633687'
-            '343abe98c77e6be000d3996a1312cb6b0b00f3b83c84d3f1c753c6a5a86f9fec'
+            '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
             'cc766679b3f1dd1e1fe1d4428b747ab44b8778c4127dc011cafd491842756e41'
             '89b061802eee198218c2936ca02ac61be90c46a3e76ebbe2ffa2f60c1cf07cba'
-            '3915be673f6f19f8c60e0df3405ca765addceac44e6da144db604efcbf0f4d04'
-            'f0f3da47778bae1030986441c63f1b2a7f053d63820e13955ab5664086c92e13')
+            '27f3ef84f59a008ee9a2324730386e11f68a9b10bbcd7ee4bbdbf4693b08d00d'
+            '745182b5977aff117109705a84558c1ce7d83bd369949c4138da71cd039de492')
 
 build() {
   cd "${srcdir}/postgresql-${pkgver}"
 
   export CC="gcc -mx32"
   export CXX="g++ -mx32"
-  export CFLAGS="--include=/usr/include/python2.7/pyconfig-x32.h"
   export PKG_CONFIG_PATH="/usr/libx32/pkgconfig"
 
   patch -Np1 < ../postgresql-run-socket.patch
@@ -56,9 +54,9 @@ build() {
   --with-krb5 \
   --with-libxml \
   --with-openssl \
-  --with-perl PERL=/usr/bin/perl-x32 \
-  --with-python PYTHON=/usr/bin/python2-x32 \
-  --with-tcl TCLSH=/usr/bin/tclsh-x32 \
+  --without-perl \
+  --without-python \
+  --without-tcl \
   --with-pam \
   --with-system-tzdata=/usr/share/zoneinfo \
   --with-pgport=5433 \
@@ -77,7 +75,7 @@ package_libx32-postgresql-libs() {
   cd "${srcdir}/postgresql-${pkgver}"
 
   # install libs
-  for dir in src/interfaces src/bin/pg_config src/bin/psql; do
+  for dir in src/interfaces src/bin/pg_config src/bin/psql src/bin/pg_dump; do
     make -C ${dir} DESTDIR="${pkgdir}" install
   done
 
@@ -96,17 +94,14 @@ package_libx32-postgresql-libs() {
   # install license
   install -dm755 "$pkgdir"/usr/share/licenses
   ln -s postgresql-libs "${pkgdir}"/usr/share/licenses/libx32-postgresql-libs
-
 }
 
 package_binx32-postgresql() {
   pkgdesc="A sophisticated object-relational DBMS (x32 ABI)"
-  backup=('etc/conf.d/postgresql-x32' 'etc/logrotate.d/postgresql-x32')
-  depends=("libx32-postgresql-libs>=${pkgver}" 'libx32-krb5' 'libx32-libxml2' 'libx32-readline>=6.0' 'libx32-openssl>=1.0.0' "${_pkgbase}>=9.2")
-  optdepends=('binx32-python2: for PL/Python support'
-              'binx32-perl: for PL/Perl support'
-              'binx32-tcl: for PL/Tcl support'
-              'postgresql-old-upgrade: upgrade from previous major version using pg_upgrade')
+  backup=('etc/pam.d/postgresql-x32' 'etc/logrotate.d/postgresql-x32')
+  depends=("libx32-postgresql-libs>=${pkgver}" 'libx32-krb5' 'libx32-libxml2' 'libx32-readline>=6.0' 'libx32-openssl>=1.0.0' "${_pkgbase}>=9.3")
+  optdepends=('postgresql-old-upgrade: upgrade from previous major version using pg_upgrade')
+  options=('staticlibs')
   install=postgresql.install
 
   cd "${srcdir}/postgresql-${pkgver}"
@@ -117,7 +112,7 @@ package_binx32-postgresql() {
   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/psql; do
+  for dir in src/interfaces src/bin/pg_config src/bin/psql src/bin/pg_dump; do
     make -C ${dir} DESTDIR="${pkgdir}" uninstall
   done
 
@@ -131,22 +126,18 @@ package_binx32-postgresql() {
   rm -rf "${pkgdir}/usr/include/postgresql-x32/internal"
   rm -rf "${pkgdir}/usr/include/libpq"
   find "${pkgdir}/usr/include" -maxdepth 1 -type f -execdir rm {} +
-  rm "${pkgdir}/usr/bin/"{pltcl_delmod,pltcl_listmod,pltcl_loadmod,postmaster}
 
-  # install launch script
-  install -D -m755 "${srcdir}/postgresql.rcd" "${pkgdir}/etc/rc.d/postgresql-x32"
   install -D -m644 "${srcdir}/postgresql.tmpfiles.conf" \
     "${pkgdir}/usr/lib/tmpfiles.d/postgresql-x32.conf"
   install -D -m644 "${srcdir}/postgresql.service" \
     "${pkgdir}/usr/lib/systemd/system/postgresql-x32.service"
   install -D -m755 "${srcdir}/postgresql-check-db-dir" \
     "${pkgdir}/usr/bin/postgresql-check-db-dir"
-  ln -s postgres-x32 "${pkgdir}/usr/bin/postmaster"
-  for _x in ${pkgdir}/usr/bin/*; do mv $_x $_x-x32; done
 
-  # install conf file
-  install -D -m644 "${srcdir}/postgresql.confd" \
-    "${pkgdir}/etc/conf.d/postgresql-x32"
+  install -D -m644 "${srcdir}/postgresql.pam" \
+    "${pkgdir}/etc/pam.d/postgresql-x32"
+
+  for _x in ${pkgdir}/usr/bin/*; do mv $_x $_x-x32; done
 
   install -D -m644 "${srcdir}/postgresql.logrotate" \
     "${pkgdir}/etc/logrotate.d/postgresql-x32"
diff --git a/postgresql-check-db-dir b/postgresql-check-db-dir
index 8c7382023b87..c06b5e3ed845 100755
--- a/postgresql-check-db-dir
+++ b/postgresql-check-db-dir
@@ -16,9 +16,9 @@ then
 fi
 
 # PGMAJORVERSION is major version
-PGMAJORVERSION=9.2
+PGMAJORVERSION=9.3
 # PREVMAJORVERSION is the previous major version, e.g., 8.4, for upgrades
-PREVMAJORVERSION=9.1
+PREVMAJORVERSION=9.2
 
 # Check for the PGDATA structure
 if [ -f "$PGDATA/PG_VERSION" ] && [ -d "$PGDATA/base" ]
@@ -35,7 +35,7 @@ then
     else
         echo $"An old version of the database format was found."
         echo $"You need to dump and reload before using PostgreSQL $PGMAJORVERSION."
-        echo $"See http://www.postgresql.org/docs/9.2/static/upgrading.html"
+        echo $"See http://www.postgresql.org/docs/$PGMAJORVERSION/static/upgrading.html"
         exit 1
     fi
 else
diff --git a/postgresql.confd b/postgresql.confd
deleted file mode 100644
index 3f2286cdb7d0..000000000000
--- a/postgresql.confd
+++ /dev/null
@@ -1,11 +0,0 @@
-##
-## Parameters to be passed to postgresql
-##
-## Default data directory location
-#PGROOT="/var/lib/postgres-x32"
-## Passed to initdb if necessary
-INITOPTS="--locale en_US.UTF-8"
-## Default log file location
-#PGLOG="/var/log/postgresql-x32.log"
-## Additional options to pass via pg_ctl's '-o' option
-#PGOPTS=""
diff --git a/postgresql.install b/postgresql.install
index 7d82c555b06b..4c3a28f03d7f 100644
--- a/postgresql.install
+++ b/postgresql.install
@@ -3,8 +3,17 @@ post_install() {
     mkdir -p '/var/lib/postgres-x32'
   fi
   systemd-tmpfiles --create postgresql-x32.conf
+  if [ ! -d '/var/lib/postgres-x32/data' ]; then
+    mkdir -p '/var/lib/postgres-x32/data'
+    chown postgres:postgres '/var/lib/postgres-x32/data'
+  fi
 }
 
 post_upgrade() {
   post_install $1
+  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
 }
+
diff --git a/postgresql.rcd b/postgresql.rcd
deleted file mode 100755
index acd3cc98960c..000000000000
--- a/postgresql.rcd
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/postgresql
-
-# Default PGROOT if it wasn't defined in the conf.d file
-PGROOT=${PGROOT:-/var/lib/postgres-x32}
-PGLOG=${PGLOG:-/var/log/postgresql-x32.log}
-PGCTL_BIN=/usr/bin/pg_ctl-x32
-PGCTL_ARGS=(-D "$PGROOT/data" -l "$PGLOG" -s -w)
-[[ $PGOPTS ]] && PGCTL_ARGS+=(-o "$PGOPTS")
-
-postgres_init() {
-  # initialization
-  if [[ ! -d "$PGROOT/data" ]]; then
-    mkdir -p "$PGROOT/data" && chown -R postgres:postgres "$PGROOT"
-    su - postgres -c "/usr/bin/initdb-x32 $INITOPTS -D '$PGROOT/data'"
-  fi
-  if [[ ! -e "$PGLOG" ]]; then
-    touch "$PGLOG"
-    chown postgres "$PGLOG"
-  fi
-}
-
-do_postgres() {
-  su - postgres -c "'$PGCTL_BIN' $(printf '%q ' "${PGCTL_ARGS[@]}" "$@")"
-}
-
-case $1 in
-  start)
-    postgres_init
-    stat_busy "Starting PostgreSQL"
-    if do_postgres start; then
-      add_daemon postgresql
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping PostgreSQL"
-    if do_postgres stop -m fast; then
-      rm_daemon postgresql
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  reload)
-    stat_busy "Reloading PostgreSQL"
-    if do_postgres reload; then
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  restart)
-    postgres_init
-    stat_busy "Restarting PostgreSQL"
-    if do_postgres restart -m fast; then
-      add_daemon postgresql
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  status)
-    stat_busy "Checking PostgreSQL status";
-    ck_status postgresql
-    ;;
-  *)
-    echo "usage: $0 {start|stop|reload|restart|status}"
-    exit 1
-esac
diff --git a/postgresql.tmpfiles.conf b/postgresql.tmpfiles.conf
index 412381309546..d7f7bfb3317a 100644
--- a/postgresql.tmpfiles.conf
+++ b/postgresql.tmpfiles.conf
@@ -1 +1 @@
-d /run/postgresql-x32 0755 postgres postgres -
+d /run/postgresql-x32 0775 postgres postgres -