diff --git a/postgresql-42.2.25-jdbc-src.tar.gz b/postgresql-42.2.25-jdbc-src.tar.gz deleted file mode 100644 index 4b006ccb0439e7d78c06516d8d87b13934a73316..0000000000000000000000000000000000000000 Binary files a/postgresql-42.2.25-jdbc-src.tar.gz and /dev/null differ diff --git a/postgresql-42.4.1-jdbc-src.tar.gz b/postgresql-42.4.1-jdbc-src.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..91e270dcb916f6a70272524465c10b02bbfbc556 Binary files /dev/null and b/postgresql-42.4.1-jdbc-src.tar.gz differ diff --git a/postgresql-jdbc.spec b/postgresql-jdbc.spec index 701db0dce8ebabc4689a2431df659a12460999d8..0308acd3966ea3a8ba552e71321e18b661458d1e 100644 --- a/postgresql-jdbc.spec +++ b/postgresql-jdbc.spec @@ -1,6 +1,6 @@ Name: postgresql-jdbc Summary: Postgresql JDBC Driver -Version: 42.2.25 +Version: 42.4.1 Release: 1 License: BSD URL: http://jdbc.postgresql.org/ @@ -10,6 +10,11 @@ Source0: https://repo1.maven.org/maven2/org/postgresql/postgresql/%{versi BuildRequires: maven-local java-comment-preprocessor properties-maven-plugin classloader-leak-test-framework BuildRequires: maven-enforcer-plugin maven-plugin-bundle maven-plugin-build-helper java-devel >= 1.8 BuildRequires: mvn(org.apache.maven.plugins:maven-clean-plugin) mvn(com.ongres.scram:client) +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) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter-params) +BuildRequires: mvn(org.junit.vintage:junit-vintage-engine) Obsoletes: %{name}-parent-poms < 42.2.2-2 Provides: pgjdbc = %version-%release @@ -41,6 +46,15 @@ find -type f \( -name "*.jar" -or -name "*.class" \) | xargs rm -f install -d pgjdbc/target/generated-sources/annotations +%pom_remove_dep uk.org.webcompere:system-stubs-jupiter + +# remove tests that depend on the system-stubs-jupiter +rm src/test/java/org/postgresql/test/jdbc2/DriverTest.java \ + src/test/java/org/postgresql/util/OSUtilTest.java \ + src/test/java/org/postgresql/util/PGPropertyPasswordParserTest.java \ + src/test/java/org/postgresql/util/PGPropertyServiceParserTest.java \ + src/test/java/org/postgresql/util/StubEnvironmentAndProperties.java + %build opts="-f" %mvn_build $opts -- -DwaffleEnabled=false \ @@ -64,6 +78,9 @@ find %{_buildrootdir} -name "%{name}.xml" | xargs sed -i '/pgjdbc-aggregate.pom< %doc README.md %changelog +* Tue Aug 09 2022 yaoxin - 42.4.1-1 +- Update to 42.4.1 to fix CVE-2022-31197 + * Wed Feb 16 2022 houyingchao - 42.2.25-1 - Upgrade to 42.2.25 - Fix CVE-2022-21724