From 75c6dd10c8887318d24436a1978203ef13dff23c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 10 Nov 2023 12:05:45 +0100 Subject: [PATCH] postgresql15: update to 15.5. --- srcpkgs/postgresql15/files/profile.sh | 14 -------- srcpkgs/postgresql15/template | 47 +++++++++++++++++++++++---- 2 files changed, 41 insertions(+), 20 deletions(-) delete mode 100644 srcpkgs/postgresql15/files/profile.sh diff --git a/srcpkgs/postgresql15/files/profile.sh b/srcpkgs/postgresql15/files/profile.sh deleted file mode 100644 index 54be2ca50a4..00000000000 --- a/srcpkgs/postgresql15/files/profile.sh +++ /dev/null @@ -1,14 +0,0 @@ -appendpath () { - case ":$PATH:" in - *:"$1":*) - ;; - *) - PATH="${PATH:+$PATH:}$1" - esac -} - -appendpath '/@PREFIX@/bin' - -unset appendpath - -export PATH diff --git a/srcpkgs/postgresql15/template b/srcpkgs/postgresql15/template index e076f4dd9ae..46b75145ae1 100644 --- a/srcpkgs/postgresql15/template +++ b/srcpkgs/postgresql15/template @@ -1,6 +1,6 @@ # Template file for 'postgresql15' pkgname=postgresql15 -version=15.4 +version=15.5 revision=1 build_style=gnu-configure make_build_target=world @@ -21,7 +21,7 @@ license="PostgreSQL" homepage="https://www.postgresql.org" changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html" distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2" -checksum=baec5a4bdc4437336653b6cb5d9ed89be5bd5c0c58b94e0becee0a999e63c8f9 +checksum=8f53aa95d78eb8e82536ea46b68187793b42bba3b4f65aa342f540b23c9b10a6 make_check=ci-skip # Postgres server can't be run as root conf_files=" @@ -29,6 +29,27 @@ conf_files=" /${_sysconfdir}/pam.d/postgresql /${_sysconfdir}/postgresql/postgresql.conf " +alternatives=" + postgresql:/usr/bin/initdb:/usr/lib/psql15/bin/initdb + postgresql:/usr/bin/pg_amchec:/usr/lib/psql15/bin/pg_amcheck + postgresql:/usr/bin/pg_archivecleanup:/usr/lib/psql15/bin/pg_archivecleanup + postgresql:/usr/bin/pg_basebackup:/usr/lib/psql15/bin/pg_basebackup + postgresql:/usr/bin/pg_checksums:/usr/lib/psql15/bin/pg_checksums + postgresql:/usr/bin/pg_controldata:/usr/lib/psql15/bin/pg_controldata + postgresql:/usr/bin/pg_ctl:/usr/lib/psql15/bin/pg_ctl + postgresql:/usr/bin/pg_receivewal:/usr/lib/psql15/bin/pg_receivewal + postgresql:/usr/bin/pg_recvlogical:/usr/lib/psql15/bin/pg_recvlogical + postgresql:/usr/bin/pg_resetwal:/usr/lib/psql15/bin/pg_resetwal + postgresql:/usr/bin/pg_rewind:/usr/lib/psql15/bin/pg_rewind + postgresql:/usr/bin/pg_test_fsync:/usr/lib/psql15/bin/pg_test_fsync + postgresql:/usr/bin/pg_test_timing:/usr/lib/psql15/bin/pg_test_timing + postgresql:/usr/bin/pg_upgrade:/usr/lib/psql15/bin/pg_upgrade + postgresql:/usr/bin/pg_verifybackup:/usr/lib/psql15/bin/pg_verifybackup + postgresql:/usr/bin/pg_waldump:/usr/lib/psql15/bin/pg_waldump + postgresql:/usr/bin/pgbench:/usr/lib/psql15/bin/pgbench + postgresql:/usr/bin/postgres:/usr/lib/psql15/bin/postgres + postgresql:/usr/bin/postmaster:/usr/lib/psql15/bin/postmaster +" # Create 'postgres' user for the server. system_accounts="postgres" @@ -84,8 +105,6 @@ post_install() { find "${DESTDIR}/etc/sv" -type f -exec sed -i -e s:@VERSION@:${_major}: -e s:@PREFIX@:${_prefix}: '{}' ';' vlicense COPYRIGHT - vinstall ${FILESDIR}/profile.sh 644 etc/profile.d ${pkgname}.sh - _substitute ${DESTDIR}/etc/profile.d/${pkgname}.sh vinstall ${FILESDIR}/postgresql.confd 644 ${_sysconfdir}/default postgresql _substitute ${DESTDIR}/${_sysconfdir}/default/postgresql vinstall ${FILESDIR}/postgresql.pam 644 ${_sysconfdir}/pam.d postgresql @@ -193,6 +212,20 @@ fi # !CROSS_BUILD postgresql15-client_package() { short_desc="Client frontends programs for PostgreSQL" + alternatives=" + postgresql-client:/usr/bin/clusterdb:/usr/lib/psql15/bin/clusterdb + postgresql-client:/usr/bin/createdb:/usr/lib/psql15/bin/createdb + postgresql-client:/usr/bin/createuser:/usr/lib/psql15/bin/createuser + postgresql-client:/usr/bin/dropdb:/usr/lib/psql15/bin/dropdb + postgresql-client:/usr/bin/dropuser:/usr/lib/psql15/bin/dropuser + postgresql-client:/usr/bin/pg_dump:/usr/lib/psql15/bin/pg_dump + postgresql-client:/usr/bin/pg_dumpall:/usr/lib/psql15/bin/pg_dumpall + postgresql-client:/usr/bin/pg_isready:/usr/lib/psql15/bin/pg_isready + postgresql-client:/usr/bin/pg_restore:/usr/lib/psql15/bin/pg_restore + postgresql-client:/usr/bin/psql:/usr/lib/psql15/bin/psql + postgresql-client:/usr/bin/reindexdb:/usr/lib/psql15/bin/reindexdb + postgresql-client:/usr/bin/vacuumdb:/usr/lib/psql15/bin/vacuumdb + " pkg_install() { for f in clusterdb createdb createuser dropdb \ dropuser pg_dump pg_dumpall pg_isready pg_restore psql reindexdb \ @@ -210,12 +243,14 @@ postgresql15-client_package() { done mv ${DESTDIR}/${_prefix}/share/postgresql/psqlrc.* \ ${PKGDESTDIR}/${_prefix}/share - vinstall ${FILESDIR}/profile.sh 644 etc/profile.d ${pkgname}.sh - _substitute ${PKGDESTDIR}/etc/profile.d/${pkgname}.sh } } postgresql15-contrib_package() { + alternatives=" + postgresql-contrib:/usr/bin/oid2name:/usr/lib/psql15/bin/oid2name + postgresql-contrib:/usr/bin/vacuumlo:/usr/lib/psql15/bin/vacuumlo + " short_desc="PostgreSQL contributed programs and extensions" pkg_install() { make -C contrib install DESTDIR=${PKGDESTDIR}