Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/gambas3/PKGBUILD
	community-staging/luminancehdr/PKGBUILD
	community-staging/luxrays/PKGBUILD
	community-staging/luxrender/PKGBUILD
	community-staging/performous/PKGBUILD
	community-staging/widelands/PKGBUILD
	community/chmsee/PKGBUILD
	community/flac123/PKGBUILD
	community/pam-krb5/PKGBUILD
	community/python-pyxattr/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/pygobject2/PKGBUILD
	extra/python-lxml/PKGBUILD
	extra/usbview/PKGBUILD
	extra/vlc/PKGBUILD
	extra/xorg-server/PKGBUILD
	multilib/lib32-libpng/PKGBUILD
	multilib/lib32-util-linux/PKGBUILD
	staging/bzflag/PKGBUILD
	staging/calligra/PKGBUILD
	staging/enblend-enfuse/PKGBUILD
	staging/gegl/PKGBUILD
	staging/hugin/PKGBUILD
	staging/inkscape/PKGBUILD
	testing/btrfs-progs/PKGBUILD
	testing/btrfs-progs/initcpio-hook-btrfs
	testing/btrfs-progs/initcpio-install-btrfs
	testing/cryptsetup/PKGBUILD
	testing/cryptsetup/encrypt_hook
	testing/empathy/PKGBUILD
	testing/evolution/PKGBUILD
	testing/glibmm/PKGBUILD
	testing/gtkglext/PKGBUILD
	testing/ibus/PKGBUILD
	testing/kmod/PKGBUILD
	testing/udisks2/PKGBUILD
	testing/xf86-video-intel/PKGBUILD

4 files changed, 33 insertions, 6 deletions

diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD
index ca3fbcdcb..91ddb8421 100644
--- a/extra/postgresql/PKGBUILD
+++ b/extra/postgresql/PKGBUILD
@@ -1,39 +1,47 @@
-# $Id: PKGBUILD 166983 2012-09-24 14:35:11Z dan $
+# $Id: PKGBUILD 169465 2012-10-21 16:43:35Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgbase=postgresql
 pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
 pkgver=9.2.1
 _majorver=${pkgver%.*}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.postgresql.org/"
 license=('custom:PostgreSQL')
 makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl' 'openssl>=1.0.0')
 source=(http://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2
+        postgresql-run-socket.patch
         postgresql.rcd postgresql.confd postgresql.pam postgresql.logrotate
-        postgresql.service postgresql-check-db-dir)
+        postgresql.service postgresql.tmpfiles.conf postgresql-check-db-dir)
 md5sums=('c0b4799ea9850eae3ead14f0a60e9418'
+         '75c579eed03ffb2312631f0b649175b4'
          '1ddd1df8010549f237e7983bb326025e'
          'a54d09a20ab1672adf08f037df188d53'
          '96f82c38f3f540b53f3e5144900acf17'
          'd28e443f9f65a5712c52018b84e27137'
          '89b48774b0dae7c37fbb0e907c3c1db8'
+         'd34e4ab6d589aa819a1e2829290a3b7c'
          '505e0e4abfc746cae9558584d471a03c')
 sha256sums=('db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461'
+            '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9'
             '9f6307b1358892e304f9474a456f0cb9160cfb8812a9da0430abe647f8a9cf45'
             '3de5c059eead8816db15c2c5588e6196d6c4b0d704faf1a20912796cf589ba81'
             '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
             '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e'
             'c69b614731fdd3f4e127540814f5999f423363523c5209e252e19b1d4362ad68'
+            'd25980980b4c747a1a49d8d4736d8440a77fb8bc3275dbdc3dc6c4cf4ae8de07'
             '3a3279d290f556bf7a362670e32b491794f47ed218f6b8c6acef366a3291f669')
 
 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-krb5 \
   --with-libxml \
   --with-openssl \
@@ -137,18 +145,20 @@ package_postgresql() {
 
   # install launch script
   install -D -m755 "${srcdir}/postgresql.rcd" "${pkgdir}/etc/rc.d/postgresql"
+  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 conf file
-  install -D -m644 ${srcdir}/postgresql.confd \
+  install -D -m644 "${srcdir}/postgresql.confd" \
     "${pkgdir}/etc/conf.d/postgresql"
 
-  install -D -m644 ${srcdir}/postgresql.pam \
+  install -D -m644 "${srcdir}/postgresql.pam" \
     "${pkgdir}/etc/pam.d/postgresql"
 
-  install -D -m644 ${srcdir}/postgresql.logrotate \
+  install -D -m644 "${srcdir}/postgresql.logrotate" \
     "${pkgdir}/etc/logrotate.d/postgresql"
 }
diff --git a/extra/postgresql/postgresql-run-socket.patch b/extra/postgresql/postgresql-run-socket.patch
new file mode 100644
index 000000000..b558c7b74
--- /dev/null
+++ b/extra/postgresql/postgresql-run-socket.patch
@@ -0,0 +1,12 @@
+diff -Naur postgresql-9.2.0.sockets/src/include/pg_config_manual.h postgresql-9.2.0/src/include/pg_config_manual.h
+--- postgresql-9.2.0.sockets/src/include/pg_config_manual.h	2012-09-06 17:26:17.000000000 -0400
++++ postgresql-9.2.0/src/include/pg_config_manual.h	2012-09-06 18:13:18.183092471 -0400
+@@ -144,7 +144,7 @@
+  * here's where to twiddle it.  You can also override this at runtime
+  * with the postmaster's -k switch.
+  */
+-#define DEFAULT_PGSOCKET_DIR  "/tmp"
++#define DEFAULT_PGSOCKET_DIR  "/run/postgresql"
+ 
+ /*
+  * The random() function is expected to yield values between 0 and
diff --git a/extra/postgresql/postgresql.install b/extra/postgresql/postgresql.install
index 7b73f6fa9..263bccb25 100644
--- a/extra/postgresql/postgresql.install
+++ b/extra/postgresql/postgresql.install
@@ -18,6 +18,10 @@ 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() {
diff --git a/extra/postgresql/postgresql.tmpfiles.conf b/extra/postgresql/postgresql.tmpfiles.conf
new file mode 100644
index 000000000..6c48e34ed
--- /dev/null
+++ b/extra/postgresql/postgresql.tmpfiles.conf
@@ -0,0 +1 @@
+d /run/postgresql 0755 postgres postgres -