From 6e0bc9d9cadae82dccd643375e2941481bacfd21f3ef89da9aeb16729b738a86 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 17 Mar 2022 06:00:06 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/hsqldb?expand=0&rev=44 --- hsqldb.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/hsqldb.changes b/hsqldb.changes index 78316d6..61579f3 100644 --- a/hsqldb.changes +++ b/hsqldb.changes @@ -2,6 +2,7 @@ Thu Mar 17 05:53:55 UTC 2022 - Fridrich Strba - Upgrade to upsteam version 2.6.1 + * Does not depend on jaxb-api - Modified patch: * hsqldb-apidocs.patch + adapt to changed context From 73f0951a61992ca069c1456a307fd9f486816abf6767a71fbb77674fde389b92 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 28 Mar 2022 14:58:50 +0000 Subject: [PATCH 2/5] Updating link to change in openSUSE:Factory/hsqldb revision 30.0 OBS-URL: https://build.opensuse.org/package/show/Java:packages/hsqldb?expand=0&rev=b4d57059f69a68cec895788ab6c1c72b --- hsqldb.changes | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/hsqldb.changes b/hsqldb.changes index 61579f3..95e4198 100644 --- a/hsqldb.changes +++ b/hsqldb.changes @@ -1,6 +1,22 @@ ------------------------------------------------------------------- Thu Mar 17 05:53:55 UTC 2022 - Fridrich Strba +- Upgrade to upsteam version 2.6.1 +- Modified patch: + * hsqldb-apidocs.patch + + adapt to changed context +- Removed patches: + * hsqldb-2.4.1-javadoc10.patch + * hsqldb-cmdline.patch + + not needed with this version +- Added patch: + * hsqldb-mdescriptor.patch + + module descriptor needs to be built with at least + source/target level 9 + +------------------------------------------------------------------- +Thu Mar 17 05:53:55 UTC 2022 - Fridrich Strba + - Upgrade to upsteam version 2.6.1 * Does not depend on jaxb-api - Modified patch: From 898659ceef101ecd4d3c4b4fa7b3b098ce54641cc020b917adeeb0e131379306 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 28 Mar 2022 14:58:50 +0000 Subject: [PATCH 3/5] Accepting request 962309 from Java:packages baserev update by copy to link target OBS-URL: https://build.opensuse.org/request/show/962309 OBS-URL: https://build.opensuse.org/package/show/Java:packages/hsqldb?expand=0&rev=45 --- hsqldb.changes | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/hsqldb.changes b/hsqldb.changes index 95e4198..61579f3 100644 --- a/hsqldb.changes +++ b/hsqldb.changes @@ -1,22 +1,6 @@ ------------------------------------------------------------------- Thu Mar 17 05:53:55 UTC 2022 - Fridrich Strba -- Upgrade to upsteam version 2.6.1 -- Modified patch: - * hsqldb-apidocs.patch - + adapt to changed context -- Removed patches: - * hsqldb-2.4.1-javadoc10.patch - * hsqldb-cmdline.patch - + not needed with this version -- Added patch: - * hsqldb-mdescriptor.patch - + module descriptor needs to be built with at least - source/target level 9 - -------------------------------------------------------------------- -Thu Mar 17 05:53:55 UTC 2022 - Fridrich Strba - - Upgrade to upsteam version 2.6.1 * Does not depend on jaxb-api - Modified patch: From 90319dfbeaeda544fa352b8d182524ff547ef13f4fd0cbfbdcea6794d689ed70 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 28 Mar 2022 17:09:15 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/hsqldb?expand=0&rev=46 --- hsqldb.changes | 1 - 1 file changed, 1 deletion(-) diff --git a/hsqldb.changes b/hsqldb.changes index 61579f3..78316d6 100644 --- a/hsqldb.changes +++ b/hsqldb.changes @@ -2,7 +2,6 @@ Thu Mar 17 05:53:55 UTC 2022 - Fridrich Strba - Upgrade to upsteam version 2.6.1 - * Does not depend on jaxb-api - Modified patch: * hsqldb-apidocs.patch + adapt to changed context From ba46ac4a2fe783b5cd69182f65f3eb364ff0c547e2b901bdf9109f185ddb4670 Mon Sep 17 00:00:00 2001 From: David Anes Date: Mon, 24 Oct 2022 16:52:26 +0000 Subject: [PATCH 5/5] Accepting request 1030922 from home:david.anes:branches:Java:packages - Upgrade to upstream version 2.7.1: (bsc#1204521, CVE-2022-41853) * version 2.7.1 jar requires JRE 11 or later - tested up to Java 17 * version 2.7.1 alternative jar requires JRE 8 or later * CVE-2022-41853 disallow calling java methods - setting the hsqldb.java_method_names is required for accessing java methods * enhancements to RECURSIVE CTE's - Upgrade to upstream version 2.7.0 * version 2.7.0 jar requires JRE 11 or later - tested up to Java 17 * version 2.7.0 alternative jar requires JRE 8 or later * added support for JSON constructor functions * added support for microsecond precision CURRENT_TIMESTAMP and similar functions * added support for GRANT and REVOKE on all objects in a schema * added support for CSV file data import and export * added support for regional time zones such as 'America/New_York' in conversions * added SET DATABASE SQL MAX RECURSIVE (sql.max_recursive) setting * changed the default for SET DATABASE SQL SYS INDEX NAMES (sql.sys_index_names) to true * changed the properties reported by JDBC DatabaseMetaDat::getClientInfoProperties() method * improved JDBC DatabaseMetaDat::getTablePrivileges() method to cover fine-grained privileges * improved error messages for SQL settings statements * improved documentation * added some minor enhancements * fixed a number of reported regressions and bugs (see tracker) - Refreshed/rebased patches with quilt: * hsqldb-apidocs.patch * hsqldb-mdescriptor.patch (downgraded to build as 1.7) * harden_hsqldb.service.patch - Upgrade to upstream version 2.6.1 OBS-URL: https://build.opensuse.org/request/show/1030922 OBS-URL: https://build.opensuse.org/package/show/Java:packages/hsqldb?expand=0&rev=47 --- harden_hsqldb.service.patch | 6 +- hsqldb-2.6.1.zip | 3 - hsqldb-2.6.1.pom => hsqldb-2.7.1.pom | 11 +++- hsqldb-2.7.1.zip | 3 + hsqldb-apidocs.patch | 26 ++++++--- hsqldb-mdescriptor.patch | 83 +++++++++++++++++++++++++--- hsqldb.changes | 34 +++++++++++- hsqldb.spec | 12 ++-- 8 files changed, 143 insertions(+), 35 deletions(-) delete mode 100644 hsqldb-2.6.1.zip rename hsqldb-2.6.1.pom => hsqldb-2.7.1.pom (86%) create mode 100644 hsqldb-2.7.1.zip diff --git a/harden_hsqldb.service.patch b/harden_hsqldb.service.patch index 9f2f850..3bd4a01 100644 --- a/harden_hsqldb.service.patch +++ b/harden_hsqldb.service.patch @@ -1,7 +1,7 @@ -Index: hsqldb-2.4.1/hsqldb/sample/hsqldb.service +Index: hsqldb/sample/hsqldb.service =================================================================== ---- hsqldb-2.4.1.orig/hsqldb/sample/hsqldb.service -+++ hsqldb-2.4.1/hsqldb/sample/hsqldb.service +--- hsqldb.orig/sample/hsqldb.service ++++ hsqldb/sample/hsqldb.service @@ -17,6 +17,19 @@ Description=HyperSQL Database Server After=socket.service diff --git a/hsqldb-2.6.1.zip b/hsqldb-2.6.1.zip deleted file mode 100644 index 3da09dd..0000000 --- a/hsqldb-2.6.1.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:722c721308c4b7af143a8b5dd53709372554c53443c785f27f2620f64ea446d4 -size 11078491 diff --git a/hsqldb-2.6.1.pom b/hsqldb-2.7.1.pom similarity index 86% rename from hsqldb-2.6.1.pom rename to hsqldb-2.7.1.pom index 8cf8925..f99fe09 100644 --- a/hsqldb-2.6.1.pom +++ b/hsqldb-2.7.1.pom @@ -4,7 +4,7 @@ 4.0.0 org.hsqldb hsqldb - 2.6.1 + 2.7.1 HyperSQL Database HSQLDB - Lightweight 100% Java SQL Database Engine http://hsqldb.org @@ -21,6 +21,11 @@ + + fredt + Fred Toussi + ft@cluedup.com + unsaved Blaine Simpson @@ -29,7 +34,7 @@ scm:svn:http://svn.code.sf.net/p/hsqldb/svn/base/ - 2.6.1 - http://sourceforge.net/p/hsqldb/svn/HEAD/tree/base/tags/2.6.1 + 2.7.1 + http://sourceforge.net/p/hsqldb/svn/HEAD/tree/base/tags/2.7.1 diff --git a/hsqldb-2.7.1.zip b/hsqldb-2.7.1.zip new file mode 100644 index 0000000..f8abed8 --- /dev/null +++ b/hsqldb-2.7.1.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77416bb895cd9f099ed603c759c217a43d8b3b47cbf02cd93a7f07d7842ea39d +size 11907630 diff --git a/hsqldb-apidocs.patch b/hsqldb-apidocs.patch index a11454e..074f467 100644 --- a/hsqldb-apidocs.patch +++ b/hsqldb-apidocs.patch @@ -1,8 +1,8 @@ -diff --git a/build/build.xml b/build/build.xml -index 9c46389..c523220 100644 ---- a/build/build.xml -+++ b/build/build.xml -@@ -140,6 +140,7 @@ +Index: hsqldb/build/build.xml +=================================================================== +--- hsqldb.orig/build/build.xml ++++ hsqldb/build/build.xml +@@ -167,6 +167,7 @@ examples: There is no performance penalty, since the javadoc task regenerates everything each run. --> @@ -10,17 +10,25 @@ index 9c46389..c523220 100644 -@@ -804,7 +805,6 @@ - description="Create javadoc for the distribution package"> +@@ -780,7 +781,6 @@ ${err.2} + + description="Create javadoc for the org.hsqldb.sqltool module"> + - + + + + + + + + + + + +- Upgrade to upstream version 2.7.1: (bsc#1204521, CVE-2022-41853) + * version 2.7.1 jar requires JRE 11 or later - tested up to Java 17 + * version 2.7.1 alternative jar requires JRE 8 or later + * CVE-2022-41853 disallow calling java methods - setting the + hsqldb.java_method_names is required for accessing java methods + * enhancements to RECURSIVE CTE's + +- Upgrade to upstream version 2.7.0 + * version 2.7.0 jar requires JRE 11 or later - tested up to Java 17 + * version 2.7.0 alternative jar requires JRE 8 or later + * added support for JSON constructor functions + * added support for microsecond precision CURRENT_TIMESTAMP and similar functions + * added support for GRANT and REVOKE on all objects in a schema + * added support for CSV file data import and export + * added support for regional time zones such as 'America/New_York' in conversions + * added SET DATABASE SQL MAX RECURSIVE (sql.max_recursive) setting + * changed the default for SET DATABASE SQL SYS INDEX NAMES (sql.sys_index_names) to true + * changed the properties reported by JDBC DatabaseMetaDat::getClientInfoProperties() method + * improved JDBC DatabaseMetaDat::getTablePrivileges() method to cover fine-grained privileges + * improved error messages for SQL settings statements + * improved documentation + * added some minor enhancements + * fixed a number of reported regressions and bugs (see tracker) + +- Refreshed/rebased patches with quilt: + * hsqldb-apidocs.patch + * hsqldb-mdescriptor.patch (downgraded to build as 1.7) + * harden_hsqldb.service.patch + ------------------------------------------------------------------- Thu Mar 17 05:53:55 UTC 2022 - Fridrich Strba -- Upgrade to upsteam version 2.6.1 +- Upgrade to upstream version 2.6.1 - Modified patch: * hsqldb-apidocs.patch + adapt to changed context diff --git a/hsqldb.spec b/hsqldb.spec index 5632ff5..67af825 100644 --- a/hsqldb.spec +++ b/hsqldb.spec @@ -22,7 +22,7 @@ %endif Name: hsqldb -Version: 2.6.1 +Version: 2.7.1 Release: 0 Summary: HyperSQL Database Engine License: BSD-3-Clause @@ -41,8 +41,8 @@ Source7: hsqldb-wrapper Source8: hsqldb-post Source9: hsqldb-stop # Javadoc fails to create since apidocs folder is deleted and not recreated -Patch0: %{name}-apidocs.patch -Patch1: %{name}-mdescriptor.patch +Patch0: hsqldb-apidocs.patch +Patch1: hsqldb-mdescriptor.patch Patch3: harden_hsqldb.service.patch BuildRequires: ant BuildRequires: fdupes @@ -124,13 +124,11 @@ chmod -R go=u-w * sed -i -e 's/doc-src/doc/g' build/build.xml sed -i -e 's|doc/apidocs|%{_javadocdir}/%{name}|g' index.html -%patch0 -p1 -%patch1 -p1 -%patch3 -p2 +%autopatch -p1 %build pushd build -export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8 -Dant.build.javac.source=1.7 -Dant.build.javac.target=1.7" +export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" ant hsqldb javadoc -Dservletapi.lib=$(build-classpath glassfish-servlet-api) popd