update to traccar-4.1.1, from Renaud Allard, plus regen patch

This commit is contained in:
sthen 2020-11-04 10:46:32 +00:00
parent f34fb92614
commit e07ffc92aa
4 changed files with 85 additions and 59 deletions

View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.12 2020/07/28 14:22:04 sthen Exp $
# $OpenBSD: Makefile,v 1.13 2020/11/04 10:46:32 sthen Exp $
COMMENT = modern GPS tracking platform
V = 4.10
V = 4.11
PKGNAME = traccar-${V}
DISTNAME = traccar-other-${V}
EXTRACT_SUFX = .zip

View File

@ -1,2 +1,2 @@
SHA256 (traccar-other-4.10.zip) = XaXlOVIy+T2D7dAPOprNm0vkKXZDVujoe1U1ped7bYI=
SIZE (traccar-other-4.10.zip) = 59143297
SHA256 (traccar-other-4.11.zip) = GewJ/jjQMA8QGuzeXdiLpuf85Eo8+r4SlcIEVp1kMrQ=
SIZE (traccar-other-4.11.zip) = 60139817

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-conf_default_xml,v 1.4 2020/07/28 14:22:04 sthen Exp $
$OpenBSD: patch-conf_default_xml,v 1.5 2020/11/04 10:46:32 sthen Exp $
Index: conf/default.xml
--- conf/default.xml.orig
@ -11,9 +11,9 @@ Index: conf/default.xml
+ <entry key='web.address'>127.0.0.1</entry>
+ <entry key='web.path'>${LOCALBASE}/share/traccar/web</entry>
<entry key='web.cacheControl'>max-age=3600,public</entry>
<entry key='web.healthCheck'>true</entry>
@@ -21,7 +22,7 @@
<entry key='geocoder.enable'>false</entry>
@@ -20,7 +21,7 @@
<entry key='logger.enable'>true</entry>
<entry key='logger.level'>info</entry>
@ -22,7 +22,7 @@ Index: conf/default.xml
<entry key='logger.rotate'>true</entry>
<entry key='filter.enable'>true</entry>
@@ -32,17 +33,16 @@
@@ -31,17 +32,16 @@
<entry key='processing.computedAttributes.enable'>true</entry>
<entry key='processing.engineHours.enable'>true</entry>

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.8 2020/07/28 14:22:04 sthen Exp $
@comment $OpenBSD: PLIST,v 1.9 2020/11/04 10:46:32 sthen Exp $
@newgroup _traccar:824
@newuser _traccar:824:_traccar:daemon:Traccar user:/var/empty:/sbin/nologin
@rcscript ${RCDIR}/traccar
@ -40,10 +40,10 @@ share/traccar/lib/asm-util-7.1.jar
share/traccar/lib/ch-commons-charset-3.0.2.jar
share/traccar/lib/ch-commons-util-6.0.2.jar
share/traccar/lib/ch-smpp-6.0.0-netty4-beta-3.jar
share/traccar/lib/checker-qual-2.5.2.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
share/traccar/lib/commons-codec-1.14.jar
share/traccar/lib/commons-codec-1.15.jar
share/traccar/lib/commons-collections-3.2.1.jar
share/traccar/lib/commons-collections4-4.4.jar
share/traccar/lib/commons-compress-1.18.jar
@ -92,52 +92,52 @@ 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/jcl-over-slf4j-1.7.12.jar
share/traccar/lib/jersey-client-2.31.jar
share/traccar/lib/jersey-common-2.31.jar
share/traccar/lib/jersey-container-servlet-2.31.jar
share/traccar/lib/jersey-container-servlet-core-2.31.jar
share/traccar/lib/jersey-entity-filtering-2.31.jar
share/traccar/lib/jersey-hk2-2.31.jar
share/traccar/lib/jersey-media-jaxb-2.31.jar
share/traccar/lib/jersey-media-json-jackson-2.31.jar
share/traccar/lib/jersey-server-2.31.jar
share/traccar/lib/jetty-client-9.4.30.v20200611.jar
share/traccar/lib/jetty-http-9.4.30.v20200611.jar
share/traccar/lib/jetty-io-9.4.30.v20200611.jar
share/traccar/lib/jetty-jndi-9.4.30.v20200611.jar
share/traccar/lib/jetty-proxy-9.4.30.v20200611.jar
share/traccar/lib/jetty-security-9.4.30.v20200611.jar
share/traccar/lib/jetty-server-9.4.30.v20200611.jar
share/traccar/lib/jetty-servlet-9.4.30.v20200611.jar
share/traccar/lib/jetty-util-9.4.30.v20200611.jar
share/traccar/lib/jetty-webapp-9.4.30.v20200611.jar
share/traccar/lib/jetty-xml-9.4.30.v20200611.jar
share/traccar/lib/jffi-1.2.23-native.jar
share/traccar/lib/jffi-1.2.23.jar
share/traccar/lib/jna-5.5.0.jar
share/traccar/lib/jna-platform-5.5.0.jar
share/traccar/lib/jersey-client-2.32.jar
share/traccar/lib/jersey-common-2.32.jar
share/traccar/lib/jersey-container-servlet-2.32.jar
share/traccar/lib/jersey-container-servlet-core-2.32.jar
share/traccar/lib/jersey-entity-filtering-2.32.jar
share/traccar/lib/jersey-hk2-2.32.jar
share/traccar/lib/jersey-media-jaxb-2.32.jar
share/traccar/lib/jersey-media-json-jackson-2.32.jar
share/traccar/lib/jersey-server-2.32.jar
share/traccar/lib/jetty-client-9.4.33.v20201020.jar
share/traccar/lib/jetty-http-9.4.33.v20201020.jar
share/traccar/lib/jetty-io-9.4.33.v20201020.jar
share/traccar/lib/jetty-jndi-9.4.33.v20201020.jar
share/traccar/lib/jetty-proxy-9.4.33.v20201020.jar
share/traccar/lib/jetty-security-9.4.33.v20201020.jar
share/traccar/lib/jetty-server-9.4.33.v20201020.jar
share/traccar/lib/jetty-servlet-9.4.33.v20201020.jar
share/traccar/lib/jetty-util-9.4.33.v20201020.jar
share/traccar/lib/jetty-webapp-9.4.33.v20201020.jar
share/traccar/lib/jetty-xml-9.4.33.v20201020.jar
share/traccar/lib/jffi-1.3.0-native.jar
share/traccar/lib/jffi-1.3.0.jar
share/traccar/lib/jna-5.6.0.jar
share/traccar/lib/jna-platform-5.6.0.jar
share/traccar/lib/jnr-a64asm-1.0.0.jar
share/traccar/lib/jnr-constants-0.9.15.jar
share/traccar/lib/jnr-ffi-2.1.15.jar
share/traccar/lib/jnr-posix-3.0.57.jar
share/traccar/lib/jnr-constants-0.10.0.jar
share/traccar/lib/jnr-ffi-2.2.0.jar
share/traccar/lib/jnr-posix-3.1.2.jar
share/traccar/lib/jnr-x86asm-1.0.2.jar
share/traccar/lib/joda-time-2.10.6.jar
share/traccar/lib/joda-time-2.10.8.jar
share/traccar/lib/jsr305-3.0.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.10.1.jar
share/traccar/lib/liquibase-core-3.10.3.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-8.2.2.jre8.jar
share/traccar/lib/mysql-connector-java-8.0.20.jar
share/traccar/lib/netty-all-4.1.50.Final.jar
share/traccar/lib/mssql-jdbc-8.4.1.jre8.jar
share/traccar/lib/mysql-connector-java-8.0.22.jar
share/traccar/lib/netty-all-4.1.53.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.14.jar
share/traccar/lib/protobuf-java-3.12.2.jar
share/traccar/lib/postgresql-42.2.18.jar
share/traccar/lib/protobuf-java-3.13.0.jar
share/traccar/lib/slf4j-api-1.7.30.jar
share/traccar/lib/slf4j-jdk14-1.7.30.jar
share/traccar/lib/sslext-1.2-0.jar
@ -147,11 +147,11 @@ 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.30.v20200611.jar
share/traccar/lib/websocket-client-9.4.30.v20200611.jar
share/traccar/lib/websocket-common-9.4.30.v20200611.jar
share/traccar/lib/websocket-server-9.4.30.v20200611.jar
share/traccar/lib/websocket-servlet-9.4.30.v20200611.jar
share/traccar/lib/websocket-api-9.4.33.v20201020.jar
share/traccar/lib/websocket-client-9.4.33.v20201020.jar
share/traccar/lib/websocket-common-9.4.33.v20201020.jar
share/traccar/lib/websocket-server-9.4.33.v20201020.jar
share/traccar/lib/websocket-servlet-9.4.33.v20201020.jar
share/traccar/lib/xmlbeans-3.0.1.jar
share/traccar/schema/
share/traccar/schema/changelog-3.10.xml
@ -171,6 +171,7 @@ share/traccar/schema/changelog-4.0-clean.xml
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.7.xml
share/traccar/schema/changelog-4.9.xml
share/traccar/schema/changelog-master.xml
@ -185,6 +186,7 @@ share/traccar/templates/full/
share/traccar/templates/full/alarm.vm
share/traccar/templates/full/commandResult.vm
share/traccar/templates/full/deviceFuelDrop.vm
share/traccar/templates/full/deviceInactive.vm
share/traccar/templates/full/deviceMoving.vm
share/traccar/templates/full/deviceOffline.vm
share/traccar/templates/full/deviceOnline.vm
@ -204,6 +206,7 @@ share/traccar/templates/short/
share/traccar/templates/short/alarm.vm
share/traccar/templates/short/commandResult.vm
share/traccar/templates/short/deviceFuelDrop.vm
share/traccar/templates/short/deviceInactive.vm
share/traccar/templates/short/deviceMoving.vm
share/traccar/templates/short/deviceOffline.vm
share/traccar/templates/short/deviceOnline.vm
@ -519,22 +522,44 @@ share/traccar/web/modern/favicon.ico
share/traccar/web/modern/images/
share/traccar/web/modern/images/background.svg
share/traccar/web/modern/images/icon/
share/traccar/web/modern/images/icon/marker.svg
share/traccar/web/modern/images/icon/animal.svg
share/traccar/web/modern/images/icon/bicycle.svg
share/traccar/web/modern/images/icon/boat.svg
share/traccar/web/modern/images/icon/bus.svg
share/traccar/web/modern/images/icon/car.svg
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/motorcycle.svg
share/traccar/web/modern/images/icon/offroad.svg
share/traccar/web/modern/images/icon/person.svg
share/traccar/web/modern/images/icon/pickup.svg
share/traccar/web/modern/images/icon/plane.svg
share/traccar/web/modern/images/icon/scooter.svg
share/traccar/web/modern/images/icon/ship.svg
share/traccar/web/modern/images/icon/tractor.svg
share/traccar/web/modern/images/icon/train.svg
share/traccar/web/modern/images/icon/tram.svg
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/index.html
share/traccar/web/modern/logo.svg
share/traccar/web/modern/manifest.json
share/traccar/web/modern/precache-manifest.e8bc37ccbb84d98d82ddf47c10df449d.js
share/traccar/web/modern/precache-manifest.bf387a85e5be9170c96e73b120e184a0.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.87ad83dc.chunk.css
share/traccar/web/modern/static/css/2.87ad83dc.chunk.css.map
share/traccar/web/modern/static/css/2.a1e5972f.chunk.css
share/traccar/web/modern/static/css/2.a1e5972f.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.0b923bed.chunk.js
share/traccar/web/modern/static/js/2.0b923bed.chunk.js.LICENSE.txt
share/traccar/web/modern/static/js/2.0b923bed.chunk.js.map
share/traccar/web/modern/static/js/main.b80f0b95.chunk.js
share/traccar/web/modern/static/js/main.b80f0b95.chunk.js.map
share/traccar/web/modern/static/js/2.0fac2b6a.chunk.js
share/traccar/web/modern/static/js/2.0fac2b6a.chunk.js.LICENSE.txt
share/traccar/web/modern/static/js/2.0fac2b6a.chunk.js.map
share/traccar/web/modern/static/js/main.404aac67.chunk.js
share/traccar/web/modern/static/js/main.404aac67.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/
@ -562,6 +587,7 @@ share/traccar/web/modern/static/media/roboto-latin-900.9b3766ef.woff2
share/traccar/web/modern/static/media/roboto-latin-900.bb1e4dc6.woff
share/traccar/web/modern/static/media/roboto-latin-900italic.28f91510.woff
share/traccar/web/modern/static/media/roboto-latin-900italic.ebf6d164.woff2
share/traccar/web/modern/styles.css
share/traccar/web/release.html
share/traccar/web/simple/
share/traccar/web/simple/app.js