[arch-commits] Commit in postgresql/trunk (6 files)
Dan McGee
dan at archlinux.org
Thu Sep 15 18:50:36 UTC 2011
Date: Thursday, September 15, 2011 @ 14:50:36
Author: dan
Revision: 138064
Prep for 9.1.0 release
Modified:
postgresql/trunk/PKGBUILD
postgresql/trunk/postgresql
postgresql/trunk/postgresql.confd
postgresql/trunk/postgresql.install
Deleted:
postgresql/trunk/build.patch
postgresql/trunk/perl-5.14-fix.patch
---------------------+
PKGBUILD | 66 ++++++++++++++++++--------------------------------
build.patch | 11 --------
perl-5.14-fix.patch | 25 ------------------
postgresql | 18 ++++++++-----
postgresql.confd | 5 +++
postgresql.install | 10 +++++--
6 files changed, 48 insertions(+), 87 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-09-15 18:35:47 UTC (rev 138063)
+++ PKGBUILD 2011-09-15 18:50:36 UTC (rev 138064)
@@ -3,50 +3,36 @@
pkgbase=postgresql
pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
-pkgver=9.0.4
-pkgrel=4
+pkgver=9.1.0
+_majorver=${pkgver%.*}
+pkgrel=1
arch=('i686' 'x86_64')
-url="http://www.postgresql.org"
+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
+makedepends=('libxml2' 'python2' 'perl' 'openssl>=1.0.0')
+source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2
+ postgresql postgresql.confd postgresql.pam postgresql.logrotate)
build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
+ cd "${srcdir}/postgresql-${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 \
+ ./configure --prefix=/usr --mandir=/usr/share/man \
+ --datadir=/usr/share/postgresql \
+ --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
+ --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')
+ provides=('postgresql-client')
+ conflicts=('postgresql-client')
- cd "${srcdir}/${pkgbase}-${pkgver}"
+ cd "${srcdir}/postgresql-${pkgver}"
# install license
install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-libs/LICENSE"
@@ -82,7 +68,7 @@
pkgdesc="HTML documentation for PostgreSQL"
options=(docs)
- cd "${srcdir}/${pkgbase}-${pkgver}"
+ cd "${srcdir}/postgresql-${pkgver}"
# install license
install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-docs/LICENSE"
@@ -94,13 +80,13 @@
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')
+ depends=("postgresql-libs>=${pkgver}" 'libxml2' 'readline>=6.0' 'openssl>=1.0.0')
optdepends=('python2: for PL/Python support'
- 'perl: for PL/Perl support')
- provides=('postgresql-client')
- conflicts=('postgresql-client')
+ 'perl: for PL/Perl support'
+ 'postgresql-old-upgrade: upgrade from previous major version using pg_upgrade')
+ install=postgresql.install
- cd "${srcdir}/${pkgbase}-${pkgver}"
+ cd "${srcdir}/postgresql-${pkgver}"
# install
make DESTDIR="${pkgdir}" install
@@ -132,10 +118,8 @@
"${pkgdir}/etc/logrotate.d/postgresql"
}
-md5sums=('80390514d568a7af5ab61db1cda27e29'
- 'eacf91f987d230f2dc2d040618ea1817'
- 'd63a05943cf0a2726aa2070f3033c569'
- '4d74f4227dc5e12bf95b3490758d86c9'
+md5sums=('0497b9da1d7c380c340a9a87ba5500fe'
+ '2bc5ca8d850d48fb3bb8a6d69832b6f9'
+ 'bcde874133a2e07d160fb8f0b48bb842'
'96f82c38f3f540b53f3e5144900acf17'
- 'd28e443f9f65a5712c52018b84e27137'
- '6606e4279d91fc617b5c4dae0d76c603')
+ 'd28e443f9f65a5712c52018b84e27137')
Deleted: build.patch
===================================================================
--- build.patch 2011-09-15 18:35:47 UTC (rev 138063)
+++ build.patch 2011-09-15 18:50:36 UTC (rev 138064)
@@ -1,11 +0,0 @@
-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
-
Deleted: perl-5.14-fix.patch
===================================================================
--- perl-5.14-fix.patch 2011-09-15 18:35:47 UTC (rev 138063)
+++ perl-5.14-fix.patch 2011-09-15 18:50:36 UTC (rev 138064)
@@ -1,25 +0,0 @@
---- 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 *);
Modified: postgresql
===================================================================
--- postgresql 2011-09-15 18:35:47 UTC (rev 138063)
+++ postgresql 2011-09-15 18:50:36 UTC (rev 138064)
@@ -6,17 +6,21 @@
# 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"
+PGLOG=${PGLOG:-/var/log/postgresql.log}
+PG_CTL="/usr/bin/pg_ctl -D \"$PGROOT/data\" -l \"$PGLOG\" -s -w"
+if [ -n "$PGOPTS" ]; then
+ PG_CTL="$PG_CTL -o \"$PGOPTS\""
+fi
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"
+ 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
+ if [ ! -e "$PGLOG" ]; then
+ touch "$PGLOG"
+ chown postgres "$PGLOG"
fi
}
Modified: postgresql.confd
===================================================================
--- postgresql.confd 2011-09-15 18:35:47 UTC (rev 138063)
+++ postgresql.confd 2011-09-15 18:50:36 UTC (rev 138064)
@@ -2,4 +2,9 @@
# Parameters to be passed to postgresql
#
PGROOT="/var/lib/postgres"
+# Passed to initdb if necessary
INITOPTS="--locale $LANG"
+# Default log file location
+#PGLOG="/var/log/postgresql.log"
+# Additional options to pass via pg_ctl's '-o' option
+#PGOPTS=""
Modified: postgresql.install
===================================================================
--- postgresql.install 2011-09-15 18:35:47 UTC (rev 138063)
+++ postgresql.install 2011-09-15 18:50:36 UTC (rev 138064)
@@ -12,11 +12,15 @@
# 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
+ chsh -s /bin/bash postgres
fi
}
post_remove() {
- getent passwd postgres >/dev/null && userdel postgres
- getent group postgres >/dev/null && groupdel postgres
+ if getent passwd postgres >/dev/null; then
+ userdel postgres
+ fi
+ if getent group postgres >/dev/null; then
+ groupdel postgres
+ fi
}
More information about the arch-commits
mailing list