[arch-commits] Commit in postgresql/repos/extra-x86_64 (14 files)
Levente Polyak
anthraxx at archlinux.org
Sun Aug 12 16:40:02 UTC 2018
Date: Sunday, August 12, 2018 @ 16:40:01
Author: anthraxx
Revision: 331408
archrelease: copy trunk to extra-x86_64
Added:
postgresql/repos/extra-x86_64/PKGBUILD
(from rev 331407, postgresql/trunk/PKGBUILD)
postgresql/repos/extra-x86_64/postgresql-check-db-dir
(from rev 331407, postgresql/trunk/postgresql-check-db-dir)
postgresql/repos/extra-x86_64/postgresql-run-socket.patch
(from rev 331407, postgresql/trunk/postgresql-run-socket.patch)
postgresql/repos/extra-x86_64/postgresql.install
(from rev 331407, postgresql/trunk/postgresql.install)
postgresql/repos/extra-x86_64/postgresql.logrotate
(from rev 331407, postgresql/trunk/postgresql.logrotate)
postgresql/repos/extra-x86_64/postgresql.pam
(from rev 331407, postgresql/trunk/postgresql.pam)
postgresql/repos/extra-x86_64/postgresql.service
(from rev 331407, postgresql/trunk/postgresql.service)
Deleted:
postgresql/repos/extra-x86_64/PKGBUILD
postgresql/repos/extra-x86_64/postgresql-check-db-dir
postgresql/repos/extra-x86_64/postgresql-run-socket.patch
postgresql/repos/extra-x86_64/postgresql.install
postgresql/repos/extra-x86_64/postgresql.logrotate
postgresql/repos/extra-x86_64/postgresql.pam
postgresql/repos/extra-x86_64/postgresql.service
-----------------------------+
PKGBUILD | 377 +++++++++++++++++++++---------------------
postgresql-check-db-dir | 98 +++++-----
postgresql-run-socket.patch | 24 +-
postgresql.install | 50 ++---
postgresql.logrotate | 8
postgresql.pam | 6
postgresql.service | 70 +++----
7 files changed, 317 insertions(+), 316 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-08-12 16:39:51 UTC (rev 331407)
+++ PKGBUILD 2018-08-12 16:40:01 UTC (rev 331408)
@@ -1,188 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Maintainer: Dan McGee <dan at archlinux.org>
-
-pkgbase=postgresql
-pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
-pkgver=10.4
-_majorver=${pkgver%.*}
-pkgrel=6
-pkgdesc='Sophisticated object-relational DBMS'
-url='https://www.postgresql.org/'
-arch=('x86_64')
-license=('custom:PostgreSQL')
-makedepends=('krb5' 'libxml2' 'python' 'python2' 'perl' 'tcl>=8.6.0' 'openssl>=1.0.0' 'pam' 'zlib' 'icu' 'systemd' 'libldap')
-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=('1b60812310bd5756c62d93a9f93de8c28ea63b0df254f428cd1cf1a4d9020048'
- '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9'
- '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
- '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e'
- 'ad025a5fb623b1a1e9dff0cc62cc63f66244bb27d81370a6251aa29e8574be94'
- '888a1d44f03fccfa4bf344ee45824fefb846ae3c1c0c40113ad6020b4be3b0cf')
-sha512sums=('b7c0d2fdc724e2eb1cda9fc1eb01b47352bbe6ba6357b3e898b7f5990fd78499c8c68dcb3aa9bde7821d71b5882d8856131384e899f8055d89d51cdfdbc9e663'
- '031efe12d18ce386989062327cdbbe611c5ef1f94e4e1bead502304cb3e2d410af533d3c7f1109d24f9da9708214fe32f9a10ba373a3ca8d507bdb521fbb75f7'
- '1e6183ab0eb812b3ef687ac2c26ce78f7cb30540f606d20023669ac00ba04075487fb72e4dc89cc05dab0269ff6aca98fc1167cc75669c225b88b592482fbf67'
- '9ab4da01337ffbab8faec0e220aaa2a642dbfeccf7232ef2645bdc2177a953f17ee3cc14a4d8f8ebd064e1dae8b3dba6029adbffb8afaabea383963213941ba8'
- 'acd60166ff513b16778705e824944945cd0a98abc519fa5f0232252e0e9c85460c6f8b85459d9692d1f3df1caaaf8909c3e7f785be99c2d3fb98a10b2641a795'
- '56974ef34a8d94596068413154b1a7ed5a71f5a3942bd79427f05e6f6b7853036874dedd8d988bb94306023f2a675996d500b075eaf8a192ef5c24026eb28eb0')
-
-prepare() {
- cd postgresql-${pkgver}
- patch -p1 < ../postgresql-run-socket.patch
-}
-
-build() {
- cd postgresql-${pkgver}
- local options=(
- --prefix=/usr
- --mandir=/usr/share/man
- --datadir=/usr/share/postgresql
- --sysconfdir=/etc
- --with-gssapi
- --with-libxml
- --with-openssl
- --with-perl
- --with-python
- --with-tcl
- --with-pam
- --with-system-tzdata=/usr/share/zoneinfo
- --with-uuid=e2fs
- --with-icu
- --with-systemd
- --with-ldap
- --enable-nls
- --enable-thread-safety
- )
-
- # only build plpython3 for now
- ./configure ${options[@]} \
- PYTHON=/usr/bin/python
- make -C src/pl/plpython all
- make -C contrib/hstore_plpython all
- make -C contrib/ltree_plpython all
-
- # save plpython3 build and Makefile.global
- cp -a src/pl/plpython{,3}
- cp -a contrib/hstore_plpython{,3}
- cp -a contrib/ltree_plpython{,3}
- cp -a src/Makefile.global{,.python3}
- make distclean
-
- # regular build with everything
- ./configure ${options[@]} \
- PYTHON=/usr/bin/python2
- make world
-}
-
-package_postgresql-libs() {
- pkgdesc="Libraries for use with PostgreSQL"
- depends=('krb5' 'openssl>=1.0.0' 'readline>=6.0' 'zlib' 'libldap')
- provides=('postgresql-client')
- conflicts=('postgresql-client')
-
- cd postgresql-${pkgver}
-
- # install license
- install -Dm 644 COPYRIGHT -t "${pkgdir}/usr/share/licenses/${pkgname}"
-
- # 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 createuser dropdb 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
-
- install -d "${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 postgresql-${pkgver}
-
- install -Dm 644 COPYRIGHT -t "${pkgdir}/usr/share/licenses/${pkgname}"
-
- 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='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' 'icu' 'libsystemd' 'libldap')
- optdepends=('python2: for PL/Python 2 support'
- 'python: for PL/Python 3 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
-
- # install plpython3
- mv src/Makefile.global src/Makefile.global.save
- cp src/Makefile.global.python3 src/Makefile.global
- touch -r src/Makefile.global.save src/Makefile.global
- make -C src/pl/plpython3 DESTDIR="${pkgdir}" install
- make -C contrib/hstore_plpython3 DESTDIR="${pkgdir}" install
- make -C contrib/ltree_plpython3 DESTDIR="${pkgdir}" install
-
- # 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 createuser dropdb dropuser pg_isready reindexdb vacuumdb; do
- rm "${pkgdir}"/usr/share/man/man1/${util}.1
- done
-
- # 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" -t "${pkgdir}/usr/lib/systemd/system"
- install -Dm 755 "${srcdir}/postgresql-check-db-dir" -t "${pkgdir}/usr/bin"
-
- install -Dm 644 "${srcdir}/postgresql.pam" "${pkgdir}/etc/pam.d/postgresql"
- install -Dm 644 "${srcdir}/postgresql.logrotate" "${pkgdir}/etc/logrotate.d/postgresql"
-
- install -Dm 644 COPYRIGHT -t "${pkgdir}/usr/share/licenses/${pkgname}"
-}
-
-# vim: ts=2 sw=2 et:
Copied: postgresql/repos/extra-x86_64/PKGBUILD (from rev 331407, postgresql/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-08-12 16:40:01 UTC (rev 331408)
@@ -0,0 +1,189 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Maintainer: Dan McGee <dan at archlinux.org>
+
+pkgbase=postgresql
+pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
+pkgver=10.5
+_majorver=${pkgver%.*}
+pkgrel=1
+pkgdesc='Sophisticated object-relational DBMS'
+url='https://www.postgresql.org/'
+arch=('x86_64')
+license=('custom:PostgreSQL')
+makedepends=('krb5' 'libxml2' 'python' 'python2' 'perl' 'tcl>=8.6.0' 'openssl>=1.0.0' 'pam' 'zlib' 'icu' 'systemd' 'libldap')
+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=('6c8e616c91a45142b85c0aeb1f29ebba4a361309e86469e0fb4617b6a73c4011'
+ '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9'
+ '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
+ '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e'
+ 'ad025a5fb623b1a1e9dff0cc62cc63f66244bb27d81370a6251aa29e8574be94'
+ '888a1d44f03fccfa4bf344ee45824fefb846ae3c1c0c40113ad6020b4be3b0cf')
+sha512sums=('1bad30ae88beca66f7e8b99b82e7f02aac1e9230b328e6e5a762a704cdd9dc767d924f5a66c68c93586badfef91b7ff336120a567ce970eaa58bb44c662ad48c'
+ '031efe12d18ce386989062327cdbbe611c5ef1f94e4e1bead502304cb3e2d410af533d3c7f1109d24f9da9708214fe32f9a10ba373a3ca8d507bdb521fbb75f7'
+ '1e6183ab0eb812b3ef687ac2c26ce78f7cb30540f606d20023669ac00ba04075487fb72e4dc89cc05dab0269ff6aca98fc1167cc75669c225b88b592482fbf67'
+ '9ab4da01337ffbab8faec0e220aaa2a642dbfeccf7232ef2645bdc2177a953f17ee3cc14a4d8f8ebd064e1dae8b3dba6029adbffb8afaabea383963213941ba8'
+ 'acd60166ff513b16778705e824944945cd0a98abc519fa5f0232252e0e9c85460c6f8b85459d9692d1f3df1caaaf8909c3e7f785be99c2d3fb98a10b2641a795'
+ '56974ef34a8d94596068413154b1a7ed5a71f5a3942bd79427f05e6f6b7853036874dedd8d988bb94306023f2a675996d500b075eaf8a192ef5c24026eb28eb0')
+
+prepare() {
+ cd postgresql-${pkgver}
+ patch -p1 < ../postgresql-run-socket.patch
+}
+
+build() {
+ cd postgresql-${pkgver}
+ local options=(
+ --prefix=/usr
+ --mandir=/usr/share/man
+ --datadir=/usr/share/postgresql
+ --sysconfdir=/etc
+ --with-gssapi
+ --with-libxml
+ --with-openssl
+ --with-perl
+ --with-python
+ --with-tcl
+ --with-pam
+ --with-system-tzdata=/usr/share/zoneinfo
+ --with-uuid=e2fs
+ --with-icu
+ --with-systemd
+ --with-ldap
+ --enable-nls
+ --enable-thread-safety
+ --disable-rpath
+ )
+
+ # only build plpython3 for now
+ ./configure ${options[@]} \
+ PYTHON=/usr/bin/python
+ make -C src/pl/plpython all
+ make -C contrib/hstore_plpython all
+ make -C contrib/ltree_plpython all
+
+ # save plpython3 build and Makefile.global
+ cp -a src/pl/plpython{,3}
+ cp -a contrib/hstore_plpython{,3}
+ cp -a contrib/ltree_plpython{,3}
+ cp -a src/Makefile.global{,.python3}
+ make distclean
+
+ # regular build with everything
+ ./configure ${options[@]} \
+ PYTHON=/usr/bin/python2
+ make world
+}
+
+package_postgresql-libs() {
+ pkgdesc="Libraries for use with PostgreSQL"
+ depends=('krb5' 'openssl>=1.0.0' 'readline>=6.0' 'zlib' 'libldap')
+ provides=('postgresql-client')
+ conflicts=('postgresql-client')
+
+ cd postgresql-${pkgver}
+
+ # install license
+ install -Dm 644 COPYRIGHT -t "${pkgdir}/usr/share/licenses/${pkgname}"
+
+ # 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 createuser dropdb 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
+
+ install -d "${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 postgresql-${pkgver}
+
+ install -Dm 644 COPYRIGHT -t "${pkgdir}/usr/share/licenses/${pkgname}"
+
+ 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='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' 'icu' 'libsystemd' 'libldap')
+ optdepends=('python2: for PL/Python 2 support'
+ 'python: for PL/Python 3 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
+
+ # install plpython3
+ mv src/Makefile.global src/Makefile.global.save
+ cp src/Makefile.global.python3 src/Makefile.global
+ touch -r src/Makefile.global.save src/Makefile.global
+ make -C src/pl/plpython3 DESTDIR="${pkgdir}" install
+ make -C contrib/hstore_plpython3 DESTDIR="${pkgdir}" install
+ make -C contrib/ltree_plpython3 DESTDIR="${pkgdir}" install
+
+ # 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 createuser dropdb dropuser pg_isready reindexdb vacuumdb; do
+ rm "${pkgdir}"/usr/share/man/man1/${util}.1
+ done
+
+ # 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" -t "${pkgdir}/usr/lib/systemd/system"
+ install -Dm 755 "${srcdir}/postgresql-check-db-dir" -t "${pkgdir}/usr/bin"
+
+ install -Dm 644 "${srcdir}/postgresql.pam" "${pkgdir}/etc/pam.d/postgresql"
+ install -Dm 644 "${srcdir}/postgresql.logrotate" "${pkgdir}/etc/logrotate.d/postgresql"
+
+ install -Dm 644 COPYRIGHT -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
+# vim: ts=2 sw=2 et:
Deleted: postgresql-check-db-dir
===================================================================
--- postgresql-check-db-dir 2018-08-12 16:39:51 UTC (rev 331407)
+++ postgresql-check-db-dir 2018-08-12 16:40:01 UTC (rev 331408)
@@ -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=10
-# PREVMAJORVERSION is the previous major version
-PREVMAJORVERSION=9.6
-
-# 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/extra-x86_64/postgresql-check-db-dir (from rev 331407, postgresql/trunk/postgresql-check-db-dir)
===================================================================
--- postgresql-check-db-dir (rev 0)
+++ postgresql-check-db-dir 2018-08-12 16:40:01 UTC (rev 331408)
@@ -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=10
+# PREVMAJORVERSION is the previous major version
+PREVMAJORVERSION=9.6
+
+# 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: postgresql-run-socket.patch
===================================================================
--- postgresql-run-socket.patch 2018-08-12 16:39:51 UTC (rev 331407)
+++ postgresql-run-socket.patch 2018-08-12 16:40:01 UTC (rev 331408)
@@ -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/extra-x86_64/postgresql-run-socket.patch (from rev 331407, postgresql/trunk/postgresql-run-socket.patch)
===================================================================
--- postgresql-run-socket.patch (rev 0)
+++ postgresql-run-socket.patch 2018-08-12 16:40:01 UTC (rev 331408)
@@ -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: postgresql.install
===================================================================
--- postgresql.install 2018-08-12 16:39:51 UTC (rev 331407)
+++ postgresql.install 2018-08-12 16:40:01 UTC (rev 331408)
@@ -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/extra-x86_64/postgresql.install (from rev 331407, postgresql/trunk/postgresql.install)
===================================================================
--- postgresql.install (rev 0)
+++ postgresql.install 2018-08-12 16:40:01 UTC (rev 331408)
@@ -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: postgresql.logrotate
===================================================================
--- postgresql.logrotate 2018-08-12 16:39:51 UTC (rev 331407)
+++ postgresql.logrotate 2018-08-12 16:40:01 UTC (rev 331408)
@@ -1,4 +0,0 @@
-/var/log/postgresql.log {
- copytruncate
- missingok
-}
Copied: postgresql/repos/extra-x86_64/postgresql.logrotate (from rev 331407, postgresql/trunk/postgresql.logrotate)
===================================================================
--- postgresql.logrotate (rev 0)
+++ postgresql.logrotate 2018-08-12 16:40:01 UTC (rev 331408)
@@ -0,0 +1,4 @@
+/var/log/postgresql.log {
+ copytruncate
+ missingok
+}
Deleted: postgresql.pam
===================================================================
--- postgresql.pam 2018-08-12 16:39:51 UTC (rev 331407)
+++ postgresql.pam 2018-08-12 16:40:01 UTC (rev 331408)
@@ -1,3 +0,0 @@
-auth required pam_unix.so
-account required pam_unix.so
-session required pam_unix.so
Copied: postgresql/repos/extra-x86_64/postgresql.pam (from rev 331407, postgresql/trunk/postgresql.pam)
===================================================================
--- postgresql.pam (rev 0)
+++ postgresql.pam 2018-08-12 16:40:01 UTC (rev 331408)
@@ -0,0 +1,3 @@
+auth required pam_unix.so
+account required pam_unix.so
+session required pam_unix.so
Deleted: postgresql.service
===================================================================
--- postgresql.service 2018-08-12 16:39:51 UTC (rev 331407)
+++ postgresql.service 2018-08-12 16:40:01 UTC (rev 331408)
@@ -1,35 +0,0 @@
-[Unit]
-Description=PostgreSQL database server
-After=network.target
-
-[Service]
-Type=notify
-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/postgres -D ${PGROOT}/data
-ExecReload=/bin/kill -HUP ${MAINPID}
-KillMode=mixed
-KillSignal=SIGINT
-
-# 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/extra-x86_64/postgresql.service (from rev 331407, postgresql/trunk/postgresql.service)
===================================================================
--- postgresql.service (rev 0)
+++ postgresql.service 2018-08-12 16:40:01 UTC (rev 331408)
@@ -0,0 +1,35 @@
+[Unit]
+Description=PostgreSQL database server
+After=network.target
+
+[Service]
+Type=notify
+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/postgres -D ${PGROOT}/data
+ExecReload=/bin/kill -HUP ${MAINPID}
+KillMode=mixed
+KillSignal=SIGINT
+
+# 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
More information about the arch-commits
mailing list