summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO35
-rw-r--r--PKGBUILD138
2 files changed, 115 insertions, 58 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 97fe26196b0..eae94542331 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Fri Nov 16 04:11:43 UTC 2018
pkgbase = postgresql-1c
pkgdesc = Sophisticated object-relational DBMS
- pkgver = 10.3
- pkgrel = 3
+ pkgver = 10.5
+ pkgrel = 1
url = https://www.postgresql.org/
arch = x86_64
license = custom:PostgreSQL
@@ -15,22 +13,19 @@ pkgbase = postgresql-1c
makedepends = openssl>=1.0.0
makedepends = pam
makedepends = zlib
- source = https://ftp.postgresql.org/pub/source/v10.3/postgresql-10.3.tar.bz2
- source = http://www.r-s-v.ru/1c-patch/1c-patch.tgz
+ source = http://www.r-s-v.ru/1c-patch/postgresql10-1c-10.5-24.el7.src.rpm
source = postgresql-run-socket.patch
source = postgresql.pam
source = postgresql.logrotate
source = postgresql.service
source = postgresql-check-db-dir
- sha256sums = 6ea268780ee35e88c65cdb0af7955ad90b7d0ef34573867f223f14e43467931a
- sha256sums = cb5524cca3acf3775e18f5c2844baba4f39ff3f037614c17e90b5c3ac20b47fa
+ sha256sums = c1343254023d07668056010eb785121954167f5c1acd15c801481b6dfa0ff127
sha256sums = 8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9
sha256sums = 57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5
sha256sums = 6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e
sha256sums = b48fe97f8e43ed0d2041d519119a4dafb70fcae72870951bf4fb7350fe169ac8
sha256sums = 888a1d44f03fccfa4bf344ee45824fefb846ae3c1c0c40113ad6020b4be3b0cf
- sha512sums = 05cf82d3483bdf38734e6ff0fef6b80e7f8fd3cb5ea6792ffe222a599d97d1a29638970bf28ebf5bd1f877e8dcd9986d88f5c5e5379e74fe79ce83e20d2babba
- sha512sums = 97b25013d5a31211c9bacd641de6f9638cbe4bcc831298eaff0587f4c439cfb5bb294231dc9d3dec90fa51d976885ae3f90e6b08bb397598f40c5e9f364ca471
+ sha512sums = 79151d2fdce69a1a4f6ffc3288d58d7bab8fad9c8f193d0f95941a2590fc6aa40ccf40734868aac8de05ba2a385a8ecdee7d0c162f42a31092ee9b5c341de329
sha512sums = 031efe12d18ce386989062327cdbbe611c5ef1f94e4e1bead502304cb3e2d410af533d3c7f1109d24f9da9708214fe32f9a10ba373a3ca8d507bdb521fbb75f7
sha512sums = 1e6183ab0eb812b3ef687ac2c26ce78f7cb30540f606d20023669ac00ba04075487fb72e4dc89cc05dab0269ff6aca98fc1167cc75669c225b88b592482fbf67
sha512sums = 9ab4da01337ffbab8faec0e220aaa2a642dbfeccf7232ef2645bdc2177a953f17ee3cc14a4d8f8ebd064e1dae8b3dba6029adbffb8afaabea383963213941ba8
@@ -43,27 +38,37 @@ pkgname = postgresql-libs-1c
depends = openssl>=1.0.0
depends = readline>=6.0
depends = zlib
+ depends = libldap
provides = postgresql-client
- provides = postgresql-libs=10.3.3
+ provides = postgresql-libs=10.5
conflicts = postgresql-client
conflicts = postgresql-libs
pkgname = postgresql-1c
pkgdesc = Sophisticated object-relational DBMS
install = postgresql.install
- depends = postgresql-libs-1c>=10.3
+ depends = postgresql-libs>=10.5
depends = krb5
depends = libxml2
depends = readline>=6.0
depends = openssl>=1.0.0
depends = pam
- optdepends = python2: for PL/Python support
+ depends = icu
+ depends = libsystemd
+ depends = libldap
+ optdepends = python2: for PL/Python 2 support
+ optdepends = python: for PL/Python 3 support
optdepends = perl: for PL/Perl support
optdepends = tcl: for PL/Tcl support
- optdepends = postgresql-old-upgrade: upgrade from previous major version using pg_upgrade
- provides = postgresql
+ provides = postgresql=10.5
conflicts = postgresql
options = staticlibs
backup = etc/pam.d/postgresql
backup = etc/logrotate.d/postgresql
+pkgname = postgresql-docs-1c
+ pkgdesc = HTML documentation for PostgreSQL
+ provides = postgresql-docs=10.5
+ conflicts = postgresql-docs
+ options = docs
+
diff --git a/PKGBUILD b/PKGBUILD
index ba244496e9d..2229c4fafd4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,31 +2,28 @@
# Contributor: Ivan Agarkov <ivan.agarkov@gmail.com>
pkgbase=postgresql-1c
-pkgname=('postgresql-libs-1c' 'postgresql-1c')
-pkgver=10.3
+pkgname=('postgresql-libs-1c' 'postgresql-1c' 'postgresql-docs-1c')
+pkgver=10.5
_majorver=${pkgver%.*}
-pkgrel=3
+pkgrel=1
pkgdesc='Sophisticated object-relational DBMS'
url='https://www.postgresql.org/'
arch=('x86_64')
license=('custom:PostgreSQL')
makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl>=8.6.0' 'openssl>=1.0.0' 'pam' 'zlib')
-source=(https://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2
- http://www.r-s-v.ru/1c-patch/1c-patch.tgz
+source=(http://www.r-s-v.ru/1c-patch/postgresql10-1c-10.5-24.el7.src.rpm
postgresql-run-socket.patch
postgresql.pam
postgresql.logrotate
postgresql.service
postgresql-check-db-dir)
-sha256sums=('6ea268780ee35e88c65cdb0af7955ad90b7d0ef34573867f223f14e43467931a'
- 'cb5524cca3acf3775e18f5c2844baba4f39ff3f037614c17e90b5c3ac20b47fa'
+sha256sums=('c1343254023d07668056010eb785121954167f5c1acd15c801481b6dfa0ff127'
'8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9'
'57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
'6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e'
'b48fe97f8e43ed0d2041d519119a4dafb70fcae72870951bf4fb7350fe169ac8'
'888a1d44f03fccfa4bf344ee45824fefb846ae3c1c0c40113ad6020b4be3b0cf')
-sha512sums=('05cf82d3483bdf38734e6ff0fef6b80e7f8fd3cb5ea6792ffe222a599d97d1a29638970bf28ebf5bd1f877e8dcd9986d88f5c5e5379e74fe79ce83e20d2babba'
- '97b25013d5a31211c9bacd641de6f9638cbe4bcc831298eaff0587f4c439cfb5bb294231dc9d3dec90fa51d976885ae3f90e6b08bb397598f40c5e9f364ca471'
+sha512sums=('79151d2fdce69a1a4f6ffc3288d58d7bab8fad9c8f193d0f95941a2590fc6aa40ccf40734868aac8de05ba2a385a8ecdee7d0c162f42a31092ee9b5c341de329'
'031efe12d18ce386989062327cdbbe611c5ef1f94e4e1bead502304cb3e2d410af533d3c7f1109d24f9da9708214fe32f9a10ba373a3ca8d507bdb521fbb75f7'
'1e6183ab0eb812b3ef687ac2c26ce78f7cb30540f606d20023669ac00ba04075487fb72e4dc89cc05dab0269ff6aca98fc1167cc75669c225b88b592482fbf67'
'9ab4da01337ffbab8faec0e220aaa2a642dbfeccf7232ef2645bdc2177a953f17ee3cc14a4d8f8ebd064e1dae8b3dba6029adbffb8afaabea383963213941ba8'
@@ -34,41 +31,72 @@ sha512sums=('05cf82d3483bdf38734e6ff0fef6b80e7f8fd3cb5ea6792ffe222a599d97d1a2963
'56974ef34a8d94596068413154b1a7ed5a71f5a3942bd79427f05e6f6b7853036874dedd8d988bb94306023f2a675996d500b075eaf8a192ef5c24026eb28eb0')
prepare() {
- cd postgresql-${pkgver}
- patch -p1 < ../postgresql-run-socket.patch
- patch -p1 < ../00001-1c_FULL_100_EXT.patch
- patch -p1 < ../00002-online_analyze.patch
- patch -p1 < ../00003-plantuner.patch
- patch -p1 < ../00004-postgresql-1c-10.patch
- patch -p1 < ../00005-coalesce_cost.patch
- patch -p1 < ../00006-pg_receivewal.patch
+ tar -xvf postgresql-${pkgver}.tar.bz2
+ cd postgresql-${pkgver}
+ patch -p1 < ../postgresql-run-socket.patch
+ patch -p1 < ../00001-1c_FULL_100_EXT.patch
+ patch -p1 < ../00002-online_analyze.patch
+ patch -p1 < ../00003-plantuner.patch
+ patch -p1 < ../00004-postgresql-1c-10.patch
+ patch -p1 < ../00005-coalesce_cost.patch
+ patch -p1 < ../00006-pg_receivewal.patch
+ patch -p1 < ../00007-remove_selfjoin.patch
+ patch -p1 < ../00008-planner_timing.patch
+ patch -p1 < ../00009-opt_group_by_and_cost_sort.patch
+ patch -p1 < ../00010-joinsel.patch
+ patch -p1 < ../00011-max_files_per_process.patch
+ patch -p1 < ../00012-index_getattr_optimization.patch
}
build() {
cd postgresql-${pkgver}
- ./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 \
+ 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-1c() {
pkgdesc="Libraries for use with PostgreSQL"
- depends=('krb5' 'openssl>=1.0.0' 'readline>=6.0' 'zlib')
- provides=('postgresql-client' 'postgresql-libs=10.3.3')
+ depends=('krb5' 'openssl>=1.0.0' 'readline>=6.0' 'zlib' 'libldap')
+ provides=('postgresql-client' "postgresql-libs=$pkgver")
conflicts=('postgresql-client' 'postgresql-libs')
cd postgresql-${pkgver}
@@ -88,7 +116,7 @@ package_postgresql-libs-1c() {
cd src/include
- mkdir -p "${pkgdir}"/usr/include/{libpq,postgresql/internal/libpq}
+ 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"
@@ -105,16 +133,33 @@ package_postgresql-libs-1c() {
install -m 644 libpq/pqcomm.h "${pkgdir}/usr/include/postgresql/internal/libpq"
}
+package_postgresql-docs-1c() {
+ pkgdesc="HTML documentation for PostgreSQL"
+ options=('docs')
+ provides=("postgresql-docs=$pkgver")
+ conflicts=('postgresql-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-1c() {
pkgdesc='Sophisticated object-relational DBMS'
backup=('etc/pam.d/postgresql' 'etc/logrotate.d/postgresql')
- depends=("postgresql-libs-1c>=${pkgver}" 'krb5' 'libxml2' 'readline>=6.0' 'openssl>=1.0.0' 'pam')
- optdepends=('python2: for PL/Python support'
+ 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')
- provides=('postgresql')
+ 'tcl: for PL/Tcl support')
+ provides=("postgresql=$pkgver")
conflicts=('postgresql')
options=('staticlibs')
install=postgresql.install
@@ -126,6 +171,14 @@ package_postgresql-1c() {
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
@@ -135,9 +188,6 @@ package_postgresql-1c() {
rm "${pkgdir}"/usr/share/man/man1/${util}.1
done
- # install license
- install -Dm 644 COPYRIGHT -t "${pkgdir}/usr/share/licenses/${pkgname}"
-
# clean up unneeded installed items
rm -rf "${pkgdir}/usr/include/postgresql/internal"
rm -rf "${pkgdir}/usr/include/libpq"
@@ -149,4 +199,6 @@ package_postgresql-1c() {
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}"
}