On 2022/01/20 10:07, Renaud Allard wrote:
>
>
>
> On 1/20/22 10:06, Renaud Allard wrote:
> > Hi Stuart,
> >
> > On 1/20/22 09:40, Stuart Henderson wrote:
> > > On 2022/01/20 09:23, Renaud Allard wrote:
> > > > - <entry key='logger.file'>./logs/tracker-server.log</entry>
> > > > -+ <entry
> > > > key='logger.file'>/var/log/traccar/tracker-server.log</entry>
> > > > ++ <entry
> > > > key='logger.file'>${VARBASE}/log/traccar/tracker-server.log</entry>
> > >
> > > I think this should just use /var/log
> >
> > When are we supposed to use $VARBASE and when /var? This isn't
> > completely clear to me. Former patch was indeed using /var, but, as I
> > had to change it, I did put $VARBASE which seems more appropriate.
VARBASE is never going to change, it relates to the directory used in
the base OS rather than packages, and things just won't work if that
changes from /var (and there's no need to do it). Might as well just
use /var instead of that. Less typing, less use of SUBST_CMD.
Now you _could_ use LOCALSTATEDIR which is the "overridable" variable
based on VARBASE, but it has the same issues as LOCALBASE, it is baked in
at package build time, the only way to use it is to build your own set
of packages, and there will be many things to fix on the way (and
we already pretty much decided that it's pointless to go through
contortions to support a different LOCALBASE).
> > > Also (not new), I noticed this in the patch, doesn't seem quite right?
> > >
> > > - <entry
> > > key='database.changelog'>./schema/changelog-master.xml</entry>
> > > + <entry
> > > key='database.changelog'>../..${LOCALBASE}/share/traccar/schema/changelog-master.xml</entry>
> > >
> > >
> >
> > It was already like this before. If I remember well, traccar doesn't
> > allow a relative path for this setting and that's why I had to use this
> > kind of bad looking trick.
>
> I obviously meant "ONLY allows", and not "doesn't allow"
Ah OK :) This is something that comments in the patches are useful for,
making it clear why something that seems a bit odd is being done.
So I would suggest this diff instead, does that make sense for you?
Index: Makefile
===================================================================
RCS file: /cvs/ports/geo/traccar/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile 16 Aug 2021 10:09:10 -0000 1.17
+++ Makefile 20 Jan 2022 09:36:23 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.17 2021/08/16 10:09:10 sthen Exp $
COMMENT = modern GPS tracking platform
-V = 4.14
+V = 4.15
PKGNAME = traccar-${V}
DISTNAME = traccar-other-${V}
EXTRACT_SUFX = .zip
Index: distinfo
===================================================================
RCS file: /cvs/ports/geo/traccar/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 16 Aug 2021 10:09:10 -0000 1.11
+++ distinfo 20 Jan 2022 09:36:23 -0000
@@ -1,2 +1,2 @@
-SHA256 (traccar-other-4.14.zip) = dBqftyCGpjXbbLX4hdxvmO1Sqev1MH1QhvN7GhCbCrM=
-SIZE (traccar-other-4.14.zip) = 79240444
+SHA256 (traccar-other-4.15.zip) = SirAIa+WsmX1LxYSuJI0dMaQRSEnX4LqaR59QnxjESE=
+SIZE (traccar-other-4.15.zip) = 82952742
Index: patches/patch-conf_default_xml
===================================================================
RCS file: /cvs/ports/geo/traccar/patches/patch-conf_default_xml,v
retrieving revision 1.7
diff -u -p -r1.7 patch-conf_default_xml
--- patches/patch-conf_default_xml 5 Jun 2021 18:35:51 -0000 1.7
+++ patches/patch-conf_default_xml 20 Jan 2022 09:36:23 -0000
@@ -1,18 +1,22 @@
$OpenBSD: patch-conf_default_xml,v 1.7 2021/06/05 18:35:51 sthen Exp $
+seems that database.changelog requires a relative path
+
Index: conf/default.xml
--- conf/default.xml.orig
+++ conf/default.xml
-@@ -11,13 +11,14 @@
+@@ -11,7 +11,8 @@
-->
<entry key='web.port'>8082</entry>
- <entry key='web.path'>./web</entry>
+ <entry key='web.address'>127.0.0.1</entry>
+ <entry key='web.path'>${LOCALBASE}/share/traccar/web</entry>
+ <entry key='web.persistSession'>false</entry>
- <entry key='geocoder.enable'>false</entry>
- <entry key='geocoder.type'>google</entry>
+ <entry key='geocoder.enable'>true</entry>
+@@ -20,7 +21,7 @@
+ <entry key='geocoder.key'>pk.689d849289c8c63708068b2ff1f63b2d</entry>
<entry key='logger.level'>info</entry>
- <entry key='logger.file'>./logs/tracker-server.log</entry>
@@ -20,7 +24,7 @@ Index: conf/default.xml
<entry key='logger.rotate'>true</entry>
<entry key='filter.enable'>true</entry>
-@@ -27,17 +28,16 @@
+@@ -30,17 +31,16 @@
<entry key='processing.computedAttributes.enable'>true</entry>
<entry key='processing.engineHours.enable'>true</entry>
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/geo/traccar/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST 16 Aug 2021 10:09:10 -0000 1.12
+++ pkg/PLIST 20 Jan 2022 09:36:23 -0000
@@ -26,19 +26,19 @@ share/traccar/conf/traccar.xml
@owner
@group
share/traccar/lib/
-share/traccar/lib/HikariCP-5.0.0.jar
+share/traccar/lib/HikariCP-5.0.1.jar
share/traccar/lib/activation-1.1.1.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.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.12.47.jar
-share/traccar/lib/aws-java-sdk-sns-1.12.47.jar
-share/traccar/lib/aws-java-sdk-sqs-1.12.47.jar
+share/traccar/lib/asm-9.2.jar
+share/traccar/lib/asm-analysis-9.2.jar
+share/traccar/lib/asm-commons-9.2.jar
+share/traccar/lib/asm-tree-9.2.jar
+share/traccar/lib/asm-util-9.2.jar
+share/traccar/lib/aws-java-sdk-core-1.12.141.jar
+share/traccar/lib/aws-java-sdk-sns-1.12.141.jar
+share/traccar/lib/aws-java-sdk-sqs-1.12.141.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
@@ -63,13 +63,13 @@ share/traccar/lib/groovy-dateutil-3.0.7.
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/h2-2.0.206.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/httpclient-4.5.13.jar
share/traccar/lib/httpcore-4.4.13.jar
-share/traccar/lib/ical4j-3.0.29.jar
+share/traccar/lib/ical4j-3.1.2.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.3.jar
@@ -84,7 +84,7 @@ share/traccar/lib/jakarta.activation-2.0
share/traccar/lib/jakarta.activation-api-1.2.1.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.transaction-api-1.3.3.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-3.0.1.jar
@@ -98,59 +98,60 @@ share/traccar/lib/jaxb-api-2.3.1.jar
share/traccar/lib/jaxb-core-3.0.2.jar
share/traccar/lib/jaxb-impl-3.0.2.jar
share/traccar/lib/jcl-over-slf4j-1.7.12.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.6.jar
-share/traccar/lib/jetty-annotations-10.0.6.jar
-share/traccar/lib/jetty-client-10.0.6.jar
-share/traccar/lib/jetty-http-10.0.6.jar
-share/traccar/lib/jetty-io-10.0.6.jar
-share/traccar/lib/jetty-jndi-10.0.6.jar
-share/traccar/lib/jetty-plus-10.0.6.jar
-share/traccar/lib/jetty-proxy-10.0.6.jar
-share/traccar/lib/jetty-security-10.0.6.jar
-share/traccar/lib/jetty-server-10.0.6.jar
-share/traccar/lib/jetty-servlet-10.0.6.jar
+share/traccar/lib/jersey-client-2.35.jar
+share/traccar/lib/jersey-common-2.35.jar
+share/traccar/lib/jersey-container-servlet-2.35.jar
+share/traccar/lib/jersey-container-servlet-core-2.35.jar
+share/traccar/lib/jersey-entity-filtering-2.35.jar
+share/traccar/lib/jersey-hk2-2.35.jar
+share/traccar/lib/jersey-media-json-jackson-2.35.jar
+share/traccar/lib/jersey-server-2.35.jar
+share/traccar/lib/jetty-alpn-client-10.0.7.jar
+share/traccar/lib/jetty-annotations-10.0.7.jar
+share/traccar/lib/jetty-client-10.0.7.jar
+share/traccar/lib/jetty-http-10.0.7.jar
+share/traccar/lib/jetty-io-10.0.7.jar
+share/traccar/lib/jetty-jndi-10.0.7.jar
+share/traccar/lib/jetty-plus-10.0.7.jar
+share/traccar/lib/jetty-proxy-10.0.7.jar
+share/traccar/lib/jetty-security-10.0.7.jar
+share/traccar/lib/jetty-server-10.0.7.jar
+share/traccar/lib/jetty-servlet-10.0.7.jar
share/traccar/lib/jetty-servlet-api-4.0.6.jar
-share/traccar/lib/jetty-util-10.0.6.jar
-share/traccar/lib/jetty-webapp-10.0.6.jar
-share/traccar/lib/jetty-xml-10.0.6.jar
-share/traccar/lib/jffi-1.3.3-native.jar
-share/traccar/lib/jffi-1.3.3.jar
-share/traccar/lib/jmespath-java-1.12.47.jar
-share/traccar/lib/jna-5.8.0.jar
-share/traccar/lib/jna-platform-5.8.0.jar
+share/traccar/lib/jetty-util-10.0.7.jar
+share/traccar/lib/jetty-webapp-10.0.7.jar
+share/traccar/lib/jetty-xml-10.0.7.jar
+share/traccar/lib/jffi-1.3.9-native.jar
+share/traccar/lib/jffi-1.3.9.jar
+share/traccar/lib/jmespath-java-1.12.141.jar
+share/traccar/lib/jna-5.10.0.jar
+share/traccar/lib/jna-platform-5.10.0.jar
share/traccar/lib/jnr-a64asm-1.0.0.jar
-share/traccar/lib/jnr-constants-0.10.2.jar
-share/traccar/lib/jnr-ffi-2.2.4.jar
-share/traccar/lib/jnr-posix-3.1.7.jar
+share/traccar/lib/jnr-constants-0.10.3.jar
+share/traccar/lib/jnr-ffi-2.2.11.jar
+share/traccar/lib/jnr-posix-3.1.15.jar
share/traccar/lib/jnr-x86asm-1.0.2.jar
share/traccar/lib/joda-time-2.8.1.jar
+share/traccar/lib/jparsec-3.1.jar
share/traccar/lib/jsr305-3.0.2.jar
-share/traccar/lib/jts-core-1.18.1.jar
+share/traccar/lib/jts-core-1.18.2.jar
share/traccar/lib/jxls-2.4.7.jar
share/traccar/lib/jxls-poi-1.0.16.jar
-share/traccar/lib/liquibase-core-4.4.3.jar
+share/traccar/lib/liquibase-core-4.7.0.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.4.0.jre11.jar
-share/traccar/lib/mysql-connector-java-8.0.26.jar
+share/traccar/lib/mssql-jdbc-9.4.1.jre11.jar
+share/traccar/lib/mysql-connector-java-8.0.27.jar
share/traccar/lib/netty-all-4.1.66.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.23.jar
-share/traccar/lib/protobuf-java-3.17.3.jar
-share/traccar/lib/slf4j-api-2.0.0-alpha4.jar
-share/traccar/lib/slf4j-jdk14-2.0.0-alpha4.jar
+share/traccar/lib/postgresql-42.3.1.jar
+share/traccar/lib/protobuf-java-3.19.3.jar
+share/traccar/lib/slf4j-api-2.0.0-alpha6.jar
+share/traccar/lib/slf4j-jdk14-2.0.0-alpha6.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
@@ -159,12 +160,12 @@ share/traccar/lib/struts-tiles-1.3.8.jar
share/traccar/lib/threeten-extra-1.5.0.jar
share/traccar/lib/velocity-1.7.jar
share/traccar/lib/velocity-tools-2.0.jar
-share/traccar/lib/websocket-core-common-10.0.6.jar
-share/traccar/lib/websocket-core-server-10.0.6.jar
-share/traccar/lib/websocket-jetty-api-10.0.6.jar
-share/traccar/lib/websocket-jetty-common-10.0.6.jar
-share/traccar/lib/websocket-jetty-server-10.0.6.jar
-share/traccar/lib/websocket-servlet-10.0.6.jar
+share/traccar/lib/websocket-core-common-10.0.7.jar
+share/traccar/lib/websocket-core-server-10.0.7.jar
+share/traccar/lib/websocket-jetty-api-10.0.7.jar
+share/traccar/lib/websocket-jetty-common-10.0.7.jar
+share/traccar/lib/websocket-jetty-server-10.0.7.jar
+share/traccar/lib/websocket-servlet-10.0.7.jar
share/traccar/lib/xmlbeans-3.0.1.jar
share/traccar/schema/
share/traccar/schema/changelog-3.10.xml
@@ -186,6 +187,7 @@ 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.15.xml
share/traccar/schema/changelog-4.7.xml
share/traccar/schema/changelog-4.9.xml
share/traccar/schema/changelog-master.xml
@@ -1208,7 +1210,6 @@ share/traccar/web/modern/images/icon/car
share/traccar/web/modern/images/icon/crane.svg
share/traccar/web/modern/images/icon/default.svg
share/traccar/web/modern/images/icon/helicopter.svg
-share/traccar/web/modern/images/icon/ignition.svg
share/traccar/web/modern/images/icon/motorcycle.svg
share/traccar/web/modern/images/icon/offroad.svg
share/traccar/web/modern/images/icon/person.svg
@@ -1222,10 +1223,11 @@ share/traccar/web/modern/images/icon/tra
share/traccar/web/modern/images/icon/trolleybus.svg
share/traccar/web/modern/images/icon/truck.svg
share/traccar/web/modern/images/icon/van.svg
+share/traccar/web/modern/images/ignition.svg
share/traccar/web/modern/index.html
share/traccar/web/modern/logo.svg
share/traccar/web/modern/manifest.json
-share/traccar/web/modern/precache-manifest.6e938c6310ad4ffb7664cf01d9c1a79f.js
+share/traccar/web/modern/precache-manifest.a22808e7e3564f40a8416b0bcaddc2ec.js
share/traccar/web/modern/service-worker.js
share/traccar/web/modern/static/
share/traccar/web/modern/static/css/
@@ -1234,11 +1236,11 @@ share/traccar/web/modern/static/css/2.2a
share/traccar/web/modern/static/css/main.d1cf201a.chunk.css
share/traccar/web/modern/static/css/main.d1cf201a.chunk.css.map
share/traccar/web/modern/static/js/
-share/traccar/web/modern/static/js/2.50940e55.chunk.js
-share/traccar/web/modern/static/js/2.50940e55.chunk.js.LICENSE.txt
-share/traccar/web/modern/static/js/2.50940e55.chunk.js.map
-share/traccar/web/modern/static/js/main.01f3ec8e.chunk.js
-share/traccar/web/modern/static/js/main.01f3ec8e.chunk.js.map
+share/traccar/web/modern/static/js/2.97f61fcf.chunk.js
+share/traccar/web/modern/static/js/2.97f61fcf.chunk.js.LICENSE.txt
+share/traccar/web/modern/static/js/2.97f61fcf.chunk.js.map
+share/traccar/web/modern/static/js/main.4c1727d3.chunk.js
+share/traccar/web/modern/static/js/main.4c1727d3.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/
