8 files changed, 290 insertions, 0 deletions
diff --git a/staging/postgresql/PKGBUILD b/staging/postgresql/PKGBUILD
new file mode 100644
index 000000000..d5a887585
--- /dev/null
+++ b/staging/postgresql/PKGBUILD
@@ -0,0 +1,141 @@
+# $Id: PKGBUILD 125329 2011-05-25 22:33:15Z dan $
+# Maintainer: Dan McGee <dan@archlinux.org>
+
+pkgbase=postgresql
+pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
+pkgver=9.0.4
+pkgrel=4
+arch=('i686' 'x86_64')
+url="http://www.postgresql.org"
+license=('custom:PostgreSQL')
+makedepends=('libxml2' 'python2' 'perl')
+source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 \
+        postgresql postgresql.confd build.patch postgresql.pam postgresql.logrotate
+        perl-5.14-fix.patch)
+install=postgresql.install
+
+build() {
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  # patch to remove regress/test make target (won't build with it present)
+  patch -Np1 -i ../build.patch
+  # fix for perl 5.14
+  patch -Np1 -i ../perl-5.14-fix.patch
+
+  # configure
+  ./configure --prefix=/usr --mandir=/usr/share/man --with-libxml \
+  --with-openssl --with-perl \
+  --with-python PYTHON=/usr/bin/python2 --with-pam \
+  --with-system-tzdata=/usr/share/zoneinfo --enable-nls \
+  --datadir=/usr/share/postgresql --enable-thread-safety
+
+  sed -i -e '/interfaces/d' src/Makefile
+
+  # build
+  make world
+
+  # build libs
+  for dir in src/interfaces src/bin/pg_config; do
+    pushd ${dir}
+    make
+    popd
+  done
+}
+
+package_postgresql-libs() {
+  pkgdesc="Libraries for use with PostgreSQL"
+  depends=('openssl>=1.0.0')
+
+  cd "${srcdir}/${pkgbase}-${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; do
+    pushd ${dir}
+    make DESTDIR="${pkgdir}" install
+    popd
+  done
+
+  install -D -m644 doc/src/sgml/man1/pg_config.1 "${pkgdir}/usr/share/man/man1/pg_config.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}/${pkgbase}-${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/"
+}
+
+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}" 'libxml2' 'readline>=6.0')
+  optdepends=('python2: for PL/Python support'
+              'perl: for PL/Perl support')
+  provides=('postgresql-client')
+  conflicts=('postgresql-client')
+
+  cd "${srcdir}/${pkgbase}-${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 this, it is in the -libs package
+  make -C src/bin/pg_config DESTDIR="${pkgdir}" uninstall
+  rm "${pkgdir}/usr/share/man/man1/pg_config.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 {} +
+
+  # install launch script
+  install -D -m755 "${srcdir}/postgresql" "${pkgdir}/etc/rc.d/postgresql"
+
+  # 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"
+}
+
+md5sums=('80390514d568a7af5ab61db1cda27e29'
+         'eacf91f987d230f2dc2d040618ea1817'
+         'd63a05943cf0a2726aa2070f3033c569'
+         '4d74f4227dc5e12bf95b3490758d86c9'
+         '96f82c38f3f540b53f3e5144900acf17'
+         'd28e443f9f65a5712c52018b84e27137'
+         '6606e4279d91fc617b5c4dae0d76c603')
diff --git a/staging/postgresql/build.patch b/staging/postgresql/build.patch
new file mode 100644
index 000000000..c8f665d12
--- /dev/null
+++ b/staging/postgresql/build.patch
@@ -0,0 +1,11 @@
+diff -Naur postgresql-8.2.3-orig/src/Makefile postgresql-8.2.3/src/Makefile
+--- postgresql-8.2.3-orig/src/Makefile	2006-06-22 16:50:35.000000000 -0700
++++ postgresql-8.2.3/src/Makefile	2007-03-05 10:46:24.000000000 -0800
+@@ -23,7 +23,6 @@
+ 	$(MAKE) -C bin $@
+ 	$(MAKE) -C pl $@
+ 	$(MAKE) -C makefiles $@
+-	$(MAKE) -C test/regress $@
+ 
+ install: install-local
+ 
diff --git a/staging/postgresql/perl-5.14-fix.patch b/staging/postgresql/perl-5.14-fix.patch
new file mode 100644
index 000000000..82ef7d688
--- /dev/null
+++ b/staging/postgresql/perl-5.14-fix.patch
@@ -0,0 +1,25 @@
+--- a/src/pl/plperl/plperl.c
++++ b/src/pl/plperl/plperl.c
+@@ -926,7 +926,7 @@ plperl_trusted_init(void)
+ 		if (!isGV_with_GP(sv) || !GvCV(sv))
+ 			continue;
+ 		SvREFCNT_dec(GvCV(sv)); /* free the CV */
+-		GvCV(sv) = NULL;		/* prevent call via GV */
++		GvCV_set(sv, NULL);		/* prevent call via GV */
+ 	}
+ 	hv_clear(stash);
+ 
+--- a/src/pl/plperl/plperl.h
++++ b/src/pl/plperl/plperl.h
+@@ -49,6 +49,11 @@
+ 								(U32)HeKUTF8(he))
+ #endif
+ 
++/* supply GvCV_set if it's missing - ppport.h doesn't supply it, unfortunately */
++#ifndef GvCV_set
++#define GvCV_set(gv, cv)		(GvCV(gv) = cv)
++#endif
++
+ /* declare routines from plperl.c for access by .xs files */
+ HV		   *plperl_spi_exec(char *, int);
+ void		plperl_return_next(SV *);
diff --git a/staging/postgresql/postgresql b/staging/postgresql/postgresql
new file mode 100755
index 000000000..0fbe94036
--- /dev/null
+++ b/staging/postgresql/postgresql
@@ -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}
+PG_CTL="/usr/bin/pg_ctl -D $PGROOT/data -l /var/log/postgresql.log -s -w"
+
+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 /var/log/postgresql.log ]; then
+        touch /var/log/postgresql.log
+        chown postgres /var/log/postgresql.log
+    fi
+}
+
+case "$1" in
+  start)
+    postgres_init
+    stat_busy "Starting PostgreSQL"
+    su - postgres -c \
+     "$PG_CTL start"
+    if [ $? -gt 0 ]; then
+      stat_fail
+      exit 1
+    else
+      add_daemon postgresql
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping PostgreSQL"
+    su - postgres -c \
+      "$PG_CTL stop -m fast"
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon postgresql
+      stat_done
+    fi
+    ;;
+  reload)
+    stat_busy "Reloading PostgreSQL"
+    su - postgres -c \
+      "$PG_CTL reload"
+    if [ $? -gt 0 ]; then
+      stat_fail
+      exit 1
+    else
+      stat_done
+    fi
+    ;;
+  restart)
+        postgres_init
+    stat_busy "Restarting PostgreSQL"
+    su - postgres -c \
+      "$PG_CTL restart -m fast"
+    if [ $? -gt 0 ]; then
+      stat_fail
+      exit 1
+    else
+      add_daemon postgresql
+      stat_done
+    fi
+    ;;
+  status)
+    stat_busy "Checking PostgreSQL status";
+    ck_status postgresql
+    ;;
+  *)
+    echo "usage: $0 {start|stop|reload|restart|status}"  
+esac
+exit 0
diff --git a/staging/postgresql/postgresql.confd b/staging/postgresql/postgresql.confd
new file mode 100644
index 000000000..5f8fa034c
--- /dev/null
+++ b/staging/postgresql/postgresql.confd
@@ -0,0 +1,5 @@
+#
+# Parameters to be passed to postgresql
+#
+PGROOT="/var/lib/postgres"
+INITOPTS="--locale $LANG"
diff --git a/staging/postgresql/postgresql.install b/staging/postgresql/postgresql.install
new file mode 100644
index 000000000..d65bb6a7f
--- /dev/null
+++ b/staging/postgresql/postgresql.install
@@ -0,0 +1,22 @@
+post_install() {
+  if [ ! -d '/var/lib/postgres' ]; then
+    mkdir -p '/var/lib/postgres'
+  fi
+  getent group postgres >/dev/null || groupadd -g 88 postgres
+  getent passwd postgres >/dev/null || useradd -c 'PostgreSQL user' -u 88 -g postgres -d '/var/lib/postgres' -s /bin/bash postgres
+  passwd -l postgres >/dev/null
+}
+
+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
+}
+
+post_remove() {
+  getent passwd postgres >/dev/null && userdel postgres
+  getent group postgres >/dev/null && groupdel postgres
+}
diff --git a/staging/postgresql/postgresql.logrotate b/staging/postgresql/postgresql.logrotate
new file mode 100644
index 000000000..9c36918be
--- /dev/null
+++ b/staging/postgresql/postgresql.logrotate
@@ -0,0 +1,4 @@
+/var/log/postgresql.log {
+   copytruncate
+   missingok
+}
diff --git a/staging/postgresql/postgresql.pam b/staging/postgresql/postgresql.pam
new file mode 100644
index 000000000..53724d1f8
--- /dev/null
+++ b/staging/postgresql/postgresql.pam
@@ -0,0 +1,3 @@
+auth		required	pam_unix.so
+account		required	pam_unix.so
+session		required	pam_unix.so