diff --git a/.gitignore b/.gitignore index 91decf6..eff8356 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -postgresql-42.7.1-jdbc-src.tar.gz +postgresql-42.7.2-jdbc-src.tar.gz diff --git a/postgresql-jdbc.spec b/postgresql-jdbc.spec index 4d4f430..93df0e8 100644 --- a/postgresql-jdbc.spec +++ b/postgresql-jdbc.spec @@ -48,8 +48,8 @@ Summary: JDBC driver for PostgreSQL Name: postgresql-jdbc -Version: 42.7.1 -Release: 8%{?dist} +Version: 42.7.2 +Release: 1%{?dist} License: BSD-2-Clause URL: https://jdbc.postgresql.org/ Source0: https://repo1.maven.org/maven2/org/postgresql/postgresql/%{version}/postgresql-%{version}-jdbc-src.tar.gz @@ -62,6 +62,7 @@ BuildRequires: maven-local BuildRequires: mvn(com.ongres.scram:client) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api) BuildRequires: mvn(se.jiderhamn:classloader-leak-test-framework) @@ -75,6 +76,11 @@ BuildRequires: postgresql-test-rpm-macros Obsoletes: %{name}-parent-poms < 42.2.2-2 +Provides: bundled(mvn(com.ongres.stringprep:saslprep)) = 1.1 +Provides: bundled(mvn(com.ongres.stringprep:stringprep)) = 1.1 +Provides: bundled(mvn(com.ongres.scram:common)) = 2.1 +Provides: bundled(mvn(com.ongres.scram:client)) = 2.1 + %description PostgreSQL is an advanced Object-Relational database management system. The postgresql-jdbc package includes the .jar files needed for @@ -94,9 +100,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']" - # compat symlink: requested by dtardon (libreoffice), reverts part of # 0af97ce32de877 commit. %mvn_file org.postgresql:postgresql %{name}/postgresql %{name} postgresql @@ -163,6 +166,13 @@ opts="-f" %license LICENSE %changelog +* Tue Apr 07 2026 Marian Koncek - 42.7.2-1 +- Rebase to 42.7.2 +- Resolves: CVE-2024-1597 + +* Fri Jan 09 2026 Marian Koncek - 42.7.1-9 +- Bundle shaded ongres-* dependencies + * Tue Apr 01 2025 Marián Konček - 42.7.1-8 - Fix BuildRequires diff --git a/sources b/sources index 9691e19..c6e70f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (postgresql-42.7.1-jdbc-src.tar.gz) = a722415cb29551a59a830c6287873e9ba0cb75e1aa456175b8678caa96be871f42b9294c25a532a67109c7a7e48e3d6d7d5773e99ffb124019b1895430b213ef +SHA512 (postgresql-42.7.2-jdbc-src.tar.gz) = 50bb99562c8713c4629e29618c259ecf14a354b1ed0e34a7c2bb7da16ab3f0bee4b44bbc213b605da279f0dd57fa2f882e1d63d51f51c528e93a214cf4e4143a