diff --git a/0000-disable-ConnectTimeoutTest.patch b/0000-disable-ConnectTimeoutTest.patch deleted file mode 100644 index 420d6ab054a1894fa32b3b1a218824af89c1e9f8..0000000000000000000000000000000000000000 --- a/0000-disable-ConnectTimeoutTest.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java -index 188183a..c0e4cca 100644 ---- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java -+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java -@@ -104,7 +104,7 @@ import org.junit.runners.Suite; - LoginTimeoutTest.class, - TestACL.class, - -- ConnectTimeoutTest.class, -+ // ConnectTimeoutTest.class, - - PGPropertyTest.class, - diff --git a/9000-disable-the-failed-tests-that-caused-by-BEP.patch b/9000-disable-the-failed-tests-that-caused-by-BEP.patch deleted file mode 100644 index f212406e753511085b785f22837d931b2bc228ff..0000000000000000000000000000000000000000 --- a/9000-disable-the-failed-tests-that-caused-by-BEP.patch +++ /dev/null @@ -1,40 +0,0 @@ -From c8a3de804253174624c6c7677958d307afa599df Mon Sep 17 00:00:00 2001 -From: wangjia -Date: Tue, 30 Apr 2019 19:14:28 -0400 -Subject: [PATCH] disable the failed tests that caused by BEP - ---- - pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java | 3 --- - 1 file changed, 0 insertions(+), 3 deletions(-) - -diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java -index 96890d0..d41578c 100644 ---- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java -+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java -@@ -88,7 +88,6 @@ import org.junit.runners.Suite; - OidValueOfTest.class, - - PreparedStatementTest.class, -- StatementTest.class, - QuotationTest.class, - - ServerPreparedStmtTest.class, -@@ -101,7 +101,6 @@ import org.junit.runners.Suite; - DeepBatchedInsertStatementTest.class, - JBuilderTest.class, - MiscTest.class, -- NotifyTest.class, - DatabaseEncodingTest.class, - ClientEncodingTest.class, - -@@ -118,7 +118,6 @@ import org.junit.runners.Suite; - IntervalTest.class, - GeometricTest.class, - -- LoginTimeoutTest.class, - TestACL.class, - - // ConnectTimeoutTest.class, --- -1.8.3.1 - diff --git a/pgjdbc-REL42.2.4.tar.gz b/pgjdbc-REL42.2.4.tar.gz deleted file mode 100644 index 699748b04f79d08d60b601d8670b9923dcd6a38f..0000000000000000000000000000000000000000 Binary files a/pgjdbc-REL42.2.4.tar.gz and /dev/null differ diff --git a/pgjdbc-parent-poms-REL1.1.5.tar.gz b/pgjdbc-parent-poms-REL1.1.5.tar.gz deleted file mode 100644 index 90b14a8cb0189d97941b6ab896e5ccabc3b1e6d3..0000000000000000000000000000000000000000 Binary files a/pgjdbc-parent-poms-REL1.1.5.tar.gz and /dev/null differ diff --git a/postgresql-42.2.25-jdbc-src.tar.gz b/postgresql-42.2.25-jdbc-src.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..4b006ccb0439e7d78c06516d8d87b13934a73316 Binary files /dev/null and b/postgresql-42.2.25-jdbc-src.tar.gz differ diff --git a/postgresql-jdbc.spec b/postgresql-jdbc.spec index 79eb0c05ab43a397400599a824a474708327077e..701db0dce8ebabc4689a2431df659a12460999d8 100644 --- a/postgresql-jdbc.spec +++ b/postgresql-jdbc.spec @@ -1,15 +1,11 @@ Name: postgresql-jdbc Summary: Postgresql JDBC Driver -Version: 42.2.4 -Release: 4 +Version: 42.2.25 +Release: 1 License: BSD URL: http://jdbc.postgresql.org/ -Source0: https://github.com/pgjdbc/pgjdbc/archive/REL%{version}/pgjdbc-REL%{version}.tar.gz -Source1: https://github.com/pgjdbc/pgjdbc-parent-poms/archive/REL1.1.5/pgjdbc-parent-poms-REL1.1.5.tar.gz - -Patch0: 0000-disable-ConnectTimeoutTest.patch -Patch9000: 9000-disable-the-failed-tests-that-caused-by-BEP.patch +Source0: https://repo1.maven.org/maven2/org/postgresql/postgresql/%{version}/postgresql-%{version}-jdbc-src.tar.gz 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 @@ -35,19 +31,10 @@ This package contains the API Documentation for %{name}. %package_help %prep -%setup -c -q -a 1 -mv pgjdbc-REL%version/* . -mv pgjdbc-parent-poms-REL1.1.5 pgjdbc-parent-poms - -%patch0 -p1 -%patch9000 -p1 - -find -name "*.jar" -or -name "*.class" | xargs rm -f - -%pom_xpath_inject pom:modules "./pgjdbc-parent-poms" -%pom_xpath_inject pom:parent "pgjdbc-parent-poms/pgjdbc-versions" -%pom_xpath_set pom:relativePath ../pgjdbc-parent-poms/pgjdbc-core-parent pgjdbc -%pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-shade-plugin']" pgjdbc +%setup -c -q +mv postgresql-%{version}-jdbc-src/* . +find -type f \( -name "*.jar" -or -name "*.class" \) | xargs rm -f +%pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-shade-plugin']" %mvn_file org.postgresql:postgresql %{name}/postgresql %{name} postgresql %mvn_package ":*{parent,versions,prevjre}*" __noinstall %mvn_alias org.postgresql:postgresql postgresql:postgresql @@ -77,6 +64,10 @@ find %{_buildrootdir} -name "%{name}.xml" | xargs sed -i '/pgjdbc-aggregate.pom< %doc README.md %changelog +* Wed Feb 16 2022 houyingchao - 42.2.25-1 +- Upgrade to 42.2.25 +- Fix CVE-2022-21724 + * Thu Dec 11 2019 caomeng - 42.2.4-4 - Package init @@ -96,4 +87,4 @@ find %{_buildrootdir} -name "%{name}.xml" | xargs sed -i '/pgjdbc-aggregate.pom< - Type:enhancement - ID:NA - SUG:NA -- DESC:disable the failed tests that caused by BEP to repair binary diffrence \ No newline at end of file +- DESC:disable the failed tests that caused by BEP to repair binary diffrence