pool/hsqldb
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1031121 from Java:packages

Browse Source 
2.7.1 + sec fixes

OBS-URL: https://build.opensuse.org/request/show/1031121
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hsqldb?expand=0&rev=31
This commit is contained in:
Dominique Leuenberger 2022-10-27 11:53:53 +00:00 committed by Git OBS Bridge
commit 194fdfa905
8 changed files with 143 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
harden_hsqldb.service.patch
View File

@ -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

3
hsqldb-2.6.1.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:722c721308c4b7af143a8b5dd53709372554c53443c785f27f2620f64ea446d4
size 11078491

11
hsqldb-2.6.1.pom → hsqldb-2.7.1.pom
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.6.1</version>
<version>2.7.1</version>
<name>HyperSQL Database</name>
<description>HSQLDB - Lightweight 100% Java SQL Database Engine</description>
<url>http://hsqldb.org</url>
@ -21,6 +21,11 @@
</license>
</licenses>
<developers>
<developer>
<id>fredt</id>
<name>Fred Toussi</name>
<email>ft@cluedup.com</email>
</developer>
<developer>
<id>unsaved</id>
<name>Blaine Simpson</name>
@ -29,7 +34,7 @@
</developers>
<scm>
<connection>scm:svn:http://svn.code.sf.net/p/hsqldb/svn/base/</connection>
<tag>2.6.1</tag>
<url>http://sourceforge.net/p/hsqldb/svn/HEAD/tree/base/tags/2.6.1</url>
<tag>2.7.1</tag>
<url>http://sourceforge.net/p/hsqldb/svn/HEAD/tree/base/tags/2.7.1</url>
</scm>
</project>

3
hsqldb-2.7.1.zip Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:77416bb895cd9f099ed603c759c217a43d8b3b47cbf02cd93a7f07d7842ea39d
size 11907630

26
hsqldb-apidocs.patch
View File

@ -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
<copy todir="doc/apidocs">
<!-- IMPORTANT:
Add a fixcrlf if we add non-binary files to doc/apidocs. -->
@@ -804,7 +805,6 @@
description="Create javadoc for the distribution package">
@@ -780,7 +781,6 @@ ${err.2}</fail>
<delete file="${swsrc}org/hsqldb/server/Servlet.java"/>
<javadoc
destdir="doc/apidocs"
- stylesheetfile="doc/apidocs/javadoc.css"
docencoding="UTF-8"
charset="UTF-8"
author="true"
@@ -852,7 +852,6 @@
@@ -818,7 +818,6 @@ ${err.2}</fail>
description="Create javadoc for the org.hsqldb.sqltool module">
<javadoc
destdir="doc/apidocssqltool"
- stylesheetfile="doc/apidocs/javadoc.css"
docencoding="UTF-8"
charset="UTF-8"
author="true"
@@ -857,7 +856,6 @@ ${err.2}</fail>
<javadoc
destdir="doc/apidocs"
destdir="doc/apidocsdev"
docencoding="UTF-8"
- stylesheetfile="doc/apidocs/javadoc.css"
charset="UTF-8"

83
hsqldb-mdescriptor.patch
View File

@ -1,11 +1,76 @@
--- a/build/build.xml 2021-07-19 10:09:56.000000000 +0200
+++ b/build/build.xml 2022-03-17 06:44:51.105907875 +0100
@@ -676,6 +676,8 @@
<mkdir dir='classes/modules/${module.name}'/>
<javac srcdir="${swsrc}/modules/${module.name}"
sourcepath="${swsrc}"
+ source="9"
+ target="9"
Index: hsqldb/build/build.xml
===================================================================
--- hsqldb.orig/build/build.xml
+++ hsqldb/build/build.xml
@@ -257,6 +257,8 @@ examples:
<target name="mdesc-hsqldbmin" depends="sw-hsqldbmin" if="ant.java.iscjava11" >
<javac srcdir="${swsrcmin}"
+ source="7"
+ target="7"
bootclasspath="${javac.bootcp.override}"
sourcepath=""
includeantruntime="false"
@@ -276,6 +278,8 @@ examples:
<fail unless='_servlet_available'
message="Place Jar file for Servlet API at '${servletapi.lib}', or set property 'servletapi.lib'"/>
<javac srcdir="${swsrc}"
+ source="7"
+ target="7"
bootclasspath="${javac.bootcp.override}"
sourcepath=""
includeantruntime="false"
@@ -290,6 +294,8 @@ examples:
<target name="classes" depends="sw-hsqldb,-javajsse"
description="compiles JVM-independent non-lib/util/cmdline/servlet classes">
<javac srcdir="${swsrc}"
+ source="7"
+ target="7"
bootclasspath="${javac.bootcp.override}"
includeantruntime="false"
encoding="${javac.encoding}"
@@ -331,6 +337,8 @@ examples:
<target name="-util" depends="-prepare, sw-hsqldb"
description="compiles the util folder">
<javac srcdir="${swsrc}"
+ source="7"
+ target="7"
bootclasspath="${javac.bootcp.override}"
includeantruntime="false"
encoding="${javac.encoding}"
@@ -349,6 +357,8 @@ examples:
<!-- This javac is no longer dependent upon default attr. includeAntRuntime=true -->
<!-- Ant resolver and preprocessor moved to trunk/integration/ant/prepocessor/src -->
<javac srcdir="src"
+ source="7"
+ target="7"
bootclasspath="${javac.bootcp.override}"
encoding="${javac.encoding}"
destdir="classes"
@@ -364,6 +374,8 @@ examples:
-conditionalize-sqlfile-scanner, -sqlfile-scanner">
<javac srcdir="${swsrctool}"
+ source="7"
+ target="7"
bootclasspath="${javac.bootcp.override}"
includeantruntime="false"
encoding="${javac.encoding}"
@@ -390,6 +402,8 @@ examples:
<target name="-swing" depends="sw-hsqldb"
description="compiles the swing based classes in the util folder">
<javac srcdir="${swsrc}"
+ source="7"
+ target="7"
bootclasspath="${javac.bootcp.override}"
includeantruntime="false"
encoding="${javac.encoding}"
@@ -415,6 +429,8 @@ examples:
<target name="scanner-driver" depends="-cmdline"
description="Build Scanner Driver. For SqlTool scanner developers.">
<javac srcdir="${swsrc}"
+ source="7"
+ target="7"
bootclasspath="${javac.bootcp.override}"
includeantruntime="false"
encoding="${javac.encoding}"
destdir="classes/modules/${module.name}"

34
hsqldb.changes
View File

@ -1,7 +1,39 @@
-------------------------------------------------------------------
Mon Oct 24 15:55:11 UTC 2022 - David Anes <david.anes@suse.com>
- 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 <fstrba@suse.com>
- Upgrade to upsteam version 2.6.1
- Upgrade to upstream version 2.6.1
- Modified patch:
* hsqldb-apidocs.patch
+ adapt to changed context

12
hsqldb.spec
View File

@ -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