[arch-commits] Commit in postgresql/trunk (PKGBUILD postgresql-check-db-dir)

[Dan McGee]

    Date: Saturday, January 3, 2015 @ 22:03:55
  Author: dan
Revision: 228403

upgpkg: postgresql 9.4.0-1

Modified:
  postgresql/trunk/PKGBUILD
  postgresql/trunk/postgresql-check-db-dir

-------------------------+
 PKGBUILD                |   66 ++++++++++++++++++++++------------------------
 postgresql-check-db-dir |    4 +-
 2 files changed, 34 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-03 20:40:14 UTC (rev 228402)
+++ PKGBUILD	2015-01-03 21:03:55 UTC (rev 228403)
@@ -3,7 +3,7 @@
 
 pkgbase=postgresql
 pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
-pkgver=9.3.5
+pkgver=9.4.0
 _majorver=${pkgver%.*}
 pkgrel=1
 arch=('i686' 'x86_64')
@@ -14,20 +14,20 @@
         postgresql-run-socket.patch
         postgresql.pam postgresql.logrotate
         postgresql.service postgresql.tmpfiles.conf postgresql-check-db-dir)
-md5sums=('5059857c7d7e6ad83b6d55893a121b59'
+md5sums=('8cd6e33e1f8d4d2362c8c08bd0e8802b'
          '75c579eed03ffb2312631f0b649175b4'
          '96f82c38f3f540b53f3e5144900acf17'
          'd28e443f9f65a5712c52018b84e27137'
          '89b48774b0dae7c37fbb0e907c3c1db8'
          '1c5a1f99e8e93776c593c468e2612985'
-         'ea7f9f914900e60835d20cb95010e63c')
-sha256sums=('14176ffb1f90a189e7626214365be08ea2bfc26f26994bafb4235be314b9b4b0'
+         'ba9b7d804500dffc095eac78c4a2a00f')
+sha256sums=('7a35c3cb77532f7b15702e474d7ef02f0f419527ee80a4ca6036fffb551625a5'
             '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9'
             '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
             '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e'
             'c69b614731fdd3f4e127540814f5999f423363523c5209e252e19b1d4362ad68'
             '7e086d70e0dcaa6ce45693b4e826ce92d770192b3aff5642319b1ef279d88dc4'
-            'b3ed31e5882e5bdf4515d488d3f2db874ff5561be3091eab29810f831038a888')
+            'f15418433b7d9a153eea22af58cc64fda462144d7039d1083ae1e2e489cc303a')
 
 build() {
   cd "${srcdir}/postgresql-${pkgver}"
@@ -34,21 +34,21 @@
 
   patch -Np1 < ../postgresql-run-socket.patch
 
-  ./configure --prefix=/usr \
-  --mandir=/usr/share/man \
-  --datadir=/usr/share/postgresql \
-  --sysconfdir=/etc \
-  --with-krb5 \
-  --with-gssapi \
-  --with-libxml \
-  --with-openssl \
-  --with-perl \
-  --with-python PYTHON=/usr/bin/python2 \
-  --with-tcl \
-  --with-pam \
-  --with-system-tzdata=/usr/share/zoneinfo \
-  --enable-nls \
-  --enable-thread-safety
+  ./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 \
+    --enable-nls \
+    --enable-thread-safety
 
   make world
 }
@@ -64,16 +64,15 @@
   # install license
   install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-libs/LICENSE"
 
-  # install libs
-  for dir in src/interfaces src/bin/pg_config src/bin/psql src/bin/pg_dump; do
+  # 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
 
-  install -D -m644 doc/src/sgml/man1/pg_config.1 "${pkgdir}/usr/share/man/man1/pg_config.1"
-  install -D -m644 doc/src/sgml/man1/pg_dump.1 "${pkgdir}/usr/share/man/man1/pg_dump.1"
-  install -D -m644 doc/src/sgml/man1/pg_dumpall.1 "${pkgdir}/usr/share/man/man1/pg_dumpall.1"
-  install -D -m644 doc/src/sgml/man1/pg_restore.1 "${pkgdir}/usr/share/man/man1/pg_restore.1"
-  install -D -m644 doc/src/sgml/man1/psql.1 "${pkgdir}/usr/share/man/man1/psql.1"
+  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
+  done
 
   cd src/include
 
@@ -114,7 +113,7 @@
 package_postgresql() {
   pkgdesc="A 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')
+  depends=("postgresql-libs>=${pkgver}" 'krb5' 'libxml2' 'readline>=6.0' 'openssl>=1.0.0' 'pam')
   optdepends=('python2: for PL/Python support'
               'perl: for PL/Perl support'
               'tcl: for PL/Tcl support'
@@ -130,14 +129,13 @@
   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 src/bin/pg_dump; 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
-  rm "${pkgdir}/usr/share/man/man1/pg_config.1"
-  rm "${pkgdir}/usr/share/man/man1/pg_dump.1"
-  rm "${pkgdir}/usr/share/man/man1/pg_dumpall.1"
-  rm "${pkgdir}/usr/share/man/man1/pg_restore.1"
-  rm "${pkgdir}/usr/share/man/man1/psql.1"
+  for util in pg_config pg_dump pg_dumpall pg_restore psql \
+      clusterdb createdb createlang createuser dropdb droplang 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"

Modified: postgresql-check-db-dir
===================================================================
--- postgresql-check-db-dir	2015-01-03 20:40:14 UTC (rev 228402)
+++ postgresql-check-db-dir	2015-01-03 21:03:55 UTC (rev 228403)
@@ -16,9 +16,9 @@
 fi
 
 # PGMAJORVERSION is major version
-PGMAJORVERSION=9.3
+PGMAJORVERSION=9.4
 # PREVMAJORVERSION is the previous major version, e.g., 8.4, for upgrades
-PREVMAJORVERSION=9.2
+PREVMAJORVERSION=9.3
 
 # Check for the PGDATA structure
 if [ -f "$PGDATA/PG_VERSION" ] && [ -d "$PGDATA/base" ]