diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index 98190d7..d4c3b11 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,15 @@ -SOURCES/postgresql-12.9.tar.bz2 -SOURCES/postgresql-13.7-US.pdf -SOURCES/postgresql-13.7.tar.bz2 -SOURCES/postgresql-setup-8.6.tar.gz -/postgresql-12.9.tar.bz2 -/postgresql-13.7-US.pdf +/postgresql-12.6.tar.bz2 +/postgresql-12.6.tar.bz2.sha256 +/postgresql-13.2.tar.bz2 +/postgresql-13.2.tar.bz2.sha256 +/postgresql-setup-8.5.tar.gz +/postgresql-13.2-US.pdf /postgresql-13.7.tar.bz2 +/postgresql-13.7.tar.bz2.sha256 +/postgresql-13.7-US.pdf +/postgresql-12.9.tar.bz2 +/postgresql-12.9.tar.bz2.sha256 +/postgresql-13.10.tar.bz2 +/postgresql-13.10.tar.bz2.sha256 /postgresql-setup-8.6.tar.gz +/postgresql-13.10-US.pdf diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index c190bde..0000000 --- a/gating.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- !Policy -product_versions: - - rhel-9 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} diff --git a/generate-sources-and-gitignore.sh b/generate-sources-and-gitignore.sh new file mode 100755 index 0000000..51b2fc8 --- /dev/null +++ b/generate-sources-and-gitignore.sh @@ -0,0 +1,13 @@ +#! /bin/sh + +rm sources .gitignore +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 + echo "/$base" >> .gitignore +done diff --git a/postgresql-12.5-contrib-dblink-expected-out.patch b/postgresql-12.5-contrib-dblink-expected-out.patch deleted file mode 100644 index bd4b0e5..0000000 --- a/postgresql-12.5-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/postgresql-12.9.tar.bz2.sha256 b/postgresql-12.9.tar.bz2.sha256 deleted file mode 100644 index 5eae283..0000000 --- a/postgresql-12.9.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -89fda2de33ed04a98548e43f3ee5f15b882be17505d631fe0dd1a540a2b56dce postgresql-12.9.tar.bz2 diff --git a/postgresql-13.7.tar.bz2.sha256 b/postgresql-13.7.tar.bz2.sha256 deleted file mode 100644 index c285633..0000000 --- a/postgresql-13.7.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -1b905bf4f3d83614a393b3c51fd345910fd261e4f5124a68d9a1fdd3a2a46399 postgresql-13.7.tar.bz2 diff --git a/postgresql-no-libecpg.patch b/postgresql-no-libecpg.patch deleted file mode 100644 index 0d2e9c1..0000000 --- a/postgresql-no-libecpg.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up postgresql-13.1/src/interfaces/Makefile.patch10 postgresql-13.1/src/interfaces/Makefile ---- postgresql-13.1/src/interfaces/Makefile.patch10 2021-02-02 21:33:23.235292305 +0100 -+++ postgresql-13.1/src/interfaces/Makefile 2021-02-02 21:33:30.281365440 +0100 -@@ -12,7 +12,7 @@ subdir = src/interfaces - top_builddir = ../.. - include $(top_builddir)/src/Makefile.global - --SUBDIRS = libpq ecpg -+SUBDIRS = libpq - - $(recurse) - diff --git a/postgresql-no-libs.patch b/postgresql-no-libs.patch new file mode 100644 index 0000000..81e9dae --- /dev/null +++ b/postgresql-no-libs.patch @@ -0,0 +1,33 @@ +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/postgresql-pgcrypto-openssl3-tests.patch b/postgresql-pgcrypto-openssl3-tests.patch deleted file mode 100644 index 16399a4..0000000 --- a/postgresql-pgcrypto-openssl3-tests.patch +++ /dev/null @@ -1,102 +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 -@@ -49,12 +49,13 @@ - pgcrypto--1.0--1.1.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 - -+#REGRESS = init pgp-pubkey-decrypt pgp-decrypt \ - EXTRA_CLEAN = gen-rtab - - ifdef USE_PGXS -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/postgresql.spec b/postgresql.spec index 2e24d34..ab07fde 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -59,8 +59,8 @@ Summary: PostgreSQL client programs Name: postgresql %global majorversion 13 -Version: %{majorversion}.7 -Release: 2%{?dist} +Version: %{majorversion}.10 +Release: 1%{?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. @@ -1225,10 +1225,9 @@ make -C postgresql-setup-%{setup_version} check %changelog -* Thu May 19 2022 Filip Januš - 13.7-2 -- Resolves: CVE-2022-1552 -- Release bump due to wrongly reported CVE of libpq - Build after reverted changes in libpq package +* Mon Feb 27 2023 Filip Janus - 13.10-1 +- Resolves: #2114733 +- Update to 13.10 * Mon May 16 2022 Filip Januš - 13.7-1 - Resolves: CVE-2022-1552 diff --git a/rpminspect.yaml b/rpminspect.yaml deleted file mode 100644 index 57f19bb..0000000 --- a/rpminspect.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -# Forbidden function symbols found: -# inet_net_ntop -# inet_net_pton -# This is not a problem because the older version is only used for upgrade -# purposes and communicates through unix socket only -badfuncs: - ignore: - - /usr/lib*/pgsql/postgresql-*/bin/postgres diff --git a/sources b/sources old mode 100644 new mode 100755 index 9c72e74..18d7ea2 --- a/sources +++ b/sources @@ -1,4 +1,6 @@ SHA512 (postgresql-12.9.tar.bz2) = 11697d8283f5df5a9c74c2406e94d1b6da6df8358ad48f3b773825aab98e8395f9fd4e3fc8b1e6ebad3743c3dadbda8b795d4fe84a447d7913223e136cf2b88f -SHA512 (postgresql-13.7-US.pdf) = 7658c76b3f6ebdf7d79bc678ed8d7a2ea0ae72941558dc0c87575ed07ad62c39af078b03c2fee8359c05dd6fa6eae4943f180a61789d1bcf8841774e7e8760cf -SHA512 (postgresql-13.7.tar.bz2) = 9254f21519c8d4e926f70082503bb5593c91064a3d2a4ea18ac503dfd9aa94751d6f01ce00fca9fec9b2b7af40caf8d0951b661dd8be4d6aa87c1e35b6fa7a41 +SHA512 (postgresql-12.9.tar.bz2.sha256) = e06887f94a470d723c8d65ece5a32358da1881411ad92cc4ef35c9f6e8aa05a0485c729e07ab381cda4b53fe6fdaec1b07c2d0200ee8823ec45849e8a8f277f0 +SHA512 (postgresql-13.10.tar.bz2) = 328c81f7c2ca2bad92fa62f4b0377d7cc104f294636db019c68ceccb580003eebe79455bbafa24eab2b3cce305e3d9c702a8544b38556f9c3431cc3c78d00cff +SHA512 (postgresql-13.10.tar.bz2.sha256) = 0b71b2db5a5f16deef4f5f41ab3c4fa17001d3dc9a24b823bc2fa03ff83f53f3df1594048391de26525c7616934ef67cb798694efe1ba5a5c770019fc0c85fa8 SHA512 (postgresql-setup-8.6.tar.gz) = dc687670cd58070512833271d8f3e7e4308c47cba1ad4c93e3d5f61acf07f390ed048f4d7f1567d2826f19a253562e13e56407dcf81a42f42c61ac96d8fe3178 +SHA512 (postgresql-13.10-US.pdf) = 34691d4d4ab84dd8b302526d973a7f1f7235530e4020d9ac86b1d2c39e639ad283c0f7d24b490ccc703919d0949d6713903426745868bdae6741ae15e8c4ec4c diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 7ba029d..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,16 +0,0 @@ -# This package uses external repositories for maintaining CI test cases. -# Please don't edit this file if possible. - -- hosts: localhost - roles: - - role: standard-test-beakerlib - repositories: - - repo: https://src.fedoraproject.org/tests/postgresql.git - dest: postgresql - # TODO: minimize: https://pagure.io/standard-test-roles/issue/294 - fmf_filter: "tier: 1" - # TODO: minimize: https://pagure.io/standard-test-roles/issue/294 - tags: - - classic - - container - - atomic