On 2021/06/02 10:50, Renaud Allard wrote:
> Hello,
>
> Here is a diff to update geo/traccar to 4.13.
>
> There is an important change due to a modification in liquibase. If you have
> defined 'database.changelog' in /etc/traccar/traccar.xml, it will need to
> change to a relative path. However, it is not expected that users define it
> in their own configuration file.
Well, if any changes have been made to traccar.xml, the database.changelog
path will need to be updated because the update won't be merged automatically.
Do you know what the path is relative to? (i.e. is ../../ going to work for
everyone, or are there situations where it might need to be something else?)
What an annoying change for liquibase to have made.
>
> Best Regards
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/geo/traccar/Makefile,v
> retrieving revision 1.14
> diff -u -p -r1.14 Makefile
> --- Makefile 6 Feb 2021 21:07:31 -0000 1.14
> +++ Makefile 2 Jun 2021 08:46:19 -0000
> @@ -1,7 +1,7 @@
> # $OpenBSD: Makefile,v 1.14 2021/02/06 21:07:31 sthen Exp $
>
> COMMENT = modern GPS tracking platform
> -V = 4.12
> +V = 4.13
> PKGNAME = traccar-${V}
> DISTNAME = traccar-other-${V}
> EXTRACT_SUFX = .zip
> @@ -18,7 +18,7 @@ PERMIT_PACKAGE = Yes
> MASTER_SITES = https://github.com/traccar/traccar/releases/download/v${V}/
>
> MODULES = java
> -MODJAVA_VER = 1.8+
> +MODJAVA_VER = 11+
>
> RUN_DEPENDS= java/javaPathHelper
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/geo/traccar/distinfo,v
> retrieving revision 1.9
> diff -u -p -r1.9 distinfo
> --- distinfo 6 Feb 2021 21:07:31 -0000 1.9
> +++ distinfo 2 Jun 2021 08:46:19 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (traccar-other-4.12.zip) =
> Gc+hVRfG3PwcmobXysd8O6dFlQz5+kcr9nif1PUQeZ0=
> -SIZE (traccar-other-4.12.zip) = 64392818
> +SHA256 (traccar-other-4.13.zip) =
> +6ctOhquILMvzMwV7GRXNwLqCj5PEvolTwDjjPgAMNM=
> +SIZE (traccar-other-4.13.zip) = 74110664
> Index: patches/patch-conf_default_xml
> ===================================================================
> RCS file: /cvs/ports/geo/traccar/patches/patch-conf_default_xml,v
> retrieving revision 1.6
> diff -u -p -r1.6 patch-conf_default_xml
> --- patches/patch-conf_default_xml 6 Feb 2021 21:07:31 -0000 1.6
> +++ patches/patch-conf_default_xml 2 Jun 2021 08:46:19 -0000
> @@ -37,7 +37,7 @@ Index: conf/default.xml
> <entry key='database.ignoreUnknown'>true</entry>
> <entry key='database.generateQueries'>true</entry>
> - <entry key='database.changelog'>./schema/changelog-master.xml</entry>
> -+ <entry
> key='database.changelog'>${LOCALBASE}/share/traccar/schema/changelog-master.xml</entry>
> ++ <entry
> key='database.changelog'>../..${LOCALBASE}/share/traccar/schema/changelog-master.xml</entry>
>
> <entry key='database.loginUser'>
> SELECT * FROM tc_users
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/geo/traccar/pkg/PLIST,v
> retrieving revision 1.10
> diff -u -p -r1.10 PLIST
> --- pkg/PLIST 6 Feb 2021 21:07:31 -0000 1.10
> +++ pkg/PLIST 2 Jun 2021 08:46:19 -0000
> @@ -26,17 +26,20 @@ share/traccar/conf/traccar.xml
> @owner
> @group
> share/traccar/lib/
> -share/traccar/lib/HikariCP-4.0.1.jar
> +share/traccar/lib/HikariCP-4.0.3.jar
> share/traccar/lib/activation-1.1.1.jar
> -share/traccar/lib/animal-sniffer-annotations-1.17.jar
> share/traccar/lib/antlr-2.7.2.jar
> share/traccar/lib/aopalliance-1.0.jar
> share/traccar/lib/aopalliance-repackaged-2.6.1.jar
> -share/traccar/lib/asm-9.0.jar
> -share/traccar/lib/asm-analysis-9.0.jar
> -share/traccar/lib/asm-commons-9.0.jar
> -share/traccar/lib/asm-tree-9.0.jar
> -share/traccar/lib/asm-util-9.0.jar
> +share/traccar/lib/asm-9.1.jar
> +share/traccar/lib/asm-analysis-9.1.jar
> +share/traccar/lib/asm-commons-9.1.jar
> +share/traccar/lib/asm-tree-9.1.jar
> +share/traccar/lib/asm-util-9.1.jar
> +share/traccar/lib/aws-java-sdk-core-1.11.1030.jar
> +share/traccar/lib/aws-java-sdk-sns-1.11.1030.jar
> +share/traccar/lib/aws-java-sdk-sqs-1.11.1030.jar
> +share/traccar/lib/cache-api-1.1.1.jar
> share/traccar/lib/checker-qual-3.5.0.jar
> share/traccar/lib/commons-beanutils-1.9.2.jar
> share/traccar/lib/commons-chain-1.1.jar
> @@ -47,34 +50,41 @@ share/traccar/lib/commons-compress-1.18.
> share/traccar/lib/commons-digester-1.8.jar
> share/traccar/lib/commons-jexl-2.1.1.jar
> share/traccar/lib/commons-lang-2.4.jar
> -share/traccar/lib/commons-lang3-3.6.jar
> -share/traccar/lib/commons-logging-1.1.1.jar
> +share/traccar/lib/commons-lang3-3.8.1.jar
> +share/traccar/lib/commons-logging-1.2.jar
> share/traccar/lib/commons-validator-1.3.1.jar
> share/traccar/lib/curvesapi-1.04.jar
> share/traccar/lib/dom4j-1.1.jar
> share/traccar/lib/encoder-1.2.3.jar
> -share/traccar/lib/error_prone_annotations-2.2.0.jar
> +share/traccar/lib/error_prone_annotations-2.3.4.jar
> share/traccar/lib/failureaccess-1.0.1.jar
> -share/traccar/lib/guava-27.1-jre.jar
> -share/traccar/lib/guice-4.2.3.jar
> -share/traccar/lib/guice-assistedinject-4.2.3.jar
> +share/traccar/lib/groovy-3.0.7.jar
> +share/traccar/lib/groovy-dateutil-3.0.7.jar
> +share/traccar/lib/guava-30.1-jre.jar
> +share/traccar/lib/guice-5.0.1.jar
> +share/traccar/lib/guice-assistedinject-5.0.1.jar
> share/traccar/lib/h2-1.4.200.jar
> share/traccar/lib/hk2-api-2.6.1.jar
> share/traccar/lib/hk2-locator-2.6.1.jar
> share/traccar/lib/hk2-utils-2.6.1.jar
> -share/traccar/lib/ical4j-2.0.5.jar
> -share/traccar/lib/j2objc-annotations-1.1.jar
> -share/traccar/lib/jackson-annotations-2.12.1.jar
> -share/traccar/lib/jackson-core-2.12.1.jar
> -share/traccar/lib/jackson-databind-2.12.1.jar
> -share/traccar/lib/jackson-datatype-jsr353-2.12.1.jar
> -share/traccar/lib/jackson-jaxrs-base-2.12.1.jar
> -share/traccar/lib/jackson-jaxrs-json-provider-2.12.1.jar
> -share/traccar/lib/jackson-module-jaxb-annotations-2.12.1.jar
> +share/traccar/lib/httpclient-4.5.13.jar
> +share/traccar/lib/httpcore-4.4.13.jar
> +share/traccar/lib/ical4j-3.0.25.jar
> +share/traccar/lib/ion-java-1.0.2.jar
> +share/traccar/lib/j2objc-annotations-1.3.jar
> +share/traccar/lib/jackson-annotations-2.12.2.jar
> +share/traccar/lib/jackson-core-2.12.2.jar
> +share/traccar/lib/jackson-databind-2.12.2.jar
> +share/traccar/lib/jackson-dataformat-cbor-2.12.2.jar
> +share/traccar/lib/jackson-datatype-jsr353-2.12.2.jar
> +share/traccar/lib/jackson-jaxrs-base-2.12.2.jar
> +share/traccar/lib/jackson-jaxrs-json-provider-2.12.2.jar
> +share/traccar/lib/jackson-module-jaxb-annotations-2.12.2.jar
> share/traccar/lib/jakarta.activation-1.2.2.jar
> share/traccar/lib/jakarta.activation-api-1.2.2.jar
> share/traccar/lib/jakarta.annotation-api-1.3.5.jar
> share/traccar/lib/jakarta.inject-2.6.1.jar
> +share/traccar/lib/jakarta.transaction-api-1.3.2.jar
> share/traccar/lib/jakarta.validation-api-2.0.2.jar
> share/traccar/lib/jakarta.ws.rs-api-2.1.6.jar
> share/traccar/lib/jakarta.xml.bind-api-2.3.3.jar
> @@ -84,73 +94,76 @@ share/traccar/lib/javax.inject-1.jar
> share/traccar/lib/javax.json-1.1.4.jar
> share/traccar/lib/javax.json-api-1.1.4.jar
> share/traccar/lib/javax.mail-1.6.2.jar
> -share/traccar/lib/javax.servlet-api-3.1.0.jar
> share/traccar/lib/jaxb-api-2.3.1.jar
> share/traccar/lib/jaxb-core-2.3.0.1.jar
> -share/traccar/lib/jaxb-impl-2.3.3.jar
> +share/traccar/lib/jaxb-impl-2.3.4.jar
> share/traccar/lib/jcl-over-slf4j-1.7.12.jar
> -share/traccar/lib/jersey-client-2.33.jar
> -share/traccar/lib/jersey-common-2.33.jar
> -share/traccar/lib/jersey-container-servlet-2.33.jar
> -share/traccar/lib/jersey-container-servlet-core-2.33.jar
> -share/traccar/lib/jersey-entity-filtering-2.33.jar
> -share/traccar/lib/jersey-hk2-2.33.jar
> -share/traccar/lib/jersey-media-json-jackson-2.33.jar
> -share/traccar/lib/jersey-server-2.33.jar
> -share/traccar/lib/jetty-client-9.4.36.v20210114.jar
> -share/traccar/lib/jetty-http-9.4.36.v20210114.jar
> -share/traccar/lib/jetty-io-9.4.36.v20210114.jar
> -share/traccar/lib/jetty-jndi-9.4.36.v20210114.jar
> -share/traccar/lib/jetty-proxy-9.4.36.v20210114.jar
> -share/traccar/lib/jetty-security-9.4.36.v20210114.jar
> -share/traccar/lib/jetty-server-9.4.36.v20210114.jar
> -share/traccar/lib/jetty-servlet-9.4.36.v20210114.jar
> -share/traccar/lib/jetty-util-9.4.36.v20210114.jar
> -share/traccar/lib/jetty-util-ajax-9.4.36.v20210114.jar
> -share/traccar/lib/jetty-webapp-9.4.36.v20210114.jar
> -share/traccar/lib/jetty-xml-9.4.36.v20210114.jar
> -share/traccar/lib/jffi-1.3.1-native.jar
> -share/traccar/lib/jffi-1.3.1.jar
> -share/traccar/lib/jna-5.6.0.jar
> -share/traccar/lib/jna-platform-5.6.0.jar
> +share/traccar/lib/jersey-client-2.34.jar
> +share/traccar/lib/jersey-common-2.34.jar
> +share/traccar/lib/jersey-container-servlet-2.34.jar
> +share/traccar/lib/jersey-container-servlet-core-2.34.jar
> +share/traccar/lib/jersey-entity-filtering-2.34.jar
> +share/traccar/lib/jersey-hk2-2.34.jar
> +share/traccar/lib/jersey-media-json-jackson-2.34.jar
> +share/traccar/lib/jersey-server-2.34.jar
> +share/traccar/lib/jetty-alpn-client-10.0.3.jar
> +share/traccar/lib/jetty-annotations-10.0.3.jar
> +share/traccar/lib/jetty-client-10.0.3.jar
> +share/traccar/lib/jetty-http-10.0.3.jar
> +share/traccar/lib/jetty-io-10.0.3.jar
> +share/traccar/lib/jetty-jndi-10.0.3.jar
> +share/traccar/lib/jetty-plus-10.0.3.jar
> +share/traccar/lib/jetty-proxy-10.0.3.jar
> +share/traccar/lib/jetty-security-10.0.3.jar
> +share/traccar/lib/jetty-server-10.0.3.jar
> +share/traccar/lib/jetty-servlet-10.0.3.jar
> +share/traccar/lib/jetty-servlet-api-4.0.6.jar
> +share/traccar/lib/jetty-util-10.0.3.jar
> +share/traccar/lib/jetty-webapp-10.0.3.jar
> +share/traccar/lib/jetty-xml-10.0.3.jar
> +share/traccar/lib/jffi-1.3.3-native.jar
> +share/traccar/lib/jffi-1.3.3.jar
> +share/traccar/lib/jmespath-java-1.11.1030.jar
> +share/traccar/lib/jna-5.8.0.jar
> +share/traccar/lib/jna-platform-5.8.0.jar
> share/traccar/lib/jnr-a64asm-1.0.0.jar
> share/traccar/lib/jnr-constants-0.10.1.jar
> -share/traccar/lib/jnr-ffi-2.2.1.jar
> -share/traccar/lib/jnr-posix-3.1.4.jar
> +share/traccar/lib/jnr-ffi-2.2.3.jar
> +share/traccar/lib/jnr-posix-3.1.6.jar
> share/traccar/lib/jnr-x86asm-1.0.2.jar
> +share/traccar/lib/joda-time-2.8.1.jar
> share/traccar/lib/jsr305-3.0.2.jar
> -share/traccar/lib/jts-core-1.18.0.jar
> +share/traccar/lib/jts-core-1.18.1.jar
> share/traccar/lib/jxls-2.4.7.jar
> share/traccar/lib/jxls-poi-1.0.16.jar
> -share/traccar/lib/liquibase-core-3.10.3.jar
> +share/traccar/lib/liquibase-core-4.3.5.jar
>
> share/traccar/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
> share/traccar/lib/logback-core-1.1.3.jar
> -share/traccar/lib/mssql-jdbc-9.2.0.jre8.jar
> -share/traccar/lib/mysql-connector-java-8.0.21.jar
> -share/traccar/lib/mysql-connector-java-8.0.23.jar
> -share/traccar/lib/netty-all-4.1.58.Final.jar
> +share/traccar/lib/mssql-jdbc-9.2.1.jre11.jar
> +share/traccar/lib/mysql-connector-java-8.0.25.jar
> +share/traccar/lib/netty-all-4.1.65.Final.jar
> share/traccar/lib/oro-2.0.8.jar
> share/traccar/lib/osgi-resource-locator-1.0.3.jar
> share/traccar/lib/poi-4.0.0.jar
> share/traccar/lib/poi-ooxml-4.0.0.jar
> share/traccar/lib/poi-ooxml-schemas-4.0.0.jar
> -share/traccar/lib/postgresql-42.2.18.jar
> -share/traccar/lib/protobuf-java-3.14.0.jar
> -share/traccar/lib/slf4j-api-1.7.30.jar
> -share/traccar/lib/slf4j-jdk14-1.7.30.jar
> +share/traccar/lib/postgresql-42.2.20.jar
> +share/traccar/lib/protobuf-java-3.17.1.jar
> +share/traccar/lib/slf4j-api-2.0.0-alpha1.jar
> +share/traccar/lib/slf4j-jdk14-2.0.0-alpha1.jar
> share/traccar/lib/spatial4j-0.8.jar
> share/traccar/lib/sslext-1.2-0.jar
> share/traccar/lib/struts-core-1.3.8.jar
> share/traccar/lib/struts-taglib-1.3.8.jar
> share/traccar/lib/struts-tiles-1.3.8.jar
> -share/traccar/lib/threetenbp-1.3.6.jar
> share/traccar/lib/velocity-1.7.jar
> share/traccar/lib/velocity-tools-2.0.jar
> -share/traccar/lib/websocket-api-9.4.36.v20210114.jar
> -share/traccar/lib/websocket-client-9.4.36.v20210114.jar
> -share/traccar/lib/websocket-common-9.4.36.v20210114.jar
> -share/traccar/lib/websocket-server-9.4.36.v20210114.jar
> -share/traccar/lib/websocket-servlet-9.4.36.v20210114.jar
> +share/traccar/lib/websocket-core-common-10.0.3.jar
> +share/traccar/lib/websocket-core-server-10.0.3.jar
> +share/traccar/lib/websocket-jetty-api-10.0.3.jar
> +share/traccar/lib/websocket-jetty-common-10.0.3.jar
> +share/traccar/lib/websocket-jetty-server-10.0.3.jar
> +share/traccar/lib/websocket-servlet-10.0.3.jar
> share/traccar/lib/xmlbeans-3.0.1.jar
> share/traccar/schema/
> share/traccar/schema/changelog-3.10.xml
> @@ -171,6 +184,7 @@ share/traccar/schema/changelog-4.0.xml
> share/traccar/schema/changelog-4.1.xml
> share/traccar/schema/changelog-4.10.xml
> share/traccar/schema/changelog-4.11.xml
> +share/traccar/schema/changelog-4.13.xml
> share/traccar/schema/changelog-4.7.xml
> share/traccar/schema/changelog-4.9.xml
> share/traccar/schema/changelog-master.xml
> @@ -198,6 +212,7 @@ share/traccar/templates/full/geofenceExi
> share/traccar/templates/full/ignitionOff.vm
> share/traccar/templates/full/ignitionOn.vm
> share/traccar/templates/full/maintenance.vm
> +share/traccar/templates/full/passwordReset.vm
> share/traccar/templates/full/test.vm
> share/traccar/templates/full/textMessage.vm
> share/traccar/templates/full/unknown.vm
> @@ -489,6 +504,7 @@ share/traccar/web/l10n/lo.json
> share/traccar/web/l10n/lt.json
> share/traccar/web/l10n/lv.json
> share/traccar/web/l10n/ml.json
> +share/traccar/web/l10n/mn.json
> share/traccar/web/l10n/ms.json
> share/traccar/web/l10n/nb.json
> share/traccar/web/l10n/ne.json
> @@ -545,20 +561,20 @@ share/traccar/web/modern/images/icon/van
> share/traccar/web/modern/index.html
> share/traccar/web/modern/logo.svg
> share/traccar/web/modern/manifest.json
> -share/traccar/web/modern/precache-manifest.e9b9024d5b73032f7fd5bf6f524c2b36.js
> +share/traccar/web/modern/precache-manifest.e8a3baa198d459632dcf48a8f9d8498c.js
> share/traccar/web/modern/service-worker.js
> share/traccar/web/modern/static/
> share/traccar/web/modern/static/css/
> -share/traccar/web/modern/static/css/2.fa773933.chunk.css
> -share/traccar/web/modern/static/css/2.fa773933.chunk.css.map
> +share/traccar/web/modern/static/css/2.f966c203.chunk.css
> +share/traccar/web/modern/static/css/2.f966c203.chunk.css.map
> share/traccar/web/modern/static/css/main.99aaa63c.chunk.css
> share/traccar/web/modern/static/css/main.99aaa63c.chunk.css.map
> share/traccar/web/modern/static/js/
> -share/traccar/web/modern/static/js/2.8403bcc7.chunk.js
> -share/traccar/web/modern/static/js/2.8403bcc7.chunk.js.LICENSE.txt
> -share/traccar/web/modern/static/js/2.8403bcc7.chunk.js.map
> -share/traccar/web/modern/static/js/main.db80d764.chunk.js
> -share/traccar/web/modern/static/js/main.db80d764.chunk.js.map
> +share/traccar/web/modern/static/js/2.20723cf4.chunk.js
> +share/traccar/web/modern/static/js/2.20723cf4.chunk.js.LICENSE.txt
> +share/traccar/web/modern/static/js/2.20723cf4.chunk.js.map
> +share/traccar/web/modern/static/js/main.775f7564.chunk.js
> +share/traccar/web/modern/static/js/main.775f7564.chunk.js.map
> share/traccar/web/modern/static/js/runtime-main.2dc76e5b.js
> share/traccar/web/modern/static/js/runtime-main.2dc76e5b.js.map
> share/traccar/web/modern/static/media/
