This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, rel_3_14 has been updated via 580b5ceac530fbbfda700e5b895d11573ba7739c (commit) via 2c8f2aca86ee7c4812e494da64974ad69070942a (commit) from 837b63151b4d943efd675e8161faed0b2435285c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 580b5ceac530fbbfda700e5b895d11573ba7739c Author: Jason Boyer <> Date: Mon Feb 3 15:29:17 2025 -0500 LP2097308: Use PostgreSQL apt archive when necessary Debian Buster has been moved to PostgreSQL's apt archive and removed from the primary repo. This will break fresh installs as the pgdg repo can't be added correctly. This patch will allow buster installations to work again and can be used as a template when other Debian PostgreSQL packages are archived before we stop supporting them. Signed-off-by: Jason Boyer <JBoyer@equinoxOLI.org> Signed-off-by: Chris Sharp <csharp@georgialibraries.org> diff --git a/Open-ILS/src/extras/install/Makefile.debian b/Open-ILS/src/extras/install/Makefile.debian index 9f3223b788..2aeb5cc18b 100644 --- a/Open-ILS/src/extras/install/Makefile.debian +++ b/Open-ILS/src/extras/install/Makefile.debian @@ -33,11 +33,17 @@ debian_sys_config: # Adding this for installing versions from PostgreSQL community apt source debian_postgresql_repo: - if test -z "$$(grep -R apt.postgresql.org /etc/apt/)" ; then \ + if test -z "$$(grep -R postgresql.org /etc/apt/)" ; then \ mkdir -p --mode 0755 /etc/apt/keyrings ; \ - echo "deb [signed-by=/etc/apt/keyrings/pgdg.asc] http://apt.postgresql.org/pub/repos/apt/ $(RELEASE_CODENAME)-pgdg main" \ - > /etc/apt/sources.list.d/pgdg.list; \ wget --quiet -O /etc/apt/keyrings/pgdg.asc https://www.postgresql.org/media/keys/ACCC4CF8.asc ; \ + if test "$(RELEASE_CODENAME)" = "buster" ; then \ + $(APT_TOOL) install apt-transport-https ; \ + echo "deb [signed-by=/etc/apt/trusted.gpg.d/pgdg.asc] https://apt-archive.postgresql.org/pub/repos/apt/ $(RELEASE_CODENAME)-pgdg main" \ + > /etc/apt/sources.list.d/pgdg.list; \ + else \ + echo "deb [signed-by=/etc/apt/keyrings/pgdg.asc] http://apt.postgresql.org/pub/repos/apt/ $(RELEASE_CODENAME)-pgdg main" \ + > /etc/apt/sources.list.d/pgdg.list; \ + fi ; \ $(APT_TOOL) update ; \ fi commit 2c8f2aca86ee7c4812e494da64974ad69070942a Author: Jason Boyer <> Date: Mon Feb 3 16:23:48 2025 -0500 LP2097313: Keep PostgreSQL's key in another pocket It's not considered good practice to use /etc/apt/trusted.gpg.d/ to store locally managed keys because this causes them to be trusted to sign any package in any repository. For our use-case (see [1]) /etc/apt/keyrings is preferred. [1] https://wiki.debian.org/DebianRepository/UseThirdParty#line-16 Signed-off-by: Jason Boyer <JBoyer@equinoxOLI.org> Signed-off-by: Chris Sharp <csharp@georgialibraries.org> diff --git a/Open-ILS/src/extras/install/Makefile.debian b/Open-ILS/src/extras/install/Makefile.debian index bc427ecc4c..9f3223b788 100644 --- a/Open-ILS/src/extras/install/Makefile.debian +++ b/Open-ILS/src/extras/install/Makefile.debian @@ -34,9 +34,10 @@ debian_sys_config: # Adding this for installing versions from PostgreSQL community apt source debian_postgresql_repo: if test -z "$$(grep -R apt.postgresql.org /etc/apt/)" ; then \ - echo "deb [signed-by=/etc/apt/trusted.gpg.d/pgdg.asc] http://apt.postgresql.org/pub/repos/apt/ $(RELEASE_CODENAME)-pgdg main" \ + mkdir -p --mode 0755 /etc/apt/keyrings ; \ + echo "deb [signed-by=/etc/apt/keyrings/pgdg.asc] http://apt.postgresql.org/pub/repos/apt/ $(RELEASE_CODENAME)-pgdg main" \ > /etc/apt/sources.list.d/pgdg.list; \ - wget --quiet -O /etc/apt/trusted.gpg.d/pgdg.asc https://www.postgresql.org/media/keys/ACCC4CF8.asc ; \ + wget --quiet -O /etc/apt/keyrings/pgdg.asc https://www.postgresql.org/media/keys/ACCC4CF8.asc ; \ $(APT_TOOL) update ; \ fi ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/extras/install/Makefile.debian | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) hooks/post-receive -- Evergreen ILS