summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore4
-rw-r--r--add-sw_64-support.patch80
-rw-r--r--postgresql-14.11.tar.bz2.sha2561
-rw-r--r--postgresql-14.24.tar.bz2.sha2561
-rw-r--r--postgresql-15.19.tar.bz2.sha2561
-rw-r--r--postgresql-15.6.tar.bz2.sha2561
-rw-r--r--postgresql-man.patch6
-rw-r--r--postgresql-pgcrypto-openssl3-tests.patch90
-rw-r--r--postgresql.spec62
-rw-r--r--sources8
10 files changed, 143 insertions, 111 deletions
diff --git a/.gitignore b/.gitignore
index 691f506..54afe82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,7 @@
/postgresql-15.6-US.pdf
/postgresql-15.6.tar.bz2
/postgresql-setup-8.8.tar.gz
+/postgresql-14.24.tar.bz2
+/postgresql-15.19-US.pdf
+/postgresql-15.19.tar.bz2
+/postgresql-setup-8.10.tar.gz
diff --git a/add-sw_64-support.patch b/add-sw_64-support.patch
new file mode 100644
index 0000000..caa0c66
--- /dev/null
+++ b/add-sw_64-support.patch
@@ -0,0 +1,80 @@
+From ed05d50b808df2bb0d11456515896a40e620389b Mon Sep 17 00:00:00 2001
+From: mahailiang <mahailiang@uniontech.com>
+Date: Sat, 15 Mar 2025 11:46:26 +0800
+Subject: [PATCH] add sw_64 support
+
+---
+ contrib/pgcrypto/crypt-blowfish.c | 2 +-
+ src/include/storage/s_lock.h | 43 +++++++++++++++++++++++++++++++
+ 2 files changed, 44 insertions(+), 1 deletion(-)
+
+diff --git a/contrib/pgcrypto/crypt-blowfish.c b/contrib/pgcrypto/crypt-blowfish.c
+index a663852..e6d72b2 100644
+--- a/contrib/pgcrypto/crypt-blowfish.c
++++ b/contrib/pgcrypto/crypt-blowfish.c
+@@ -41,7 +41,7 @@
+ #ifdef __i386__
+ #define BF_ASM 0 /* 1 */
+ #define BF_SCALE 1
+-#elif defined(__x86_64__) || defined(__alpha__) || defined(__hppa__)
++#elif defined(__x86_64__) || defined(__alpha__) || defined(__hppa__) || defined(__sw_64__)
+ #define BF_ASM 0
+ #define BF_SCALE 1
+ #else
+diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
+index 1ada0a8..3afd20e 100644
+--- a/src/include/storage/s_lock.h
++++ b/src/include/storage/s_lock.h
+@@ -771,6 +771,49 @@ tas(volatile slock_t *lock)
+
+ #endif /* __sh__ */
+
++#if defined(__sw_64) || defined(__sw_64__) /* sw_64 */
++#define HAS_TEST_AND_SET
++
++typedef unsigned long slock_t;
++
++#define TAS(lock) tas(lock)
++
++static __inline__ int
++tas(volatile slock_t *lock)
++{
++ register slock_t _res;
++ unsigned long tmp;
++ __asm__ __volatile__(
++ " ldl $0, %1 \n"
++ " bne $0, 2f \n"
++ " ldi %2, %1\n"
++ " lldl %0, 0(%2) \n"
++ " mov 1, $0 \n"
++ " wr_f $0 \n"
++ " memb \n"
++ " lstl $0, 0(%2) \n"
++ " rd_f $0 \n"
++ " bne %0, 2f \n"
++ " beq $0, 2f \n"
++ " memb \n"
++ " br 3f \n"
++ "2: mov 1, %0 \n"
++ "3: \n"
++: "=&r"(_res), "+m"(*lock),"=r" (tmp)
++:
++: "memory", "0");
++ return (int) _res;
++}
++
++#define S_UNLOCK(lock) \
++do \
++{\
++ __asm__ __volatile__ (" memb \n"); \
++ *((volatile slock_t *) (lock)) = 0; \
++} while (0)
++
++#endif /* __sw_64 || __sw_64__ */
++
+
+ /* These live in s_lock.c, but only for gcc */
+
+--
+2.43.5
+
diff --git a/postgresql-14.11.tar.bz2.sha256 b/postgresql-14.11.tar.bz2.sha256
deleted file mode 100644
index 34cfe9a..0000000
--- a/postgresql-14.11.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-a670bd7dce22dcad4297b261136b3b1d4a09a6f541719562aa14ca63bf2968a8 postgresql-14.11.tar.bz2
diff --git a/postgresql-14.24.tar.bz2.sha256 b/postgresql-14.24.tar.bz2.sha256
new file mode 100644
index 0000000..3ddcb0c
--- /dev/null
+++ b/postgresql-14.24.tar.bz2.sha256
@@ -0,0 +1 @@
+a7fa7ed3d558172355f51406097a7bd4f6b473be80f311ef7cda96bf383d8897 postgresql-14.24.tar.bz2
diff --git a/postgresql-15.19.tar.bz2.sha256 b/postgresql-15.19.tar.bz2.sha256
new file mode 100644
index 0000000..0f687ba
--- /dev/null
+++ b/postgresql-15.19.tar.bz2.sha256
@@ -0,0 +1 @@
+e1a64a87a46b825b88c082e4518161a47aab53c45694964f8ba1df28f7859f89 postgresql-15.19.tar.bz2
diff --git a/postgresql-15.6.tar.bz2.sha256 b/postgresql-15.6.tar.bz2.sha256
deleted file mode 100644
index b9cc1cf..0000000
--- a/postgresql-15.6.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-8455146ed9c69c93a57de954aead0302cafad035c2b242175d6aa1e17ebcb2fb postgresql-15.6.tar.bz2
diff --git a/postgresql-man.patch b/postgresql-man.patch
index 6b0ed00..789fb79 100644
--- a/postgresql-man.patch
+++ b/postgresql-man.patch
@@ -6,8 +6,8 @@ RHBZ#948933).
diff -up postgresql-13.1/doc/src/sgml/man1/ecpg.1.patch6 postgresql-13.1/doc/src/sgml/man1/ecpg.1
--- postgresql-13.1/doc/src/sgml/man1/ecpg.1.patch6 2020-11-09 23:38:03.000000000 +0100
+++ postgresql-13.1/doc/src/sgml/man1/ecpg.1 2020-11-18 09:26:40.547324791 +0100
-@@ -81,6 +81,11 @@ ORACLE\&.
- Define a C preprocessor symbol\&.
+@@ -86,6 +86,11 @@
+ 1\&.
.RE
.PP
+\fB\-h \fR
@@ -18,7 +18,7 @@ diff -up postgresql-13.1/doc/src/sgml/man1/ecpg.1.patch6 postgresql-13.1/doc/src
\fB\-h\fR
.RS 4
Process header files\&. When this option is specified, the output file extension becomes
-@@ -144,6 +149,11 @@ Allow question mark as placeholder for c
+@@ -149,6 +154,11 @@
.RE
.RE
.PP
diff --git a/postgresql-pgcrypto-openssl3-tests.patch b/postgresql-pgcrypto-openssl3-tests.patch
deleted file mode 100644
index 6ca2a9b..0000000
--- a/postgresql-pgcrypto-openssl3-tests.patch
+++ /dev/null
@@ -1,90 +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-15.0_original/contrib/pgcrypto/Makefile postgresql-15.0/contrib/pgcrypto/Makefile
---- postgresql-15.0_original/contrib/pgcrypto/Makefile 2022-09-05 23:12:45.000000000 +0200
-+++ postgresql-15.0/contrib/pgcrypto/Makefile 2022-09-27 17:12:54.463159362 +0200
-@@ -39,9 +39,9 @@
- pgcrypto--1.0--1.1.sql
- PGFILEDESC = "pgcrypto - cryptographic functions"
-
--REGRESS = init md5 sha1 hmac-md5 hmac-sha1 blowfish rijndael \
-- sha2 des 3des cast5 \
-- crypt-des crypt-md5 crypt-blowfish crypt-xdes \
-+REGRESS = init md5 sha1 hmac-md5 hmac-sha1 rijndael \
-+ sha2 \
-+ 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/postgresql.spec b/postgresql.spec
index 7302b92..d7a9c26 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -31,20 +31,20 @@
Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 15
-Version: %{majorversion}.6
+Version: %{majorversion}.19
Release: 1
# 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
-Url: http://www.postgresql.org/
+Url: https://www.postgresql.org/
%global prevmajorversion 14
-%global prevversion %{prevmajorversion}.11
+%global prevversion %{prevmajorversion}.24
%global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
%global precise_version %{?epoch:%epoch:}%version-%release
-%global setup_version 8.8
+%global setup_version 8.10
%global service_name postgresql.service
@@ -76,7 +76,7 @@ Patch8: postgresql-external-libpq.patch
Patch9: postgresql-server-pg_config.patch
Patch10: postgresql-no-libecpg.patch
Patch11: postgresql-datalayout-mismatch-on-s390.patch
-Patch16: postgresql-pgcrypto-openssl3-tests.patch
+Patch17: add-sw_64-support.patch
BuildRequires: gcc clang
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
@@ -160,9 +160,7 @@ postgresql-server sub-package.
%package private-libs
Summary: The shared libraries required only for this build of PostgreSQL server
Group: Applications/Databases
-# for /sbin/ldconfig
-Requires(post): glibc
-Requires(postun): glibc
+Conflicts: postgresql < 15.13-2
%description private-libs
The postgresql-private-libs package provides the shared libraries for this
@@ -378,7 +376,7 @@ goal of accelerating analytics queries.
%endif
%patch -P 9 -p1
%patch -P 11 -p1
-%patch -P 16 -p1
+%patch -P 17 -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.
@@ -949,9 +947,6 @@ make -C postgresql-setup-%{setup_version} check
# so that extensions can use this dir.
%dir %{_libdir}/pgsql/bitcode
%endif
-%if ! %external_libpq
-%{_libdir}/libpq.so.*
-%endif
%files docs
%doc *-US.pdf
@@ -1140,6 +1135,7 @@ make -C postgresql-setup-%{setup_version} check
%dir %{_datadir}/pgsql/contrib
%dir %{_datadir}/pgsql/extension
%{_datadir}/pgsql/extension/plpgsql*
+%{_datadir}/pgsql/fix-CVE-2024-4317.sql
%{_datadir}/pgsql/information_schema.sql
%{_datadir}/pgsql/postgres.bki
%{_datadir}/pgsql/snowball_create.sql
@@ -1297,6 +1293,48 @@ make -C postgresql-setup-%{setup_version} check
%changelog
+* Fri Aug 14 2026 Funda Wang <fundawang@yeah.net> - 15.19-1
+- update to 15.19
+
+* Fri May 15 2026 Funda Wang <fundawang@yeah.net> - 15.18-1
+- update to 15.18
+
+* Fri Feb 27 2026 Funda Wang <fundawang@yeah.net> - 15.17-1
+- update to 15.17
+
+* Fri Feb 13 2026 Funda Wang <fundawang@yeah.net> - 15.16-1
+- update to 15.16
+
+* Fri Nov 14 2025 Funda Wang <fundawang@yeah.net> - 15.15-1
+- update to 15.15
+
+* Fri Aug 15 2025 Funda Wang <fundawang@yeah.net> - 15.14-1
+- update to 15.14
+
+* Sun Jun 15 2025 Funda Wang <fundawang@yeah.net> - 15.13-2
+- remove duplicate shared libs
+
+* Fri May 09 2025 Funda Wang <fundawang@yeah.net> - 15.13-1
+- update to 15.13
+
+* Sat Mar 15 2025 mahailiang <mahailiang@uniontech.com> - 15.12-2
+- add sw_64 support
+
+* Thu Feb 20 2025 Funda Wang <fundawang@yeah.net> - 15.12-1
+- update to 15.12
+
+* Fri Feb 14 2025 Funda Wang <fundawang@yeah.net> - 15.11-1
+- update to 15.11 to fix CVE-2025-1094
+
+* Fri Nov 22 2024 Funda Wang <fundawang@yeah.net> - 15.10-1
+- update to 15.10
+
+* Fri Nov 15 2024 Funda Wang <fundawang@yeah.net> - 15.9-1
+- update to 15.9 (CVE-2024-10976, CVE-2024-10977, CVE-2024-10978, CVE-2024-10979)
+
+* Fri Aug 09 2024 Funda Wang <fundawagn@yeah.net> - 15.8-1
+- update to 15.8 (CVE-2024-7348)
+
* Fri Mar 29 2024 xiejing <xiejing@kylinos.cn> - 15.6-1
- update to 15.6
diff --git a/sources b/sources
index a77d0ce..d14e2c7 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-9f9ed8060f4e68db110d6bff9b6b954a postgresql-14.11.tar.bz2
-a18130f9081b8307641be57e4f108138 postgresql-15.6-US.pdf
-666511aeb53bd4ac029e236e35b42ca8 postgresql-15.6.tar.bz2
-84cea5ea978de8626a21ddced52be373 postgresql-setup-8.8.tar.gz
+9069764ea7f88cd28a7be8231d347133 postgresql-14.24.tar.bz2
+13aa35ff7af15ea15398cb3adac5e91c postgresql-15.19-US.pdf
+40f950b7f4b235e6e9d563a6bc43826e postgresql-15.19.tar.bz2
+b8eff4ae72d4c132e172df673342e722 postgresql-setup-8.10.tar.gz
generated by cgit v1.2.3 (git 2.25.1) at 2026-10-05 16:09:36 +0000