From 14c88f5c153ec6955df7e652d2985273eb41baf0 Mon Sep 17 00:00:00 2001 From: Adam Samalik Date: Thu, 29 Jun 2023 17:19:22 +0200 Subject: [PATCH] re-import sources as agreed with the maintainer --- .gitignore | 18 +++- gating.yaml | 6 -- generate-pdf.sh | 0 ...es.sh => generate-sources-and-gitignore.sh | 3 +- ...sql-12.5-contrib-dblink-expected-out.patch | 13 --- postgresql-9.6.22.tar.bz2.sha256 | 1 - postgresql-external-libpq.patch | 43 -------- postgresql-no-libecpg.patch | 12 --- postgresql-pgcrypto-openssl3-tests.patch | 102 ------------------ rpminspect.yaml | 9 -- sources | 3 +- tests/tests.yml | 16 --- 12 files changed, 17 insertions(+), 209 deletions(-) delete mode 100644 gating.yaml mode change 100755 => 100644 generate-pdf.sh rename generate-sources.sh => generate-sources-and-gitignore.sh (82%) mode change 100755 => 100644 delete mode 100644 postgresql-12.5-contrib-dblink-expected-out.patch delete mode 100644 postgresql-9.6.22.tar.bz2.sha256 delete mode 100644 postgresql-external-libpq.patch delete mode 100644 postgresql-no-libecpg.patch delete mode 100644 postgresql-pgcrypto-openssl3-tests.patch delete mode 100644 rpminspect.yaml delete mode 100644 tests/tests.yml diff --git a/.gitignore b/.gitignore index 5d42aa2..617af19 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,14 @@ -SOURCES/postgresql-9.6.22-US.pdf -SOURCES/postgresql-9.6.22.tar.bz2 -SOURCES/postgresql-setup-8.2.tar.gz -/postgresql-9.6.22-US.pdf -/postgresql-9.6.22.tar.bz2 +/postgresql-9.6.10.tar.bz2 +/postgresql-9.6.10.tar.bz2.sha256 /postgresql-setup-8.2.tar.gz +/postgresql-9.6.10-US.pdf +/postgresql-10.5-US.pdf +/postgresql-9.6.19-US.pdf +/postgresql-9.6.19.tar.bz2 +/postgresql-9.6.19.tar.bz2.sha256 +/postgresql-9.6.20.tar.bz2 +/postgresql-9.6.20.tar.bz2.sha256 +/postgresql-9.6.20-US.pdf +/postgresql-9.6.22.tar.bz2 +/postgresql-9.6.22.tar.bz2.sha256 +/postgresql-9.6.22-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-pdf.sh b/generate-pdf.sh old mode 100755 new mode 100644 diff --git a/generate-sources.sh b/generate-sources-and-gitignore.sh old mode 100755 new mode 100644 similarity index 82% rename from generate-sources.sh rename to generate-sources-and-gitignore.sh index 1d53682..51b2fc8 --- a/generate-sources.sh +++ b/generate-sources-and-gitignore.sh @@ -1,6 +1,6 @@ #! /bin/sh -rm sources +rm sources .gitignore set -e spectool -S *.spec | cut -d' ' -f2 \ | grep -E -e 'postgresql-.*\.tar\.*' -e 'postgresql.*\.pdf' | sort | \ @@ -9,4 +9,5 @@ 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-9.6.22.tar.bz2.sha256 b/postgresql-9.6.22.tar.bz2.sha256 deleted file mode 100644 index 38c1db0..0000000 --- a/postgresql-9.6.22.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930 postgresql-9.6.22.tar.bz2 diff --git a/postgresql-external-libpq.patch b/postgresql-external-libpq.patch deleted file mode 100644 index ba7ef73..0000000 --- a/postgresql-external-libpq.patch +++ /dev/null @@ -1,43 +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 bcdbd95..4bea236 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 b9d86ac..29df69f 100644 ---- a/src/Makefile.global.in -+++ b/src/Makefile.global.in -@@ -549,7 +549,7 @@ endif - # How to link to libpq. (This macro may be used as-is by backend extensions. - # Client-side code should go through libpq_pgport or libpq_pgport_shlib, - # instead.) --libpq = -L$(libpq_builddir) -lpq -+libpq = -lpq - - # libpq_pgport is for use by client executables (not libraries) that use libpq. - # We force clients to pull symbols from the non-shared libraries libpgport -@@ -579,7 +579,6 @@ endif - # Commonly used submake targets - - submake-libpq: | submake-generated-headers -- $(MAKE) -C $(libpq_builddir) all - - submake-libpgport: | submake-generated-headers - $(MAKE) -C $(top_builddir)/src/port all --- -2.21.0 - 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-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/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 index d6e1957..72b4691 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ -SHA512 (postgresql-9.6.22-US.pdf) = a591d44a6a25bbbbda7ca1ab284fce8fd2cde25651d36442c13f669e9678f2db605a8f81febb8058bee30b7668b6b9b0165fed7afc83444c0ec7629244aa0a8d SHA512 (postgresql-9.6.22.tar.bz2) = 371f85f2d02a8a3b888396440149e9b432f91e106a7feb8a163b275a0586843683124281a0965abf3c1215cb68e2002976913f88c75e35e52ac5f78d4145fd7b +SHA512 (postgresql-9.6.22.tar.bz2.sha256) = f2e84dc64753f4233ba7a1976d5a85c62f905018516c5597d94c5a430b6ecf82d4e240cf340b009544a517688b6b05f209ce761422a9f6e3e368896e338aad5f SHA512 (postgresql-setup-8.2.tar.gz) = b21ec508e207074ae1f5259479415f99301ae58a766d476a16fec620b7778ef6e5d32fa1d2cc0060cbfc5eee328a9495182500a8f2f8573ef20c359c290d8430 +SHA512 (postgresql-9.6.22-US.pdf) = a591d44a6a25bbbbda7ca1ab284fce8fd2cde25651d36442c13f669e9678f2db605a8f81febb8058bee30b7668b6b9b0165fed7afc83444c0ec7629244aa0a8d 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