Date: Sunday, March 5, 2017 @ 12:11:18 Author: anthraxx Revision: 290011
archrelease: copy trunk to staging-i686, staging-x86_64 Added: postgresql/repos/staging-i686/PKGBUILD (from rev 290010, postgresql/trunk/PKGBUILD) postgresql/repos/staging-i686/postgresql-check-db-dir (from rev 290010, postgresql/trunk/postgresql-check-db-dir) postgresql/repos/staging-i686/postgresql-run-socket.patch (from rev 290010, postgresql/trunk/postgresql-run-socket.patch) postgresql/repos/staging-i686/postgresql.install (from rev 290010, postgresql/trunk/postgresql.install) postgresql/repos/staging-i686/postgresql.logrotate (from rev 290010, postgresql/trunk/postgresql.logrotate) postgresql/repos/staging-i686/postgresql.pam (from rev 290010, postgresql/trunk/postgresql.pam) postgresql/repos/staging-i686/postgresql.service (from rev 290010, postgresql/trunk/postgresql.service) postgresql/repos/staging-x86_64/PKGBUILD (from rev 290010, postgresql/trunk/PKGBUILD) postgresql/repos/staging-x86_64/postgresql-check-db-dir (from rev 290010, postgresql/trunk/postgresql-check-db-dir) postgresql/repos/staging-x86_64/postgresql-run-socket.patch (from rev 290010, postgresql/trunk/postgresql-run-socket.patch) postgresql/repos/staging-x86_64/postgresql.install (from rev 290010, postgresql/trunk/postgresql.install) postgresql/repos/staging-x86_64/postgresql.logrotate (from rev 290010, postgresql/trunk/postgresql.logrotate) postgresql/repos/staging-x86_64/postgresql.pam (from rev 290010, postgresql/trunk/postgresql.pam) postgresql/repos/staging-x86_64/postgresql.service (from rev 290010, postgresql/trunk/postgresql.service) Deleted: postgresql/repos/staging-i686/PKGBUILD postgresql/repos/staging-i686/postgresql-check-db-dir postgresql/repos/staging-i686/postgresql-run-socket.patch postgresql/repos/staging-i686/postgresql.install postgresql/repos/staging-i686/postgresql.logrotate postgresql/repos/staging-i686/postgresql.pam postgresql/repos/staging-i686/postgresql.service postgresql/repos/staging-x86_64/PKGBUILD postgresql/repos/staging-x86_64/postgresql-check-db-dir postgresql/repos/staging-x86_64/postgresql-run-socket.patch postgresql/repos/staging-x86_64/postgresql.install postgresql/repos/staging-x86_64/postgresql.logrotate postgresql/repos/staging-x86_64/postgresql.pam postgresql/repos/staging-x86_64/postgresql.service --------------------------------------------+ /PKGBUILD | 324 +++++++++++++++++++++++++++ /postgresql-check-db-dir | 98 ++++++++ /postgresql-run-socket.patch | 24 ++ /postgresql.install | 50 ++++ /postgresql.logrotate | 8 /postgresql.pam | 6 /postgresql.service | 68 +++++ staging-i686/PKGBUILD | 158 ------------- staging-i686/postgresql-check-db-dir | 49 ---- staging-i686/postgresql-run-socket.patch | 12 - staging-i686/postgresql.install | 25 -- staging-i686/postgresql.logrotate | 4 staging-i686/postgresql.pam | 3 staging-i686/postgresql.service | 34 -- staging-x86_64/PKGBUILD | 158 ------------- staging-x86_64/postgresql-check-db-dir | 49 ---- staging-x86_64/postgresql-run-socket.patch | 12 - staging-x86_64/postgresql.install | 25 -- staging-x86_64/postgresql.logrotate | 4 staging-x86_64/postgresql.pam | 3 staging-x86_64/postgresql.service | 34 -- 21 files changed, 578 insertions(+), 570 deletions(-) Deleted: staging-i686/PKGBUILD =================================================================== --- staging-i686/PKGBUILD 2017-03-05 12:10:50 UTC (rev 290010) +++ staging-i686/PKGBUILD 2017-03-05 12:11:18 UTC (rev 290011) @@ -1,158 +0,0 @@ -# $Id$ -# Maintainer: Dan McGee <d...@archlinux.org> - -pkgbase=postgresql -pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') -pkgver=9.6.1 -_majorver=${pkgver%.*} -pkgrel=4 -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.pam postgresql.logrotate - postgresql.service postgresql-check-db-dir) -md5sums=('92ae6d7cdf18e648b3c22d0aa015565d' - '75c579eed03ffb2312631f0b649175b4' - '96f82c38f3f540b53f3e5144900acf17' - 'd28e443f9f65a5712c52018b84e27137' - '5a7933453a572bbe12320b088272ee71' - 'ac707e63c1ac68c7a5c31516ba27b172') -sha256sums=('e5101e0a49141fc12a7018c6dad594694d3a3325f5ab71e93e0e51bd94e51fcd' - '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9' - '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' - '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e' - 'b48fe97f8e43ed0d2041d519119a4dafb70fcae72870951bf4fb7350fe169ac8' - '2340da0947bcb1c5602008d0ca00588ca0bfa8aca4fa6947a8bdb2c6df800b0e') - -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-gssapi \ - --with-libxml \ - --with-openssl \ - --with-perl \ - --with-python PYTHON=/usr/bin/python2 \ - --with-tcl \ - --with-pam \ - --with-system-tzdata=/usr/share/zoneinfo \ - --with-uuid=e2fs \ - --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 and non-server binaries - for dir in src/interfaces src/bin/pg_config src/bin/pg_dump src/bin/psql src/bin/scripts; do - make -C ${dir} DESTDIR="${pkgdir}" install - done - - for util in pg_config pg_dump pg_dumpall pg_restore psql \ - clusterdb createdb createlang createuser dropdb droplang dropuser pg_isready reindexdb vacuumdb; do - install -D -m644 doc/src/sgml/man1/${util}.1 "${pkgdir}"/usr/share/man/man1/${util}.1 - done - - 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 pg_config_ext.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/pam.d/postgresql' 'etc/logrotate.d/postgresql') - depends=("postgresql-libs>=${pkgver}" 'krb5' 'libxml2' 'readline>=6.0' 'openssl>=1.0.0' 'pam') - 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') - options=('staticlibs') - 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/pg_dump src/bin/psql src/bin/scripts; do - make -C ${dir} DESTDIR="${pkgdir}" uninstall - done - for util in pg_config pg_dump pg_dumpall pg_restore psql \ - clusterdb createdb createlang createuser dropdb droplang dropuser pg_isready reindexdb vacuumdb; do - rm "${pkgdir}"/usr/share/man/man1/${util}.1 - done - - # 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 -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 -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/PKGBUILD (from rev 290010, postgresql/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2017-03-05 12:11:18 UTC (rev 290011) @@ -0,0 +1,162 @@ +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Maintainer: Dan McGee <d...@archlinux.org> + +pkgbase=postgresql +pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') +pkgver=9.6.2 +_majorver=${pkgver%.*} +pkgrel=1 +arch=('i686' 'x86_64') +url="https://www.postgresql.org/" +license=('custom:PostgreSQL') +makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl>=8.6.0' 'openssl>=1.0.0') +source=(https://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 + postgresql-run-socket.patch + postgresql.pam + postgresql.logrotate + postgresql.service + postgresql-check-db-dir) +sha256sums=('0187b5184be1c09034e74e44761505e52357248451b0c854dddec6c231fe50c9' + '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9' + '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' + '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e' + 'b48fe97f8e43ed0d2041d519119a4dafb70fcae72870951bf4fb7350fe169ac8' + '2340da0947bcb1c5602008d0ca00588ca0bfa8aca4fa6947a8bdb2c6df800b0e') +sha512sums=('7c9d61a591408e29d7dc70d6b28ecdf06edf7f8fbf4e014e60a1e4f841fd5734c74a820094f6153e10ef633d48ea73f2a85194f6d2cd519a8f7087a261e9e02b' + '031efe12d18ce386989062327cdbbe611c5ef1f94e4e1bead502304cb3e2d410af533d3c7f1109d24f9da9708214fe32f9a10ba373a3ca8d507bdb521fbb75f7' + '1e6183ab0eb812b3ef687ac2c26ce78f7cb30540f606d20023669ac00ba04075487fb72e4dc89cc05dab0269ff6aca98fc1167cc75669c225b88b592482fbf67' + '9ab4da01337ffbab8faec0e220aaa2a642dbfeccf7232ef2645bdc2177a953f17ee3cc14a4d8f8ebd064e1dae8b3dba6029adbffb8afaabea383963213941ba8' + 'ec2625c3ccfb6c142ea12ef4392b00f3d4cb0a5411d603b98157d55cd162ed3b422dbbd42e8b13211063db94a42f6d1f3febd4acaadde69ea17bfd8eccae3539' + 'f12d8777ca819366eac959e023fedf2eb409aa3f358f56269e13e19185d6e9c93c1f2a6e37c8bc6465ab32a02ff83d9f196ddea3cddf24a9884be9ac6970dad2') + +build() { + cd postgresql-${pkgver} + + patch -Np1 < ../postgresql-run-socket.patch + + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --datadir=/usr/share/postgresql \ + --sysconfdir=/etc \ + --with-gssapi \ + --with-libxml \ + --with-openssl \ + --with-perl \ + --with-python PYTHON=/usr/bin/python2 \ + --with-tcl \ + --with-pam \ + --with-system-tzdata=/usr/share/zoneinfo \ + --with-uuid=e2fs \ + --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 postgresql-${pkgver} + + # install license + install -Dm 644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-libs/LICENSE" + + # install libs and non-server binaries + for dir in src/interfaces src/bin/pg_config src/bin/pg_dump src/bin/psql src/bin/scripts; do + make -C ${dir} DESTDIR="${pkgdir}" install + done + + for util in pg_config pg_dump pg_dumpall pg_restore psql \ + clusterdb createdb createlang createuser dropdb droplang dropuser pg_isready reindexdb vacuumdb; do + install -Dm 644 doc/src/sgml/man1/${util}.1 "${pkgdir}"/usr/share/man/man1/${util}.1 + done + + cd src/include + + mkdir -p "${pkgdir}"/usr/include/{libpq,postgresql/internal/libpq} + + # these headers are needed by the public headers of the interfaces + install -m 644 pg_config.h "${pkgdir}/usr/include" + install -m 644 pg_config_os.h "${pkgdir}/usr/include" + install -m 644 pg_config_ext.h "${pkgdir}/usr/include" + install -m 644 postgres_ext.h "${pkgdir}/usr/include" + install -m 644 libpq/libpq-fs.h "${pkgdir}/usr/include/libpq" + install -m 644 pg_config_manual.h "${pkgdir}/usr/include" + + # these he aders are needed by the not-so-public headers of the interfaces + install -m 644 c.h "${pkgdir}/usr/include/postgresql/internal" + install -m 644 port.h "${pkgdir}/usr/include/postgresql/internal" + install -m 644 postgres_fe.h "${pkgdir}/usr/include/postgresql/internal" + install -m 644 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 -Dm 644 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/pam.d/postgresql' 'etc/logrotate.d/postgresql') + depends=("postgresql-libs>=${pkgver}" 'krb5' 'libxml2' 'readline>=6.0' 'openssl>=1.0.0' 'pam') + 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') + options=('staticlibs') + install=postgresql.install + + cd 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/pg_dump src/bin/psql src/bin/scripts; do + make -C ${dir} DESTDIR="${pkgdir}" uninstall + done + for util in pg_config pg_dump pg_dumpall pg_restore psql \ + clusterdb createdb createlang createuser dropdb droplang dropuser pg_isready reindexdb vacuumdb; do + rm "${pkgdir}"/usr/share/man/man1/${util}.1 + done + + # install license + install -Dm 644 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 -Dm 644 "${srcdir}/postgresql.service" \ + "${pkgdir}/usr/lib/systemd/system/postgresql.service" + install -Dm 755 "${srcdir}/postgresql-check-db-dir" \ + "${pkgdir}/usr/bin/postgresql-check-db-dir" + + install -Dm 644 "${srcdir}/postgresql.pam" \ + "${pkgdir}/etc/pam.d/postgresql" + + install -Dm 644 "${srcdir}/postgresql.logrotate" \ + "${pkgdir}/etc/logrotate.d/postgresql" +} + +# vim: ts=2 sw=2 et: Deleted: staging-i686/postgresql-check-db-dir =================================================================== --- staging-i686/postgresql-check-db-dir 2017-03-05 12:10:50 UTC (rev 290010) +++ staging-i686/postgresql-check-db-dir 2017-03-05 12:11:18 UTC (rev 290011) @@ -1,49 +0,0 @@ -#!/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.6 -# PREVMAJORVERSION is the previous major version -PREVMAJORVERSION=9.5 - -# 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/$PGMAJORVERSION/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-check-db-dir (from rev 290010, postgresql/trunk/postgresql-check-db-dir) =================================================================== --- staging-i686/postgresql-check-db-dir (rev 0) +++ staging-i686/postgresql-check-db-dir 2017-03-05 12:11:18 UTC (rev 290011) @@ -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.6 +# PREVMAJORVERSION is the previous major version +PREVMAJORVERSION=9.5 + +# 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/$PGMAJORVERSION/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 Deleted: staging-i686/postgresql-run-socket.patch =================================================================== --- staging-i686/postgresql-run-socket.patch 2017-03-05 12:10:50 UTC (rev 290010) +++ staging-i686/postgresql-run-socket.patch 2017-03-05 12:11:18 UTC (rev 290011) @@ -1,12 +0,0 @@ -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-run-socket.patch (from rev 290010, postgresql/trunk/postgresql-run-socket.patch) =================================================================== --- staging-i686/postgresql-run-socket.patch (rev 0) +++ staging-i686/postgresql-run-socket.patch 2017-03-05 12:11:18 UTC (rev 290011) @@ -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 Deleted: staging-i686/postgresql.install =================================================================== --- staging-i686/postgresql.install 2017-03-05 12:10:50 UTC (rev 290010) +++ staging-i686/postgresql.install 2017-03-05 12:11:18 UTC (rev 290011) @@ -1,25 +0,0 @@ -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 - if [ ! -d '/var/lib/postgres/data' ]; then - mkdir -p '/var/lib/postgres/data' - chown postgres:postgres '/var/lib/postgres/data' - fi -} - -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 -} Copied: postgresql/repos/staging-i686/postgresql.install (from rev 290010, postgresql/trunk/postgresql.install) =================================================================== --- staging-i686/postgresql.install (rev 0) +++ staging-i686/postgresql.install 2017-03-05 12:11:18 UTC (rev 290011) @@ -0,0 +1,25 @@ +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 + if [ ! -d '/var/lib/postgres/data' ]; then + mkdir -p '/var/lib/postgres/data' + chown postgres:postgres '/var/lib/postgres/data' + fi +} + +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 +} Deleted: staging-i686/postgresql.logrotate =================================================================== --- staging-i686/postgresql.logrotate 2017-03-05 12:10:50 UTC (rev 290010) +++ staging-i686/postgresql.logrotate 2017-03-05 12:11:18 UTC (rev 290011) @@ -1,4 +0,0 @@ -/var/log/postgresql.log { - copytruncate - missingok -} Copied: postgresql/repos/staging-i686/postgresql.logrotate (from rev 290010, postgresql/trunk/postgresql.logrotate) =================================================================== --- staging-i686/postgresql.logrotate (rev 0) +++ staging-i686/postgresql.logrotate 2017-03-05 12:11:18 UTC (rev 290011) @@ -0,0 +1,4 @@ +/var/log/postgresql.log { + copytruncate + missingok +} Deleted: staging-i686/postgresql.pam =================================================================== --- staging-i686/postgresql.pam 2017-03-05 12:10:50 UTC (rev 290010) +++ staging-i686/postgresql.pam 2017-03-05 12:11:18 UTC (rev 290011) @@ -1,3 +0,0 @@ -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so Copied: postgresql/repos/staging-i686/postgresql.pam (from rev 290010, postgresql/trunk/postgresql.pam) =================================================================== --- staging-i686/postgresql.pam (rev 0) +++ staging-i686/postgresql.pam 2017-03-05 12:11:18 UTC (rev 290011) @@ -0,0 +1,3 @@ +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so Deleted: staging-i686/postgresql.service =================================================================== --- staging-i686/postgresql.service 2017-03-05 12:10:50 UTC (rev 290010) +++ staging-i686/postgresql.service 2017-03-05 12:11:18 UTC (rev 290011) @@ -1,34 +0,0 @@ -[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 -RuntimeDirectory=postgresql -RuntimeDirectoryMode=755 - -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 - -# Additional security-related features -PrivateTmp=true -ProtectHome=true -ProtectSystem=full -NoNewPrivileges=true - -[Install] -WantedBy=multi-user.target Copied: postgresql/repos/staging-i686/postgresql.service (from rev 290010, postgresql/trunk/postgresql.service) =================================================================== --- staging-i686/postgresql.service (rev 0) +++ staging-i686/postgresql.service 2017-03-05 12:11:18 UTC (rev 290011) @@ -0,0 +1,34 @@ +[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 +RuntimeDirectory=postgresql +RuntimeDirectoryMode=755 + +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 + +# Additional security-related features +PrivateTmp=true +ProtectHome=true +ProtectSystem=full +NoNewPrivileges=true + +[Install] +WantedBy=multi-user.target Deleted: staging-x86_64/PKGBUILD =================================================================== --- staging-x86_64/PKGBUILD 2017-03-05 12:10:50 UTC (rev 290010) +++ staging-x86_64/PKGBUILD 2017-03-05 12:11:18 UTC (rev 290011) @@ -1,158 +0,0 @@ -# $Id$ -# Maintainer: Dan McGee <d...@archlinux.org> - -pkgbase=postgresql -pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') -pkgver=9.6.1 -_majorver=${pkgver%.*} -pkgrel=4 -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.pam postgresql.logrotate - postgresql.service postgresql-check-db-dir) -md5sums=('92ae6d7cdf18e648b3c22d0aa015565d' - '75c579eed03ffb2312631f0b649175b4' - '96f82c38f3f540b53f3e5144900acf17' - 'd28e443f9f65a5712c52018b84e27137' - '5a7933453a572bbe12320b088272ee71' - 'ac707e63c1ac68c7a5c31516ba27b172') -sha256sums=('e5101e0a49141fc12a7018c6dad594694d3a3325f5ab71e93e0e51bd94e51fcd' - '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9' - '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' - '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e' - 'b48fe97f8e43ed0d2041d519119a4dafb70fcae72870951bf4fb7350fe169ac8' - '2340da0947bcb1c5602008d0ca00588ca0bfa8aca4fa6947a8bdb2c6df800b0e') - -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-gssapi \ - --with-libxml \ - --with-openssl \ - --with-perl \ - --with-python PYTHON=/usr/bin/python2 \ - --with-tcl \ - --with-pam \ - --with-system-tzdata=/usr/share/zoneinfo \ - --with-uuid=e2fs \ - --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 and non-server binaries - for dir in src/interfaces src/bin/pg_config src/bin/pg_dump src/bin/psql src/bin/scripts; do - make -C ${dir} DESTDIR="${pkgdir}" install - done - - for util in pg_config pg_dump pg_dumpall pg_restore psql \ - clusterdb createdb createlang createuser dropdb droplang dropuser pg_isready reindexdb vacuumdb; do - install -D -m644 doc/src/sgml/man1/${util}.1 "${pkgdir}"/usr/share/man/man1/${util}.1 - done - - 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 pg_config_ext.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/pam.d/postgresql' 'etc/logrotate.d/postgresql') - depends=("postgresql-libs>=${pkgver}" 'krb5' 'libxml2' 'readline>=6.0' 'openssl>=1.0.0' 'pam') - 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') - options=('staticlibs') - 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/pg_dump src/bin/psql src/bin/scripts; do - make -C ${dir} DESTDIR="${pkgdir}" uninstall - done - for util in pg_config pg_dump pg_dumpall pg_restore psql \ - clusterdb createdb createlang createuser dropdb droplang dropuser pg_isready reindexdb vacuumdb; do - rm "${pkgdir}"/usr/share/man/man1/${util}.1 - done - - # 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 -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 -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/PKGBUILD (from rev 290010, postgresql/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2017-03-05 12:11:18 UTC (rev 290011) @@ -0,0 +1,162 @@ +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Maintainer: Dan McGee <d...@archlinux.org> + +pkgbase=postgresql +pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') +pkgver=9.6.2 +_majorver=${pkgver%.*} +pkgrel=1 +arch=('i686' 'x86_64') +url="https://www.postgresql.org/" +license=('custom:PostgreSQL') +makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl>=8.6.0' 'openssl>=1.0.0') +source=(https://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 + postgresql-run-socket.patch + postgresql.pam + postgresql.logrotate + postgresql.service + postgresql-check-db-dir) +sha256sums=('0187b5184be1c09034e74e44761505e52357248451b0c854dddec6c231fe50c9' + '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9' + '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' + '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e' + 'b48fe97f8e43ed0d2041d519119a4dafb70fcae72870951bf4fb7350fe169ac8' + '2340da0947bcb1c5602008d0ca00588ca0bfa8aca4fa6947a8bdb2c6df800b0e') +sha512sums=('7c9d61a591408e29d7dc70d6b28ecdf06edf7f8fbf4e014e60a1e4f841fd5734c74a820094f6153e10ef633d48ea73f2a85194f6d2cd519a8f7087a261e9e02b' + '031efe12d18ce386989062327cdbbe611c5ef1f94e4e1bead502304cb3e2d410af533d3c7f1109d24f9da9708214fe32f9a10ba373a3ca8d507bdb521fbb75f7' + '1e6183ab0eb812b3ef687ac2c26ce78f7cb30540f606d20023669ac00ba04075487fb72e4dc89cc05dab0269ff6aca98fc1167cc75669c225b88b592482fbf67' + '9ab4da01337ffbab8faec0e220aaa2a642dbfeccf7232ef2645bdc2177a953f17ee3cc14a4d8f8ebd064e1dae8b3dba6029adbffb8afaabea383963213941ba8' + 'ec2625c3ccfb6c142ea12ef4392b00f3d4cb0a5411d603b98157d55cd162ed3b422dbbd42e8b13211063db94a42f6d1f3febd4acaadde69ea17bfd8eccae3539' + 'f12d8777ca819366eac959e023fedf2eb409aa3f358f56269e13e19185d6e9c93c1f2a6e37c8bc6465ab32a02ff83d9f196ddea3cddf24a9884be9ac6970dad2') + +build() { + cd postgresql-${pkgver} + + patch -Np1 < ../postgresql-run-socket.patch + + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --datadir=/usr/share/postgresql \ + --sysconfdir=/etc \ + --with-gssapi \ + --with-libxml \ + --with-openssl \ + --with-perl \ + --with-python PYTHON=/usr/bin/python2 \ + --with-tcl \ + --with-pam \ + --with-system-tzdata=/usr/share/zoneinfo \ + --with-uuid=e2fs \ + --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 postgresql-${pkgver} + + # install license + install -Dm 644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-libs/LICENSE" + + # install libs and non-server binaries + for dir in src/interfaces src/bin/pg_config src/bin/pg_dump src/bin/psql src/bin/scripts; do + make -C ${dir} DESTDIR="${pkgdir}" install + done + + for util in pg_config pg_dump pg_dumpall pg_restore psql \ + clusterdb createdb createlang createuser dropdb droplang dropuser pg_isready reindexdb vacuumdb; do + install -Dm 644 doc/src/sgml/man1/${util}.1 "${pkgdir}"/usr/share/man/man1/${util}.1 + done + + cd src/include + + mkdir -p "${pkgdir}"/usr/include/{libpq,postgresql/internal/libpq} + + # these headers are needed by the public headers of the interfaces + install -m 644 pg_config.h "${pkgdir}/usr/include" + install -m 644 pg_config_os.h "${pkgdir}/usr/include" + install -m 644 pg_config_ext.h "${pkgdir}/usr/include" + install -m 644 postgres_ext.h "${pkgdir}/usr/include" + install -m 644 libpq/libpq-fs.h "${pkgdir}/usr/include/libpq" + install -m 644 pg_config_manual.h "${pkgdir}/usr/include" + + # these he aders are needed by the not-so-public headers of the interfaces + install -m 644 c.h "${pkgdir}/usr/include/postgresql/internal" + install -m 644 port.h "${pkgdir}/usr/include/postgresql/internal" + install -m 644 postgres_fe.h "${pkgdir}/usr/include/postgresql/internal" + install -m 644 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 -Dm 644 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/pam.d/postgresql' 'etc/logrotate.d/postgresql') + depends=("postgresql-libs>=${pkgver}" 'krb5' 'libxml2' 'readline>=6.0' 'openssl>=1.0.0' 'pam') + 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') + options=('staticlibs') + install=postgresql.install + + cd 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/pg_dump src/bin/psql src/bin/scripts; do + make -C ${dir} DESTDIR="${pkgdir}" uninstall + done + for util in pg_config pg_dump pg_dumpall pg_restore psql \ + clusterdb createdb createlang createuser dropdb droplang dropuser pg_isready reindexdb vacuumdb; do + rm "${pkgdir}"/usr/share/man/man1/${util}.1 + done + + # install license + install -Dm 644 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 -Dm 644 "${srcdir}/postgresql.service" \ + "${pkgdir}/usr/lib/systemd/system/postgresql.service" + install -Dm 755 "${srcdir}/postgresql-check-db-dir" \ + "${pkgdir}/usr/bin/postgresql-check-db-dir" + + install -Dm 644 "${srcdir}/postgresql.pam" \ + "${pkgdir}/etc/pam.d/postgresql" + + install -Dm 644 "${srcdir}/postgresql.logrotate" \ + "${pkgdir}/etc/logrotate.d/postgresql" +} + +# vim: ts=2 sw=2 et: Deleted: staging-x86_64/postgresql-check-db-dir =================================================================== --- staging-x86_64/postgresql-check-db-dir 2017-03-05 12:10:50 UTC (rev 290010) +++ staging-x86_64/postgresql-check-db-dir 2017-03-05 12:11:18 UTC (rev 290011) @@ -1,49 +0,0 @@ -#!/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.6 -# PREVMAJORVERSION is the previous major version -PREVMAJORVERSION=9.5 - -# 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/$PGMAJORVERSION/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-check-db-dir (from rev 290010, postgresql/trunk/postgresql-check-db-dir) =================================================================== --- staging-x86_64/postgresql-check-db-dir (rev 0) +++ staging-x86_64/postgresql-check-db-dir 2017-03-05 12:11:18 UTC (rev 290011) @@ -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.6 +# PREVMAJORVERSION is the previous major version +PREVMAJORVERSION=9.5 + +# 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/$PGMAJORVERSION/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 Deleted: staging-x86_64/postgresql-run-socket.patch =================================================================== --- staging-x86_64/postgresql-run-socket.patch 2017-03-05 12:10:50 UTC (rev 290010) +++ staging-x86_64/postgresql-run-socket.patch 2017-03-05 12:11:18 UTC (rev 290011) @@ -1,12 +0,0 @@ -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-run-socket.patch (from rev 290010, postgresql/trunk/postgresql-run-socket.patch) =================================================================== --- staging-x86_64/postgresql-run-socket.patch (rev 0) +++ staging-x86_64/postgresql-run-socket.patch 2017-03-05 12:11:18 UTC (rev 290011) @@ -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 Deleted: staging-x86_64/postgresql.install =================================================================== --- staging-x86_64/postgresql.install 2017-03-05 12:10:50 UTC (rev 290010) +++ staging-x86_64/postgresql.install 2017-03-05 12:11:18 UTC (rev 290011) @@ -1,25 +0,0 @@ -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 - if [ ! -d '/var/lib/postgres/data' ]; then - mkdir -p '/var/lib/postgres/data' - chown postgres:postgres '/var/lib/postgres/data' - fi -} - -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 -} Copied: postgresql/repos/staging-x86_64/postgresql.install (from rev 290010, postgresql/trunk/postgresql.install) =================================================================== --- staging-x86_64/postgresql.install (rev 0) +++ staging-x86_64/postgresql.install 2017-03-05 12:11:18 UTC (rev 290011) @@ -0,0 +1,25 @@ +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 + if [ ! -d '/var/lib/postgres/data' ]; then + mkdir -p '/var/lib/postgres/data' + chown postgres:postgres '/var/lib/postgres/data' + fi +} + +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 +} Deleted: staging-x86_64/postgresql.logrotate =================================================================== --- staging-x86_64/postgresql.logrotate 2017-03-05 12:10:50 UTC (rev 290010) +++ staging-x86_64/postgresql.logrotate 2017-03-05 12:11:18 UTC (rev 290011) @@ -1,4 +0,0 @@ -/var/log/postgresql.log { - copytruncate - missingok -} Copied: postgresql/repos/staging-x86_64/postgresql.logrotate (from rev 290010, postgresql/trunk/postgresql.logrotate) =================================================================== --- staging-x86_64/postgresql.logrotate (rev 0) +++ staging-x86_64/postgresql.logrotate 2017-03-05 12:11:18 UTC (rev 290011) @@ -0,0 +1,4 @@ +/var/log/postgresql.log { + copytruncate + missingok +} Deleted: staging-x86_64/postgresql.pam =================================================================== --- staging-x86_64/postgresql.pam 2017-03-05 12:10:50 UTC (rev 290010) +++ staging-x86_64/postgresql.pam 2017-03-05 12:11:18 UTC (rev 290011) @@ -1,3 +0,0 @@ -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so Copied: postgresql/repos/staging-x86_64/postgresql.pam (from rev 290010, postgresql/trunk/postgresql.pam) =================================================================== --- staging-x86_64/postgresql.pam (rev 0) +++ staging-x86_64/postgresql.pam 2017-03-05 12:11:18 UTC (rev 290011) @@ -0,0 +1,3 @@ +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so Deleted: staging-x86_64/postgresql.service =================================================================== --- staging-x86_64/postgresql.service 2017-03-05 12:10:50 UTC (rev 290010) +++ staging-x86_64/postgresql.service 2017-03-05 12:11:18 UTC (rev 290011) @@ -1,34 +0,0 @@ -[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 -RuntimeDirectory=postgresql -RuntimeDirectoryMode=755 - -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 - -# Additional security-related features -PrivateTmp=true -ProtectHome=true -ProtectSystem=full -NoNewPrivileges=true - -[Install] -WantedBy=multi-user.target Copied: postgresql/repos/staging-x86_64/postgresql.service (from rev 290010, postgresql/trunk/postgresql.service) =================================================================== --- staging-x86_64/postgresql.service (rev 0) +++ staging-x86_64/postgresql.service 2017-03-05 12:11:18 UTC (rev 290011) @@ -0,0 +1,34 @@ +[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 +RuntimeDirectory=postgresql +RuntimeDirectoryMode=755 + +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 + +# Additional security-related features +PrivateTmp=true +ProtectHome=true +ProtectSystem=full +NoNewPrivileges=true + +[Install] +WantedBy=multi-user.target