From 1f5f691fbb40f637c4d8b9de60100aaf27181179 Mon Sep 17 00:00:00 2001 From: AlmaLinux RelEng Bot Date: Mon, 30 Mar 2026 10:54:30 -0400 Subject: [PATCH] import CS postgresql-jdbc-42.2.28-2.el9 --- .gitignore | 2 +- .postgresql-jdbc.metadata | 2 +- SPECS/postgresql-jdbc.spec | 18 +++++++++++++----- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index ac31f38..f0a195f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/postgresql-42.2.27-jdbc-src.tar.gz +SOURCES/postgresql-42.2.28-jdbc-src.tar.gz diff --git a/.postgresql-jdbc.metadata b/.postgresql-jdbc.metadata index b2ba1ff..045b145 100644 --- a/.postgresql-jdbc.metadata +++ b/.postgresql-jdbc.metadata @@ -1 +1 @@ -189347e9b24d6200d00d171636795bdce6e1307e SOURCES/postgresql-42.2.27-jdbc-src.tar.gz +276aecec8e0a384e7cc6329289cf6d97a8e6e05f SOURCES/postgresql-42.2.28-jdbc-src.tar.gz diff --git a/SPECS/postgresql-jdbc.spec b/SPECS/postgresql-jdbc.spec index 70eafd9..261666e 100644 --- a/SPECS/postgresql-jdbc.spec +++ b/SPECS/postgresql-jdbc.spec @@ -48,8 +48,8 @@ Summary: JDBC driver for PostgreSQL Name: postgresql-jdbc -Version: 42.2.27 -Release: 1%{?dist} +Version: 42.2.28 +Release: 2%{?dist} License: BSD URL: http://jdbc.postgresql.org/ @@ -65,6 +65,7 @@ BuildRequires: maven-plugin-bundle BuildRequires: classloader-leak-test-framework BuildRequires: mvn(com.ongres.scram:client) +BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) BuildRequires: mvn(org.apache.maven.surefire:surefire-junit-platform) BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api) BuildRequires: mvn(org.junit.jupiter:junit-jupiter-engine) @@ -81,6 +82,9 @@ BuildRequires: postgresql-test-rpm-macros Obsoletes: %{name}-parent-poms < 42.2.2-2 +Provides: bundled(mvn(com.ongres.scram:client)) = 1.9.beta1 +Provides: bundled(mvn(com.ongres.scram:common)) = 1.9.beta1 + %description PostgreSQL is an advanced Object-Relational database management system. The postgresql-jdbc package includes the .jar files needed for @@ -102,9 +106,6 @@ mv postgresql-%{version}-jdbc-src/* . # remove any binary libs find -type f \( -name "*.jar" -or -name "*.class" \) | xargs rm -f -# Build parent POMs in the same Maven call. -%pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-shade-plugin']" - %pom_remove_plugin -r :maven-javadoc-plugin # compat symlink: requested by dtardon (libreoffice), reverts part of @@ -165,6 +166,13 @@ opts="-f" %changelog +* Fri Jan 09 2026 Marian Koncek - 42.2.28-2 +- Bundle shaded ongres-* dependencies + +* Wed Feb 28 2024 Zuzana Miklankova - 42.2.28-1 +- rebase to 42.2.28 +- fix for CVE-2024-1597 + * Tue Jan 03 2023 Zuzana Miklankova - 42.2.27-1 - rebase to 42.2.27 - fix for CVE-2022-41946