[arch-commits] Commit in postgresql/repos (11 files)
Felix Yan
felixonmars at archlinux.org
Sat Dec 19 07:06:36 UTC 2020
Date: Saturday, December 19, 2020 @ 07:06:36
Author: felixonmars
Revision: 404548
archrelease: copy trunk to staging-x86_64
Added:
postgresql/repos/staging-x86_64/
postgresql/repos/staging-x86_64/PKGBUILD
(from rev 404547, postgresql/trunk/PKGBUILD)
postgresql/repos/staging-x86_64/icu68.patch
(from rev 404547, postgresql/trunk/icu68.patch)
postgresql/repos/staging-x86_64/postgresql-check-db-dir
(from rev 404547, postgresql/trunk/postgresql-check-db-dir)
postgresql/repos/staging-x86_64/postgresql-perl-rpath.patch
(from rev 404547, postgresql/trunk/postgresql-perl-rpath.patch)
postgresql/repos/staging-x86_64/postgresql-run-socket.patch
(from rev 404547, postgresql/trunk/postgresql-run-socket.patch)
postgresql/repos/staging-x86_64/postgresql.logrotate
(from rev 404547, postgresql/trunk/postgresql.logrotate)
postgresql/repos/staging-x86_64/postgresql.pam
(from rev 404547, postgresql/trunk/postgresql.pam)
postgresql/repos/staging-x86_64/postgresql.service
(from rev 404547, postgresql/trunk/postgresql.service)
postgresql/repos/staging-x86_64/postgresql.sysusers
(from rev 404547, postgresql/trunk/postgresql.sysusers)
postgresql/repos/staging-x86_64/postgresql.tmpfiles
(from rev 404547, postgresql/trunk/postgresql.tmpfiles)
-----------------------------+
PKGBUILD | 224 ++++++++++++++++++++++++++++++++++++++++++
icu68.patch | 17 +++
postgresql-check-db-dir | 49 +++++++++
postgresql-perl-rpath.patch | 13 ++
postgresql-run-socket.patch | 12 ++
postgresql.logrotate | 4
postgresql.pam | 3
postgresql.service | 43 ++++++++
postgresql.sysusers | 1
postgresql.tmpfiles | 2
10 files changed, 368 insertions(+)
Copied: postgresql/repos/staging-x86_64/PKGBUILD (from rev 404547, postgresql/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2020-12-19 07:06:36 UTC (rev 404548)
@@ -0,0 +1,224 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Maintainer: Dan McGee <dan at archlinux.org>
+
+pkgbase=postgresql
+pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
+pkgver=13.1
+_majorver=${pkgver%.*}
+pkgrel=3
+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' 'llvm' 'clang' 'libxslt')
+source=(https://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2
+ icu68.patch
+ postgresql-run-socket.patch
+ postgresql-perl-rpath.patch
+ postgresql.pam
+ postgresql.logrotate
+ postgresql.service
+ postgresql-check-db-dir
+ postgresql.sysusers
+ postgresql.tmpfiles)
+sha256sums=('12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f'
+ 'fa784fe8b94833539cdb52f3986561bba3673e3b1d80e18d9e097826c5658454'
+ '02ffb53b0a5049233f665c873b96264db77daab30e5a2194d038202d815a8e6a'
+ 'af6186d40128e043f333da4591455bf62b7c96e80214835f5c8c60b635ea9afb'
+ '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
+ '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e'
+ '25fb140b90345828dc01a4f286345757e700a47178bab03d217a7a5a79105b57'
+ '7db9626c322928b2465aa126b48ba7f0eebd366bf2aa19c9c0a92b488cb469c5'
+ '7fa8f0ef3f9d40abd4749cc327c2f52478cb6dfb6e2405bd0279c95e9ff99f12'
+ '4a4c0bb9ceb156cc47e9446d8393d1f72b4fe9ea1d39ba17213359df9211da57')
+b2sums=('609ac10f87da800754223c7f7d6b02efa3ed1308a5d27cc793c937be983f4041576e20de3b2efe514e3f61dc863e6212ec01d73adb93f6bcc373a596b2946675'
+ '0f829658a4fdc39b83f62b47bc3f5ca61c8bfc1cea166286ce797939f008542147fb10773267f46ef98e7e330975223e784f5117eefa1e8b75d850f7e0c7c59e'
+ '71dc1b4e41294fd235db05317c991d42de082c49d38a2f97d1394572a93a4aa77f42ec29b4e6cf0a17adb3a4471afcb1e2464870f2b9e847906bf49541763a53'
+ '5135c5f9dafe427de8d3740d4a67c6dba2869be47dc52b4190b8aa1148e702992fde1821371b68e93b224f5805f697d490ea28ec80d7ce55e5a224551b0a6247'
+ '3eab84d332d96678fe6e435ee243c8f1a82b838f601d61d3604d11e918aed7a62202edca5e476c4b9031ed284570e6fcd6c659cfdbd9624aa0019d3233755f81'
+ '2209b7550acad7955102ec6922754b4046b2a2ad2a7e1cfb2cc4053c0705abac7aa7d7968eab617f50894797d06345f51c9a669926bd2a77dcf688206a2027e0'
+ 'a4255df47b7ac1418d20aa73aa0f6e70c7952a10d706e5523043c48b2c3b6d8e39838049dfcc826913cd0f2c06502561d1abe8b19cce7071db66139ae93a37bf'
+ '2eaf8867cc71b8e838925e1e1e2c37b5edd69c3fe7c144410a8683662ba0c342122803217d436d808e18826d28da352978e5d15dd1bc91b6b44dbaf4cfcd4d51'
+ '5e9cba2f45604db83eb77c7bbb54bc499a38274be6cd97abb056c9bdf18e637a8ac354e18f41f614f7e1a2d6f13c2a0b562ab0aaebf9447cf5eb2d60e6501e12'
+ '8a8e5ec24ea338b2b51b8d2be5a336ac8d4cc6b25200ed0f0d564df9942997478df0c54da2fac7b27d677774a34398f69047eecd0f97bdc0df8fe50a1b5ed74d')
+
+prepare() {
+ cd postgresql-${pkgver}
+ patch -p0 < ../icu68.patch
+ patch -p1 < ../postgresql-run-socket.patch
+ patch -p1 < ../postgresql-perl-rpath.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
+ --with-llvm
+ --with-libxslt
+ --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
+}
+
+_postgres_check() {
+ make "${1}" || (find . -name regression.diffs | \
+ while read -r line; do
+ error "make ${1} failure: ${line}"
+ cat "${line}"
+ done; exit 1)
+}
+
+check() {
+ cd postgresql-${pkgver}
+ _postgres_check check
+ _postgres_check check-world
+}
+
+package_postgresql-libs() {
+ pkgdesc="Libraries for use with PostgreSQL"
+ depends=('krb5' 'openssl>=1.0.0' 'readline>=6.0' 'zlib' 'libldap')
+ provides=('postgresql-client' 'libpq.so' 'libecpg.so' 'libecpg_compat.so' 'libpgtypes.so')
+ 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' 'systemd-libs' 'libldap' 'llvm-libs' 'libxslt')
+ 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')
+
+ 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
+
+ install -Dm 644 COPYRIGHT -t "${pkgdir}/usr/share/licenses/${pkgname}"
+
+ cd "${srcdir}"
+ install -Dm 755 postgresql-check-db-dir -t "${pkgdir}/usr/bin"
+
+ install -Dm 644 ${pkgname}.pam "${pkgdir}/etc/pam.d/${pkgname}"
+ install -Dm 644 ${pkgname}.logrotate "${pkgdir}/etc/logrotate.d/${pkgname}"
+
+ install -Dm 644 ${pkgname}.service -t "${pkgdir}/usr/lib/systemd/system"
+ install -Dm 644 ${pkgname}.sysusers "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
+ install -Dm 644 ${pkgname}.tmpfiles "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
+
+ # 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"
+}
+
+# vim: ts=2 sw=2 et:
Copied: postgresql/repos/staging-x86_64/icu68.patch (from rev 404547, postgresql/trunk/icu68.patch)
===================================================================
--- staging-x86_64/icu68.patch (rev 0)
+++ staging-x86_64/icu68.patch 2020-12-19 07:06:36 UTC (rev 404548)
@@ -0,0 +1,17 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+collationcmds.c:467:51: error: use of undeclared identifier 'TRUE'
+ uloc_toLanguageTag(localename, buf, sizeof(buf), TRUE, &status);
+ ^
+
+--- src/backend/commands/collationcmds.c.orig 2020-09-21 20:47:36 UTC
++++ src/backend/commands/collationcmds.c
+@@ -464,7 +464,7 @@ get_icu_language_tag(const char *localename)
+ UErrorCode status;
+
+ status = U_ZERO_ERROR;
+- uloc_toLanguageTag(localename, buf, sizeof(buf), TRUE, &status);
++ uloc_toLanguageTag(localename, buf, sizeof(buf), true, &status);
+ if (U_FAILURE(status))
+ ereport(ERROR,
+ (errmsg("could not convert locale name \"%s\" to language tag: %s",
Copied: postgresql/repos/staging-x86_64/postgresql-check-db-dir (from rev 404547, postgresql/trunk/postgresql-check-db-dir)
===================================================================
--- staging-x86_64/postgresql-check-db-dir (rev 0)
+++ staging-x86_64/postgresql-check-db-dir 2020-12-19 07:06:36 UTC (rev 404548)
@@ -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=13
+# PREVMAJORVERSION is the previous major version
+PREVMAJORVERSION=12
+
+# 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-perl-rpath.patch (from rev 404547, postgresql/trunk/postgresql-perl-rpath.patch)
===================================================================
--- staging-x86_64/postgresql-perl-rpath.patch (rev 0)
+++ staging-x86_64/postgresql-perl-rpath.patch 2020-12-19 07:06:36 UTC (rev 404548)
@@ -0,0 +1,13 @@
+diff -Naur postgresql-9.1.5.orig/src/pl/plperl/GNUmakefile postgresql-9.1.5/src/pl/plperl/GNUmakefile
+--- postgresql-9.1.5.orig/src/pl/plperl/GNUmakefile 2012-08-14 18:41:04.000000000 -0400
++++ postgresql-9.1.5/src/pl/plperl/GNUmakefile 2012-08-17 11:15:09.457116708 -0400
+@@ -55,6 +55,9 @@
+
+ SHLIB_LINK = $(perl_embed_ldflags)
+
++# Force rpath to be used even though we disable it everywhere else
++SHLIB_LINK += $(rpath)
++
+ REGRESS_OPTS = --dbname=$(PL_TESTDB)
+ REGRESS = plperl_setup plperl plperl_lc plperl_trigger plperl_shared \
+ plperl_elog plperl_util plperl_init plperlu plperl_array \
Copied: postgresql/repos/staging-x86_64/postgresql-run-socket.patch (from rev 404547, postgresql/trunk/postgresql-run-socket.patch)
===================================================================
--- staging-x86_64/postgresql-run-socket.patch (rev 0)
+++ staging-x86_64/postgresql-run-socket.patch 2020-12-19 07:06:36 UTC (rev 404548)
@@ -0,0 +1,12 @@
+diff -upr postgresql-13.1.orig/src/include/pg_config_manual.h postgresql-13.1/src/include/pg_config_manual.h
+--- postgresql-13.1.orig/src/include/pg_config_manual.h 2020-11-10 00:24:30.000000000 +0200
++++ postgresql-13.1/src/include/pg_config_manual.h 2020-12-10 01:55:35.999605194 +0200
+@@ -201,7 +201,7 @@
+ * support them yet.
+ */
+ #ifndef WIN32
+-#define DEFAULT_PGSOCKET_DIR "/tmp"
++#define DEFAULT_PGSOCKET_DIR "/run/postgresql"
+ #else
+ #define DEFAULT_PGSOCKET_DIR ""
+ #endif
Copied: postgresql/repos/staging-x86_64/postgresql.logrotate (from rev 404547, postgresql/trunk/postgresql.logrotate)
===================================================================
--- staging-x86_64/postgresql.logrotate (rev 0)
+++ staging-x86_64/postgresql.logrotate 2020-12-19 07:06:36 UTC (rev 404548)
@@ -0,0 +1,4 @@
+/var/log/postgresql.log {
+ copytruncate
+ missingok
+}
Copied: postgresql/repos/staging-x86_64/postgresql.pam (from rev 404547, postgresql/trunk/postgresql.pam)
===================================================================
--- staging-x86_64/postgresql.pam (rev 0)
+++ staging-x86_64/postgresql.pam 2020-12-19 07:06:36 UTC (rev 404548)
@@ -0,0 +1,3 @@
+auth required pam_unix.so
+account required pam_unix.so
+session required pam_unix.so
Copied: postgresql/repos/staging-x86_64/postgresql.service (from rev 404547, postgresql/trunk/postgresql.service)
===================================================================
--- staging-x86_64/postgresql.service (rev 0)
+++ staging-x86_64/postgresql.service 2020-12-19 07:06:36 UTC (rev 404548)
@@ -0,0 +1,43 @@
+[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
+ProtectControlGroups=true
+ProtectKernelModules=true
+ProtectKernelTunables=true
+PrivateDevices=true
+RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
+RestrictNamespaces=true
+RestrictRealtime=true
+SystemCallArchitectures=native
+
+[Install]
+WantedBy=multi-user.target
Copied: postgresql/repos/staging-x86_64/postgresql.sysusers (from rev 404547, postgresql/trunk/postgresql.sysusers)
===================================================================
--- staging-x86_64/postgresql.sysusers (rev 0)
+++ staging-x86_64/postgresql.sysusers 2020-12-19 07:06:36 UTC (rev 404548)
@@ -0,0 +1 @@
+u postgres - "PostgreSQL user" /var/lib/postgres /bin/bash
Copied: postgresql/repos/staging-x86_64/postgresql.tmpfiles (from rev 404547, postgresql/trunk/postgresql.tmpfiles)
===================================================================
--- staging-x86_64/postgresql.tmpfiles (rev 0)
+++ staging-x86_64/postgresql.tmpfiles 2020-12-19 07:06:36 UTC (rev 404548)
@@ -0,0 +1,2 @@
+d /var/lib/postgres/data 700 postgres postgres
+h /var/lib/postgres/data - - - - +C
More information about the arch-commits
mailing list