From 0abb1942e8be584d56a1b35b2d1911cbe9f5bbd1 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 29 Sep 2011 23:14:32 +0000 Subject: Thu Sep 29 23:14:32 UTC 2011 --- extra/postgresql/PKGBUILD | 95 ++++++++++++++++++------------------- extra/postgresql/postgresql | 66 +++++++++++++------------- extra/postgresql/postgresql.confd | 16 +++++-- extra/postgresql/postgresql.install | 10 ++-- 4 files changed, 97 insertions(+), 90 deletions(-) (limited to 'extra/postgresql') diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD index d5a887585..c5809af93 100644 --- a/extra/postgresql/PKGBUILD +++ b/extra/postgresql/PKGBUILD @@ -1,64 +1,49 @@ -# $Id: PKGBUILD 125329 2011-05-25 22:33:15Z dan $ +# $Id: PKGBUILD 139090 2011-09-28 20:46:57Z dan $ # Maintainer: Dan McGee pkgbase=postgresql pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') -pkgver=9.0.4 -pkgrel=4 +pkgver=9.1.1 +_majorver=${pkgver%.*} +pkgrel=2 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 - - sed -i -e '/interfaces/d' src/Makefile + --enable-thread-safety - # 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') + depends=('openssl>=1.0.0' 'readline>=6.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" # install libs - for dir in src/interfaces src/bin/pg_config; do - pushd ${dir} - make DESTDIR="${pkgdir}" install - popd + 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 @@ -82,33 +67,41 @@ package_postgresql-docs() { 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" 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}" '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 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 + + # 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" @@ -117,6 +110,7 @@ package_postgresql() { 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" "${pkgdir}/etc/rc.d/postgresql" @@ -132,10 +126,13 @@ package_postgresql() { "${pkgdir}/etc/logrotate.d/postgresql" } -md5sums=('80390514d568a7af5ab61db1cda27e29' - 'eacf91f987d230f2dc2d040618ea1817' - 'd63a05943cf0a2726aa2070f3033c569' - '4d74f4227dc5e12bf95b3490758d86c9' +md5sums=('061a9f17323117c9358ed60f33ecff78' + '4a6e9b63f2aa50195735f2b46aba040b' + '2bef962971bac882022c41a72efabb96' '96f82c38f3f540b53f3e5144900acf17' - 'd28e443f9f65a5712c52018b84e27137' - '6606e4279d91fc617b5c4dae0d76c603') + 'd28e443f9f65a5712c52018b84e27137') +sha256sums=('c794016bcf3fc1f561bc86796c6c9d050e3d8d2d55356515126e048275ae56f2' + 'b2931d7a719e765f14811b9109310b2418d3064bfcedef699573fc25854a2201' + '92fe999c34824a9b8fe4b7212d58f60247e3d0514dd38807758eac64c4198190' + '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' + '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e') diff --git a/extra/postgresql/postgresql b/extra/postgresql/postgresql index 0fbe94036..2ff845f73 100755 --- a/extra/postgresql/postgresql +++ b/extra/postgresql/postgresql @@ -6,67 +6,67 @@ # 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} +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" + 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 } -case "$1" in +do_postgres() { + su - postgres -c "'$PGCTL_BIN' $(printf '%q ' "${PGCTL_ARGS[@]}") $@" +} + +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 + if do_postgres start; then add_daemon postgresql stat_done + else + stat_fail + exit 1 fi ;; stop) stat_busy "Stopping PostgreSQL" - su - postgres -c \ - "$PG_CTL stop -m fast" - if [ $? -gt 0 ]; then - stat_fail - else + if do_postgres stop -m fast; then rm_daemon postgresql stat_done + else + stat_fail + exit 1 fi ;; reload) stat_busy "Reloading PostgreSQL" - su - postgres -c \ - "$PG_CTL reload" - if [ $? -gt 0 ]; then + if do_postgres reload; then + stat_done + else stat_fail exit 1 - else - stat_done fi ;; restart) - postgres_init + postgres_init stat_busy "Restarting PostgreSQL" - su - postgres -c \ - "$PG_CTL restart -m fast" - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else + if do_postgres restart -m fast; then add_daemon postgresql stat_done + else + stat_fail + exit 1 fi ;; status) @@ -74,6 +74,6 @@ case "$1" in ck_status postgresql ;; *) - echo "usage: $0 {start|stop|reload|restart|status}" + echo "usage: $0 {start|stop|reload|restart|status}" + exit 1 esac -exit 0 diff --git a/extra/postgresql/postgresql.confd b/extra/postgresql/postgresql.confd index 5f8fa034c..2d68f2772 100644 --- a/extra/postgresql/postgresql.confd +++ b/extra/postgresql/postgresql.confd @@ -1,5 +1,11 @@ -# -# Parameters to be passed to postgresql -# -PGROOT="/var/lib/postgres" -INITOPTS="--locale $LANG" +## +## Parameters to be passed to postgresql +## +## Default data directory location +#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="" diff --git a/extra/postgresql/postgresql.install b/extra/postgresql/postgresql.install index d65bb6a7f..c52432271 100644 --- a/extra/postgresql/postgresql.install +++ b/extra/postgresql/postgresql.install @@ -12,11 +12,15 @@ post_upgrade() { # 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 } -- cgit v1.2.3-54-g00ecf