From 1db7812c5e36d4a2311b3778a35454605ed2db74 Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Wed, 6 Apr 2022 09:48:06 +0200 Subject: [PATCH 1/2] Rebase to upstream version 42.2.25 --- .gitignore | 1 + postgresql-jdbc.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 982a037..8f9063c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /postgresql-42.2.19-jdbc-src.tar.gz /postgresql-42.2.23-jdbc-src.tar.gz /postgresql-42.2.24-jdbc-src.tar.gz +/postgresql-42.2.25-jdbc-src.tar.gz diff --git a/postgresql-jdbc.spec b/postgresql-jdbc.spec index 1c11dea..057fd64 100644 --- a/postgresql-jdbc.spec +++ b/postgresql-jdbc.spec @@ -48,7 +48,7 @@ Summary: JDBC driver for PostgreSQL Name: postgresql-jdbc -Version: 42.2.24 +Version: 42.2.25 Release: 1%{?dist} License: BSD URL: http://jdbc.postgresql.org/ @@ -163,6 +163,9 @@ opts="-f" %changelog +* Wed Apr 06 2022 Zuzana Miklankova - 42.2.25-1 +- rebase to version 42.2.25 + * Mon Oct 04 2021 Zuzana Miklankova - 42.2.24-1 - rebase to version 42.2.24 diff --git a/sources b/sources index 5f7ecbf..24f87b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (postgresql-42.2.24-jdbc-src.tar.gz) = e1ddf0f6913a84a51969c42d7e2a429b62c1a2520b84fa551a71bd861ac33b12d9da3df85892c084b12d435888247a5e900a637e6ea113c3913fd5c6a87aa35e +SHA512 (postgresql-42.2.25-jdbc-src.tar.gz) = 8f1774e12ccedaa9ed49c672cb7c2a7d54b7f04b54d42d8cc00808ffb2ac27a90059639817e4f420cefd53069a1b7568379381bc5c7ec099a4b916502eca665e From 9216df165befa704322e8b8d7dbc4313d5359622 Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Mon, 26 Sep 2022 08:37:12 +0200 Subject: [PATCH 2/2] Update to version 42.2.26 Resolves: CVE-2022-31197 --- .gitignore | 1 + postgresql-jdbc.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8f9063c..ae594a1 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /postgresql-42.2.23-jdbc-src.tar.gz /postgresql-42.2.24-jdbc-src.tar.gz /postgresql-42.2.25-jdbc-src.tar.gz +/postgresql-42.2.26-jdbc-src.tar.gz diff --git a/postgresql-jdbc.spec b/postgresql-jdbc.spec index 057fd64..151861f 100644 --- a/postgresql-jdbc.spec +++ b/postgresql-jdbc.spec @@ -48,7 +48,7 @@ Summary: JDBC driver for PostgreSQL Name: postgresql-jdbc -Version: 42.2.25 +Version: 42.2.26 Release: 1%{?dist} License: BSD URL: http://jdbc.postgresql.org/ @@ -163,6 +163,10 @@ opts="-f" %changelog +* Mon Sep 26 2022 Zuzana Miklankova - 42.2.26-1 +- rebase to version 42.2.26 +- includes fix for CVE-2022-31197 + * Wed Apr 06 2022 Zuzana Miklankova - 42.2.25-1 - rebase to version 42.2.25 diff --git a/sources b/sources index 24f87b4..310b39c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (postgresql-42.2.25-jdbc-src.tar.gz) = 8f1774e12ccedaa9ed49c672cb7c2a7d54b7f04b54d42d8cc00808ffb2ac27a90059639817e4f420cefd53069a1b7568379381bc5c7ec099a4b916502eca665e +SHA512 (postgresql-42.2.26-jdbc-src.tar.gz) = 3ed0367fd8e006e75e5e8330cbab0d21ca25934a9868b04b00617cbc19089e97717f631f5f203d5a7f2ecbfeddf98a86b4ec9ad3b6cb008569aefae75aae696c