[arch-commits] Commit in postgresql/repos (22 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Sat Dec 22 20:49:41 UTC 2012


    Date: Saturday, December 22, 2012 @ 15:49:41
  Author: andyrtr
Revision: 173782

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  postgresql/repos/staging-i686/
  postgresql/repos/staging-i686/PKGBUILD
    (from rev 173781, postgresql/trunk/PKGBUILD)
  postgresql/repos/staging-i686/postgresql-check-db-dir
    (from rev 173781, postgresql/trunk/postgresql-check-db-dir)
  postgresql/repos/staging-i686/postgresql-run-socket.patch
    (from rev 173781, postgresql/trunk/postgresql-run-socket.patch)
  postgresql/repos/staging-i686/postgresql.confd
    (from rev 173781, postgresql/trunk/postgresql.confd)
  postgresql/repos/staging-i686/postgresql.install
    (from rev 173781, postgresql/trunk/postgresql.install)
  postgresql/repos/staging-i686/postgresql.logrotate
    (from rev 173781, postgresql/trunk/postgresql.logrotate)
  postgresql/repos/staging-i686/postgresql.pam
    (from rev 173781, postgresql/trunk/postgresql.pam)
  postgresql/repos/staging-i686/postgresql.rcd
    (from rev 173781, postgresql/trunk/postgresql.rcd)
  postgresql/repos/staging-i686/postgresql.service
    (from rev 173781, postgresql/trunk/postgresql.service)
  postgresql/repos/staging-i686/postgresql.tmpfiles.conf
    (from rev 173781, postgresql/trunk/postgresql.tmpfiles.conf)
  postgresql/repos/staging-x86_64/
  postgresql/repos/staging-x86_64/PKGBUILD
    (from rev 173781, postgresql/trunk/PKGBUILD)
  postgresql/repos/staging-x86_64/postgresql-check-db-dir
    (from rev 173781, postgresql/trunk/postgresql-check-db-dir)
  postgresql/repos/staging-x86_64/postgresql-run-socket.patch
    (from rev 173781, postgresql/trunk/postgresql-run-socket.patch)
  postgresql/repos/staging-x86_64/postgresql.confd
    (from rev 173781, postgresql/trunk/postgresql.confd)
  postgresql/repos/staging-x86_64/postgresql.install
    (from rev 173781, postgresql/trunk/postgresql.install)
  postgresql/repos/staging-x86_64/postgresql.logrotate
    (from rev 173781, postgresql/trunk/postgresql.logrotate)
  postgresql/repos/staging-x86_64/postgresql.pam
    (from rev 173781, postgresql/trunk/postgresql.pam)
  postgresql/repos/staging-x86_64/postgresql.rcd
    (from rev 173781, postgresql/trunk/postgresql.rcd)
  postgresql/repos/staging-x86_64/postgresql.service
    (from rev 173781, postgresql/trunk/postgresql.service)
  postgresql/repos/staging-x86_64/postgresql.tmpfiles.conf
    (from rev 173781, postgresql/trunk/postgresql.tmpfiles.conf)

--------------------------------------------+
 staging-i686/PKGBUILD                      |  164 +++++++++++++++++++++++++++
 staging-i686/postgresql-check-db-dir       |   49 ++++++++
 staging-i686/postgresql-run-socket.patch   |   12 +
 staging-i686/postgresql.confd              |   11 +
 staging-i686/postgresql.install            |   35 +++++
 staging-i686/postgresql.logrotate          |    4 
 staging-i686/postgresql.pam                |    3 
 staging-i686/postgresql.rcd                |   79 +++++++++++++
 staging-i686/postgresql.service            |   26 ++++
 staging-i686/postgresql.tmpfiles.conf      |    1 
 staging-x86_64/PKGBUILD                    |  164 +++++++++++++++++++++++++++
 staging-x86_64/postgresql-check-db-dir     |   49 ++++++++
 staging-x86_64/postgresql-run-socket.patch |   12 +
 staging-x86_64/postgresql.confd            |   11 +
 staging-x86_64/postgresql.install          |   35 +++++
 staging-x86_64/postgresql.logrotate        |    4 
 staging-x86_64/postgresql.pam              |    3 
 staging-x86_64/postgresql.rcd              |   79 +++++++++++++
 staging-x86_64/postgresql.service          |   26 ++++
 staging-x86_64/postgresql.tmpfiles.conf    |    1 
 20 files changed, 768 insertions(+)

Copied: postgresql/repos/staging-i686/PKGBUILD (from rev 173781, postgresql/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2012-12-22 20:49:41 UTC (rev 173782)
@@ -0,0 +1,164 @@
+# $Id$
+# Maintainer: Dan McGee <dan at archlinux.org>
+
+pkgbase=postgresql
+pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
+pkgver=9.2.2
+_majorver=${pkgver%.*}
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://www.postgresql.org/"
+license=('custom:PostgreSQL')
+makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl>=8.6.0' '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.tmpfiles.conf postgresql-check-db-dir)
+md5sums=('1cc388988e69bf75c6b55d59070100f6'
+         '75c579eed03ffb2312631f0b649175b4'
+         '1ddd1df8010549f237e7983bb326025e'
+         'a54d09a20ab1672adf08f037df188d53'
+         '96f82c38f3f540b53f3e5144900acf17'
+         'd28e443f9f65a5712c52018b84e27137'
+         '89b48774b0dae7c37fbb0e907c3c1db8'
+         'd34e4ab6d589aa819a1e2829290a3b7c'
+         '505e0e4abfc746cae9558584d471a03c')
+sha256sums=('e1a7a854a98896cb7fcd1696a76fca6f3bcac94d75e68a6154ffe2b69184f7f3'
+            '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 \
+  --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
+}
+
+package_postgresql-libs() {
+  pkgdesc="Libraries for use with PostgreSQL"
+  depends=('krb5' 'openssl>=1.0.0' 'readline>=6.0')
+  provides=('postgresql-client')
+  conflicts=('postgresql-client')
+
+  cd "${srcdir}/postgresql-${pkgver}"
+
+  # 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; 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/psql.1 "${pkgdir}/usr/share/man/man1/psql.1"
+
+  cd src/include
+
+  mkdir -p "${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 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/"
+}
+
+package_postgresql-docs() {
+  pkgdesc="HTML documentation for PostgreSQL"
+  options=(docs)
+
+  cd "${srcdir}/postgresql-${pkgver}"
+
+  # install license
+  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-docs/LICENSE"
+
+  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() {
+  pkgdesc="A sophisticated object-relational DBMS"
+  backup=('etc/conf.d/postgresql' 'etc/pam.d/postgresql' 'etc/logrotate.d/postgresql')
+  depends=("postgresql-libs>=${pkgver}" 'krb5' 'libxml2' 'readline>=6.0' 'openssl>=1.0.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
+
+  cd "${srcdir}/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/psql; do
+    make -C ${dir} DESTDIR="${pkgdir}" uninstall
+  done
+  rm "${pkgdir}/usr/share/man/man1/pg_config.1"
+  rm "${pkgdir}/usr/share/man/man1/psql.1"
+
+  # install license
+  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE"
+
+  # 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 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" \
+    "${pkgdir}/etc/conf.d/postgresql"
+
+  install -D -m644 "${srcdir}/postgresql.pam" \
+    "${pkgdir}/etc/pam.d/postgresql"
+
+  install -D -m644 "${srcdir}/postgresql.logrotate" \
+    "${pkgdir}/etc/logrotate.d/postgresql"
+}

Copied: postgresql/repos/staging-i686/postgresql-check-db-dir (from rev 173781, postgresql/trunk/postgresql-check-db-dir)
===================================================================
--- staging-i686/postgresql-check-db-dir	                        (rev 0)
+++ staging-i686/postgresql-check-db-dir	2012-12-22 20:49:41 UTC (rev 173782)
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+# This script verifies that the postgresql data directory has been correctly
+# initialized.  We do not want to automatically initdb it, because that has
+# a risk of catastrophic failure (ie, overwriting a valuable database) in
+# corner cases, such as a remotely mounted database on a volume that's a
+# bit slow to mount.  But we can at least emit a message advising newbies
+# what to do.
+
+PGDATA="$1"
+
+if [ -z "$PGDATA" ]
+then
+    echo "Usage: $0 database-path"
+    exit 1
+fi
+
+# PGMAJORVERSION is major version
+PGMAJORVERSION=9.2
+# PREVMAJORVERSION is the previous major version, e.g., 8.4, for upgrades
+PREVMAJORVERSION=9.1
+
+# Check for the PGDATA structure
+if [ -f "$PGDATA/PG_VERSION" ] && [ -d "$PGDATA/base" ]
+then
+    # Check version of existing PGDATA
+    if [ x`cat "$PGDATA/PG_VERSION"` = x"$PGMAJORVERSION" ]
+    then
+        : A-OK
+    elif [ x`cat "$PGDATA/PG_VERSION"` = x"$PREVMAJORVERSION" ]
+    then
+        echo $"An old version of the database format was found."
+        echo $"See https://wiki.archlinux.org/index.php/PostgreSQL#Upgrading_PostgreSQL"
+        exit 1
+    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"
+        exit 1
+    fi
+else
+    # No existing PGDATA! Warn the user to initdb it.
+    echo $"\"$PGDATA\" is missing or empty. Use a command like"
+    echo $"  su - postgres -c \"initdb --locale en_US.UTF-8 -D '$PGDATA'\""
+    echo $"with relevant options, to initialize the database cluster."
+    exit 1
+fi
+
+exit 0

Copied: postgresql/repos/staging-i686/postgresql-run-socket.patch (from rev 173781, postgresql/trunk/postgresql-run-socket.patch)
===================================================================
--- staging-i686/postgresql-run-socket.patch	                        (rev 0)
+++ staging-i686/postgresql-run-socket.patch	2012-12-22 20:49:41 UTC (rev 173782)
@@ -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

Copied: postgresql/repos/staging-i686/postgresql.confd (from rev 173781, postgresql/trunk/postgresql.confd)
===================================================================
--- staging-i686/postgresql.confd	                        (rev 0)
+++ staging-i686/postgresql.confd	2012-12-22 20:49:41 UTC (rev 173782)
@@ -0,0 +1,11 @@
+##
+## Parameters to be passed to postgresql
+##
+## Default data directory location
+#PGROOT="/var/lib/postgres"
+## Passed to initdb if necessary
+INITOPTS="--locale en_US.UTF-8"
+## Default log file location
+#PGLOG="/var/log/postgresql.log"
+## Additional options to pass via pg_ctl's '-o' option
+#PGOPTS=""

Copied: postgresql/repos/staging-i686/postgresql.install (from rev 173781, postgresql/trunk/postgresql.install)
===================================================================
--- staging-i686/postgresql.install	                        (rev 0)
+++ staging-i686/postgresql.install	2012-12-22 20:49:41 UTC (rev 173782)
@@ -0,0 +1,35 @@
+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
+}
+
+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
+  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
+}

Copied: postgresql/repos/staging-i686/postgresql.logrotate (from rev 173781, postgresql/trunk/postgresql.logrotate)
===================================================================
--- staging-i686/postgresql.logrotate	                        (rev 0)
+++ staging-i686/postgresql.logrotate	2012-12-22 20:49:41 UTC (rev 173782)
@@ -0,0 +1,4 @@
+/var/log/postgresql.log {
+   copytruncate
+   missingok
+}

Copied: postgresql/repos/staging-i686/postgresql.pam (from rev 173781, postgresql/trunk/postgresql.pam)
===================================================================
--- staging-i686/postgresql.pam	                        (rev 0)
+++ staging-i686/postgresql.pam	2012-12-22 20:49:41 UTC (rev 173782)
@@ -0,0 +1,3 @@
+auth		required	pam_unix.so
+account		required	pam_unix.so
+session		required	pam_unix.so

Copied: postgresql/repos/staging-i686/postgresql.rcd (from rev 173781, postgresql/trunk/postgresql.rcd)
===================================================================
--- staging-i686/postgresql.rcd	                        (rev 0)
+++ staging-i686/postgresql.rcd	2012-12-22 20:49:41 UTC (rev 173782)
@@ -0,0 +1,79 @@
+#!/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}
+PGLOG=${PGLOG:-/var/log/postgresql.log}
+PGCTL_BIN=/usr/bin/pg_ctl
+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 $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

Copied: postgresql/repos/staging-i686/postgresql.service (from rev 173781, postgresql/trunk/postgresql.service)
===================================================================
--- staging-i686/postgresql.service	                        (rev 0)
+++ staging-i686/postgresql.service	2012-12-22 20:49:41 UTC (rev 173782)
@@ -0,0 +1,26 @@
+[Unit]
+Description=PostgreSQL database server
+After=network.target
+
+[Service]
+Type=forking
+TimeoutSec=120
+User=postgres
+Group=postgres
+
+Environment=PGROOT=/var/lib/postgres
+
+SyslogIdentifier=postgres
+PIDFile=/var/lib/postgres/data/postmaster.pid
+
+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
+
+# Due to PostgreSQL's use of shared memory, OOM killer is often overzealous in
+# killing Postgres, so adjust it downward
+OOMScoreAdjust=-200
+
+[Install]
+WantedBy=multi-user.target

Copied: postgresql/repos/staging-i686/postgresql.tmpfiles.conf (from rev 173781, postgresql/trunk/postgresql.tmpfiles.conf)
===================================================================
--- staging-i686/postgresql.tmpfiles.conf	                        (rev 0)
+++ staging-i686/postgresql.tmpfiles.conf	2012-12-22 20:49:41 UTC (rev 173782)
@@ -0,0 +1 @@
+d /run/postgresql 0755 postgres postgres -

Copied: postgresql/repos/staging-x86_64/PKGBUILD (from rev 173781, postgresql/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2012-12-22 20:49:41 UTC (rev 173782)
@@ -0,0 +1,164 @@
+# $Id$
+# Maintainer: Dan McGee <dan at archlinux.org>
+
+pkgbase=postgresql
+pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
+pkgver=9.2.2
+_majorver=${pkgver%.*}
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://www.postgresql.org/"
+license=('custom:PostgreSQL')
+makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl>=8.6.0' '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.tmpfiles.conf postgresql-check-db-dir)
+md5sums=('1cc388988e69bf75c6b55d59070100f6'
+         '75c579eed03ffb2312631f0b649175b4'
+         '1ddd1df8010549f237e7983bb326025e'
+         'a54d09a20ab1672adf08f037df188d53'
+         '96f82c38f3f540b53f3e5144900acf17'
+         'd28e443f9f65a5712c52018b84e27137'
+         '89b48774b0dae7c37fbb0e907c3c1db8'
+         'd34e4ab6d589aa819a1e2829290a3b7c'
+         '505e0e4abfc746cae9558584d471a03c')
+sha256sums=('e1a7a854a98896cb7fcd1696a76fca6f3bcac94d75e68a6154ffe2b69184f7f3'
+            '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 \
+  --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
+}
+
+package_postgresql-libs() {
+  pkgdesc="Libraries for use with PostgreSQL"
+  depends=('krb5' 'openssl>=1.0.0' 'readline>=6.0')
+  provides=('postgresql-client')
+  conflicts=('postgresql-client')
+
+  cd "${srcdir}/postgresql-${pkgver}"
+
+  # 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; 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/psql.1 "${pkgdir}/usr/share/man/man1/psql.1"
+
+  cd src/include
+
+  mkdir -p "${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 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/"
+}
+
+package_postgresql-docs() {
+  pkgdesc="HTML documentation for PostgreSQL"
+  options=(docs)
+
+  cd "${srcdir}/postgresql-${pkgver}"
+
+  # install license
+  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-docs/LICENSE"
+
+  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() {
+  pkgdesc="A sophisticated object-relational DBMS"
+  backup=('etc/conf.d/postgresql' 'etc/pam.d/postgresql' 'etc/logrotate.d/postgresql')
+  depends=("postgresql-libs>=${pkgver}" 'krb5' 'libxml2' 'readline>=6.0' 'openssl>=1.0.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
+
+  cd "${srcdir}/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/psql; do
+    make -C ${dir} DESTDIR="${pkgdir}" uninstall
+  done
+  rm "${pkgdir}/usr/share/man/man1/pg_config.1"
+  rm "${pkgdir}/usr/share/man/man1/psql.1"
+
+  # install license
+  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE"
+
+  # 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 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" \
+    "${pkgdir}/etc/conf.d/postgresql"
+
+  install -D -m644 "${srcdir}/postgresql.pam" \
+    "${pkgdir}/etc/pam.d/postgresql"
+
+  install -D -m644 "${srcdir}/postgresql.logrotate" \
+    "${pkgdir}/etc/logrotate.d/postgresql"
+}

Copied: postgresql/repos/staging-x86_64/postgresql-check-db-dir (from rev 173781, postgresql/trunk/postgresql-check-db-dir)
===================================================================
--- staging-x86_64/postgresql-check-db-dir	                        (rev 0)
+++ staging-x86_64/postgresql-check-db-dir	2012-12-22 20:49:41 UTC (rev 173782)
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+# This script verifies that the postgresql data directory has been correctly
+# initialized.  We do not want to automatically initdb it, because that has
+# a risk of catastrophic failure (ie, overwriting a valuable database) in
+# corner cases, such as a remotely mounted database on a volume that's a
+# bit slow to mount.  But we can at least emit a message advising newbies
+# what to do.
+
+PGDATA="$1"
+
+if [ -z "$PGDATA" ]
+then
+    echo "Usage: $0 database-path"
+    exit 1
+fi
+
+# PGMAJORVERSION is major version
+PGMAJORVERSION=9.2
+# PREVMAJORVERSION is the previous major version, e.g., 8.4, for upgrades
+PREVMAJORVERSION=9.1
+
+# Check for the PGDATA structure
+if [ -f "$PGDATA/PG_VERSION" ] && [ -d "$PGDATA/base" ]
+then
+    # Check version of existing PGDATA
+    if [ x`cat "$PGDATA/PG_VERSION"` = x"$PGMAJORVERSION" ]
+    then
+        : A-OK
+    elif [ x`cat "$PGDATA/PG_VERSION"` = x"$PREVMAJORVERSION" ]
+    then
+        echo $"An old version of the database format was found."
+        echo $"See https://wiki.archlinux.org/index.php/PostgreSQL#Upgrading_PostgreSQL"
+        exit 1
+    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"
+        exit 1
+    fi
+else
+    # No existing PGDATA! Warn the user to initdb it.
+    echo $"\"$PGDATA\" is missing or empty. Use a command like"
+    echo $"  su - postgres -c \"initdb --locale en_US.UTF-8 -D '$PGDATA'\""
+    echo $"with relevant options, to initialize the database cluster."
+    exit 1
+fi
+
+exit 0

Copied: postgresql/repos/staging-x86_64/postgresql-run-socket.patch (from rev 173781, postgresql/trunk/postgresql-run-socket.patch)
===================================================================
--- staging-x86_64/postgresql-run-socket.patch	                        (rev 0)
+++ staging-x86_64/postgresql-run-socket.patch	2012-12-22 20:49:41 UTC (rev 173782)
@@ -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

Copied: postgresql/repos/staging-x86_64/postgresql.confd (from rev 173781, postgresql/trunk/postgresql.confd)
===================================================================
--- staging-x86_64/postgresql.confd	                        (rev 0)
+++ staging-x86_64/postgresql.confd	2012-12-22 20:49:41 UTC (rev 173782)
@@ -0,0 +1,11 @@
+##
+## Parameters to be passed to postgresql
+##
+## Default data directory location
+#PGROOT="/var/lib/postgres"
+## Passed to initdb if necessary
+INITOPTS="--locale en_US.UTF-8"
+## Default log file location
+#PGLOG="/var/log/postgresql.log"
+## Additional options to pass via pg_ctl's '-o' option
+#PGOPTS=""

Copied: postgresql/repos/staging-x86_64/postgresql.install (from rev 173781, postgresql/trunk/postgresql.install)
===================================================================
--- staging-x86_64/postgresql.install	                        (rev 0)
+++ staging-x86_64/postgresql.install	2012-12-22 20:49:41 UTC (rev 173782)
@@ -0,0 +1,35 @@
+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
+}
+
+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
+  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
+}

Copied: postgresql/repos/staging-x86_64/postgresql.logrotate (from rev 173781, postgresql/trunk/postgresql.logrotate)
===================================================================
--- staging-x86_64/postgresql.logrotate	                        (rev 0)
+++ staging-x86_64/postgresql.logrotate	2012-12-22 20:49:41 UTC (rev 173782)
@@ -0,0 +1,4 @@
+/var/log/postgresql.log {
+   copytruncate
+   missingok
+}

Copied: postgresql/repos/staging-x86_64/postgresql.pam (from rev 173781, postgresql/trunk/postgresql.pam)
===================================================================
--- staging-x86_64/postgresql.pam	                        (rev 0)
+++ staging-x86_64/postgresql.pam	2012-12-22 20:49:41 UTC (rev 173782)
@@ -0,0 +1,3 @@
+auth		required	pam_unix.so
+account		required	pam_unix.so
+session		required	pam_unix.so

Copied: postgresql/repos/staging-x86_64/postgresql.rcd (from rev 173781, postgresql/trunk/postgresql.rcd)
===================================================================
--- staging-x86_64/postgresql.rcd	                        (rev 0)
+++ staging-x86_64/postgresql.rcd	2012-12-22 20:49:41 UTC (rev 173782)
@@ -0,0 +1,79 @@
+#!/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}
+PGLOG=${PGLOG:-/var/log/postgresql.log}
+PGCTL_BIN=/usr/bin/pg_ctl
+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 $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

Copied: postgresql/repos/staging-x86_64/postgresql.service (from rev 173781, postgresql/trunk/postgresql.service)
===================================================================
--- staging-x86_64/postgresql.service	                        (rev 0)
+++ staging-x86_64/postgresql.service	2012-12-22 20:49:41 UTC (rev 173782)
@@ -0,0 +1,26 @@
+[Unit]
+Description=PostgreSQL database server
+After=network.target
+
+[Service]
+Type=forking
+TimeoutSec=120
+User=postgres
+Group=postgres
+
+Environment=PGROOT=/var/lib/postgres
+
+SyslogIdentifier=postgres
+PIDFile=/var/lib/postgres/data/postmaster.pid
+
+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
+
+# Due to PostgreSQL's use of shared memory, OOM killer is often overzealous in
+# killing Postgres, so adjust it downward
+OOMScoreAdjust=-200
+
+[Install]
+WantedBy=multi-user.target

Copied: postgresql/repos/staging-x86_64/postgresql.tmpfiles.conf (from rev 173781, postgresql/trunk/postgresql.tmpfiles.conf)
===================================================================
--- staging-x86_64/postgresql.tmpfiles.conf	                        (rev 0)
+++ staging-x86_64/postgresql.tmpfiles.conf	2012-12-22 20:49:41 UTC (rev 173782)
@@ -0,0 +1 @@
+d /run/postgresql 0755 postgres postgres -




More information about the arch-commits mailing list