On 2019/02/04 15:02, Renaud Allard wrote:
> Hello,
>
> Here is the diff for traccar 4.3. I am running it since this morning without
> issues.
>
> Best Regards
committed,
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/geo/traccar/Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 Makefile
> --- Makefile 17 Dec 2018 19:48:23 -0000 1.2
> +++ Makefile 4 Feb 2019 13:59:57 -0000
> @@ -1,8 +1,7 @@
> -# $OpenBSD: Makefile,v 1.2 2018/12/17 19:48:23 landry Exp $
> +# $OpenBSD: Makefile,v 1.23 2018/12/13 12:46:19 renaud Exp $
please just leave those lines as-is, CVS deals with them itself.
>
> COMMENT = modern GPS tracking platform
> -V = 4.2
> -REVISION = 0
> +V = 4.3
> PKGNAME = traccar-${V}
> DISTNAME = traccar-other-${V}
> EXTRACT_SUFX = .zip
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/geo/traccar/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- distinfo 16 Dec 2018 15:09:58 -0000 1.1.1.1
> +++ distinfo 4 Feb 2019 13:59:57 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (traccar-other-4.2.zip) = JkE2fCE+c2mHeCt0aGdvcbBZQNiwblqD5cmqbebInZU=
> -SIZE (traccar-other-4.2.zip) = 48926893
> +SHA256 (traccar-other-4.3.zip) = 1r5RHSp7pMRtfD4lXpr9KUO80yKSvDgHR43CXYke4Cc=
> +SIZE (traccar-other-4.3.zip) = 50582323
> Index: patches/patch-conf_default_xml
> ===================================================================
> RCS file: /cvs/ports/geo/traccar/patches/patch-conf_default_xml,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-conf_default_xml
> --- patches/patch-conf_default_xml 17 Dec 2018 19:48:24 -0000 1.2
> +++ patches/patch-conf_default_xml 4 Feb 2019 13:59:57 -0000
> @@ -1,3 +1,5 @@
> +$OpenBSD$
> +
> Index: conf/default.xml
> --- conf/default.xml.orig
> +++ conf/default.xml
> @@ -17,10 +19,10 @@ Index: conf/default.xml
> <entry key='logger.level'>info</entry>
> - <entry key='logger.file'>./logs/tracker-server.log</entry>
> + <entry key='logger.file'>/var/log/traccar/tracker-server.log</entry>
> + <entry key='logger.rotate'>true</entry>
>
> <entry key='filter.enable'>true</entry>
> - <entry key='filter.future'>86400</entry>
> -@@ -30,17 +31,16 @@
> +@@ -31,17 +32,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.2
> diff -u -p -r1.2 PLIST
> --- pkg/PLIST 17 Dec 2018 19:48:24 -0000 1.2
> +++ pkg/PLIST 4 Feb 2019 13:59:57 -0000
> @@ -1,4 +1,4 @@
> -@comment $OpenBSD: PLIST,v 1.2 2018/12/17 19:48:24 landry Exp $
> +@comment $OpenBSD: PLIST,v 1.4 2018/09/04 12:46:19 espie Exp $
> @newgroup _traccar:824
> @newuser _traccar:824:_traccar:daemon:Traccar user:/var/empty:/sbin/nologin
> @rcscript ${RCDIR}/traccar
> @@ -20,12 +20,12 @@ share/traccar/conf/traccar.xml
> @sample ${SYSCONFDIR}/traccar/
> @sample ${SYSCONFDIR}/traccar/traccar.xml
> share/traccar/lib/
> -share/traccar/lib/HikariCP-3.2.0.jar
> +share/traccar/lib/HikariCP-3.3.0.jar
> share/traccar/lib/activation-1.1.1.jar
> share/traccar/lib/animal-sniffer-annotations-1.14.jar
> share/traccar/lib/antlr-2.7.2.jar
> share/traccar/lib/aopalliance-1.0.jar
> -share/traccar/lib/aopalliance-repackaged-2.5.0-b42.jar
> +share/traccar/lib/aopalliance-repackaged-2.5.0.jar
> share/traccar/lib/asm-5.0.3.jar
> share/traccar/lib/asm-analysis-5.0.3.jar
> share/traccar/lib/asm-commons-5.0.3.jar
> @@ -40,6 +40,7 @@ share/traccar/lib/commons-chain-1.1.jar
> share/traccar/lib/commons-codec-1.11.jar
> share/traccar/lib/commons-collections-3.2.1.jar
> share/traccar/lib/commons-collections4-4.2.jar
> +share/traccar/lib/commons-compress-1.18.jar
> 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
> @@ -51,96 +52,96 @@ share/traccar/lib/dom4j-1.1.jar
> share/traccar/lib/encoder-1.2.2.jar
> share/traccar/lib/error_prone_annotations-2.1.3.jar
> share/traccar/lib/guava-25.1-android.jar
> -share/traccar/lib/guice-4.2.1.jar
> -share/traccar/lib/guice-assistedinject-4.2.1.jar
> +share/traccar/lib/guice-4.2.2.jar
> +share/traccar/lib/guice-assistedinject-4.2.2.jar
> share/traccar/lib/h2-1.4.197.jar
> -share/traccar/lib/hk2-api-2.5.0-b42.jar
> -share/traccar/lib/hk2-locator-2.5.0-b42.jar
> -share/traccar/lib/hk2-utils-2.5.0-b42.jar
> +share/traccar/lib/hk2-api-2.5.0.jar
> +share/traccar/lib/hk2-locator-2.5.0.jar
> +share/traccar/lib/hk2-utils-2.5.0.jar
> share/traccar/lib/ical4j-2.0.5.jar
> share/traccar/lib/j2objc-annotations-1.1.jar
> -share/traccar/lib/jackson-annotations-2.8.10.jar
> -share/traccar/lib/jackson-core-2.8.10.jar
> -share/traccar/lib/jackson-databind-2.8.10.jar
> -share/traccar/lib/jackson-datatype-jsr353-2.8.10.jar
> -share/traccar/lib/jackson-jaxrs-base-2.8.10.jar
> -share/traccar/lib/jackson-jaxrs-json-provider-2.8.10.jar
> -share/traccar/lib/jackson-module-jaxb-annotations-2.8.10.jar
> +share/traccar/lib/jackson-annotations-2.9.8.jar
> +share/traccar/lib/jackson-core-2.9.8.jar
> +share/traccar/lib/jackson-databind-2.9.8.jar
> +share/traccar/lib/jackson-datatype-jsr353-2.9.8.jar
> +share/traccar/lib/jackson-jaxrs-base-2.9.8.jar
> +share/traccar/lib/jackson-jaxrs-json-provider-2.9.8.jar
> +share/traccar/lib/jackson-module-jaxb-annotations-2.9.8.jar
> +share/traccar/lib/jakarta.annotation-api-1.3.4.jar
> +share/traccar/lib/jakarta.inject-2.5.0.jar
> +share/traccar/lib/jakarta.ws.rs-api-2.1.5.jar
> share/traccar/lib/javassist-3.22.0-CR2.jar
> -share/traccar/lib/javax.annotation-api-1.2.jar
> +share/traccar/lib/javax.activation-api-1.2.0.jar
> share/traccar/lib/javax.inject-1.jar
> -share/traccar/lib/javax.inject-2.5.0-b42.jar
> -share/traccar/lib/javax.json-1.1.3.jar
> -share/traccar/lib/javax.json-api-1.1.3.jar
> +share/traccar/lib/javax.json-1.1.4.jar
> +share/traccar/lib/javax.json-api-1.0.jar
> share/traccar/lib/javax.mail-1.6.2.jar
> share/traccar/lib/javax.servlet-api-3.1.0.jar
> -share/traccar/lib/javax.ws.rs-api-2.1.jar
> -share/traccar/lib/jaxb-api-2.2.11.jar
> -share/traccar/lib/jaxb-core-2.2.11.jar
> -share/traccar/lib/jaxb-impl-2.2.11.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.2.jar
> share/traccar/lib/jcl-over-slf4j-1.7.12.jar
> -share/traccar/lib/jersey-client-2.27.jar
> -share/traccar/lib/jersey-common-2.27.jar
> -share/traccar/lib/jersey-container-servlet-2.27.jar
> -share/traccar/lib/jersey-container-servlet-core-2.27.jar
> -share/traccar/lib/jersey-entity-filtering-2.27.jar
> -share/traccar/lib/jersey-hk2-2.27.jar
> -share/traccar/lib/jersey-media-jaxb-2.27.jar
> -share/traccar/lib/jersey-media-json-jackson-2.27.jar
> -share/traccar/lib/jersey-server-2.27.jar
> -share/traccar/lib/jetty-client-9.4.12.v20180830.jar
> -share/traccar/lib/jetty-http-9.4.12.v20180830.jar
> -share/traccar/lib/jetty-io-9.4.12.v20180830.jar
> -share/traccar/lib/jetty-jndi-9.4.12.v20180830.jar
> -share/traccar/lib/jetty-proxy-9.4.12.v20180830.jar
> -share/traccar/lib/jetty-security-9.4.12.v20180830.jar
> -share/traccar/lib/jetty-server-9.4.12.v20180830.jar
> -share/traccar/lib/jetty-servlet-9.4.12.v20180830.jar
> -share/traccar/lib/jetty-util-9.4.12.v20180830.jar
> -share/traccar/lib/jetty-webapp-9.4.12.v20180830.jar
> -share/traccar/lib/jetty-xml-9.4.12.v20180830.jar
> +share/traccar/lib/jersey-client-2.28.jar
> +share/traccar/lib/jersey-common-2.28.jar
> +share/traccar/lib/jersey-container-servlet-2.28.jar
> +share/traccar/lib/jersey-container-servlet-core-2.28.jar
> +share/traccar/lib/jersey-entity-filtering-2.28.jar
> +share/traccar/lib/jersey-hk2-2.28.jar
> +share/traccar/lib/jersey-media-jaxb-2.28.jar
> +share/traccar/lib/jersey-media-json-jackson-2.28.jar
> +share/traccar/lib/jersey-server-2.28.jar
> +share/traccar/lib/jetty-client-9.4.14.v20181114.jar
> +share/traccar/lib/jetty-http-9.4.14.v20181114.jar
> +share/traccar/lib/jetty-io-9.4.14.v20181114.jar
> +share/traccar/lib/jetty-jndi-9.4.14.v20181114.jar
> +share/traccar/lib/jetty-proxy-9.4.14.v20181114.jar
> +share/traccar/lib/jetty-security-9.4.14.v20181114.jar
> +share/traccar/lib/jetty-server-9.4.14.v20181114.jar
> +share/traccar/lib/jetty-servlet-9.4.14.v20181114.jar
> +share/traccar/lib/jetty-util-9.4.14.v20181114.jar
> +share/traccar/lib/jetty-webapp-9.4.14.v20181114.jar
> +share/traccar/lib/jetty-xml-9.4.14.v20181114.jar
> share/traccar/lib/jffi-1.2.16-native.jar
> share/traccar/lib/jffi-1.2.17.jar
> -share/traccar/lib/jna-4.5.2.jar
> -share/traccar/lib/jna-platform-4.5.2.jar
> +share/traccar/lib/jna-5.2.0.jar
> +share/traccar/lib/jna-platform-5.2.0.jar
> share/traccar/lib/jnr-constants-0.9.9.jar
> share/traccar/lib/jnr-ffi-2.1.8.jar
> -share/traccar/lib/jnr-posix-3.0.46.jar
> +share/traccar/lib/jnr-posix-3.0.49.jar
> share/traccar/lib/jnr-x86asm-1.0.2.jar
> share/traccar/lib/joda-time-2.10.1.jar
> share/traccar/lib/jsr305-3.0.2.jar
> -share/traccar/lib/jxls-2.4.6.jar
> -share/traccar/lib/jxls-poi-1.0.15.jar
> -share/traccar/lib/liquibase-core-3.6.2.jar
> +share/traccar/lib/jxls-2.4.7.jar
> +share/traccar/lib/jxls-poi-1.0.16.jar
> +share/traccar/lib/liquibase-core-3.6.3.jar
> share/traccar/lib/logback-core-1.1.3.jar
> -share/traccar/lib/mssql-jdbc-7.0.0.jre8.jar
> +share/traccar/lib/mssql-jdbc-7.2.0.jre8.jar
> share/traccar/lib/mysql-connector-java-5.1.47.jar
> -share/traccar/lib/netty-all-4.1.30.Final.jar
> +share/traccar/lib/netty-all-4.1.33.Final.jar
> share/traccar/lib/oro-2.0.8.jar
> share/traccar/lib/osgi-resource-locator-1.0.1.jar
> -share/traccar/lib/poi-3.17.jar
> -share/traccar/lib/poi-ooxml-3.17.jar
> -share/traccar/lib/poi-ooxml-schemas-3.17.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.5.jar
> share/traccar/lib/servlet-api-2.3.jar
> share/traccar/lib/slf4j-api-1.7.25.jar
> share/traccar/lib/slf4j-jdk14-1.7.25.jar
> share/traccar/lib/snakeyaml-1.18.jar
> share/traccar/lib/sslext-1.2-0.jar
> -share/traccar/lib/stax-api-1.0.1.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/validation-api-1.1.0.Final.jar
> +share/traccar/lib/validation-api-2.0.1.Final.jar
> share/traccar/lib/velocity-1.7.jar
> share/traccar/lib/velocity-tools-2.0.jar
> -share/traccar/lib/websocket-api-9.4.12.v20180830.jar
> -share/traccar/lib/websocket-client-9.4.12.v20180830.jar
> -share/traccar/lib/websocket-common-9.4.12.v20180830.jar
> -share/traccar/lib/websocket-server-9.4.12.v20180830.jar
> -share/traccar/lib/websocket-servlet-9.4.12.v20180830.jar
> -share/traccar/lib/xmlbeans-2.6.0.jar
> +share/traccar/lib/websocket-api-9.4.14.v20181114.jar
> +share/traccar/lib/websocket-client-9.4.14.v20181114.jar
> +share/traccar/lib/websocket-common-9.4.14.v20181114.jar
> +share/traccar/lib/websocket-server-9.4.14.v20181114.jar
> +share/traccar/lib/websocket-servlet-9.4.14.v20181114.jar
> +share/traccar/lib/xmlbeans-3.0.1.jar
> share/traccar/schema/
> share/traccar/schema/changelog-3.10.xml
> share/traccar/schema/changelog-3.11.xml
