From 844e354acd247bebab171a1f645c8480046cacf2 Mon Sep 17 00:00:00 2001 From: Keenan Brock Date: Fri, 22 Oct 2021 12:35:53 -0400 Subject: [PATCH 01/12] declare rpm dependencies for creating user We create a manageiq user to properly setup permissions as the manageiq (non-root) user --- rpm_spec/subpackages/manageiq-core | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rpm_spec/subpackages/manageiq-core b/rpm_spec/subpackages/manageiq-core index 43073548..a24908c9 100644 --- a/rpm_spec/subpackages/manageiq-core +++ b/rpm_spec/subpackages/manageiq-core @@ -16,6 +16,8 @@ Requires: net-snmp Requires: net-snmp-libs Requires: net-snmp-utils Requires: socat +Requires: core-utils # rpm %pre calls uses id +Requires: shadow-utils # rpm %pre calls uses useradd %description core %{product_summary} Core From 437880f1dba8e8390239a01cbf1332c28d52ffd3 Mon Sep 17 00:00:00 2001 From: Jason Frey Date: Sat, 12 Aug 2023 14:23:33 -0400 Subject: [PATCH 02/12] Changes after new branch quinteros --- Dockerfile | 2 +- config/options.yml | 12 +++--- .../manageiq-17-quinteros.repo | 41 ------------------- .../manageiq-18-radjabov.repo | 41 +++++++++++++++++++ .../manageiq-release/manageiq-release.spec | 7 +++- rpm_spec/changelog | 3 ++ 6 files changed, 56 insertions(+), 50 deletions(-) delete mode 100644 packages/manageiq-release/manageiq-17-quinteros.repo create mode 100644 packages/manageiq-release/manageiq-18-radjabov.repo diff --git a/Dockerfile b/Dockerfile index b6586b47..3e162f48 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ RUN ARCH=$(uname -m) && \ http://mirror.centos.org/centos/8-stream/BaseOS/${ARCH}/os/Packages/centos-gpg-keys-8-2.el8.noarch.rpm ; fi && \ dnf -y install \ https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm \ - https://rpm.manageiq.org/release/17-quinteros/el8/noarch/manageiq-release-17.0-1.el8.noarch.rpm && \ + https://rpm.manageiq.org/release/18-radjabov/el8/noarch/manageiq-release-18.0-1.el8.noarch.rpm && \ dnf -y module enable ruby:3.0 && \ dnf -y module enable nodejs:18 && \ dnf -y module disable virt:rhel && \ diff --git a/config/options.yml b/config/options.yml index 64ae2a51..2c691141 100644 --- a/config/options.yml +++ b/config/options.yml @@ -14,7 +14,7 @@ repos: version: release: rpm: - version: 17.0.0 + version: 18.0.0 release: 0 repo_name: org_name: manageiq @@ -36,15 +36,15 @@ rpm_repository: - s390x - x86_64 :content: - :17-quinteros: + :18-radjabov: :targets: - el8 - el9 :rpms: :ansible: !ruby/regexp /.+-5\.4.+/ :kafka: !ruby/regexp /.+-3\.3.+/ - :manageiq: !ruby/regexp /.+-17\.\d\.\d-(alpha|beta|rc)?\d(\.\d)?\.el.+/ - :manageiq-release: !ruby/regexp /.+-17\.0.+/ + :manageiq: !ruby/regexp /.+-18\.\d\.\d-(alpha|beta|rc)?\d(\.\d)?\.el.+/ + :manageiq-release: !ruby/regexp /.+-18\.0.+/ :postgresql: !ruby/regexp /.+-10\.21.+/ :python-bambou: !ruby/regexp /.+-3\.1\.1.+/ :python-pylxca: !ruby/regexp /.+-2\.1\.1.+/ @@ -53,9 +53,9 @@ rpm_repository: :qpid-proton: !ruby/regexp /.+-0\.30\.0.+/ :repmgr13: !ruby/regexp /.+-5\.2\.1.+/ :wmi: !ruby/regexp /.+-1\.3\.14.+/ - :17-quinteros-nightly: + :18-radjabov-nightly: :targets: - el8 - el9 :rpms: - :manageiq-nightly: !ruby/regexp /.+-17\.\d\.\d-(\d\.\d\.)?\d{14,}+\.el.+/ + :manageiq-nightly: !ruby/regexp /.+-18\.\d\.\d-(\d\.\d\.)?\d{14,}+\.el.+/ diff --git a/packages/manageiq-release/manageiq-17-quinteros.repo b/packages/manageiq-release/manageiq-17-quinteros.repo deleted file mode 100644 index 9d67779a..00000000 --- a/packages/manageiq-release/manageiq-17-quinteros.repo +++ /dev/null @@ -1,41 +0,0 @@ -[manageiq-17-quinteros] -name=ManageIQ 17 (Quinteros) Release - $basearch -baseurl=https://rpm.manageiq.org/release/17-quinteros/el$releasever/$basearch -enabled=1 -gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MANAGEIQ - -[manageiq-17-quinteros-noarch] -name=ManageIQ 17 (Quinteros) Release - noarch -baseurl=https://rpm.manageiq.org/release/17-quinteros/el$releasever/noarch -enabled=1 -gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MANAGEIQ - -[manageiq-17-quinteros-source] -name=ManageIQ 17 (Quinteros) Release - source -baseurl=https://rpm.manageiq.org/release/17-quinteros/el$releasever/src -enabled=0 -gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MANAGEIQ - -[manageiq-17-quinteros-nightly] -name=ManageIQ 17 (Quinteros) Nightly - $basearch -baseurl=https://rpm.manageiq.org/release/17-quinteros-nightly/el$releasever/$basearch -enabled=0 -gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MANAGEIQ - -[manageiq-17-quinteros-nightly-noarch] -name=ManageIQ 17 (Quinteros) Nightly - noarch -baseurl=https://rpm.manageiq.org/release/17-quinteros-nightly/el$releasever/noarch -enabled=0 -gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MANAGEIQ - -[manageiq-17-quinteros-nightly-source] -name=ManageIQ 17 (Quinteros) Nightly - source -baseurl=https://rpm.manageiq.org/release/17-quinteros-nightly/el$releasever/src -enabled=0 -gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MANAGEIQ diff --git a/packages/manageiq-release/manageiq-18-radjabov.repo b/packages/manageiq-release/manageiq-18-radjabov.repo new file mode 100644 index 00000000..1f9ee48c --- /dev/null +++ b/packages/manageiq-release/manageiq-18-radjabov.repo @@ -0,0 +1,41 @@ +[manageiq-18-radjabov] +name=ManageIQ 18 (Radjabov) Release - $basearch +baseurl=https://rpm.manageiq.org/release/18-radjabov/el$releasever/$basearch +enabled=1 +gpgcheck=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MANAGEIQ + +[manageiq-18-radjabov-noarch] +name=ManageIQ 18 (Radjabov) Release - noarch +baseurl=https://rpm.manageiq.org/release/18-radjabov/el$releasever/noarch +enabled=1 +gpgcheck=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MANAGEIQ + +[manageiq-18-radjabov-source] +name=ManageIQ 18 (Radjabov) Release - source +baseurl=https://rpm.manageiq.org/release/18-radjabov/el$releasever/src +enabled=0 +gpgcheck=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MANAGEIQ + +[manageiq-18-radjabov-nightly] +name=ManageIQ 18 (Radjabov) Nightly - $basearch +baseurl=https://rpm.manageiq.org/release/18-radjabov-nightly/el$releasever/$basearch +enabled=0 +gpgcheck=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MANAGEIQ + +[manageiq-18-radjabov-nightly-noarch] +name=ManageIQ 18 (Radjabov) Nightly - noarch +baseurl=https://rpm.manageiq.org/release/18-radjabov-nightly/el$releasever/noarch +enabled=0 +gpgcheck=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MANAGEIQ + +[manageiq-18-radjabov-nightly-source] +name=ManageIQ 18 (Radjabov) Nightly - source +baseurl=https://rpm.manageiq.org/release/18-radjabov-nightly/el$releasever/src +enabled=0 +gpgcheck=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MANAGEIQ diff --git a/packages/manageiq-release/manageiq-release.spec b/packages/manageiq-release/manageiq-release.spec index 840018b6..0310c5b6 100644 --- a/packages/manageiq-release/manageiq-release.spec +++ b/packages/manageiq-release/manageiq-release.spec @@ -1,11 +1,11 @@ Name: manageiq-release -Version: 17.0 +Version: 18.0 Release: 1%{dist} Summary: ManageIQ RPM repository configuration License: Apache-2.0 URL: https://rpm.manageiq.org/release/ Source0: RPM-GPG-KEY-MANAGEIQ -Source1: manageiq-17-quinteros.repo +Source1: manageiq-18-radjabov.repo BuildArch: noarch %description @@ -36,6 +36,9 @@ rm -rf $RPM_BUILD_ROOT /etc/pki/rpm-gpg/* %changelog +* Sat Aug 12 2023 Jason Frey - 18.0-1%{dist} +- Initial build of manageiq-release for Radjabov. + * Thu Feb 16 2023 Jason Frey - 17.0-1%{dist} - Initial build of manageiq-release for Quinteros. diff --git a/rpm_spec/changelog b/rpm_spec/changelog index c1a0a529..54123944 100644 --- a/rpm_spec/changelog +++ b/rpm_spec/changelog @@ -1,4 +1,7 @@ %changelog +* Sat Aug 12 2023 Jason Frey - 18.0.0-1 +- Initial build of manageiq-release for Radjabov. + * Thu Feb 16 2023 Jason Frey - 17.0.0-1 - Initial build of manageiq-release for Quinteros. From c87a3b481fa954ff6c8d28efe592fc6107bac926 Mon Sep 17 00:00:00 2001 From: Brandon Dunne Date: Thu, 24 Aug 2023 13:59:40 -0400 Subject: [PATCH 03/12] Fix RPM spec require parsing issue ---> rpmbuild -ba --define '_sourcedir /root/BUILD/rpm_spec' --define '_srcrpmdir /root/BUILD/rpms/x86_64' --define '_rpmdir /root/BUILD/rpms' manageiq.spec error: line 307: Dependency tokens must begin with alpha-numeric, '_' or '/': Requires: core-utils # rpm %pre calls uses id --- rpm_spec/subpackages/manageiq-core | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/rpm_spec/subpackages/manageiq-core b/rpm_spec/subpackages/manageiq-core index a24908c9..2d746ce7 100644 --- a/rpm_spec/subpackages/manageiq-core +++ b/rpm_spec/subpackages/manageiq-core @@ -16,8 +16,12 @@ Requires: net-snmp Requires: net-snmp-libs Requires: net-snmp-utils Requires: socat -Requires: core-utils # rpm %pre calls uses id -Requires: shadow-utils # rpm %pre calls uses useradd + +# rpm %pre uses id +Requires: core-utils + +# rpm %pre uses useradd +Requires: shadow-utils %description core %{product_summary} Core From 6ac42433a33962f9925c5e2e4b838e4a8ab208b5 Mon Sep 17 00:00:00 2001 From: Brandon Dunne Date: Mon, 28 Aug 2023 12:08:13 -0400 Subject: [PATCH 04/12] core-utils is coreutils on appliances and coreutils-single on containers The two packages conflict with each other, so we have to specify an OR on the requires --- rpm_spec/subpackages/manageiq-core | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm_spec/subpackages/manageiq-core b/rpm_spec/subpackages/manageiq-core index 2d746ce7..d4d71271 100644 --- a/rpm_spec/subpackages/manageiq-core +++ b/rpm_spec/subpackages/manageiq-core @@ -17,8 +17,8 @@ Requires: net-snmp-libs Requires: net-snmp-utils Requires: socat -# rpm %pre uses id -Requires: core-utils +# rpm %pre uses id (appliance or containers) +Requires: (coreutils or coreutils-single) # rpm %pre uses useradd Requires: shadow-utils From 5160dc2509bbbac40b7595b9252f9c1cd3532790 Mon Sep 17 00:00:00 2001 From: Adam Grare Date: Mon, 28 Aug 2023 15:00:29 -0400 Subject: [PATCH 05/12] Add subuid/subgid for the manageiq user Allow running non-root containers by setting subuid/gid maps for the manageiq user. --- rpm_spec/subpackages/manageiq-appliance | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rpm_spec/subpackages/manageiq-appliance b/rpm_spec/subpackages/manageiq-appliance index b3031677..f30df958 100644 --- a/rpm_spec/subpackages/manageiq-appliance +++ b/rpm_spec/subpackages/manageiq-appliance @@ -61,6 +61,11 @@ Requires: cockpit-ws %description appliance %{product_summary} Appliance +%pre appliance +# Add sub uids/gids for running non-privileged containers +grep manageiq /etc/subuid >/dev/null 2>&1 || /usr/sbin/usermod --add-subuids 100000-165535 manageiq +grep manageiq /etc/subgid >/dev/null 2>&1 || /usr/sbin/usermod --add-subgids 100000-165535 manageiq + %posttrans appliance %{_bindir}/systemctl try-restart evmserverd.service From 992f1ab536c70cebadb19d72523f0685e8163b50 Mon Sep 17 00:00:00 2001 From: Brandon Dunne Date: Mon, 28 Aug 2023 17:28:33 -0400 Subject: [PATCH 06/12] Lock down to UBI 8.8-1032 /etc/yum.repos.d/ubi.repo is missing from registry.redhat.io/ubi8:8.8-1032.1692772289(latest) for PPC64le latest minimal, micro and s2i-core are fine RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=2233877 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3e162f48..14f29e5b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi8/ubi +FROM registry.access.redhat.com/ubi8/ubi:8.8-1032 ENV TERM=xterm \ APPLIANCE=true \ From 2910a6eec9f6ad47563a2605551999a62ff9038f Mon Sep 17 00:00:00 2001 From: Jason Frey Date: Mon, 18 Sep 2023 11:12:41 -0400 Subject: [PATCH 07/12] Update actions/checkout version to v4 --- .github/workflows/build_rpms.yaml | 4 ++-- .github/workflows/ci.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_rpms.yaml b/.github/workflows/build_rpms.yaml index fc2406a6..272cc570 100644 --- a/.github/workflows/build_rpms.yaml +++ b/.github/workflows/build_rpms.yaml @@ -10,7 +10,7 @@ jobs: if: github.repository_owner == 'ManageIQ' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up registry credentials run: | echo "REGISTRY_USERNAME=${{ secrets.DOCKER_REGISTRY_USERNAME }}" >> $GITHUB_ENV @@ -22,7 +22,7 @@ jobs: if: github.repository_owner == 'ManageIQ' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up registry credentials run: | echo "REGISTRY_USERNAME=${{ secrets.DOCKER_REGISTRY_USERNAME }}" >> $GITHUB_ENV diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index dab99eda..74845f33 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -15,7 +15,7 @@ jobs: - '2.7' - '3.0' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: @@ -28,6 +28,6 @@ jobs: needs: ci runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build RPM build image run: bin/build_container_image From 2a43121d43468f7bfb6cd0bbf9fb583a5d6b020c Mon Sep 17 00:00:00 2001 From: Jason Frey Date: Mon, 18 Sep 2023 12:59:27 -0400 Subject: [PATCH 08/12] Remove yarn1 hack now that yarn4 works on s390x --- lib/manageiq/rpm_build/generate_core.rb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/manageiq/rpm_build/generate_core.rb b/lib/manageiq/rpm_build/generate_core.rb index d00a94a9..b90b553d 100644 --- a/lib/manageiq/rpm_build/generate_core.rb +++ b/lib/manageiq/rpm_build/generate_core.rb @@ -56,15 +56,10 @@ def build_service_ui symlink_plugin_paths("manageiq-ui-service", ui_service_dir) Dir.chdir(ui_service_dir) do - shell_cmd("yarn set version 1.22.18") if RUBY_PLATFORM.include?("s390x") - shell_cmd("yarn install") # Add --immutable once s390x is off of yarn 1. + shell_cmd("yarn install") # TODO: Add --immutable once s390x doesn't change the checksums. shell_cmd("yarn run available-languages") shell_cmd("yarn run build") - shell_cmd("git clean -xdf") # cleanup temp files - if RUBY_PLATFORM.include?("s390x") - shell_cmd("git checkout .yarn*") - shell_cmd("yarn set version 1.22.18") - end + shell_cmd("git clean -xdf") # cleanup temp files end end From 5f4d69a48cf7d2bdded2f547a498e60085a56d2c Mon Sep 17 00:00:00 2001 From: Brandon Dunne Date: Wed, 20 Sep 2023 11:00:41 -0400 Subject: [PATCH 09/12] Revert "Lock down to UBI 8.8-1032" This reverts commit 992f1ab536c70cebadb19d72523f0685e8163b50. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 14f29e5b..3e162f48 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi8/ubi:8.8-1032 +FROM registry.access.redhat.com/ubi8/ubi ENV TERM=xterm \ APPLIANCE=true \ From 9c78302bf13647a0430e362ebe382488d1d736e7 Mon Sep 17 00:00:00 2001 From: Jason Frey Date: Wed, 20 Sep 2023 16:49:01 -0400 Subject: [PATCH 10/12] Drop s390x hack now that we are on yarn 4 --- scripts/npm_registry/yarn_registry_cleanup.sh | 8 +------- scripts/npm_registry/yarn_registry_setup.sh | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/scripts/npm_registry/yarn_registry_cleanup.sh b/scripts/npm_registry/yarn_registry_cleanup.sh index a1e31217..f6c627d0 100755 --- a/scripts/npm_registry/yarn_registry_cleanup.sh +++ b/scripts/npm_registry/yarn_registry_cleanup.sh @@ -1,13 +1,7 @@ #!/bin/bash NPM_REGISTRY_OVERRIDE="$1" - -if [[ $(uname -m) == "s390x" ]]; then - # For yarn v1 - yarn config delete registry -else - yarn config delete npmRegistryServer -fi +yarn config delete npmRegistryServer # Replace registry in yarn.lock default_yarn_registry=`yarn config get npmRegistryServer` diff --git a/scripts/npm_registry/yarn_registry_setup.sh b/scripts/npm_registry/yarn_registry_setup.sh index 3f0ecb5e..0cd9cd84 100755 --- a/scripts/npm_registry/yarn_registry_setup.sh +++ b/scripts/npm_registry/yarn_registry_setup.sh @@ -1,13 +1,7 @@ #!/bin/bash NPM_REGISTRY_OVERRIDE="$1" - -if [[ $(uname -m) == "s390x" ]]; then - # For yarn v1 - yarn config set registry ${NPM_REGISTRY_OVERRIDE} -else - yarn config set npmRegistryServer ${NPM_REGISTRY_OVERRIDE} -fi +yarn config set npmRegistryServer ${NPM_REGISTRY_OVERRIDE} # Replace registry in existing yarn.lock ui_plugin_repos=`rake update:print_engines | grep path: | cut -d: -f2` From 8501100fe2b5bee6f7d62890cb9211995ee41ec7 Mon Sep 17 00:00:00 2001 From: Brandon Dunne Date: Thu, 21 Sep 2023 13:32:28 -0400 Subject: [PATCH 11/12] No longer need to build postgres ourselves. 10.23 is available upstream --- config/options.yml | 1 - packages/postgresql/Makefile.regress | 69 - packages/postgresql/generate-pdf.sh | 58 - packages/postgresql/generate-sources.sh | 12 - .../hstore-plperl-data-dumper.patch | 192 -- ...ql-10.15-contrib-dblink-expected-out.patch | 13 - .../postgresql-10.21.tar.bz2.sha256 | 1 - .../postgresql/postgresql-13.7.tar.bz2.sha256 | 1 - .../postgresql/postgresql-14.3.tar.bz2.sha256 | 1 - .../postgresql-9.6.24.tar.bz2.sha256 | 1 - packages/postgresql/postgresql-bashprofile | 4 - .../postgresql-external-libpq.patch | 40 - packages/postgresql/postgresql-logging.patch | 41 - packages/postgresql/postgresql-man.patch | 37 - .../postgresql-pgcrypto-openssl3-tests.patch | 99 - .../postgresql-server-pg_config.patch | 59 - .../postgresql-var-run-socket.patch | 53 - packages/postgresql/postgresql.pam | 3 - packages/postgresql/postgresql.spec | 2472 ----------------- packages/postgresql/postgresql.tmpfiles.d | 1 - packages/postgresql/rpm-pgsql.patch | 72 - packages/postgresql/sources | 7 - 22 files changed, 3237 deletions(-) delete mode 100644 packages/postgresql/Makefile.regress delete mode 100755 packages/postgresql/generate-pdf.sh delete mode 100755 packages/postgresql/generate-sources.sh delete mode 100644 packages/postgresql/hstore-plperl-data-dumper.patch delete mode 100644 packages/postgresql/postgresql-10.15-contrib-dblink-expected-out.patch delete mode 100644 packages/postgresql/postgresql-10.21.tar.bz2.sha256 delete mode 100644 packages/postgresql/postgresql-13.7.tar.bz2.sha256 delete mode 100644 packages/postgresql/postgresql-14.3.tar.bz2.sha256 delete mode 100644 packages/postgresql/postgresql-9.6.24.tar.bz2.sha256 delete mode 100644 packages/postgresql/postgresql-bashprofile delete mode 100644 packages/postgresql/postgresql-external-libpq.patch delete mode 100644 packages/postgresql/postgresql-logging.patch delete mode 100644 packages/postgresql/postgresql-man.patch delete mode 100644 packages/postgresql/postgresql-pgcrypto-openssl3-tests.patch delete mode 100644 packages/postgresql/postgresql-server-pg_config.patch delete mode 100644 packages/postgresql/postgresql-var-run-socket.patch delete mode 100644 packages/postgresql/postgresql.pam delete mode 100644 packages/postgresql/postgresql.spec delete mode 100644 packages/postgresql/postgresql.tmpfiles.d delete mode 100644 packages/postgresql/rpm-pgsql.patch delete mode 100644 packages/postgresql/sources diff --git a/config/options.yml b/config/options.yml index 2c691141..4daa1c56 100644 --- a/config/options.yml +++ b/config/options.yml @@ -45,7 +45,6 @@ rpm_repository: :kafka: !ruby/regexp /.+-3\.3.+/ :manageiq: !ruby/regexp /.+-18\.\d\.\d-(alpha|beta|rc)?\d(\.\d)?\.el.+/ :manageiq-release: !ruby/regexp /.+-18\.0.+/ - :postgresql: !ruby/regexp /.+-10\.21.+/ :python-bambou: !ruby/regexp /.+-3\.1\.1.+/ :python-pylxca: !ruby/regexp /.+-2\.1\.1.+/ :python-unittest2: !ruby/regexp /.+-1\.1\.0.+/ diff --git a/packages/postgresql/Makefile.regress b/packages/postgresql/Makefile.regress deleted file mode 100644 index 95bc589e..00000000 --- a/packages/postgresql/Makefile.regress +++ /dev/null @@ -1,69 +0,0 @@ -# -# Simplified makefile for running the PostgreSQL regression tests -# in an RPM installation -# - -# maximum simultaneous connections for parallel tests -MAXCONNOPT = -ifdef MAX_CONNECTIONS -MAXCONNOPT += --max-connections=$(MAX_CONNECTIONS) -endif - -# locale -NOLOCALE = -ifdef NO_LOCALE -NOLOCALE += --no-locale -endif - -srcdir := . - -REGRESS_OPTS += --dlpath=. - -pg_regress_locale_flags = $(if $(ENCODING),--encoding=$(ENCODING)) $(NOLOCALE) - -pg_regress_installcheck = ./pg_regress --inputdir=$(srcdir) --bindir=@bindir@ $(pg_regress_locale_flags) - -# Test input and expected files. These are created by pg_regress itself, so we -# don't have a rule to create them. We do need rules to clean them however. -ifile_list := $(subst .source,, $(notdir $(wildcard $(srcdir)/input/*.source))) -input_files := $(foreach file, $(ifile_list), sql/$(file).sql) -ofile_list := $(subst .source,, $(notdir $(wildcard $(srcdir)/output/*.source))) -output_files := $(foreach file, $(ofile_list), expected/$(file).out) - -abs_srcdir := $(shell pwd) -abs_builddir := $(shell pwd) - -check: installcheck-parallel - -installcheck: cleandirs - $(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/serial_schedule $(EXTRA_TESTS) - -installcheck-parallel: cleandirs - $(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(EXTRA_TESTS) - -# The tests command the server to write into testtablespace and results. -# On a SELinux-enabled system this will fail unless we mark those directories -# as writable by the server. -cleandirs: - -rm -rf testtablespace results - mkdir testtablespace results - if test -x /usr/bin/chcon && ! test -f /.dockerenv; then \ - /usr/bin/chcon -u system_u -r object_r -t postgresql_db_t testtablespace results ; \ - fi - -# old interfaces follow... - -runcheck: check -runtest: installcheck -runtest-parallel: installcheck-parallel - - -## -## Clean up -## - -clean distclean maintainer-clean: - rm -f $(output_files) $(input_files) - rm -rf testtablespace - rm -rf results tmp_check log - rm -f regression.diffs regression.out regress.out run_check.out diff --git a/packages/postgresql/generate-pdf.sh b/packages/postgresql/generate-pdf.sh deleted file mode 100755 index e0ed0088..00000000 --- a/packages/postgresql/generate-pdf.sh +++ /dev/null @@ -1,58 +0,0 @@ -#! /bin/sh - -# This script builds the PDF version of the PostgreSQL documentation. -# -# In principle we could do this as part of the RPM build, but there are -# good reasons not to: -# 1. The build would take longer and have a larger BuildRequires footprint. -# 2. The generated PDF has timestamps in it, which would inevitably result -# in multilib conflicts due to slightly different timestamps. -# So instead, we run this manually when rebasing to a new upstream release, -# and treat the resulting PDF as a separate Source file. -# -# You will need to have the docbook packages installed to run this. -# Expect it to take about 20 minutes and use about 160MB of disk. - -set -e - -# Pass package version (e.g., 9.1.2) as argument -VERSION=$1 - -test -z "$VERSION" && VERSION=`awk '/^Version:/ { print $2; }' postgresql.spec` - -TARGETFILE=postgresql-$VERSION-US.pdf -test -f "$TARGETFILE" && echo "$TARGETFILE exists" && exit 1 - -echo Building $TARGETFILE ... - -# Unpack postgresql - -rm -rf postgresql-$VERSION - -tar xfj postgresql-$VERSION.tar.bz2 - -cd postgresql-$VERSION - -# Apply any patches that affect the PDF documentation - -# patch -p1 < ../xxx.patch - -# Configure ... - -./configure >/dev/null - -# Build the PDF docs - -cd doc/src/sgml - -make postgres-US.pdf >make.log - -mv -f postgres-US.pdf ../../../../$TARGETFILE - -# Clean up - -cd ../../../.. - -rm -rf postgresql-$VERSION - -exit 0 diff --git a/packages/postgresql/generate-sources.sh b/packages/postgresql/generate-sources.sh deleted file mode 100755 index 1d53682e..00000000 --- a/packages/postgresql/generate-sources.sh +++ /dev/null @@ -1,12 +0,0 @@ -#! /bin/sh - -rm sources -set -e -spectool -S *.spec | cut -d' ' -f2 \ - | grep -E -e 'postgresql-.*\.tar\.*' -e 'postgresql.*\.pdf' | sort | \ -while read line -do - base=`basename "$line"` - echo " * handling $base" - sha512sum --tag "$base" >> sources -done diff --git a/packages/postgresql/hstore-plperl-data-dumper.patch b/packages/postgresql/hstore-plperl-data-dumper.patch deleted file mode 100644 index dfc2f234..00000000 --- a/packages/postgresql/hstore-plperl-data-dumper.patch +++ /dev/null @@ -1,192 +0,0 @@ -From 69db3b0cfccc0687dfbdf56afcfb2f8e536053c6 Mon Sep 17 00:00:00 2001 -From: Andrew Dunstan -Date: Sun, 14 May 2017 01:10:18 -0400 -Subject: [PATCH] Suppress indentation from Data::Dumper in regression tests - -Ultra-modern versions of the perl Data::Dumper module have apparently -changed how they indent output. Instead of trying to keep up we choose -to tell it to supporess all indentation in the hstore_plperl regression -tests. - -Backpatch to 9.5 where this feature was introduced. ---- - contrib/hstore_plperl/expected/hstore_plperlu.out | 44 ++++++----------------- - contrib/hstore_plperl/sql/hstore_plperlu.sql | 6 ++++ - 2 files changed, 17 insertions(+), 33 deletions(-) - -diff --git a/contrib/hstore_plperl/expected/hstore_plperlu.out b/contrib/hstore_plperl/expected/hstore_plperlu.out -index b09fb78..d719d29 100644 ---- a/contrib/hstore_plperl/expected/hstore_plperlu.out -+++ b/contrib/hstore_plperl/expected/hstore_plperlu.out -@@ -20,15 +20,12 @@ TRANSFORM FOR TYPE hstore - AS $$ - use Data::Dumper; - $Data::Dumper::Sortkeys = 1; -+$Data::Dumper::Indent = 0; - elog(INFO, Dumper($_[0])); - return scalar(keys %{$_[0]}); - $$; - SELECT test1('aa=>bb, cc=>NULL'::hstore); --INFO: $VAR1 = { -- 'aa' => 'bb', -- 'cc' => undef -- }; -- -+INFO: $VAR1 = {'aa' => 'bb','cc' => undef}; - test1 - ------- - 2 -@@ -39,12 +36,12 @@ LANGUAGE plperlu - AS $$ - use Data::Dumper; - $Data::Dumper::Sortkeys = 1; -+$Data::Dumper::Indent = 0; - elog(INFO, Dumper($_[0])); - return scalar(keys %{$_[0]}); - $$; - SELECT test1none('aa=>bb, cc=>NULL'::hstore); - INFO: $VAR1 = '"aa"=>"bb", "cc"=>NULL'; -- - test1none - ----------- - 0 -@@ -56,15 +53,12 @@ TRANSFORM FOR TYPE hstore - AS $$ - use Data::Dumper; - $Data::Dumper::Sortkeys = 1; -+$Data::Dumper::Indent = 0; - elog(INFO, Dumper($_[0])); - return scalar(keys %{$_[0]}); - $$; - SELECT test1list('aa=>bb, cc=>NULL'::hstore); --INFO: $VAR1 = { -- 'aa' => 'bb', -- 'cc' => undef -- }; -- -+INFO: $VAR1 = {'aa' => 'bb','cc' => undef}; - test1list - ----------- - 2 -@@ -77,18 +71,12 @@ TRANSFORM FOR TYPE hstore - AS $$ - use Data::Dumper; - $Data::Dumper::Sortkeys = 1; -+$Data::Dumper::Indent = 0; - elog(INFO, Dumper($_[0]->[0], $_[0]->[1])); - return scalar(keys %{$_[0]}); - $$; - SELECT test1arr(array['aa=>bb, cc=>NULL'::hstore, 'dd=>ee']); --INFO: $VAR1 = { -- 'aa' => 'bb', -- 'cc' => undef -- }; --$VAR2 = { -- 'dd' => 'ee' -- }; -- -+INFO: $VAR1 = {'aa' => 'bb','cc' => undef};$VAR2 = {'dd' => 'ee'}; - test1arr - ---------- - 2 -@@ -101,6 +89,7 @@ TRANSFORM FOR TYPE hstore - AS $$ - use Data::Dumper; - $Data::Dumper::Sortkeys = 1; -+$Data::Dumper::Indent = 0; - - $rv = spi_exec_query(q{SELECT 'aa=>bb, cc=>NULL'::hstore AS col1}); - elog(INFO, Dumper($rv->{rows}[0]->{col1})); -@@ -111,13 +100,8 @@ $rv = spi_exec_prepared($plan, {}, $val); - elog(INFO, Dumper($rv->{rows}[0]->{col1})); - $$; - SELECT test3(); --INFO: $VAR1 = { -- 'aa' => 'bb', -- 'cc' => undef -- }; -- -+INFO: $VAR1 = {'aa' => 'bb','cc' => undef}; - INFO: $VAR1 = '"a"=>"1", "b"=>"boo", "c"=>NULL'; -- - test3 - ------- - -@@ -138,6 +122,7 @@ TRANSFORM FOR TYPE hstore - AS $$ - use Data::Dumper; - $Data::Dumper::Sortkeys = 1; -+$Data::Dumper::Indent = 0; - elog(INFO, Dumper($_TD->{new})); - if ($_TD->{new}{a} == 1) { - $_TD->{new}{b} = {a => 1, b => 'boo', c => undef}; -@@ -147,14 +132,7 @@ return "MODIFY"; - $$; - CREATE TRIGGER test4 BEFORE UPDATE ON test1 FOR EACH ROW EXECUTE PROCEDURE test4(); - UPDATE test1 SET a = a; --INFO: $VAR1 = { -- 'a' => '1', -- 'b' => { -- 'aa' => 'bb', -- 'cc' => undef -- } -- }; -- -+INFO: $VAR1 = {'a' => '1','b' => {'aa' => 'bb','cc' => undef}}; - SELECT * FROM test1; - a | b - ---+--------------------------------- -diff --git a/contrib/hstore_plperl/sql/hstore_plperlu.sql b/contrib/hstore_plperl/sql/hstore_plperlu.sql -index 8d8508c..c714b35 100644 ---- a/contrib/hstore_plperl/sql/hstore_plperlu.sql -+++ b/contrib/hstore_plperl/sql/hstore_plperlu.sql -@@ -15,6 +15,7 @@ TRANSFORM FOR TYPE hstore - AS $$ - use Data::Dumper; - $Data::Dumper::Sortkeys = 1; -+$Data::Dumper::Indent = 0; - elog(INFO, Dumper($_[0])); - return scalar(keys %{$_[0]}); - $$; -@@ -26,6 +27,7 @@ LANGUAGE plperlu - AS $$ - use Data::Dumper; - $Data::Dumper::Sortkeys = 1; -+$Data::Dumper::Indent = 0; - elog(INFO, Dumper($_[0])); - return scalar(keys %{$_[0]}); - $$; -@@ -38,6 +40,7 @@ TRANSFORM FOR TYPE hstore - AS $$ - use Data::Dumper; - $Data::Dumper::Sortkeys = 1; -+$Data::Dumper::Indent = 0; - elog(INFO, Dumper($_[0])); - return scalar(keys %{$_[0]}); - $$; -@@ -52,6 +55,7 @@ TRANSFORM FOR TYPE hstore - AS $$ - use Data::Dumper; - $Data::Dumper::Sortkeys = 1; -+$Data::Dumper::Indent = 0; - elog(INFO, Dumper($_[0]->[0], $_[0]->[1])); - return scalar(keys %{$_[0]}); - $$; -@@ -66,6 +70,7 @@ TRANSFORM FOR TYPE hstore - AS $$ - use Data::Dumper; - $Data::Dumper::Sortkeys = 1; -+$Data::Dumper::Indent = 0; - - $rv = spi_exec_query(q{SELECT 'aa=>bb, cc=>NULL'::hstore AS col1}); - elog(INFO, Dumper($rv->{rows}[0]->{col1})); -@@ -90,6 +95,7 @@ TRANSFORM FOR TYPE hstore - AS $$ - use Data::Dumper; - $Data::Dumper::Sortkeys = 1; -+$Data::Dumper::Indent = 0; - elog(INFO, Dumper($_TD->{new})); - if ($_TD->{new}{a} == 1) { - $_TD->{new}{b} = {a => 1, b => 'boo', c => undef}; --- -2.1.4 diff --git a/packages/postgresql/postgresql-10.15-contrib-dblink-expected-out.patch b/packages/postgresql/postgresql-10.15-contrib-dblink-expected-out.patch deleted file mode 100644 index bd4b0e53..00000000 --- a/packages/postgresql/postgresql-10.15-contrib-dblink-expected-out.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out -index 6ceabb453c..6516d4f131 100644 ---- a/contrib/dblink/expected/dblink.out -+++ b/contrib/dblink/expected/dblink.out -@@ -879,7 +879,7 @@ $d$; - CREATE USER MAPPING FOR public SERVER fdtest - OPTIONS (server 'localhost'); -- fail, can't specify server here - ERROR: invalid option "server" --HINT: Valid options in this context are: user, password -+HINT: Valid options in this context are: user, password, sslpassword - CREATE USER MAPPING FOR public SERVER fdtest OPTIONS (user :'USER'); - GRANT USAGE ON FOREIGN SERVER fdtest TO regress_dblink_user; - GRANT EXECUTE ON FUNCTION dblink_connect_u(text, text) TO regress_dblink_user; diff --git a/packages/postgresql/postgresql-10.21.tar.bz2.sha256 b/packages/postgresql/postgresql-10.21.tar.bz2.sha256 deleted file mode 100644 index 9dfa861e..00000000 --- a/packages/postgresql/postgresql-10.21.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -d32198856d52a9a6f5d50642ef86687ac058bd6efca5c9ed57be7808496f45d1 postgresql-10.21.tar.bz2 diff --git a/packages/postgresql/postgresql-13.7.tar.bz2.sha256 b/packages/postgresql/postgresql-13.7.tar.bz2.sha256 deleted file mode 100644 index c2856330..00000000 --- a/packages/postgresql/postgresql-13.7.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -1b905bf4f3d83614a393b3c51fd345910fd261e4f5124a68d9a1fdd3a2a46399 postgresql-13.7.tar.bz2 diff --git a/packages/postgresql/postgresql-14.3.tar.bz2.sha256 b/packages/postgresql/postgresql-14.3.tar.bz2.sha256 deleted file mode 100644 index b1284697..00000000 --- a/packages/postgresql/postgresql-14.3.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -279057368bf59a919c05ada8f95c5e04abb43e74b9a2a69c3d46a20e07a9af38 postgresql-14.3.tar.bz2 diff --git a/packages/postgresql/postgresql-9.6.24.tar.bz2.sha256 b/packages/postgresql/postgresql-9.6.24.tar.bz2.sha256 deleted file mode 100644 index 99275df1..00000000 --- a/packages/postgresql/postgresql-9.6.24.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -aeb7a196be3ebed1a7476ef565f39722187c108dd47da7489be9c4fcae982ace postgresql-9.6.24.tar.bz2 diff --git a/packages/postgresql/postgresql-bashprofile b/packages/postgresql/postgresql-bashprofile deleted file mode 100644 index 1cd70d33..00000000 --- a/packages/postgresql/postgresql-bashprofile +++ /dev/null @@ -1,4 +0,0 @@ -[ -f /etc/profile ] && source /etc/profile - -PGDATA=/var/lib/pgsql/data -export PGDATA diff --git a/packages/postgresql/postgresql-external-libpq.patch b/packages/postgresql/postgresql-external-libpq.patch deleted file mode 100644 index bf0001bb..00000000 --- a/packages/postgresql/postgresql-external-libpq.patch +++ /dev/null @@ -1,40 +0,0 @@ -We don't build/install interfaces by upstream's implicit rules. - -This patch is used on two places; postgresql.spec and libecpg.spec -- keep those -in sync! - -Related: rhbz#1618698 - -diff --git a/src/Makefile b/src/Makefile -index febbced..9737b55 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -20,7 +20,6 @@ SUBDIRS = \ - backend/utils/mb/conversion_procs \ - backend/snowball \ - include \ -- interfaces \ - backend/replication/libpqwalreceiver \ - backend/replication/pgoutput \ - fe_utils \ -diff --git a/src/Makefile.global.in b/src/Makefile.global.in -index 4ed5174..d0e0dae 100644 ---- a/src/Makefile.global.in -+++ b/src/Makefile.global.in -@@ -457,7 +457,7 @@ endif - - # This macro is for use by libraries linking to libpq. (Because libpgport - # isn't created with the same link flags as libpq, it can't be used.) --libpq = -L$(libpq_builddir) -lpq -+libpq = -lpq - - # This macro is for use by client executables (not libraries) that use libpq. - # We force clients to pull symbols from the non-shared libraries libpgport -@@ -483,7 +483,6 @@ endif - # Commonly used submake targets - - submake-libpq: -- $(MAKE) -C $(libpq_builddir) all - - submake-libpgport: - $(MAKE) -C $(top_builddir)/src/port all diff --git a/packages/postgresql/postgresql-logging.patch b/packages/postgresql/postgresql-logging.patch deleted file mode 100644 index 76ff7b8c..00000000 --- a/packages/postgresql/postgresql-logging.patch +++ /dev/null @@ -1,41 +0,0 @@ -Default to stderr-based logging with a week's worth of daily logfiles. - - -diff -Naur postgresql-9.1rc1.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.1rc1/src/backend/utils/misc/postgresql.conf.sample ---- postgresql-9.1rc1.orig/src/backend/utils/misc/postgresql.conf.sample 2011-08-18 17:23:13.000000000 -0400 -+++ postgresql-9.1rc1/src/backend/utils/misc/postgresql.conf.sample 2011-08-18 18:39:39.697526799 -0400 -@@ -279,7 +279,7 @@ - # requires logging_collector to be on. - - # This is used when logging to stderr: --#logging_collector = off # Enable capturing of stderr and csvlog -+logging_collector = on # Enable capturing of stderr and csvlog - # into log files. Required to be on for - # csvlogs. - # (change requires restart) -@@ -355,11 +355,11 @@ - # These are only used if logging_collector is on: - #log_directory = 'log' # directory where log files are written, - # can be absolute or relative to PGDATA --#log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log' # log file name pattern, -+log_filename = 'postgresql-%a.log' # log file name pattern, - # can include strftime() escapes - #log_file_mode = 0600 # creation mode for log files, - # begin with 0 to use octal notation --#log_truncate_on_rotation = off # If on, an existing log file with the -+log_truncate_on_rotation = on # If on, an existing log file with the - # same name as the new log file will be - # truncated rather than appended to. - # But such truncation only occurs on -@@ -367,9 +367,9 @@ - # or size-driven rotation. Default is - # off, meaning append to existing files - # in all cases. --#log_rotation_age = 1d # Automatic rotation of logfiles will -+log_rotation_age = 1d # Automatic rotation of logfiles will - # happen after that time. 0 disables. --#log_rotation_size = 10MB # Automatic rotation of logfiles will -+log_rotation_size = 0 # Automatic rotation of logfiles will - # happen after that much log output. - # 0 disables. - diff --git a/packages/postgresql/postgresql-man.patch b/packages/postgresql/postgresql-man.patch deleted file mode 100644 index d231f474..00000000 --- a/packages/postgresql/postgresql-man.patch +++ /dev/null @@ -1,37 +0,0 @@ -PostgreSQL ecpg/initdb manual page fixes - -This was generated based on automatic Red Hat manual page scan (private -RHBZ#948933). - -diff -up ./doc/src/sgml/man1/ecpg.1.man948933 ./doc/src/sgml/man1/ecpg.1 ---- ./doc/src/sgml/man1/ecpg.1.man948933 2014-12-16 02:13:15.000000000 +0100 -+++ ./doc/src/sgml/man1/ecpg.1 2014-12-23 11:26:37.883644047 +0100 -@@ -128,6 +133,11 @@ Allow question mark as placeholder for c - .RE - .RE - .PP -+\fB\-\-regression\fR -+.RS 4 -+Run in regression testing mode\&. -+.RE -+.PP - \fB\-t\fR - .RS 4 - Turn on autocommit of transactions\&. In this mode, each SQL command is automatically committed unless it is inside an explicit transaction block\&. In the default mode, commands are committed only when -diff -up ./doc/src/sgml/man1/initdb.1.man948933 ./doc/src/sgml/man1/initdb.1 ---- ./doc/src/sgml/man1/initdb.1.man948933 2014-12-16 02:13:21.000000000 +0100 -+++ ./doc/src/sgml/man1/initdb.1 2014-12-23 11:26:37.883644047 +0100 -@@ -281,6 +281,13 @@ determines that an error prevented it fr - .PP - Other options: - .PP -+\fB\-s\fR -+.br -+\fB\-\-show\fR -+.RS 4 -+Print the internal settings, then exit\&. -+.RE -+.PP - \fB\-V\fR - .br - \fB\-\-version\fR diff --git a/packages/postgresql/postgresql-pgcrypto-openssl3-tests.patch b/packages/postgresql/postgresql-pgcrypto-openssl3-tests.patch deleted file mode 100644 index a779e9d7..00000000 --- a/packages/postgresql/postgresql-pgcrypto-openssl3-tests.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff -ur postgresql-13.4/contrib/pgcrypto/expected/pgp-decrypt.out postgresql-13.4.patched/contrib/pgcrypto/expected/pgp-decrypt.out ---- postgresql-13.4/contrib/pgcrypto/expected/pgp-decrypt.out 2021-08-09 16:49:05.000000000 -0400 -+++ postgresql-13.4.patched/contrib/pgcrypto/expected/pgp-decrypt.out 2021-09-01 08:16:48.138600886 -0400 -@@ -4,20 +4,6 @@ - -- Checking ciphers - select pgp_sym_decrypt(dearmor(' - -----BEGIN PGP MESSAGE----- --Comment: dat1.blowfish.sha1.mdc.s2k3.z0 -- --jA0EBAMCfFNwxnvodX9g0jwB4n4s26/g5VmKzVab1bX1SmwY7gvgvlWdF3jKisvS --yA6Ce1QTMK3KdL2MPfamsTUSAML8huCJMwYQFfE= --=JcP+ -------END PGP MESSAGE----- --'), 'foobar'); -- pgp_sym_decrypt ------------------- -- Secret message. --(1 row) -- --select pgp_sym_decrypt(dearmor(' -------BEGIN PGP MESSAGE----- - Comment: dat1.aes.sha1.mdc.s2k3.z0 - - jA0EBwMCci97v0Q6Z0Zg0kQBsVf5Oe3iC+FBzUmuMV9KxmAyOMyjCc/5i8f1Eest -diff -ur postgresql-13.4/contrib/pgcrypto/expected/pgp-pubkey-decrypt.out postgresql-13.4.patched/contrib/pgcrypto/expected/pgp-pubkey-decrypt.out ---- postgresql-13.4/contrib/pgcrypto/expected/pgp-pubkey-decrypt.out 2021-08-09 16:49:05.000000000 -0400 -+++ postgresql-13.4.patched/contrib/pgcrypto/expected/pgp-pubkey-decrypt.out 2021-09-01 08:05:27.750172653 -0400 -@@ -594,13 +594,6 @@ - (1 row) - - select pgp_pub_decrypt(dearmor(data), dearmor(seckey)) --from keytbl, encdata where keytbl.id=2 and encdata.id=2; -- pgp_pub_decrypt ------------------- -- Secret msg --(1 row) -- --select pgp_pub_decrypt(dearmor(data), dearmor(seckey)) - from keytbl, encdata where keytbl.id=3 and encdata.id=3; - pgp_pub_decrypt - ----------------- -diff -ur postgresql-13.4/contrib/pgcrypto/Makefile postgresql-13.4.patched/contrib/pgcrypto/Makefile ---- postgresql-13.4/contrib/pgcrypto/Makefile 2021-08-09 16:49:05.000000000 -0400 -+++ postgresql-13.4.patched/contrib/pgcrypto/Makefile 2021-09-01 08:26:47.207164873 -0400 -@@ -5,7 +5,7 @@ - INT_TESTS = sha2 - - OSSL_SRCS = openssl.c pgp-mpi-openssl.c --OSSL_TESTS = sha2 des 3des cast5 -+OSSL_TESTS = sha2 - - ZLIB_TST = pgp-compression - ZLIB_OFF_TST = pgp-zlib-DISABLED -@@ -30,9 +30,9 @@ - pgcrypto--1.0--1.1.sql pgcrypto--unpackaged--1.0.sql - PGFILEDESC = "pgcrypto - cryptographic functions" - --REGRESS = init md5 sha1 hmac-md5 hmac-sha1 blowfish rijndael \ -+REGRESS = init md5 sha1 hmac-md5 hmac-sha1 rijndael \ - $(CF_TESTS) \ -- crypt-des crypt-md5 crypt-blowfish crypt-xdes \ -+ crypt-md5 \ - pgp-armor pgp-decrypt pgp-encrypt $(CF_PGP_TESTS) \ - pgp-pubkey-decrypt pgp-pubkey-encrypt pgp-info - - -diff -ur postgresql-13.4/contrib/pgcrypto/sql/pgp-decrypt.sql postgresql-13.4.patched/contrib/pgcrypto/sql/pgp-decrypt.sql ---- postgresql-13.4/contrib/pgcrypto/sql/pgp-decrypt.sql 2021-08-09 16:49:05.000000000 -0400 -+++ postgresql-13.4.patched/contrib/pgcrypto/sql/pgp-decrypt.sql 2021-09-01 08:16:12.525212175 -0400 -@@ -5,16 +5,6 @@ - -- Checking ciphers - select pgp_sym_decrypt(dearmor(' - -----BEGIN PGP MESSAGE----- --Comment: dat1.blowfish.sha1.mdc.s2k3.z0 -- --jA0EBAMCfFNwxnvodX9g0jwB4n4s26/g5VmKzVab1bX1SmwY7gvgvlWdF3jKisvS --yA6Ce1QTMK3KdL2MPfamsTUSAML8huCJMwYQFfE= --=JcP+ -------END PGP MESSAGE----- --'), 'foobar'); -- --select pgp_sym_decrypt(dearmor(' -------BEGIN PGP MESSAGE----- - Comment: dat1.aes.sha1.mdc.s2k3.z0 - - jA0EBwMCci97v0Q6Z0Zg0kQBsVf5Oe3iC+FBzUmuMV9KxmAyOMyjCc/5i8f1Eest -diff -ur postgresql-13.4/contrib/pgcrypto/sql/pgp-pubkey-decrypt.sql postgresql-13.4.patched/contrib/pgcrypto/sql/pgp-pubkey-decrypt.sql ---- postgresql-13.4/contrib/pgcrypto/sql/pgp-pubkey-decrypt.sql 2021-08-09 16:49:05.000000000 -0400 -+++ postgresql-13.4.patched/contrib/pgcrypto/sql/pgp-pubkey-decrypt.sql 2021-09-01 08:06:18.963732342 -0400 -@@ -606,9 +606,6 @@ - from keytbl, encdata where keytbl.id=1 and encdata.id=1; - - select pgp_pub_decrypt(dearmor(data), dearmor(seckey)) --from keytbl, encdata where keytbl.id=2 and encdata.id=2; -- --select pgp_pub_decrypt(dearmor(data), dearmor(seckey)) - from keytbl, encdata where keytbl.id=3 and encdata.id=3; - - select pgp_pub_decrypt(dearmor(data), dearmor(seckey)) diff --git a/packages/postgresql/postgresql-server-pg_config.patch b/packages/postgresql/postgresql-server-pg_config.patch deleted file mode 100644 index 06ef22f9..00000000 --- a/packages/postgresql/postgresql-server-pg_config.patch +++ /dev/null @@ -1,59 +0,0 @@ -We should ideally provide '/bin/pg_config' in postgresql-server-devel, and -provide no pg_config binary in libpq package. But most of the Fedora packages -that use pg_config actually only build against PG libraries (and -postgresql-server-devel isn't needed). So.., to avoid the initial rush around -rhbz#1618698 change, rather provide pg_server_config binary, which int urn means -that we'll have to fix only a minimal set of packages which really build -PostgreSQL server modules. - -diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile -index c410087..e546b7b 100644 ---- a/src/bin/pg_config/Makefile -+++ b/src/bin/pg_config/Makefile -@@ -11,28 +11,30 @@ - PGFILEDESC = "pg_config - report configuration information" - PGAPPICON=win32 - -+PG_CONFIG = pg_server_config$(X) -+ - subdir = src/bin/pg_config - top_builddir = ../../.. - include $(top_builddir)/src/Makefile.global - - OBJS= pg_config.o $(WIN32RES) - --all: pg_config -+all: $(PG_CONFIG) - --pg_config: $(OBJS) | submake-libpgport -- $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) -+$(PG_CONFIG): $(OBJS) | submake-libpgport -+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@ - - install: all installdirs -- $(INSTALL_SCRIPT) pg_config$(X) '$(DESTDIR)$(bindir)/pg_config$(X)' -+ $(INSTALL_SCRIPT) $(PG_CONFIG) '$(DESTDIR)$(bindir)/$(PG_CONFIG)' - - installdirs: - $(MKDIR_P) '$(DESTDIR)$(bindir)' - - uninstall: -- rm -f '$(DESTDIR)$(bindir)/pg_config$(X)' -+ rm -f '$(DESTDIR)$(bindir)/$(PG_CONFIG)' - - clean distclean maintainer-clean: -- rm -f pg_config$(X) $(OBJS) -+ rm -f $(PG_CONFIG) $(OBJS) - rm -rf tmp_check - - check: -diff --git a/src/bin/pg_config/nls.mk b/src/bin/pg_config/nls.mk -index 1d41f90ee0..0f34f371cc 100644 ---- a/src/bin/pg_config/nls.mk -+++ b/src/bin/pg_config/nls.mk -@@ -1,4 +1,4 @@ - # src/bin/pg_config/nls.mk --CATALOG_NAME = pg_config -+CATALOG_NAME = pg_server_config - AVAIL_LANGUAGES = cs de es fr he it ja ko nb pl pt_BR ro ru sv ta tr zh_CN zh_TW - GETTEXT_FILES = pg_config.c ../../common/config_info.c ../../common/exec.c diff --git a/packages/postgresql/postgresql-var-run-socket.patch b/packages/postgresql/postgresql-var-run-socket.patch deleted file mode 100644 index 8e3b1930..00000000 --- a/packages/postgresql/postgresql-var-run-socket.patch +++ /dev/null @@ -1,53 +0,0 @@ -Change the built-in default socket directory to be /var/run/postgresql. -For backwards compatibility with (probably non-libpq-based) clients that -might still expect to find the socket in /tmp, also create a socket in -/tmp. This is to resolve communication problems with clients operating -under systemd's PrivateTmp environment, which won't be using the same -global /tmp directory as the server; see bug #825448. - -Note that we apply the socket directory change at the level of the -hard-wired defaults in the C code, not by just twiddling the setting in -postgresql.conf.sample; this is so that the change will take effect on -server package update, without requiring any existing postgresql.conf -to be updated. (Of course, a user who dislikes this behavior can still -override it via postgresql.conf.) - -diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c -index 9481f2d..75532c7 100644 ---- a/src/backend/utils/misc/guc.c -+++ b/src/backend/utils/misc/guc.c -@@ -3196,7 +3196,7 @@ static struct config_string ConfigureNamesString[] = - }, - &Unix_socket_directories, - #ifdef HAVE_UNIX_SOCKETS -- DEFAULT_PGSOCKET_DIR, -+ DEFAULT_PGSOCKET_DIR ", /tmp", - #else - "", - #endif -diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c -index feeff9e..3e3d784 100644 ---- a/src/bin/initdb/initdb.c -+++ b/src/bin/initdb/initdb.c -@@ -1234,7 +1234,7 @@ setup_config(void) - - #ifdef HAVE_UNIX_SOCKETS - snprintf(repltok, sizeof(repltok), "#unix_socket_directories = '%s'", -- DEFAULT_PGSOCKET_DIR); -+ DEFAULT_PGSOCKET_DIR ", /tmp"); - #else - snprintf(repltok, sizeof(repltok), "#unix_socket_directories = ''"); - #endif -diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h -index e278fa0..9ee15d4 100644 ---- a/src/include/pg_config_manual.h -+++ b/src/include/pg_config_manual.h -@@ -169,7 +169,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 "/var/run/postgresql" - - /* - * This is the default event source for Windows event log. diff --git a/packages/postgresql/postgresql.pam b/packages/postgresql/postgresql.pam deleted file mode 100644 index 1d785946..00000000 --- a/packages/postgresql/postgresql.pam +++ /dev/null @@ -1,3 +0,0 @@ -#%PAM-1.0 -auth include password-auth -account include password-auth diff --git a/packages/postgresql/postgresql.spec b/packages/postgresql/postgresql.spec deleted file mode 100644 index 0b30847a..00000000 --- a/packages/postgresql/postgresql.spec +++ /dev/null @@ -1,2472 +0,0 @@ -# This is the PostgreSQL Global Development Group Official RPMset spec file, -# or a derivative thereof. -# Copyright 2003-2009 Lamar Owen -# and others listed. ** vi: ts=4 sw=4 noexpandtab nosmarttab - -# Major Contributors: -# --------------- -# Lamar Owen -# Trond Eivind Glomsrd -# Thomas Lockhart -# Reinhard Max -# Karl DeBisschop -# Peter Eisentraut -# Joe Conway -# Andrew Overholt -# David Jee -# Kaj J. Niemi -# Sander Steffann -# Tom Lane -# and others in the Changelog.... - -# This spec file and ancillary files are licensed in accordance with -# The PostgreSQL license. - -# In this file you can find the default build package list macros. -# These can be overridden by defining on the rpm command line: -# rpm --define 'packagename 1' .... to force the package to build. -# rpm --define 'packagename 0' .... to force the package NOT to build. -# The base package, the libs package, the devel package, and the server package -# always get built. - -%{!?beta:%global beta 0} - -%global test 1 -%global upgrade 1 -%global plpython 1 -%global plpython3 1 -%global pltcl 1 -%global plperl 1 -%global ssl 1 -%global kerberos 1 -%global ldap 1 -%global nls 1 -%global uuid 1 -%global xml 1 -%global pam 1 -%global sdt 1 -%global selinux 1 -%global runselftest 1 - -# By default, patch(1) creates backup files when chunks apply with offsets. -# Turn that off to ensure such files don't get included in RPMs. -%global _default_patch_flags --no-backup-if-mismatch - -# https://fedoraproject.org/wiki/Packaging:Guidelines#Packaging_of_Additional_RPM_Macros -%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) - -%if 0%{?fedora} > 29 -%global external_libs 1 -%endif - -Summary: PostgreSQL client programs -Name: postgresql -%global majorversion 10 -Version: %{majorversion}.21 -%{?dirty_hack_epoch} -Release: 2%{?dist} - -# The PostgreSQL license is very similar to other MIT licenses, but the OSI -# recognizes it as an independent license, so we do as well. -License: PostgreSQL -Group: Applications/Databases -Url: http://www.postgresql.org/ - -# This SRPM includes a copy of the previous major release, which is needed for -# in-place upgrade of an old database. In most cases it will not be critical -# that this be kept up with the latest minor release of the previous series; -# but update when bugs affecting pg_dump output are fixed. -%global prevmajorversion 9.6 -%global prevversion %{prevmajorversion}.24 -%global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion} -%global precise_version %{?epoch:%epoch:}%version-%release - -%global setup_version 8.7 - -%global service_name postgresql.service -Source0: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2 -# The PDF file is generated by generate-pdf.sh, which see for comments -Source1: postgresql-%{version}-US.pdf -# generate-pdf.sh is not used during RPM build, but include for documentation -Source2: generate-pdf.sh -Source3: https://ftp.postgresql.org/pub/source/v%{prevversion}/postgresql-%{prevversion}.tar.bz2 -Source4: Makefile.regress -Source9: postgresql.tmpfiles.d -Source10: postgresql.pam -Source11: postgresql-bashprofile - - -# git: https://github.com/devexp-db/postgresql-setup -Source12: https://github.com/devexp-db/postgresql-setup/releases/download/v%{setup_version}/postgresql-setup-%{setup_version}.tar.gz - -# Those here are just to enforce packagers check that the tarball was downloaded -# correctly. Also, this allows us check that packagers-only tarballs do not -# differ with publicly released ones. -Source16: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2.sha256 -Source17: https://ftp.postgresql.org/pub/source/v%{prevversion}/postgresql-%{prevversion}.tar.bz2.sha256 - -# Comments for these patches are in the patch files. -Patch1: rpm-pgsql.patch -Patch2: postgresql-logging.patch -Patch5: postgresql-var-run-socket.patch -Patch6: postgresql-man.patch -Patch8: postgresql-external-libpq.patch -Patch9: postgresql-server-pg_config.patch -Patch10: postgresql-10.15-contrib-dblink-expected-out.patch -# This patch disables deprecated ciphers in the test suite -Patch14: postgresql-pgcrypto-openssl3-tests.patch - -BuildRequires: gcc -BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk -BuildRequires: perl(ExtUtils::Embed), perl-devel -%if 0%{?fedora} || 0%{?rhel} > 7 -BuildRequires: perl-generators -%endif -BuildRequires: readline-devel zlib-devel -BuildRequires: systemd systemd-devel util-linux -BuildRequires: multilib-rpm-config -BuildRequires: libpq-devel -BuildRequires: docbook-style-xsl - -# postgresql-setup build requires -BuildRequires: m4 elinks docbook-utils help2man - -%if %plpython -BuildRequires: python2-devel -%endif - -%if %plpython3 -BuildRequires: python3-devel -%endif - -%if %pltcl -BuildRequires: tcl-devel -%endif - -%if %ssl -BuildRequires: openssl-devel -%endif - -%if %kerberos -BuildRequires: krb5-devel -%endif - -%if %ldap -BuildRequires: openldap-devel -%endif - -%if %nls -BuildRequires: gettext >= 0.10.35 -%endif - -%if %uuid -BuildRequires: uuid-devel -%endif - -%if %xml -BuildRequires: libxml2-devel libxslt-devel -%endif - -%if %pam -BuildRequires: pam-devel -%endif - -%if %sdt -BuildRequires: systemtap-sdt-devel -%endif - -%if %selinux -BuildRequires: libselinux-devel -%endif - -%if ! 0%{?external_libs} -# main package requires -libs subpackage -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -%endif - -# https://bugzilla.redhat.com/1464368 -%global __provides_exclude_from %{_libdir}/pgsql - -%description -PostgreSQL is an advanced Object-Relational database management system (DBMS). -The base postgresql package contains the client programs that you'll need to -access a PostgreSQL DBMS server, as well as HTML documentation for the whole -system. These client programs can be located on the same machine as the -PostgreSQL server, or on a remote machine that accesses a PostgreSQL server -over a network connection. The PostgreSQL server can be found in the -postgresql-server sub-package. - - -%if ! 0%{?external_libs} -%package libs -Summary: The shared libraries required for any PostgreSQL clients -Group: Applications/Databases -Provides: libpq.so = %{version}-%{release} -# for /sbin/ldconfig -Requires(post): glibc -Requires(postun): glibc - -%description libs -The postgresql-libs package provides the essential shared libraries for any -PostgreSQL client program or interface. You will need to install this package -to use any other PostgreSQL package or any clients that need to connect to a -PostgreSQL server. -%endif - -%package server -Summary: The programs needed to create and run a PostgreSQL server -Group: Applications/Databases -Requires: %{name}%{?_isa} = %precise_version -%{!?external_libs:Requires: %{name}-libs%{?_isa} = %precise_version} -Requires(pre): /usr/sbin/useradd -# We require this to be present for %%{_prefix}/lib/tmpfiles.d -Requires: systemd -# Make sure it's there when scriptlets run, too -%{?systemd_requires} -# Packages which provide postgresql plugins should build-require -# postgresql-(server-)devel and require -# postgresql-server(:MODULE_COMPAT_%%{postgresql_major}). -# This will automatically guard against incompatible server & plugin -# installation (#1008939, #1007840) -Provides: %{name}-server(:MODULE_COMPAT_%{majorversion}) -Provides: bundled(postgresql-setup) = %setup_version - -%description server -PostgreSQL is an advanced Object-Relational database management system (DBMS). -The postgresql-server package contains the programs needed to create -and run a PostgreSQL server, which will in turn allow you to create -and maintain PostgreSQL databases. - - -%package docs -Summary: Extra documentation for PostgreSQL -Group: Applications/Databases -Requires: %{name}%{?_isa} = %precise_version -# Just for more intuitive documentation installation -Provides: %{name}-doc = %precise_version - -%description docs -The postgresql-docs package contains some additional documentation for -PostgreSQL. Currently, this includes the main documentation in PDF format -and source files for the PostgreSQL tutorial. - - -%package contrib -Summary: Extension modules distributed with PostgreSQL -Group: Applications/Databases -Requires: %{name}%{?_isa} = %precise_version -%{!?external_libs:Requires: %{name}-libs%{?_isa} = %precise_version} - -%description contrib -The postgresql-contrib package contains various extension modules that are -included in the PostgreSQL distribution. - - -%package %{?external_libs:server-}devel -Summary: PostgreSQL development header files and libraries -Group: Development/Libraries -%{!?external_libs:Requires: %{name}-libs%{?_isa} = %precise_version} - -%description %{?external_libs:server-}devel -Package contains the header files and configuration needed to compile PostgreSQL -server extension. - - -%package test-rpm-macros -Summary: Convenience RPM macros for build-time testing against PostgreSQL server -Requires: %{name}-server = %precise_version - -%description test-rpm-macros -This package is meant to be added as BuildRequires: dependency of other packages -that want to run build-time testsuite against running PostgreSQL server. - - -%package static -Summary: Statically linked PostgreSQL libraries -Requires: %{name}-%{?external_libs:server-}devel%{?_isa} = %precise_version - -%description static -Statically linked PostgreSQL libraries that do not have dynamically linked -counterparts. - - -%if %upgrade -%package upgrade -Summary: Support for upgrading from the previous major release of PostgreSQL -Group: Applications/Databases -Requires: %{name}-server%{?_isa} = %precise_version -%{!?external_libs:Requires: %{name}-libs%{?_isa} = %precise_version} -Provides: bundled(postgresql-server) = %prevversion - -%description upgrade -The postgresql-upgrade package contains the pg_upgrade utility and supporting -files needed for upgrading a PostgreSQL database from the previous major -version of PostgreSQL. - - -%package upgrade-devel -Summary: Support for build of extensions required for upgrade process -Group: Development/Libraries -Requires: %{name}-upgrade%{?_isa} = %precise_version - -%description upgrade-devel -The postgresql-devel package contains the header files and libraries -needed to compile C or C++ applications which are necessary in upgrade -process. -%endif - - -%if %plperl -%package plperl -Summary: The Perl procedural language for PostgreSQL -Group: Applications/Databases -Requires: %{name}-server%{?_isa} = %precise_version -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -BuildRequires: perl(Opcode) -%if %runselftest -BuildRequires: perl(Data::Dumper) -%endif - -%description plperl -The postgresql-plperl package contains the PL/Perl procedural language, -which is an extension to the PostgreSQL database server. -Install this if you want to write database functions in Perl. -%endif - - -%if %plpython -%package plpython -Summary: The Python2 procedural language for PostgreSQL -Group: Applications/Databases -Requires: %{name}-server%{?_isa} = %precise_version -Provides: %{name}-plpython2 = %precise_version - -%description plpython -The postgresql-plpython package contains the PL/Python procedural language, -which is an extension to the PostgreSQL database server. -Install this if you want to write database functions in Python 2. -%endif - - -%if %plpython3 -%package plpython3 -Summary: The Python3 procedural language for PostgreSQL -Group: Applications/Databases -Requires: %{name}-server%{?_isa} = %precise_version - -%description plpython3 -The postgresql-plpython3 package contains the PL/Python3 procedural language, -which is an extension to the PostgreSQL database server. -Install this if you want to write database functions in Python 3. -%endif - - -%if %pltcl -%package pltcl -Summary: The Tcl procedural language for PostgreSQL -Group: Applications/Databases -Requires: %{name}-server%{?_isa} = %precise_version - -%description pltcl -The postgresql-pltcl package contains the PL/Tcl procedural language, -which is an extension to the PostgreSQL database server. -Install this if you want to write database functions in Tcl. -%endif - - -%if %test -%package test -Summary: The test suite distributed with PostgreSQL -Group: Applications/Databases -Requires: %{name}-server%{?_isa} = %precise_version -Requires: %{name}-%{?external_libs:server-}devel%{?_isa} = %precise_version - -%description test -The postgresql-test package contains files needed for various tests for the -PostgreSQL database management system, including regression tests and -benchmarks. -%endif - - -%prep -( - cd "$(dirname "%{SOURCE0}")" - sha256sum -c %{SOURCE16} -%if %upgrade - sha256sum -c %{SOURCE17} -%endif -) -%setup -q -a 12 -%patch1 -p1 -%patch2 -p1 -%patch5 -p1 -%patch6 -p1 -%if 0%{?external_libs} -%patch8 -p1 -%patch9 -p1 -%endif -%if 0%{?fedora} >= 34 -%patch10 -p1 -%endif -%patch14 -p1 -# We used to run autoconf here, but there's no longer any real need to, -# since Postgres ships with a reasonably modern configure script. - -cp -p %{SOURCE1} . - -%if %upgrade -tar xfj %{SOURCE3} - -# apply once SOURCE3 is extracted -%endif - -# remove .gitignore files to ensure none get into the RPMs (bug #642210) -find . -type f -name .gitignore | xargs rm - - -%build -# fail quickly and obviously if user tries to build as root -%if %runselftest - if [ x"`id -u`" = x0 ]; then - echo "postgresql's regression tests fail if run as root." - echo "If you really need to build the RPM as root, use" - echo "--define='runselftest 0' to skip the regression tests." - exit 1 - fi -%endif - -# Building postgresql-setup - -cd postgresql-setup-%{setup_version} - -%configure \ - pgdocdir=%{_pkgdocdir} \ - PGVERSION=%{version} \ - PGMAJORVERSION=%{majorversion} \ - NAME_DEFAULT_PREV_SERVICE=postgresql - -make %{?_smp_mflags} -cd .. - -# Fiddling with CFLAGS. - -CFLAGS="${CFLAGS:-%optflags}" -%ifarch %{power64} -# See the bug #1051075, ppc64 should benefit from -O3 -CFLAGS=`echo $CFLAGS | xargs -n 1 | sed 's|-O2|-O3|g' | xargs -n 100` -%endif -# Strip out -ffast-math from CFLAGS.... -CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100` -export CFLAGS - -# plpython requires separate configure/build runs to build against python 2 -# versus python 3. Our strategy is to do the python 3 run first, then make -# distclean and do it again for the "normal" build. Note that the installed -# Makefile.global will reflect the python 2 build, which seems appropriate -# since that's still considered the default plpython version. -common_configure_options=' - --disable-rpath -%if %beta - --enable-debug - --enable-cassert -%endif -%if %plperl - --with-perl -%endif -%if %pltcl - --with-tcl - --with-tclconfig=%_libdir -%endif -%if %ldap - --with-ldap -%endif -%if %ssl - --with-openssl -%endif -%if %pam - --with-pam -%endif -%if %kerberos - --with-gssapi -%endif -%if %uuid - --with-ossp-uuid -%endif -%if %xml - --with-libxml - --with-libxslt -%endif -%if %nls - --enable-nls -%endif -%if %sdt - --enable-dtrace -%endif -%if %selinux - --with-selinux -%endif - --with-system-tzdata=%_datadir/zoneinfo - --datadir=%_datadir/pgsql - --with-systemd -' - -%if %plpython3 - -export PYTHON=/usr/bin/python3 - -# These configure options must match main build -%configure $common_configure_options \ - --with-python - -# Fortunately we don't need to build much except plpython itself. -%global python_subdirs \\\ - src/pl/plpython \\\ - contrib/hstore_plpython \\\ - contrib/ltree_plpython - -for dir in %python_subdirs; do - %make_build -C "$dir" all -done - -# save built form in a directory that "make distclean" won't touch -for dir in %python_subdirs; do - rm -rf "${dir}3" # shouldn't exist, unless --short-circuit - cp -a "$dir" "${dir}3" -done - -# must also save this version of Makefile.global for later -cp src/Makefile.global src/Makefile.global.python3 - -make distclean - -# %%plpython3 -%endif - -PYTHON=/usr/bin/python2 - -# Normal (python2) build begins here -%configure $common_configure_options \ -%if %plpython - --with-python -%endif - -unset PYTHON - -%make_build world - -# Have to hack makefile to put correct path into tutorial scripts -sed "s|C=\`pwd\`;|C=%{_libdir}/pgsql/tutorial;|" < src/tutorial/Makefile > src/tutorial/GNUmakefile -make %{?_smp_mflags} -C src/tutorial NO_PGXS=1 all -rm -f src/tutorial/GNUmakefile - -# The object files shouldn't be copied to rpm bz#1187514 -rm -f src/tutorial/*.o - -# run_testsuite WHERE -# ------------------- -# Run 'make check' in WHERE path. When that command fails, return the logs -# given by PostgreSQL build system and set 'test_failure=1'. This function -# never exits directly nor stops rpmbuild where `set -e` is enabled. -run_testsuite() -{ - make -k -C "$1" MAX_CONNECTIONS=5 check && return 0 || test_failure=1 - ( - set +x - echo "=== trying to find all regression.diffs files in build directory ===" - find "$1" -name 'regression.diffs' | \ - while read line; do - echo "=== make failure: $line ===" - cat "$line" - done - ) -} - -test_failure=0 - -%if %runselftest - run_testsuite "src/test/regress" - make clean -C "src/test/regress" - run_testsuite "src/pl" -%if %plpython3 - # must install Makefile.global that selects python3 - 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 - - for dir in %python_subdirs; do - # because "make check" does "make install" on the whole tree, - # we must temporarily install *plpython3 dir as *plpython, - # since that is the subdirectory src/pl/Makefile knows about - mv "$dir" "${dir}2" - mv "${dir}3" "$dir" - done - - for dir in %python_subdirs; do - run_testsuite "$dir" - done - - for dir in %python_subdirs; do - # and clean up our mess - mv "$dir" "${dir}3" - mv "${dir}2" "${dir}" - done - - mv -f src/Makefile.global.save src/Makefile.global -%endif - run_testsuite "contrib" -%endif - -# "assert(ALL_TESTS_OK)" -test "$test_failure" -eq 0 - -%if %test - # undo the "make clean" above - make all -C src/test/regress -%endif - -%if %upgrade - pushd postgresql-%{prevversion} - - # The upgrade build can be pretty stripped-down, but make sure that - # any options that affect on-disk file layout match the previous - # major release! - - # The set of built server modules here should ideally create superset - # of modules we used to ship in %%prevversion (in the installation - # the user will upgrade from), including *-contrib or *-pl* - # subpackages. This increases chances that the upgrade from - # %%prevversion will work smoothly. - -upgrade_configure () -{ - # Note we intentionally do not use %%configure here, because we *don't* want - # its ideas about installation paths. - - # The -fno-aggressive-loop-optimizations is hack for #993532 - PYTHON="${PYTHON-/usr/bin/python2}" \ - CFLAGS="$CFLAGS -fno-aggressive-loop-optimizations" ./configure \ - --build=%{_build} \ - --host=%{_host} \ - --prefix=%prev_prefix \ - --disable-rpath \ -%if %beta - --enable-debug \ - --enable-cassert \ -%endif -%if %plperl - --with-perl \ -%endif -%if %pltcl - --with-tcl \ -%endif - --with-tclconfig=%_libdir \ - --with-system-tzdata=/usr/share/zoneinfo \ - "$@" -} - -%if %plpython3 - export PYTHON=/usr/bin/python3 - upgrade_configure --with-python - for dir in %python_subdirs; do - # Previous version doesn't necessarily have this. - test -d "$dir" || continue - %make_build -C "$dir" all - - # save aside the only one file which we are interested here - cp "$dir"/*plpython3.so ./ - done - unset PYTHON - make distclean -%endif - - upgrade_configure \ -%if %plpython - --with-python -%endif - - make %{?_smp_mflags} all - make -C contrib %{?_smp_mflags} all - popd -# %%upgrade -%endif - - -%install -cd postgresql-setup-%{setup_version} -make install DESTDIR=$RPM_BUILD_ROOT -cd .. - -# For some reason, having '%%doc %%{_pkgdocdir}/README.rpm-dist' in %%files -# causes FTBFS (at least on RHEL6), see rhbz#1250006. -mv $RPM_BUILD_ROOT/%{_pkgdocdir}/README.rpm-dist ./ - -cat > $RPM_BUILD_ROOT%{_sysconfdir}/postgresql-setup/upgrade/postgresql.conf < $RPM_BUILD_ROOT%macrosdir/macros.%name-upgrade -%%postgresql_upgrade_prefix %prev_prefix -EOF -%endif - - -%if %test - # tests. There are many files included here that are unnecessary, - # but include them anyway for completeness. We replace the original - # Makefiles, however. - mkdir -p $RPM_BUILD_ROOT%{_libdir}/pgsql/test - cp -a src/test/regress $RPM_BUILD_ROOT%{_libdir}/pgsql/test - # pg_regress binary should be only in one subpackage, - # there will be a symlink from -test to -devel - rm -f $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/pg_regress - ln -sf ../../pgxs/src/test/regress/pg_regress $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/pg_regress - pushd $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress - rm -f GNUmakefile Makefile *.o - chmod 0755 pg_regress regress.so - popd - sed 's|@bindir@|%{_bindir}|g' \ - < %{SOURCE4} \ - > $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/Makefile - chmod 0644 $RPM_BUILD_ROOT%{_libdir}/pgsql/test/regress/Makefile -%endif - -rm -rf doc/html # HACK! allow 'rpmbuild -bi --short-circuit' -mv $RPM_BUILD_ROOT%{_docdir}/pgsql/html doc -rm -rf $RPM_BUILD_ROOT%{_docdir}/pgsql - -# remove files not to be packaged -%if 0%{?external_libs} -rm $RPM_BUILD_ROOT%{_libdir}/libpgfeutils.a -%else -rm $RPM_BUILD_ROOT%{_libdir}/lib{ecpg,pq,ecpg_compat,pgfeutils,pgtypes}.a -%endif - -%if !%plperl -rm -f $RPM_BUILD_ROOT%{_bindir}/pgsql/hstore_plperl.so -%endif - -%if !%plpython -rm -f $RPM_BUILD_ROOT%{_bindir}/pgsql/hstore_plpython2.so -%endif - -%if %nls -find_lang_bins () -{ - lstfile=$1 ; shift - cp /dev/null "$lstfile" - for binary; do - %find_lang "$binary"-%{majorversion} - cat "$binary"-%{majorversion}.lang >>"$lstfile" - done -} -find_lang_bins devel.lst %{?external_libs:pg_server_config}%{?!external_libs:pg_config ecpg} -%{!?external_libs:find_lang_bins libs.lst ecpglib6 libpq5} -find_lang_bins server.lst \ - initdb pg_basebackup pg_controldata pg_ctl pg_resetwal pg_rewind plpgsql postgres -find_lang_bins contrib.lst \ - pg_archivecleanup pg_test_fsync pg_test_timing pg_waldump -find_lang_bins main.lst \ - pg_dump pg_upgrade pgscripts psql -%if %plperl -find_lang_bins plperl.lst plperl -%endif -%if %plpython -find_lang_bins plpython.lst plpython -%endif -%if %plpython3 -# plpython3 shares message files with plpython -find_lang_bins plpython3.lst plpython -%endif -%if %pltcl -find_lang_bins pltcl.lst pltcl -%endif -%endif - -%pre server -/usr/sbin/groupadd -g 26 -o -r postgres >/dev/null 2>&1 || : -/usr/sbin/useradd -M -N -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \ - -c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || : - -%post server -%systemd_post %service_name - - -%preun server -%systemd_preun %service_name - - -%postun server -%systemd_postun_with_restart %service_name - - -%check -%if %runselftest -make -C postgresql-setup-%{setup_version} check -%endif - - -%clean - - -# FILES sections. -%files -f main.lst -%doc doc/KNOWN_BUGS doc/MISSING_FEATURES doc/TODO -%doc COPYRIGHT README HISTORY doc/bug.template -%doc README.rpm-dist -%{_bindir}/clusterdb -%{_bindir}/createdb -%{_bindir}/createuser -%{_bindir}/dropdb -%{_bindir}/dropuser -%{_bindir}/pg_dump -%{_bindir}/pg_dumpall -%{_bindir}/pg_isready -%{_bindir}/pg_restore -%{_bindir}/pg_upgrade -%{_bindir}/psql -%{_bindir}/reindexdb -%{_bindir}/vacuumdb -%{_mandir}/man1/clusterdb.* -%{_mandir}/man1/createdb.* -%{_mandir}/man1/createuser.* -%{_mandir}/man1/dropdb.* -%{_mandir}/man1/dropuser.* -%{_mandir}/man1/pg_dump.* -%{_mandir}/man1/pg_dumpall.* -%{_mandir}/man1/pg_isready.* -%{_mandir}/man1/pg_restore.* -%{_mandir}/man1/pg_upgrade.* -%{_mandir}/man1/psql.* -%{_mandir}/man1/reindexdb.* -%{_mandir}/man1/vacuumdb.* -%{_mandir}/man7/* - - -%files docs -%doc *-US.pdf -%doc doc/html -%{_libdir}/pgsql/tutorial/ - - -%files contrib -f contrib.lst -%doc contrib/spi/*.example -%{_bindir}/oid2name -%{_bindir}/pg_archivecleanup -%{_bindir}/pg_standby -%{_bindir}/pg_test_fsync -%{_bindir}/pg_test_timing -%{_bindir}/pg_waldump -%{_bindir}/pgbench -%{_bindir}/vacuumlo -%{_datadir}/pgsql/extension/adminpack* -%{_datadir}/pgsql/extension/amcheck* -%{_datadir}/pgsql/extension/autoinc* -%{_datadir}/pgsql/extension/bloom* -%{_datadir}/pgsql/extension/btree_gin* -%{_datadir}/pgsql/extension/btree_gist* -%{_datadir}/pgsql/extension/chkpass* -%{_datadir}/pgsql/extension/citext* -%{_datadir}/pgsql/extension/cube* -%{_datadir}/pgsql/extension/dblink* -%{_datadir}/pgsql/extension/dict_int* -%{_datadir}/pgsql/extension/dict_xsyn* -%{_datadir}/pgsql/extension/earthdistance* -%{_datadir}/pgsql/extension/file_fdw* -%{_datadir}/pgsql/extension/fuzzystrmatch* -%{_datadir}/pgsql/extension/hstore* -%{_datadir}/pgsql/extension/insert_username* -%{_datadir}/pgsql/extension/intagg* -%{_datadir}/pgsql/extension/intarray* -%{_datadir}/pgsql/extension/isn* -%{_datadir}/pgsql/extension/lo* -%{_datadir}/pgsql/extension/ltree* -%{_datadir}/pgsql/extension/moddatetime* -%{_datadir}/pgsql/extension/pageinspect* -%{_datadir}/pgsql/extension/pg_buffercache* -%{_datadir}/pgsql/extension/pg_freespacemap* -%{_datadir}/pgsql/extension/pg_prewarm* -%{_datadir}/pgsql/extension/pg_stat_statements* -%{_datadir}/pgsql/extension/pg_trgm* -%{_datadir}/pgsql/extension/pg_visibility* -%{_datadir}/pgsql/extension/pgcrypto* -%{_datadir}/pgsql/extension/pgrowlocks* -%{_datadir}/pgsql/extension/pgstattuple* -%{_datadir}/pgsql/extension/postgres_fdw* -%{_datadir}/pgsql/extension/refint* -%{_datadir}/pgsql/extension/seg* -%{_datadir}/pgsql/extension/tablefunc* -%{_datadir}/pgsql/extension/tcn* -%{_datadir}/pgsql/extension/timetravel* -%{_datadir}/pgsql/extension/tsm_system_rows* -%{_datadir}/pgsql/extension/tsm_system_time* -%{_datadir}/pgsql/extension/unaccent* -%{_libdir}/pgsql/_int.so -%{_libdir}/pgsql/adminpack.so -%{_libdir}/pgsql/amcheck.so -%{_libdir}/pgsql/auth_delay.so -%{_libdir}/pgsql/auto_explain.so -%{_libdir}/pgsql/autoinc.so -%{_libdir}/pgsql/bloom.so -%{_libdir}/pgsql/btree_gin.so -%{_libdir}/pgsql/btree_gist.so -%{_libdir}/pgsql/chkpass.so -%{_libdir}/pgsql/citext.so -%{_libdir}/pgsql/cube.so -%{_libdir}/pgsql/dblink.so -%{_libdir}/pgsql/dict_int.so -%{_libdir}/pgsql/dict_xsyn.so -%{_libdir}/pgsql/earthdistance.so -%{_libdir}/pgsql/file_fdw.so -%{_libdir}/pgsql/fuzzystrmatch.so -%{_libdir}/pgsql/hstore.so -%if %plperl -%{_libdir}/pgsql/hstore_plperl.so -%endif -%if %plpython -%{_libdir}/pgsql/hstore_plpython2.so -%endif -%if %plpython3 -%{_libdir}/pgsql/hstore_plpython3.so -%endif -%{_libdir}/pgsql/insert_username.so -%{_libdir}/pgsql/isn.so -%{_libdir}/pgsql/lo.so -%{_libdir}/pgsql/ltree.so -%if %plpython -%{_libdir}/pgsql/ltree_plpython2.so -%endif -%if %plpython3 -%{_libdir}/pgsql/ltree_plpython3.so -%endif -%{_libdir}/pgsql/moddatetime.so -%{_libdir}/pgsql/pageinspect.so -%{_libdir}/pgsql/passwordcheck.so -%{_libdir}/pgsql/pg_buffercache.so -%{_libdir}/pgsql/pg_freespacemap.so -%{_libdir}/pgsql/pg_stat_statements.so -%{_libdir}/pgsql/pg_trgm.so -%{_libdir}/pgsql/pg_visibility.so -%{_libdir}/pgsql/pgcrypto.so -%{_libdir}/pgsql/pgrowlocks.so -%{_libdir}/pgsql/pgstattuple.so -%{_libdir}/pgsql/postgres_fdw.so -%{_libdir}/pgsql/refint.so -%{_libdir}/pgsql/seg.so -%{_libdir}/pgsql/tablefunc.so -%{_libdir}/pgsql/tcn.so -%{_libdir}/pgsql/test_decoding.so -%{_libdir}/pgsql/timetravel.so -%{_libdir}/pgsql/tsm_system_rows.so -%{_libdir}/pgsql/tsm_system_time.so -%{_libdir}/pgsql/unaccent.so -%{_mandir}/man1/oid2name.* -%{_mandir}/man1/pg_archivecleanup.* -%{_mandir}/man1/pg_recvlogical.* -%{_mandir}/man1/pg_standby.* -%{_mandir}/man1/pg_test_fsync.* -%{_mandir}/man1/pg_test_timing.* -%{_mandir}/man1/pg_waldump.* -%{_mandir}/man1/pgbench.* -%{_mandir}/man1/vacuumlo.* -%{_mandir}/man3/dblink* -%if %selinux -%{_datadir}/pgsql/contrib/sepgsql.sql -%{_libdir}/pgsql/sepgsql.so -%endif -%if %ssl -%{_datadir}/pgsql/extension/sslinfo* -%{_libdir}/pgsql/sslinfo.so -%endif -%if %uuid -%{_datadir}/pgsql/extension/uuid-ossp* -%{_libdir}/pgsql/uuid-ossp.so -%endif -%if %xml -%{_datadir}/pgsql/extension/xml2* -%{_libdir}/pgsql/pgxml.so -%endif - -%if ! 0%{?external_libs} -%files libs -f libs.lst -%doc COPYRIGHT -%dir %{_libdir}/pgsql -%{_libdir}/libecpg.so.* -%{_libdir}/libecpg_compat.so.* -%{_libdir}/libpgtypes.so.* -%{_libdir}/libpq.so.* -%endif - -%files server -f server.lst -%{_bindir}/initdb -%{_bindir}/pg_basebackup -%{_bindir}/pg_controldata -%{_bindir}/pg_ctl -%{_bindir}/pg_receivewal -%{_bindir}/pg_recvlogical -%{_bindir}/pg_resetwal -%{_bindir}/pg_rewind -%{_bindir}/postgres -%{_bindir}/postgresql-setup -%{_bindir}/postgresql-upgrade -%{_bindir}/postmaster -%dir %{_datadir}/pgsql -%{_datadir}/pgsql/*.sample -%dir %{_datadir}/pgsql/contrib -%{_datadir}/pgsql/conversion_create.sql -%dir %{_datadir}/pgsql/extension -%{_datadir}/pgsql/extension/plpgsql* -%{_datadir}/pgsql/information_schema.sql -%{_datadir}/pgsql/postgres.bki -%{_datadir}/pgsql/postgres.description -%{_datadir}/pgsql/postgres.shdescription -%{_datadir}/pgsql/snowball_create.sql -%{_datadir}/pgsql/sql_features.txt -%{_datadir}/pgsql/system_views.sql -%{_datadir}/pgsql/timezonesets/ -%{_datadir}/pgsql/tsearch_data/ -%dir %{_datadir}/postgresql-setup -%{_datadir}/postgresql-setup/library.sh -%{_libdir}/pgsql/*_and_*.so -%{_libdir}/pgsql/dict_snowball.so -%{_libdir}/pgsql/euc2004_sjis2004.so -%{_libdir}/pgsql/libpqwalreceiver.so -%{_libdir}/pgsql/pg_prewarm.so -%{_libdir}/pgsql/pgoutput.so -%{_libdir}/pgsql/plpgsql.so -%dir %{_libexecdir}/initscripts/legacy-actions/postgresql -%{_libexecdir}/initscripts/legacy-actions/postgresql/* -%{_libexecdir}/postgresql-check-db-dir -%dir %{_sysconfdir}/postgresql-setup -%dir %{_sysconfdir}/postgresql-setup/upgrade -%config %{_sysconfdir}/postgresql-setup/upgrade/*.conf -%{_mandir}/man1/initdb.* -%{_mandir}/man1/pg_basebackup.* -%{_mandir}/man1/pg_controldata.* -%{_mandir}/man1/pg_ctl.* -%{_mandir}/man1/pg_receivewal.* -%{_mandir}/man1/pg_resetwal.* -%{_mandir}/man1/pg_rewind.* -%{_mandir}/man1/postgres.* -%{_mandir}/man1/postgresql-new-systemd-unit.* -%{_mandir}/man1/postgresql-setup.* -%{_mandir}/man1/postgresql-upgrade.* -%{_mandir}/man1/postmaster.* -%{_sbindir}/postgresql-new-systemd-unit -%{_tmpfilesdir}/postgresql.conf -%{_unitdir}/*postgresql*.service -%attr(700,postgres,postgres) %dir %{?_localstatedir}/lib/pgsql -%attr(644,postgres,postgres) %config(noreplace) %{?_localstatedir}/lib/pgsql/.bash_profile -%attr(700,postgres,postgres) %dir %{?_localstatedir}/lib/pgsql/backups -%attr(700,postgres,postgres) %dir %{?_localstatedir}/lib/pgsql/data -%attr(755,postgres,postgres) %dir %{?_localstatedir}/run/postgresql -%if %pam -%config(noreplace) /etc/pam.d/postgresql -%endif - - -%if 0%{?external_libs} -%files server-devel -f devel.lst -%{_bindir}/pg_server_config -%dir %{_includedir}/pgsql -%{_includedir}/pgsql/server -%{_libdir}/pgsql/pgxs/ -%{_mandir}/man1/pg_server_config.* -%else -%files devel -f devel.lst -%{_bindir}/ecpg -%{_bindir}/pg_config -%{_includedir}/* -%{_libdir}/libecpg.so -%{_libdir}/libecpg_compat.so -%{_libdir}/libpgtypes.so -%{_libdir}/libpq.so -%{_libdir}/pgsql/pgxs/ -%{_libdir}/pkgconfig/*.pc -%{_mandir}/man1/ecpg.* -%{_mandir}/man1/pg_config.* -%endif -%{_mandir}/man3/SPI_* -%{macrosdir}/macros.%name - - -%files test-rpm-macros -%{_datadir}/postgresql-setup/postgresql_pkg_tests.sh -%{macrosdir}/macros.%name-test - - -%files static -%{_libdir}/libpgcommon.a -%{_libdir}/libpgport.a - - -%if %upgrade -%files upgrade -%{_libdir}/pgsql/postgresql-%{prevmajorversion}/bin -%exclude %{_libdir}/pgsql/postgresql-%{prevmajorversion}/bin/pg_config -%{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib -%exclude %{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib/pgxs -%exclude %{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib/pkgconfig -%{_libdir}/pgsql/postgresql-%{prevmajorversion}/share - - -%files upgrade-devel -%{_libdir}/pgsql/postgresql-%{prevmajorversion}/bin/pg_config -%{_libdir}/pgsql/postgresql-%{prevmajorversion}/include -%{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib/pkgconfig -%{_libdir}/pgsql/postgresql-%{prevmajorversion}/lib/pgxs -%{macrosdir}/macros.%name-upgrade -%endif - - -%if %plperl -%files plperl -f plperl.lst -%{_datadir}/pgsql/extension/plperl* -%{_libdir}/pgsql/plperl.so -%endif - - -%if %pltcl -%files pltcl -f pltcl.lst -%{_datadir}/pgsql/extension/pltcl* -%{_libdir}/pgsql/pltcl.so -%endif - - -%if %plpython -%files plpython -f plpython.lst -%{_datadir}/pgsql/extension/plpython2* -%{_datadir}/pgsql/extension/plpythonu* -%{_libdir}/pgsql/plpython2.so -%endif - - -%if %plpython3 -%files plpython3 -f plpython3.lst -%{_datadir}/pgsql/extension/plpython3* -%{_libdir}/pgsql/plpython3.so -%endif - - -%if %test -%files test -%attr(-,postgres,postgres) %{_libdir}/pgsql/test -%endif - - -%changelog -* Wed Nov 30 2022 Brandon Dunne - 10.21-2 -- Force globals enabling features - -* Tue Jun 14 2022 Filip Janus - 10.21-1 -- Update to 10.21 - -* Wed Feb 16 2022 Filip Janus - 10.20-1 -- Update to 10.20 -- Update to postgresql-setup v8.7 - -* Mon Dec 13 2021 Marek Kulik - 10.19-1 -- Update to 10.19 -- Remove patch postgresql-pgcrypto-openssl3-init.patch - already in upstream - Fixes: - CVE-2021-23214 - -* Mon Oct 18 2021 Marek Kulik - 10.18-1 -- Update to 10.18 - -* Mon Oct 18 2021 Marek Kulik - 10.15-2 -- Backporting commit (Fix openssl3 build issue): 21b8d7a - -* Wed Jan 13 2021 Honza Horak - 10.15-1 -- Update to 10.15 - Also fixes: - CVE-2020-14349 - CVE-2020-14350 - CVE-2020-25695 - CVE-2020-25696 - CVE-2020-25694 - -* Thu Sep 03 2020 Honza Horak - 10.14-1 -- Rebase to upstream release 10.14 - -* Tue May 19 2020 Patrik Novotný - 10.13-1 -- Rebase to upstream release 10.13 - -* Thu Aug 08 2019 Petr Kubat - 10.10-1 -- New upstream release 10.10 - https://www.postgresql.org/docs/10/release-10-10.html - -* Thu Jul 11 2019 Petr Kubat - 10.9-1 -- New upstream release 10.9 - https://www.postgresql.org/docs/10/release-10-9.html - -* Thu May 09 2019 Patrik Novotný - 10.8-1 -- New postgresql-setup 8.4 -- New upstream version 10.8 - https://www.postgresql.org/docs/10/release-10-8.html - -* Thu Feb 14 2019 Patrik Novotný - 10.7-1 -- Rebase to upstream version 10.7 - https://www.postgresql.org/docs/10/release-10-7.html - -* Tue Dec 11 2018 Pavel Raiskup - 10.6-1 -- rebase to 10.6 - -* Fri Nov 09 2018 Pavel Raiskup - 10.5-6 -- modular server, both for Fedora >= 30 and Fedora < 29 - -* Fri Nov 09 2018 Pavel Raiskup - 10.5-5 -- build all python modules against both Python 2 and Python 3 - -* Wed Sep 05 2018 Pavel Raiskup - 10.5-4 -- build without postgresql-libs; libraries moved to libpq and libecpg - -* Mon Aug 27 2018 Pavel Raiskup - 10.5-3 -- devel subpackage provides postgresql-server-devel and libecpg-devel - (first step for rhbz#1618698) - -* Mon Aug 27 2018 Pavel Raiskup - 10.5-2 -- packaging cleanup -- devel subpackage to provide libpq-devel (first step for rhbz#1618698) - -* Wed Aug 08 2018 Pavel Raiskup - 10.5-1 -- update to 10.5 per release notes: - https://www.postgresql.org/docs/10/static/release-10-5.html - -* Thu Aug 02 2018 Pavel Raiskup - 10.4-8 -- new postgresql-setup, the %%postgresql_tests* macros now start - the build-time server on random port number - -* Fri Jul 13 2018 Fedora Release Engineering - 10.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Jul 12 2018 Pavel Raiskup - 10.4-6 -- drop ppc64 patch, gcc is already fixed (rhbz#1544349) -- move pg_config*.mo files into devel subpackage - -* Mon Jul 09 2018 Pavel Raiskup - 10.4-5 -- re-enable -O3 for 64bit PPC boxes -- explicitly set PYTHON=python2, /bin/python doesn't exist fc29+ - -* Tue Jul 03 2018 Petr Pisar - 10.4-4 -- Perl 5.28 rebuild - -* Wed Jun 27 2018 Jitka Plesnikova - 10.4-3 -- Perl 5.28 rebuild - -* Tue Jun 19 2018 Miro Hrončok - 10.4-2 -- Rebuilt for Python 3.7 - -* Wed May 09 2018 Pavel Raiskup - 10.4-1 -- update to 10.4 per release notes: - https://www.postgresql.org/docs/10/static/release-10-4.html - -* Thu Apr 26 2018 Pavel Raiskup - 10.3-5 -- pltcl: drop tcl-pltcl dependency (rhbz#1571181) - -* Thu Apr 19 2018 Pavel Raiskup - 10.3-4 -- upgrade: package plpython*.so modules - -* Mon Apr 16 2018 Pavel Raiskup - 10.3-3 -- upgrade: package plperl.so and pltcl.so -- upgrade: package contrib modules -- upgrade: drop dynamic libraries - -* Fri Apr 13 2018 Pavel Raiskup - 10.3-2 -- define %%precise_version helper macro -- drop explicit libpq.so provide from *-libs -- update postgresql-setup tarball -- add postgresql-test-rpm-macros package - -* Thu Mar 01 2018 Pavel Raiskup - 10.3-1 -- update to 10.3 per release notes: - https://www.postgresql.org/docs/10/static/release-10-3.html - -* Thu Feb 08 2018 Petr Kubat - 10.2-1 -- update to 10.2 per release notes: - https://www.postgresql.org/docs/10/static/release-10-2.html - -* Sat Jan 20 2018 Björn Esser - 10.1-5 -- Rebuilt for switch to libxcrypt - -* Tue Dec 19 2017 Pavel Raiskup - 10.1-4 -- configure with --with-systemd (rhbz#1414314) -- disable startup timeout of PostgreSQL service (rhbz#1525477) - -* Wed Dec 13 2017 Pavel Raiskup - 10.1-3 -- unify %%configure options for python2/python3 configure -- drop --with-krb5 option, not supported since PostgreSQL 9.4 -- python packaging - requires/provides s/python/python2/ - -* Tue Nov 14 2017 Pavel Raiskup - 10.1-2 -- postgresql-setup v7.0 - -* Wed Nov 08 2017 Pavel Raiskup - 10.1-1 -- update to 10.1 per release notes: - https://www.postgresql.org/docs/10/static/release-10-1.html - -* Mon Nov 06 2017 Pavel Raiskup - 10.0-4 -- rebase to new postgresql-setup 6.0 version, to fix CVE-2017-15097 - -* Thu Oct 12 2017 Pavel Raiskup - 10.0-3 -- confess that we bundle setup scripts and previous version of ourseleves -- provide %%postgresql_upgrade_prefix macro - -* Mon Oct 09 2017 Pavel Raiskup - 10.0-2 -- stricter separation of files in upgrade/upgrade-devel - -* Mon Oct 09 2017 Jozef Mlich - 10.0-2 -- support for upgrade with extenstions - i.e the postgresql-upgrade-devel subpackage was added (rhbz#1475177) - -* Fri Oct 06 2017 Pavel Raiskup - 10.0-1 -- update to 10.0 per release notes: - https://www.postgresql.org/docs/10/static/release-10.html - -* Tue Sep 05 2017 Pavel Raiskup - 9.6.5-2 -- move %%_libdir/pgsql into *-libs subpackage - -* Tue Aug 29 2017 Pavel Raiskup - 9.6.5-1 -- update to 9.6.5 per release notes: - https://www.postgresql.org/docs/9.6/static/release-9-6-5.html - -* Tue Aug 08 2017 Petr Kubat - 9.6.4-1 -- update to 9.6.4 per release notes: - https://www.postgresql.org/docs/9.6/static/release-9-6-4.html - -* Thu Aug 03 2017 Fedora Release Engineering - 9.6.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 9.6.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon Jul 24 2017 Pavel Raiskup - 9.6.3-7 -- drop perl rpath patch; libperl.so* is now in %%_libdir (rhbz#1474417) - -* Mon Jun 26 2017 Pavel Raiskup - 9.6.3-6 -- don't provide libpqwalreceiver.so() soname - -* Wed Jun 21 2017 Pavel Raiskup - 9.6.3-5 -- drop the __os_install_post redefinition hack - -* Mon Jun 12 2017 Pavel Raiskup - 9.6.3-4 -- drop -DLINUX_OOM_SCORE_ADJ=0 define from CFLAGS (rhbz#1110969, rhbz#1436554) - -* Sun Jun 04 2017 Jitka Plesnikova - 9.6.3-3 -- Perl 5.26 rebuild - -* Mon May 22 2017 Petr Kubat - 9.6.3-2 -- fix indentation issues in hstore_plperlu test-case (rhbz#1453111) - -* Thu May 11 2017 Pavel Raiskup - 9.6.3-1 -- update to 9.6.3 per release notes: - https://www.postgresql.org/docs/9.6/static/release-9-6-3.html - -* Mon Apr 24 2017 Pavel Raiskup - 9.6.2-4 -- rebase to postgresql-setup 5.1 - -* Mon Apr 10 2017 Pavel Raiskup - 9.6.2-3 -- spring cleanup - -* Mon Mar 27 2017 Pavel Raiskup - 9.6.2-2 -- rebuild for rhbz#1436006 - -* Wed Feb 22 2017 Pavel Raiskup - 9.6.2-1 -- update to 9.6.2 per release notes: - https://www.postgresql.org/docs/9.6/static/release-9-6-2.html -- remove mistakenly isntalled libpgfeutils.a - -* Thu Jan 12 2017 Igor Gnatenko - 9.6.1-3 -- Rebuild for readline 7.x - -* Mon Dec 19 2016 Miro Hrončok - 9.6.1-2 -- Rebuild for Python 3.6 - -* Wed Oct 26 2016 Pavel Raiskup - 9.6.1-1 -- update to 9.6.1 per release notes: - https://www.postgresql.org/docs/9.6/static/release-9-6-1.html -- add gen_sources.sh script -- remove plpython build hack, fixed upstream -- remove aarch64 and ppc64p7 hacks, fixed by the %%configure call - -* Tue Oct 04 2016 Pavel Raiskup - 9.6.0-1 -- rebase the postgresql-setup tarball - -* Fri Sep 30 2016 Pavel Raiskup - 9.6.0-1 -- update to 9.6.0 per release notes: - https://www.postgresql.org/docs/9.6/static/release-9-6.html - -* Fri Aug 12 2016 Petr Kubat - 9.5.4-1 -- update to 9.5.4 per release notes: - http://www.postgresql.org/docs/9.5/static/release-9-5-4.html - -* Mon Jun 20 2016 Pavel Raiskup - 9.5.3-3 -- use multilib-rpm-config package for multilib hacks - -* Sun May 15 2016 Jitka Plesnikova - 9.5.3-2 -- Perl 5.24 rebuild - -* Thu May 12 2016 Pavel Raiskup - 9.5.3-1 -- update to 9.5.3 per release notes: - http://www.postgresql.org/docs/9.5/static/release-9-5-3.html - -* Mon May 09 2016 Pavel Raiskup - 9.5.2-2 -- fix the test subpackage, pg_regress now uses --bindir - -* Sun Apr 03 2016 Pavel Raiskup - 9.5.2-1 -- update to 9.5.2 per release notes - http://www.postgresql.org/docs/9.5/static/release-9-5-2.html - -* Fri Feb 26 2016 Pavel Raiskup - 9.5.1-2 -- package static libraries without dynamic counterparts (rhbz#784281) - -* Tue Feb 09 2016 Pavel Raiskup - 9.5.1-1 -- update to 9.5.1 per release notes - http://www.postgresql.org/docs/9.5/static/release-9-5-1.html - -* Thu Feb 04 2016 Fedora Release Engineering - 9.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jan 06 2016 Pavel Raiskup - 9.5.0-1 -- update to 9.5.0 per release notes - http://www.postgresql.org/docs/9.5/static/release-9-5.html -- update postgresql-setup to v4.0 to reflect new packaging style - -* Wed Dec 16 2015 Pavel Kajaba - 9.4.5-5 -- fixed problem with xml2 test (rhbz#1286692) - -* Thu Dec 3 2015 Pavel Kajaba - 9.4.5-4 -- fixed short-circuit build - -* Thu Nov 12 2015 Pavel Raiskup - 9.4.5-3 -- fix testsuite failure with new Python 3.5 (rhbz#1280404) - -* Tue Nov 10 2015 Fedora Release Engineering - 9.4.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 - -* Fri Oct 16 2015 Pavel Raiskup - 9.4.5-2 -- devel package should not require the main package (rhbz#1272219) -- multilib fix, more general solution (rhbz#1190346) - -* Tue Oct 06 2015 Pavel Raiskup - 9.4.5-1 -- update to 9.4.5 per release notes - http://www.postgresql.org/docs/9.4/static/release-9-4-5.html - -* Fri Sep 25 2015 Pavel Raiskup - 9.4.4-6 -- postgresql-setup rebase to 3.4 (rhbz#1265319, rhbz#1247477) - -* Thu Sep 17 2015 Pavel Raiskup - 9.4.4-5 -- enable hardening (safe for kernel 4.1+) (see rhbz#952946 comment #24) - -* Tue Aug 04 2015 Pavel Raiskup - 9.4.4-4 -- install README.rpm-dist properly (rhbz#1249708) - -* Tue Jul 14 2015 Pavel Raiskup - 9.4.4-3 -- revert/fix part of e6acde1a9 commit related to multilib hack (rhbz#1242873) - -* Thu Jun 18 2015 Fedora Release Engineering - 9.4.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Jun 15 2015 Pavel Raiskup - 9.4.4-1 -- fix for Perl 5.22 rebase (rhbz#1231279) - -* Thu Jun 11 2015 Pavel Raiskup - 9.4.4-1 -- update to 9.4.4 per release notes - http://www.postgresql.org/docs/9.4/static/release-9-4-4.html - -* Sat Jun 06 2015 Jitka Plesnikova - 9.4.3-2 -- Perl 5.22 rebuild - -* Wed Jun 03 2015 Jozef Mlich - 9.4.3-1 -- update to 9.4.3 per release notes - http://www.postgresql.org/docs/9.4/static/release-9-4-3.html - -* Thu May 21 2015 Jozef Mlich - 9.4.2-1 -- update to 9.4.2 per release notes - http://www.postgresql.org/docs/9.4/static/release-9-4-2.html - -* Thu May 21 2015 Pavel Raiskup - 9.4.1-4 -- make the %%check phase more verbose for FAIL cases -- don't FTBFS on f23+ where hardening is on by default - -* Wed Mar 25 2015 Jozef Mlich - 9.4.1-3 -- update to postgresql-setup 3.3 - -* Thu Mar 19 2015 Jozef Mlich - 9.4.1-2 -- Adding tcl-pgtcl into Requires of -tcl subpackage - -* Wed Feb 04 2015 Pavel Raiskup - 9.4.1-1 -- update to 9.4.1 per release notes - http://www.postgresql.org/docs/9.4/static/release-9-4-1.html - -* Tue Feb 03 2015 Pavel Raiskup - 9.4.0-2 -- sort file lists alphabetically - -* Tue Dec 23 2014 Jozef Mlich - 9.4.0-1 -- update to 9.4.0 per release notes - http://www.postgresql.org/docs/9.4/static/index.html - -* Mon Nov 24 2014 Pavel Raiskup - 9.3.5-8 -- print regression.diffs contents to stdout (#1118392) - -* Mon Oct 20 2014 Pavel Raiskup - 9.3.5-7 -- be forgiving of variant spellings of locale names in pg_upgrade (#1007802) - -* Sun Sep 21 2014 Pavel Raiskup - 9.3.5-6 -- postgresql-setup & relatives are now in separate tarball - -* Wed Aug 27 2014 Jitka Plesnikova - 9.3.5-5 -- Perl 5.20 rebuild - -* Thu Aug 21 2014 Pavel Raiskup - 9.3.5-4 -- install macros.postgresql, not postgresql.macros - -* Sun Aug 17 2014 Fedora Release Engineering - 9.3.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Thu Jul 24 2014 Pavel Raiskup - 9.3.5-2 -- fix the prevversion sum link and comment a little - -* Tue Jul 22 2014 Pavel Raiskup - 9.3.5-1 -- update to 9.3.5 per release notes - http://www.postgresql.org/docs/9.3/static/release-9-3-5.html - -* Fri Jul 18 2014 Pavel Raiskup - 9.3.4-8 -- provide postgresql-doc for postgresql-docs package (#1086420) -- move html documentation to *-docs subpackage (#1086420) -- provide postgresql-server(:MODULE_COMPAT_%%{postgresql_major}) to guard - against incompatible plugin installation (#1008939) - -* Thu Jun 19 2014 Pavel Raiskup - 9.3.4-7 -- OOM handling compatible with 9.5+, by Tom Lane (#1110969) - -* Sat Jun 07 2014 Fedora Release Engineering - 9.3.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon May 26 2014 Honza Horak - 9.3.4-5 -- Rebuild for Python 3.4 - -* Fri May 23 2014 Honza Horak - 9.3.4-4 -- Change plpython_do test a bit so it is universal for all python versions - -* Wed May 21 2014 Jaroslav Škarvada - 9.3.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86 - -* Wed May 14 2014 Pavel Raiskup - 9.3.4-2 -- set basic $PATH when it is empty or unset, (#1097317) - -* Thu Mar 20 2014 Jozef Mlich - 9.3.4-1 -- update to 9.3.4 minor version per release notes: - http://www.postgresql.org/docs/9.3/static/release-9-3-4.html - -* Thu Mar 13 2014 Jozef Mlich - 9.3.3-2 -- Fix WAL replay of locking an updated tuple - kudos to Alvaro Herrera - -* Thu Feb 20 2014 Jozef Mlich - 9.3.3-1 -- update to 9.3.3 minor version per release notes: - http://www.postgresql.org/docs/9.3/static/release-9-3-3.html - -* Thu Jan 23 2014 Pavel Raiskup - 9.3.2-7 -- postgresql-setup: typos - -* Tue Jan 21 2014 Pavel Raiskup - 9.3.2-6 -- add PGSETUP_PGUPGRADE_OPTIONS env var for postgresql-setup - -* Mon Jan 20 2014 Pavel Raiskup - 9.3.2-5 -- fix the postgresql-setup --version option - -* Mon Jan 20 2014 Pavel Raiskup - 9.3.2-4 -- postgresql-setup(upgrade): don't stop old server when it can not be started -- postgresql-setup(initdb, upgrade): add $PGSETUP_INITDB_OPTIONS -- postgresql-setup: do not pretend 'sh' compatibility -- move script generation to proper place -- postgresql-setup: document a little and genrate manual page - -* Fri Jan 10 2014 Pavel Raiskup - 9.3.2-3 -- build with -O3 on ppc64 (private #1051075) - -* Fri Dec 13 2013 Pavel Raiskup - 9.3.2-2 -- lint the postgresql-setup script - -* Thu Dec 12 2013 Jozef Mlich - 9.3.2-2 -- don't fail if user has badly configure 'postgres' user access (#1040364) - -* Thu Dec 05 2013 Jozef Mlich - 9.3.2-1 -- update to 9.3.2 minor version per release notes: - http://www.postgresql.org/docs/9.3/static/release-9-3-2.html - -* Thu Oct 17 2013 Jozef Mlich - 9.3.1-2 -- the prevversion (see package upgrade process) is updated - from 9.2.4 to 9.2.5 - -* Thu Oct 10 2013 Jozef Mlich - 9.3.1-1 -- update to 9.3.1 minor version per release notes: - http://www.postgresql.org/docs/9.3/static/release-9-3-1.html - -* Tue Sep 10 2013 Pavel Raiskup - 9.3.0-1 -- update to 9.3 major version per release notes: - http://www.postgresql.org/docs/9.3/static/release-9-3.html - -* Thu Aug 15 2013 Pavel Raiskup - 9.2.4-11 -- upgrade: stop old server in case of permissions problem (#896161) - -* Mon Aug 12 2013 Pavel Raiskup - 9.2.4-10 -- disable aggressive loop optimizations for old codebase (#993532) - -* Wed Aug 07 2013 Pavel Raiskup - 9.2.4-9 -- generate links docdir links in postgresql-check-db-dir correctly (#994048) - -* Tue Aug 06 2013 Pavel Raiskup - 9.2.4-8 -- allow `rpmbuild -bi --short-circuit` - -* Sun Aug 04 2013 Fedora Release Engineering - 9.2.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Jul 24 2013 Pavel Raiskup - 9.2.4-6 -- split aarch64 patch to allow build without postgresql-upgrade - -* Tue Jul 23 2013 Pavel Raiskup - 9.2.4-5 -- fix testsuite to allow build against Perl 5.18 - -* Thu Jul 18 2013 Petr Pisar - 9.2.4-5 -- Perl 5.18 rebuild - -* Tue Jul 09 2013 Pavel Raiskup - 9.2.4-4 -- do not use -b for manual page fixes - -* Thu Jun 20 2013 Pavel Raiskup - 9.2.4-3 -- fix README.rpm-dist for the bug (#969050) -- replace hard-wired path with %%{_datadir} - -* Thu Jun 13 2013 Pavel Raiskup - 9.2.4-3 -- add atomic operations support for aarch64 to preupgrade version also (#970661) -- apply the forgotten man-page-day patch (#948933) - -* Thu Jun 13 2013 Jan Stanek - 9.2.4-3 -- added patch for manual pages (#948933) - -* Tue Jun 11 2013 Pavel Raiskup - 9.2.4-2 -- postgresql-setup: don't create whole path to server's data to make sure that - the parent directory has correct permissions (#972425) - -* Wed Jun 05 2013 Pavel Raiskup - 9.2.4-2 -- fix rpmlint warnings -- fix aarch64 build by defining missing atomic operations (#970661) - -* Thu Apr 4 2013 Tom Lane 9.2.4-1 -- Update to PostgreSQL 9.2.4, for various fixes described at - http://www.postgresql.org/docs/9.2/static/release-9-2-4.html - including the fixes for CVE-2013-1899, CVE-2013-1900, CVE-2013-1901 -Resolves: #929223, #929255, #929328 -- fix build for aarch64 and ppc64p7 - -* Thu Feb 7 2013 Tom Lane 9.2.3-1 -- Update to PostgreSQL 9.2.3, for various fixes described at - http://www.postgresql.org/docs/9.2/static/release-9-2-3.html - including the fix for CVE-2013-0255 -Resolves: #908722 -- Make the package build with selinux option disabled -Resolves: #894367 -- Include old version of pg_controldata in postgresql-upgrade subpackage -Related: #896161 - -* Thu Jan 3 2013 Tom Lane 9.2.2-3 -- Prevent creation of TCP socket during pg_upgrade regression test, so that - concurrent RPM builds on the same machine won't fail -Resolves: #891531 -- Make sure $PGDATA/pg_log/ gets the right SELinux label in postgresql-setup -Resolves: #891547 - -* Wed Dec 19 2012 Tom Lane 9.2.2-2 -- Make building of plpython3 dependent on Fedora version, per guidelines -Resolves: #888419 - -* Thu Dec 6 2012 Tom Lane 9.2.2-1 -- Update to PostgreSQL 9.2.2, for various fixes described at - http://www.postgresql.org/docs/9.2/static/release-9-2-2.html -- Use new systemd install/uninstall trigger macros conditionally, - so that package can still be installed on pre-F18 branches - -* Mon Sep 24 2012 Tom Lane 9.2.1-1 -- Update to PostgreSQL 9.2.1, for various fixes described at - http://www.postgresql.org/docs/9.2/static/release-9-2-1.html - including a nasty data-loss bug -- Adopt new systemd macros for server package install/uninstall triggers -Resolves: #850277 - -* Mon Sep 10 2012 Tom Lane 9.2.0-1 -- Update to PostgreSQL 9.2.0 (major version bump); - in-place upgrade support now works from 9.1.x as the previous version -- Add postgresql-plpython3 subpackage with PL/Python built against Python 3 - -* Tue Aug 28 2012 Tom Lane 9.1.5-2 -- Remove unnecessary ldconfig calls in pre/post triggers -Resolves: #849344 - -* Fri Aug 17 2012 Tom Lane 9.1.5-1 -- Update to PostgreSQL 9.1.5, for various fixes described at - http://www.postgresql.org/docs/9.1/static/release-9-1-5.html - including the fixes for CVE-2012-3488, CVE-2012-3489 - -* Mon Aug 13 2012 Tom Lane 9.1.4-5 -- Back-port upstream support for postmaster listening on multiple Unix sockets -- Configure postmaster to create sockets in both /var/run/postgresql and /tmp; - the former is now the default place for libpq to contact the postmaster. -Resolves: #825448 -- Annotate postgresql.conf about not setting port number there -- Minor specfile cleanup per suggestions from Tom Callaway -Related: #845110 - -* Sat Jul 21 2012 Fedora Release Engineering - 9.1.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jul 14 2012 Tom Lane 9.1.4-3 -- Update code to use oom_score_adj not oom_adj, thereby suppressing - whining in the kernel log -- Add "legacy action" scripts to support "service postgresql initdb" and - "service postgresql upgrade" in a now-approved fashion (requires a - recent version of initscripts to work) -Resolves: #800416 - -* Mon Jun 11 2012 Petr Pisar - 9.1.4-2 -- Perl 5.16 rebuild - -* Mon Jun 4 2012 Tom Lane 9.1.4-1 -- Update to PostgreSQL 9.1.4, for various fixes described at - http://www.postgresql.org/docs/9.1/static/release-9-1-4.html - including the fixes for CVE-2012-2143, CVE-2012-2655 -Resolves: #826606 -- Update previous version (embedded in postgresql-upgrade) to 9.0.8 - because fix in whole-row variable dumping could be needed for upgrades -- Revert fix for bug #800416, per fedora-packaging discussion at - http://lists.fedoraproject.org/pipermail/packaging/2012-April/008314.html - "service postgresql initdb" is dead and will stay that way - -* Sat Mar 17 2012 Tom Lane 9.1.3-3 -- Fix postgresql-setup to rely on systemd to parse the unit file, instead - of using ad-hoc code -Resolves: #804290 - -* Tue Mar 13 2012 Tom Lane 9.1.3-2 -- Fix postgresql-setup to look for unit file in /usr/lib and to ignore - comments therein -Resolves: #802835 -- Resurrect a now-mostly-dummy postgresql init script, so that people can - keep on using "service postgresql initdb" if they wish -Resolves: #800416 - -* Mon Feb 27 2012 Tom Lane 9.1.3-1 -- Update to PostgreSQL 9.1.3, for various fixes described at - http://www.postgresql.org/docs/9.1/static/release-9-1-3.html - including the fixes for CVE-2012-0866, CVE-2012-0867, CVE-2012-0868 -Resolves: #797918 - -* Mon Jan 9 2012 Tom Lane 9.1.2-2 -- Make systemd unit file more user-friendly by resurrecting the old init - script's checks for data directory presence and version match -Resolves: #771496 - -* Mon Dec 5 2011 Tom Lane 9.1.2-1 -- Update to PostgreSQL 9.1.2, for various fixes described at - http://www.postgresql.org/docs/9.1/static/release-9-1-2.html - -* Wed Nov 02 2011 Honza Horak 9.1.1-2 -- Create a symlink of pg_regress instead of full copy; - Don't strip symbols from regress libs -Related: #729012 - -* Mon Sep 26 2011 Tom Lane 9.1.1-1 -- Update to PostgreSQL 9.1.1, for various fixes described at - http://www.postgresql.org/docs/9.1/static/release-9-1-1.html -- Enable build (but not test) of contrib/sepgsql -- Clean up specfile build options so that turning options off works again - -* Mon Sep 12 2011 Tom Lane 9.1.0-1 -- Update to PostgreSQL 9.1.0 (major version bump); - in-place upgrade support now works from 9.0.x as the previous version - -* Wed Jul 27 2011 Tom Lane 9.0.4-8 -- Convert to systemd startup support -Resolves: #696427 - -* Thu Jul 21 2011 Petr Sabata - 9.0.4-7 -- Perl mass rebuild - -* Wed Jul 20 2011 Petr Sabata - 9.0.4-6 -- Perl mass rebuild - -* Wed Jul 6 2011 Tom Lane 9.0.4-5 -- Remove erroneously-included Default-Start line from LSB init block -Related: #717024 - -* Fri Jun 17 2011 Marcela Mašláňová 9.0.4-4 -- Perl mass rebuild -- incorporate upstream patch to make it build with Perl 5.14 - -* Fri Jun 10 2011 Tom Lane 9.0.4-3 -- Work around gcc 4.6.0 bug (temporary backport from next upstream release) - -* Tue May 10 2011 Tom Lane 9.0.4-2 -- Add LSB init block to initscript, to ensure sane ordering at system boot -Resolves: #703215 - -* Mon Apr 18 2011 Tom Lane 9.0.4-1 -- Update to PostgreSQL 9.0.4, for various fixes described at - http://www.postgresql.org/docs/9.0/static/release-9-0-4.html -- Add %%{?_isa} to cross-subpackage Requires, per latest packaging guidelines - -* Wed Feb 09 2011 Fedora Release Engineering - 9.0.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Feb 3 2011 Tom Lane 9.0.3-2 -- Remove filter-requires-perl-Pg.sh, which doesn't seem to be needed now that - PyGreSQL has been split out; and our use of it isn't compatible with rpm 4.9 - anyway - -* Tue Feb 1 2011 Tom Lane 9.0.3-1 -- Update to PostgreSQL 9.0.3, for various fixes described at - http://www.postgresql.org/docs/9.0/static/release-9-0-3.html - including the fix for CVE-2010-4015 -Resolves: #674296 - -* Tue Dec 28 2010 Tom Lane 9.0.2-1 -- Update to PostgreSQL 9.0.2 (major version bump) -- Create infrastructure for in-place database upgrade using pg_upgrade -Resolves: #398221 - -* Thu Dec 16 2010 Tom Lane 8.4.6-1 -- Update to PostgreSQL 8.4.6, for various fixes described at - http://www.postgresql.org/docs/8.4/static/release-8-4-6.html -- Ensure we don't package any .gitignore files from the source tarball -Related: #642210 - -* Tue Oct 5 2010 Tom Lane 8.4.5-1 -- Update to PostgreSQL 8.4.5, for various fixes described at - http://www.postgresql.org/docs/8.4/static/release-8-4-5.html - including the fix for CVE-2010-3433 -Related: #639371 -- Add -p "$pidfile" to initscript's status call to improve corner cases. -Related: #561010 - -* Sat Jul 31 2010 Orcan Ogetbil - 8.4.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild -- Duplicate COPYRIGHT in -libs subpackage, per revised packaging guidelines - -* Wed Jun 02 2010 Marcela Maslanova - 8.4.4-2 -- Mass rebuild with perl-5.12.0 - -* Mon May 17 2010 Tom Lane 8.4.4-1 -- Update to PostgreSQL 8.4.4, for various fixes described at - http://www.postgresql.org/docs/8.4/static/release-8-4-4.html - including fixes for CVE-2010-1169 and CVE-2010-1170 -Resolves: #593032 - -* Sun Mar 14 2010 Tom Lane 8.4.3-1 -- Update to PostgreSQL 8.4.3, for various fixes described at - http://www.postgresql.org/docs/8.4/static/release-8-4-3.html - -* Mon Feb 22 2010 Tom Lane 8.4.2-8 -- Bring init script into some modicum of compliance with Fedora/LSB standards -Resolves: #201043 - -* Thu Feb 18 2010 Tom "spot" Callaway 8.4.2-7 -- adjust license tag to reflect OSI decision - -* Tue Jan 26 2010 Tom Lane 8.4.2-6 -- Emit explicit error message if user tries to build RPM as root -Related: #558921 - -* Wed Jan 20 2010 Tom Lane 8.4.2-5 -- Latest version of systemtap needs the probes.o file to be built again -Resolves: #557266 -- Provide script and instructions for building the documentation PDF - -* Mon Jan 11 2010 Tom Lane 8.4.2-4 -- Arrange for the postmaster, but not any of its child processes, to be run - with oom_adj -17. This compensates for the OOM killer not being smart about - accounting for shared memory usage. - -* Sat Jan 9 2010 Tom Lane 8.4.2-3 -- Remove the postgresql-python and postgresql-tcl subpackages. These files - are now broken out as their own packages (PyGreSQL and tcl-pgtcl, - respectively), to reflect the now longstanding split of upstream projects. -Related: #452306, #452321 - -* Tue Jan 5 2010 Tom Lane 8.4.2-2 -- Remove static libraries (.a files) from package, per packaging guidelines -- Change %%define to %%global, per packaging guidelines - -* Wed Dec 16 2009 Tom Lane 8.4.2-1 -- Update to PostgreSQL 8.4.2, for various fixes described at - http://www.postgresql.org/docs/8.4/static/release-8-4-2.html - including two security issues -Related: #546321 -Related: #547662 -- Use -N not the obsolete -n in useradd call -Resolves: #495727 -- Clean up specfile to eliminate rpmlint gripes, mainly by removing - no-longer-needed provisions for superseding rh-postgresql - -* Mon Dec 7 2009 Stepan Kasal - 8.4.1-5 -- rebuild against perl 5.10.1 - -* Thu Oct 15 2009 Tom Lane 8.4.1-4 -- add sparc/sparc64 to multilib header support - -* Mon Sep 21 2009 Tom Lane 8.4.1-3 -- Ensure pgstartup.log gets the right ownership/permissions during initdb -Resolves: #498959 - -* Wed Sep 16 2009 Tomas Mraz - 8.4.1-2 -- Use password-auth common PAM configuration instead of system-auth - -* Wed Sep 9 2009 Tom Lane 8.4.1-1 -- Update to PostgreSQL 8.4.1, for various fixes described at - http://www.postgresql.org/docs/8.4/static/release-8-4-1.html - including two security issues -Related: #522085 -Related: #522092 - -* Tue Sep 01 2009 Karsten Hopp 8.4.0-3.2 -- bump release and build again with the correct libssl - -* Tue Sep 01 2009 Karsten Hopp 8.4.0-3.1 -- disable dtrace on s390x as a workaround until #520469 has been fixed - -* Fri Aug 21 2009 Tomas Mraz - 8.4.0-3 -- rebuilt with new openssl - -* Thu Aug 20 2009 Tom "spot" Callaway 8.4.0-2 -- update License tag to MIT (PostgreSQL calls it "BSD", but it is MIT) -- Note: This changes nothing from a license compatibility perspective. - -* Mon Aug 17 2009 Tom Lane 8.4.0-1 -- Update to PostgreSQL 8.4.0. See release notes at - http://www.postgresql.org/docs/8.4/static/release-8-4.html - -* Sun Jul 26 2009 Fedora Release Engineering - 8.3.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Sat Mar 21 2009 Tom Lane 8.3.7-1 -- Update to PostgreSQL 8.3.7, for various fixes described at - http://www.postgresql.org/docs/8.3/static/release-8-3-7.html - notably the fix for CVE-2009-0922 - -* Tue Mar 10 2009 Tom Lane 8.3.6-4 -- Prevent dependent packages from needing to include sys/sdt.h - (unintended side effect of previous patch) -- Use -O1 on alpha, per report from Oliver Falk; -O2 tickles gcc bugs - -* Sun Mar 8 2009 Tom Lane 8.3.6-3 -- Enable tracing via systemtap -Resolves: #488941 - -* Thu Feb 26 2009 Fedora Release Engineering - 8.3.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Feb 7 2009 Tom Lane 8.3.6-1 -- Update to PostgreSQL 8.3.6, for various fixes described at - http://www.postgresql.org/docs/8.3/static/release-8-3-6.html - -* Wed Jan 21 2009 Dennis Gilmore 8.3.5-4 -- use -O1 on sparc64 - -* Sat Jan 17 2009 Tomas Mraz - 8.3.5-3 -- rebuild with new openssl - -* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 8.3.5-2 -- Rebuild for Python 2.6 - -* Sun Nov 2 2008 Tom Lane 8.3.5-1 -- Update to PostgreSQL 8.3.5. -- Improve display from init script's initdb action, per Michael Schwendt - -* Thu Sep 25 2008 Tom Lane 8.3.4-1 -- Update to PostgreSQL 8.3.4. - -* Mon Jul 28 2008 Tom Lane 8.3.3-3 -- Fix build failure caused by new default patch fuzz = 0 policy in rawhide. - -* Fri Jun 20 2008 Tom Lane 8.3.3-2 -- Install Pgtcl in /usr/lib/tcl$TCL_VERSION, not directly in /usr/lib. - Needed because tcl 8.5 no longer puts /usr/lib into its package search path. - NOTE: do not back-port this change into branches using pre-8.5 tcl, because - /usr/lib/tcl8.4 had been a symlink to /usr/share/tcl8.4, and /usr/share - is exactly where we must not put Pgtcl. -Resolves: #228263 - -* Wed Jun 11 2008 Tom Lane 8.3.3-1 -- Update to PostgreSQL 8.3.3. -- Remove postgresql-prefer-ncurses.patch, no longer needed in recent - Fedora releases because libtermcap is gone. - -* Sat May 17 2008 Tom Lane 8.3.1-5 -- rebuild because of buildsystem hiccup - -* Sat May 17 2008 Tom Lane 8.3.1-4 -- Enable LDAP support -Resolves: #445315 -- Use -Wl,--as-needed to suppress bogus dependencies for libraries that - are really only needed by some of the subpackages - -* Mon Apr 28 2008 Tom Lane 8.3.1-3 -- Fix build breakage on PPC due to incorrect configure test -Related: #444317 - -* Sat Apr 26 2008 Tom Lane 8.3.1-2 -- Clean up cross-subpackage Requires: to ensure that updating any one - subpackage brings in the matching versions of others. -Resolves: #444271 - -* Tue Mar 25 2008 Tom Lane 8.3.1-1 -- Update to PostgreSQL 8.3.1. - -* Tue Mar 18 2008 Tom "spot" Callaway 8.3.0-3 -- add Requires for versioned perl (libperl.so) - -* Wed Feb 6 2008 Tom Lane 8.3.0-2 -- Enable the new GSSAPI support in 8.3.0. - -* Mon Feb 4 2008 Tom Lane 8.3.0-1 -- Update to PostgreSQL 8.3.0. - -* Fri Jan 18 2008 Tom Lane 8.3RC2-1 -- Update to PostgreSQL 8.3RC2 (not waiting for 8.3.0 because Fedora 9 alpha - should be 8.3-based not 8.2-based). -- Update to pgtcl 1.6.2 - -* Mon Jan 7 2008 Tom Lane 8.2.6-1 -- Update to PostgreSQL 8.2.6 to fix CVE-2007-4769, CVE-2007-4772, - CVE-2007-6067, CVE-2007-6600, CVE-2007-6601 -- Make initscript and pam config files be installed unconditionally; - seems new buildroots don't necessarily have those directories in place - -* Wed Dec 5 2007 Tom Lane 8.2.5-2 -- Rebuild for new openssl - -* Thu Sep 20 2007 Tom Lane 8.2.5-1 -- Update to PostgreSQL 8.2.5 and pgtcl 1.6.0 - -* Tue Sep 4 2007 Tom Lane 8.2.4-6 -- Fix multilib problem for /usr/include/ecpg_config.h (which is new in 8.2.x) - -* Sat Aug 25 2007 Tom Lane 8.2.4-5 -- Use nicer solution for tzdata file substitution: upstream discussion - concluded that hardwiring the path was better than a symlink after all. - -* Wed Aug 22 2007 Tom Lane 8.2.4-4 -- Use tzdata package's data files instead of private copy, so that - postgresql-server need not be turned for routine timezone updates -- Don't remove postgres user/group during RPM uninstall, per Fedora - packaging guidelines -- Seems we need an explicit BuildRequires on gawk now -- Rebuild to fix Fedora toolchain issues - -* Sun Aug 12 2007 Tom Lane 8.2.4-3 -- Recent perl changes in rawhide mean we need a more specific BuildRequires - -* Wed Jun 20 2007 Tom Lane 8.2.4-2 -- Fix oversight in postgresql-test makefile: pg_regress isn't a shell script - anymore. Per upstream bug 3398. - -* Tue Apr 24 2007 Tom Lane 8.2.4-1 -- Update to PostgreSQL 8.2.4 for CVE-2007-2138, data loss bugs -Resolves: #237682 - -* Wed Feb 14 2007 Karsten Hopp 8.2.3-2 -- rebuild with tcl-8.4 - -* Wed Feb 7 2007 Tom Lane 8.2.3-1 -- Update to PostgreSQL 8.2.3 due to regression induced by security fix -Resolves: #227522 - -* Sun Feb 4 2007 Tom Lane 8.2.2-1 -- Update to PostgreSQL 8.2.2 to fix CVE-2007-0555, CVE-2007-0556 -Related: #225496 - -* Fri Jan 12 2007 Tom Lane 8.2.1-2 -- Split -pl subpackage into three new packages to reduce dependencies - and track upstream project's packaging. - -* Wed Jan 10 2007 Tom Lane 8.2.1-1 -- Update to PostgreSQL 8.2.1 -- Update to pgtcl 1.5.3 -- Be sure we link to libncurses, not libtermcap which is disappearing in Fedora - -* Thu Dec 7 2006 Jeremy Katz - 8.2.0-2 -- rebuild for python 2.5 - -* Mon Dec 4 2006 Tom Lane 8.2.0-1 -- Update to PostgreSQL 8.2.0 -- Update to PyGreSQL 3.8.1 -- Fix chcon arguments in test/regress/Makefile -Related: #201035 -- Adjust init script to not fool /etc/rc.d/rc -Resolves: #161470 -- Change init script to not do initdb automatically, but require - manual "service postgresql initdb" for safety. Per upstream discussions. - -* Wed Jul 12 2006 Jesse Keating - 8.1.4-1.1 -- rebuild - -* Mon May 22 2006 Tom Lane 8.1.4-1 -- Update to PostgreSQL 8.1.4 (includes fixes for CVE-2006-2313, CVE-2006-2314; - see bug #192173) -- Update to PyGreSQL 3.8 -- Suppress noise from chcon, per bug #187744 - -* Mon Mar 27 2006 Tom Lane 8.1.3-2 -- Remove JDBC from this build; we will package it as separate SRPM - -* Mon Feb 13 2006 Jesse Keating - 8.1.3-1.1 -- rebump for build order issues during double-long bump - -* Mon Feb 13 2006 Tom Lane 8.1.3-1 -- Update to PostgreSQL 8.1.3 (fixes bug #180617, CVE-2006-0553) -- Update to jdbc driver build 405 -- Modify multilib header hack to not break non-RH arches, per bug #177564 - -* Tue Feb 07 2006 Jesse Keating - 8.1.2-1.1 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Mon Jan 9 2006 Tom Lane 8.1.2-1 -- Update to PostgreSQL 8.1.2 -- Repair extraneous quote in pgtcl configure script ... odd that bash - didn't use to spit up on this. - -* Thu Dec 15 2005 Tom Lane 8.1.1-3 -- fix pg_config.h for 64-bit and ppc platforms -- update Makefile.regress (needs to --load-language=plpgsql) - -* Wed Dec 14 2005 Tom Lane 8.1.1-2 -- oops, looks like we want uname -i not uname -m - -* Wed Dec 14 2005 Tom Lane 8.1.1-1 -- Update to PostgreSQL 8.1.1 -- Make pg_config.h architecture-independent for multilib installs; - put the original pg_config.h into pg_config_$ARCH.h - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Sat Nov 12 2005 Tom Lane 8.1.0-4 -- Update included PDF-format manual to 8.1. - -* Wed Nov 9 2005 Tom Lane 8.1.0-3 -- Rebuild due to openssl library update. - -* Wed Nov 9 2005 Tom Lane 8.1.0-2 -- Rebuild due to openssl library update. - -* Mon Nov 7 2005 Tom Lane 8.1.0-1 -- Update to PostgreSQL 8.1.0, PyGreSQL 3.7, and jdbc driver build 404 -- Fix PAM config file (must have account not only auth) (bug #167040) -- Add BuildPrereq: libxslt-devel (bug #170141) -- Sync with PGDG SRPM as much as feasible - -* Fri Oct 14 2005 Tomas Mraz -- use include instead of pam_stack in pam config - -* Tue Oct 4 2005 Tom Lane 8.0.4-2 -- Add rpath to plperl.so (bug #162198) - -* Tue Oct 4 2005 Tom Lane 8.0.4-1 -- Update to PostgreSQL 8.0.4, PyGreSQL 3.6.2, and jdbc driver build 312 -- Adjust pgtcl link command to ensure it binds to correct libpq (bug #166665) -- Remove obsolete Conflicts: against other python versions (bug #166754) -- Add /etc/pam.d/postgresql (bug #167040) -- Include contrib/xml2 in build (bug #167492) - -* Tue May 10 2005 Tom Lane 8.0.3-1 -- Update to PostgreSQL 8.0.3 (includes security and data-loss fixes; see - bz#156727, CAN-2005-1409, CAN-2005-1410) -- Update to jdbc driver build 311 -- Recreate postgres user after superseding an rh-postgresql install (bug #151911) -- Ensure postgresql server is restarted if running during an upgrade - -* Thu Apr 14 2005 Florian La Roche 8.0.2-2 -- rebuild for postgresql-tcl - -* Tue Apr 12 2005 Tom Lane 8.0.2-1 -- Update to PostgreSQL 8.0.2. - -* Fri Mar 11 2005 Tom Lane 8.0.1-5 -- Remove unwanted rpath specification from pgtcl (bz#150649) - -* Wed Mar 2 2005 Tom Lane 8.0.1-4 -- Attach Obsoletes: declarations for rh-postgresql to subpackages (bz#144435) -- Make Requires: and Prereq: package linkages specify release not only - version, as per recent mailing list discussion. - -* Tue Mar 1 2005 Tomas Mraz 8.0.1-3 -- rebuild with openssl-0.9.7e - -* Mon Feb 21 2005 Tom Lane 8.0.1-2 -- Repair improper error message in init script when PGVERSION doesn't match. -- Arrange for auto update of version embedded in init script. - -* Sun Jan 30 2005 Tom Lane 8.0.1-1 -- Update to PostgreSQL 8.0.1. -- Add versionless symlinks to jar files (bz#145744) - -* Wed Jan 19 2005 Tom Lane 8.0.0-1 -- Update to PostgreSQL 8.0.0, PyGreSQL 3.6.1, pgtcl 1.5.2, - and jdbc driver build 309. -- Extensive cleanout of obsolete cruft in patch set. -- Regression tests are run during RPM build (NOTE: cannot build as root when - this is enabled). -- Postmaster stderr goes someplace useful, not /dev/null (bz#76503, #103767) -- Make init script return a useful exit status (bz#80782) -- Move docs' tutorial directory to %%{_libdir}/pgsql/tutorial, since it - includes .so files that surely do not belong under /usr/share. -- Remove useless .sgml files from docs RPM (bz#134450) -- Put regression tests under /usr/lib64 on 64-bit archs, since .so files - are not architecture-independent. - -* Wed Jan 12 2005 Tim Waugh 7.4.6-5 -- Rebuilt for new readline. - -* Tue Jan 11 2005 Dan Walsh 7.4.6-4 -- Add restorecon to postgresql.init in order to restore database to correct -- SELinux context. - -* Thu Dec 16 2004 Tom Lane 7.4.6-3 -- Update to PyGreSQL 3.6 (to fix bug #142711) -- Adjust a few file permissions (bug #142431) -- Assign %%{_libdir}/pgsql to base package instead of -server (bug #74003) - -* Mon Nov 15 2004 Tom Lane 7.4.6-2 -- Rebuild so python components play with python 2.4 (bug 139160) - -* Sat Oct 23 2004 Tom Lane 7.4.6-1 -- Update to PostgreSQL 7.4.6 (bugs 136947, 136949) -- Make init script more paranoid about mkdir step of initializing a new - database (bugs 136947, 136949) - -* Wed Oct 20 2004 Tom Lane 7.4.5-4 -- Remove contrib/oidjoins stuff from installed fileset; it's of no use - to ordinary users and has a security issue (bugs 136300, 136301) -- adjust chkconfig priority (bug 128852) - -* Tue Oct 05 2004 Tom Lane 7.4.5-3 -- Solve the stale lockfile problem (bugs 71295, 96981, 134090) -- Use runuser instead of su for SELinux (bug 134588) - -* Mon Aug 30 2004 Tom Lane 7.4.5-2 -- Update to PyGreSQL 3.5. - -* Tue Aug 24 2004 Tom Lane 7.4.5-1 -- Update to PostgreSQL 7.4.5. -- Update JDBC jars to driver build 215. -- Add Obsoletes: entries for rh-postgresql packages, per bug 129278. - -* Sat Jul 10 2004 Tom Lane 7.4.3-3 -- Undo ill-considered chkconfig change that causes server to start - immediately upon install. Mea culpa (bug 127552). - -* Sat Jul 03 2004 Tom Lane 7.4.3-2 -- Update JDBC jars to driver build 214. - -* Wed Jun 23 2004 Tom Lane 7.4.3-1 -- Update to PostgreSQL 7.4.3. -- Uninstalling server RPM stops postmaster first, per bug 114846. -- Fix su commands to not assume PG user's shell is sh-like, per bug 124024. -- Fix permissions on postgresql-python doc files, per bug 124822. -- Minor postgresql.init improvements. - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Wed Mar 10 2004 Tom Lane 7.4.2-1 -- Update to PostgreSQL 7.4.2; sync with community SRPM as much as possible. -- Support PGOPTS from /etc/sysconfig/pgsql, per bug 111504. -- Fix permissions on /etc/sysconfig/pgsql, per bug 115278. -- SELinux patch in init file: always su -- rebuilt - -* Wed Feb 25 2004 Tom Lane -- Update to PostgreSQL 7.4.1. -- Rebuilt - -* Tue Feb 24 2004 Tom Lane -- Fix chown syntax in postgresql.init also. -- Rebuilt - -* Mon Feb 23 2004 Tim Waugh -- Use ':' instead of '.' as separator for chown. - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Fri Jan 9 2004 Lamar Owen -- 7.4.1-1PGDG -- Merge Sander Steffann's changes up to 7.4-0.5PGDG -- Proper 7.4.1 JDBC jars this time. -- Patch for no pl/python from Alvaro - -* Fri Dec 05 2003 David Jee 7.4-5 -- Rebuild for Perl 5.8.2. - -* Mon Dec 01 2003 David Jee 7.4-4 -- Add PyGreSQL patch for deprecated column pg_type.typprtlen [Bug #111263] -- Add headers patch which moves ecpg headers to /usr/include/ecpg - [Bug #111195] - -* Fri Nov 28 2003 David Jee 7.4-3 -- uncomment buildrequires tcl-devel - -* Fri Nov 28 2003 David Jee 7.4-2 -- rebuild - -* Mon Nov 24 2003 David Jee 7.4-1 -- initial Red Hat build -- move jars to /usr/share/java -- fix rpm-multilib patch to use sysconfig - -* Fri Nov 21 2003 Lamar Owen -- 7.4-0.1PGDG -- Development JDBC jars in addition to the 7.3 jars; will replace the -- 7.3 jars once 7.4 official jars are released. -- Changed to use the bzip2 source to save a little size. -- Removed some commented out portions of the specfile. -- Removed the 7.3.4 PDF docs. Will replace with 7.4 PDF's once they -- are ready. - -* Tue Nov 18 2003 Kaj J. Niemi 7.4-0.1 -- 7.4 -- Fixed Patch #1 (now rpm-pgsql-7.4.patch) -- Fixed Patch #2 (now rpm-multilib-7.4.patch): -- Patch #4 is unnecessary (upstream) -- Fixed Patch #6 (now postgresql-7.4-src-tutorial.patch) -- Added Patch #8 (postgresql-7.4-com_err.patch) as com_err() - is provided by e2fsprogs and CPPFLAGS gets lost somewhere - inside configure (bad macro?) -- No 7.4 PDF docs available yet (Source #17) -- PyGreSQL is separated from the upstream distribution but - we include it as usual (Source #18) -- Default to compiling libpq and ECPG as fully thread-safe - -- 7.4 Origin. See previous spec files for previous history. Adapted -- from Red Hat and PGDG's 7.3.4 RPM, directly descended from -- postgresql-7.3.4-2 as shipped in Fedora Core 1. diff --git a/packages/postgresql/postgresql.tmpfiles.d b/packages/postgresql/postgresql.tmpfiles.d deleted file mode 100644 index 6c48e34e..00000000 --- a/packages/postgresql/postgresql.tmpfiles.d +++ /dev/null @@ -1 +0,0 @@ -d /run/postgresql 0755 postgres postgres - diff --git a/packages/postgresql/rpm-pgsql.patch b/packages/postgresql/rpm-pgsql.patch deleted file mode 100644 index aec64ac7..00000000 --- a/packages/postgresql/rpm-pgsql.patch +++ /dev/null @@ -1,72 +0,0 @@ -For the RPMs, we want the custom installation directories to end in -/pgsql not /postgresql. This is historical but not worth changing. - -Notice that this patch also makes the appending of /pgsql unconditional. -This is to avoid unexpected behavior if the RPM is built in a working -directory whose path happens to include "postgres" or "pgsql" already. -However, datadir and sysconfdir are already set up in the specfile's -configure call, so we do not have to append anything to them. - - -diff -Naur postgresql-9.0.1.orig/src/Makefile.global.in postgresql-9.0.1/src/Makefile.global.in ---- postgresql-9.0.1.orig/src/Makefile.global.in 2010-10-01 10:25:44.000000000 -0400 -+++ postgresql-9.0.1/src/Makefile.global.in 2010-10-11 11:52:05.224975308 -0400 -@@ -55,8 +55,7 @@ - # Installation directories - # - # These are set by the equivalent --xxxdir configure options. We --# append "postgresql" to some of them, if the string does not already --# contain "pgsql" or "postgres", in order to avoid directory clutter. -+# append "pgsql" to some of them, in order to avoid directory clutter. - # - # In a PGXS build, we cannot use the values inserted into Makefile.global - # by configure, since the installation tree may have been relocated. -@@ -74,45 +73,23 @@ - bindir := @bindir@ - - datadir := @datadir@ --ifeq "$(findstring pgsql, $(datadir))" "" --ifeq "$(findstring postgres, $(datadir))" "" --override datadir := $(datadir)/postgresql --endif --endif - - sysconfdir := @sysconfdir@ --ifeq "$(findstring pgsql, $(sysconfdir))" "" --ifeq "$(findstring postgres, $(sysconfdir))" "" --override sysconfdir := $(sysconfdir)/postgresql --endif --endif - - libdir := @libdir@ - - pkglibdir = $(libdir) --ifeq "$(findstring pgsql, $(pkglibdir))" "" --ifeq "$(findstring postgres, $(pkglibdir))" "" --override pkglibdir := $(pkglibdir)/postgresql --endif --endif -+override pkglibdir := $(pkglibdir)/pgsql - - includedir := @includedir@ - - pkgincludedir = $(includedir) --ifeq "$(findstring pgsql, $(pkgincludedir))" "" --ifeq "$(findstring postgres, $(pkgincludedir))" "" --override pkgincludedir := $(pkgincludedir)/postgresql --endif --endif -+override pkgincludedir := $(pkgincludedir)/pgsql - - mandir := @mandir@ - - docdir := @docdir@ --ifeq "$(findstring pgsql, $(docdir))" "" --ifeq "$(findstring postgres, $(docdir))" "" --override docdir := $(docdir)/postgresql --endif --endif -+override docdir := $(docdir)/pgsql - - htmldir := @htmldir@ - diff --git a/packages/postgresql/sources b/packages/postgresql/sources deleted file mode 100644 index f7ca85d7..00000000 --- a/packages/postgresql/sources +++ /dev/null @@ -1,7 +0,0 @@ -1053e15505c0448df491119c9aad1617889b66118628a2155e3ec87e6648b2071a0a54e10d8fbbe00161b2aa86d1a6194d932a8cf5808c626e7972d135bb05c5 postgresql-10.21.tar.bz2 -5329f0d99d17821804f94d0601e56726245b35f06015cbc5372633ffc584187d61c980c532fa35166e8ed3eacbed1c7e0cb706b898ca4d64144d194191a57a98 postgresql-10.21-US.pdf -9254f21519c8d4e926f70082503bb5593c91064a3d2a4ea18ac503dfd9aa94751d6f01ce00fca9fec9b2b7af40caf8d0951b661dd8be4d6aa87c1e35b6fa7a41 postgresql-13.7.tar.bz2 -70e6f67b5729a23f80b92b04e3fad2e09596b939660e3ddebf499d06af946459a45a019279e05413673e7b65d09a28a0440ed3c2ae565068466ed37e2d4f6f17 postgresql-14.3.tar.bz2 -5069ff8030f8bf780dfa026ee968aeb56f93e2f3625af63f145db83d879dd2a332a0994e184391ed502be9ec8a015ba895f098b4aa64cd56c9466d5cfde6b7fd postgresql-14.3-US.pdf -c17ef8e7149bd136f6058e20b28f9a7307625614e37ff837feb7a6fa37b6932dfab6379285120c9bb0198961eb446c9979d5ee1f3e8583b09f981f52bee33505 postgresql-9.6.24.tar.bz2 -741f036be517e7d9725e4f146ca7dac8b8a16b6a93d045a64ef268487f48faad6b08317b58e07ad16a31002d2a10de0ac32513a4935c3f22f48ec768a742d1fc postgresql-setup-8.7.tar.gz From a1b5c1d2ae2facb4b1b714be28a8030dbf0adae2 Mon Sep 17 00:00:00 2001 From: Brandon Dunne Date: Wed, 4 Oct 2023 14:07:49 -0400 Subject: [PATCH 12/12] Fix missing git_ref default value --- bin/build.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/build.rb b/bin/build.rb index 55d6e184..eb53d618 100755 --- a/bin/build.rb +++ b/bin/build.rb @@ -7,7 +7,7 @@ opts = Optimist.options do opt :build_type, "nightly or release", :type => :string, :default => "nightly" - opt :git_ref, "Git ref to use (default: git_ref specified in options.yml)", :type => :string + opt :git_ref, "Git ref to use (default: git_ref specified in options.yml)", :type => :string, :default => ManageIQ::RPMBuild::OPTIONS.repos.ref opt :update_rpm_repo, "Publish the resulting RPMs to the public repository?" end Optimist.die "build type must be either nightly or release" unless %w[nightly release].include?(opts[:build_type])