1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-19 00:13:33 +00:00

www/domoticz: update to 2023.1

Upstream changes:

- Implemented: Accept JWT tokens as authentication and Authorization Bearer tokens (either from internal or external IAM service)
- Implemented: Blinds, added option to schedule 0%
- Implemented: dzVents, OpenURL PATCH method
- Implemented: Enphase, redesign and added battery readings (Supports firmware V7)
- Implemented: Internal OAuth2/OIDC IAM service supporting 4 different flows (OAuth2 (RFC6749), PKCE extension (RFC7636) and JWT Tokens (RFC7519))
- Implemented: MQTT, added support for Lock status
- Implemented: MQTT, added support for wildcards in discovery topics
- Implemented: MQTT, climate preset mode
- Implemented: New 'auth' debug flag to see IAM related messages
- Implemented: Now 'Applications' can be registered to get secure access to Domoticz, see 'setup' menu (standard DomoticzUI app is registered by default)
- Implemented: P1 Meter, added number of (long) power failures, voltage sags/swells
- Implemented: SECURITY_SETUP.md describing the new/improved security setup
- Implemented: Support for basic OpenID Connect Discovery ('https://<DOMOTICZURL>/.well-known/openid-configuration')
- Implemented: Search option in Switches/Scenes/Temperature/Utility and Weather tab
- Implemented: The Security realm can be configured using the 'vhostname' option (default domoticz.com)
- Implemented: Timer, Grid option for selected switches and thermostat. Big thanks to syrhus/labelette91580 and xbeaudouin
- Implemented: User device selection now displays type/subtype
- Changed: All security related setting are now in 1 settings tab
- Changed: By default prompt for login to only allow secure access
- Changed: Default 'admin' user is generated with standard password (see Users)
- Changed: Dimmer, restores to previous Set Level state after Off
- Changed: Implicit adding local IP to 'trusted networks' has been removed. Needs to be set explicitly for security reasons!
- Changed: Lots of security related code cleanup and improvements
- Changed: Menu option for 'Users' moved to main 'Setup' menu list
- Changed: MQTT timeout increased to 2 minutes
- Changed: The following proxy headers are now properly supported 'Forwarded' (RFC7239), 'X-Forwarder-For' and 'X-Real-IP' (in that order)
- Changed: The secure server (HTTPS) sends proper CORS and Security headers
- Fixed: Dashboard, scenes/lights hidden when this was disabled in user settings
- Fixed: Dashboard, mobile display did not display P1 meter current return value correctly
- Fixed: Dashboard, not showing disabled sections (temperature/weather/utility) when a device has multiple properties (for instance temperature + weather)
- Fixed: Highcharts dropdown menu z-index problem
- Fixed: Logout now returns 204 instead of 401
- Fixed: Waterflow sensor custom icon
- Fixed: Making sure Custom icons are valid (when someone manually edits the database)
- Fixed: Mobile display text objects with long lines
- Fixed: MQTT-AD Climate, fixed setpoint temperature display
- Fixed: Navigation bar display issues on some mobile devices
- Fixed: Setpoint popup when using protection

Version 2022.2 (November 5 2022)
- Implemented: Blockly,	added 'Toggle' set command
- Implemented: Camera, camera Aspect Ratio
- Implemented: Commandline option '-weblog <weblogfile>' which creates Apache Combined Logformat logs containg all webrequests
- Implemented: Counters, support for larger counter values/usage
- Implemented: Dashboard, temperature Trend indication
- Implemented: Docker	startup script (for instance to install additional packages)
- Implemented: EcoDevices, complete support for EcoDevices RT2 with firmware 3.00.xx
- Implemented: FritzBox, more statistics
- Implemented: Fritzbox, up/download statistics
- Implemented: MQTT Auto Discovery Protocol (Zigbee2MQTT/ Z-Wave JS UI)
- Implemented: P1 Meter, added Current L1/L2/L3 sensor for delivered
- Implemented: Philips Hue, support color change on some vendors bulb (like LIDL)
- Implemented: RFXCom, added internal support for Novy Mood, Level Sensor
- Implemented: SolarEdge, more sensors support
- Implemented: UVI device, added multiply field to widget
- Implemented: Xiaomi Gateway, new model for wired single key switch
- Updated: Mercedes EV, new Token URL (changed November 2022)
- Changed: All inverted Blinds types should not be used anymore, instead use the regular blinds and set the needed Reverse option
- Changed: Blinds working (see https://www.domoticz.com/wiki/Blinds)
- Changed: Energy devices have more precision
- Changed: kWh devices	MAX Power per phase from 10000 to 18400 (230V*80A)
- Changed: P1 Meter, changed P1 Max W from 17250 (25A) to 55200 (80A)
- Changed: P1 Meter, speed up CRC calculation
- Changed: Webserver, removing AppCache, switching to service worker
- Fixed: Blockly, keeping last dim level when switching OFF, option for Close state
- Fixed: Counter incremental, counter in report (when used with meter offset)
- Fixed: Counter short-term log 1 hour offset
- Fixed: Counters, rounding (number of decimals) in GUI
- Fixed: Crash when secure webserver could not start and applying settings
- Fixed: Dimmer, better handling of last dimmer level when switching on/off
- Fixed: EvoHome, correct state/mode for EvoHome type
- Fixed: Floorplan, custom utility icons corrected in Floorplan
- Fixed: Floorplan, fixed blinds state icon/switching
- Fixed: Floorplan, making sure the Door Lock is switchable in the Floorplan
- Fixed: Floorplans, fixed issues with the displaying of some icons
- Fixed: Notification system, prevent double start
- Fixed: P1 Meter, fix for Sibelga smart meters that use a too long string as an identifier
- Fixed: RFXCom, corrected RFXCom solar sensor reading
- Fixed: Temperature, corrected chill calculation
- Fixed: WebGUI, making sure status does not wrap in mobile mode
- Removed: AppCache
- Deprecated: OpenZWave, please move to MQTT Auto Discovery and ZWave JS UI (Project stopped a long time ago!)

PR:		271603
This commit is contained in:
Robert Clausecker 2023-05-24 17:55:00 +02:00
parent 482b709de3
commit 5614e7e43d
4 changed files with 178 additions and 15 deletions

View File

@ -1,6 +1,5 @@
PORTNAME= domoticz
PORTVERSION= 2022.1
PORTREVISION= 5
DISTVERSION= 2023.1
CATEGORIES= www
MAINTAINER= kiwi@oav.net
@ -10,8 +9,8 @@ WWW= https://www.domoticz.com
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/License.txt
LIB_DEPENDS= libcurl.so:ftp/curl libboost_system.so:devel/boost-libs \
libopenzwave.so:comms/openzwave-devel \
LIB_DEPENDS= libcurl.so:ftp/curl \
libboost_system.so:devel/boost-libs \
libjsoncpp.so:devel/jsoncpp \
libmosquitto.so:net/mosquitto
@ -36,13 +35,13 @@ USERS= domoticz
GROUPS= domoticz
CMAKE_INSTALL_PREFIX= ${PREFIX}/domoticz
CMAKE_OFF+= GIT_SUBMODULE USE_STATIC_BOOST USE_OPENSSL_STATIC \
CMAKE_OFF+= GIT_SUBMODULE USE_STATIC_BOOST USE_OPENSSL_STATIC USE_STATIC_BOOST \
USE_BUILTIN_SQLITE USE_BUILTIN_MINIZIP USE_BUILTIN_JSONCPP \
USE_BUILTIN_MQTT USE_STATIC_OPENZWAVE
.if ${PORT_OPTIONS:MPYTHON}
CMAKE_ON+= USE_PYTHON
USES+= python:3.8+
USES+= python:3.9+
.else
CMAKE_OFF+= USE_PYTHON
.endif

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1643629602
SHA256 (domoticz-domoticz-2022.1_GH0.tar.gz) = 8282cb71c924b6ef92503976d50f966f2c785eab8f8cffa1136ac133f0241157
SIZE (domoticz-domoticz-2022.1_GH0.tar.gz) = 12806545
TIMESTAMP = 1684829760
SHA256 (domoticz-domoticz-2023.1_GH0.tar.gz) = 3144372d0847cb4d22a8c4b1362cd31885b37671adc682c3a8e9435762cde338
SIZE (domoticz-domoticz-2023.1_GH0.tar.gz) = 13135239

View File

@ -0,0 +1,130 @@
--- CMakeLists.txt.orig 2023-05-23 11:37:06.693431000 +0200
+++ CMakeLists.txt 2023-05-23 11:37:14.422198000 +0200
@@ -395,11 +395,9 @@
# Target
set(
-domoticztester_SRCS
main/stdafx.cpp
main/Helper.cpp
main/CmdLine.cpp
-main/domoticz_tester.cpp
main/BaroForecastCalculator.cpp
main/HTMLSanitizer.cpp
main/localtime_r.cpp
@@ -412,9 +410,6 @@
#main/IFTTT.cpp
-add_executable(domoticztester ${domoticztester_SRCS})
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
-
#
# LUA
#
@@ -513,7 +508,6 @@
# explicitly say that the executable depends on the revisiontag
add_dependencies(domoticz revisiontag)
-add_dependencies(domoticztester revisiontag)
TEST_BIG_ENDIAN(BIGENDIAN)
IF(${BIGENDIAN})
@@ -533,7 +527,6 @@
set(JSONCPP_WITH_PKGCONFIG_SUPPORT OFF CACHE BOOL "Enable jsoncpp pkgconfig support" FORCE)
add_subdirectory (extern/jsoncpp EXCLUDE_FROM_ALL)
target_link_libraries(domoticz jsoncpp_static)
- target_link_libraries(domoticztester jsoncpp_static)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/extern/jsoncpp/include)
ELSE(USE_BUILTIN_JSONCPP)
find_package(PkgConfig)
@@ -543,9 +536,6 @@
target_include_directories(domoticz PRIVATE ${JSONCPP_INCLUDE_DIRS})
target_link_directories(domoticz PRIVATE ${JSONCPP_LIBRARY_DIRS})
target_link_libraries(domoticz ${JSONCPP_LIBRARIES})
- target_include_directories(domoticztester PRIVATE ${JSONCPP_INCLUDE_DIRS})
- target_link_directories(domoticztester PRIVATE ${JSONCPP_LIBRARY_DIRS})
- target_link_libraries(domoticztester ${JSONCPP_LIBRARIES})
ELSE(JSONCPP_FOUND)
MESSAGE(FATAL_ERROR "JSONCPP not found on your system! try 'sudo apt-get install jsoncpp-dev'")
ENDIF(JSONCPP_FOUND)
@@ -558,7 +548,6 @@
option(DOCUMENTATION "Build documentation?" OFF)
add_subdirectory (extern/mosquitto EXCLUDE_FROM_ALL)
target_link_libraries(domoticz libmosquitto_static)
- target_link_libraries(domoticztester libmosquitto_static)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/extern/mosquitto/include)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/extern/mosquitto/lib)
ELSE(USE_BUILTIN_MQTT)
@@ -577,7 +566,6 @@
MESSAGE(STATUS "Using builtin SQLite library")
add_subdirectory (extern/sqlite-amalgamation EXCLUDE_FROM_ALL)
target_link_libraries(domoticz SQLite3)
- target_link_libraries(domoticztester SQLite3)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/extern/sqlite-amalgamation)
ELSE(USE_BUILTIN_SQLITE)
find_package(SQLite3)
@@ -586,7 +574,6 @@
MESSAGE(STATUS "SQLite includes found at: ${SQLite3_INCLUDE_DIRS}")
INCLUDE_DIRECTORIES(${SQLite3_INCLUDE_DIRS})
target_link_libraries(domoticz ${SQLite3_LIBRARIES})
- target_link_libraries(domoticztester ${SQLite3_LIBRARIES})
ELSE(SQLite3_FOUND)
MESSAGE(FATAL_ERROR "SQLite3 not found on your system! try 'sudo apt-get install libsqlite3-dev'")
ENDIF(SQLite3_FOUND)
@@ -596,7 +583,6 @@
IF(USE_BUILTIN_MINIZIP)
add_subdirectory (extern/minizip EXCLUDE_FROM_ALL)
target_link_libraries(domoticz minizip)
- target_link_libraries(domoticztester minizip)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/extern/minizip)
ELSE(USE_BUILTIN_MINIZIP)
find_package(PkgConfig)
@@ -606,9 +592,6 @@
target_include_directories(domoticz PRIVATE ${MINIZIP_INCLUDE_DIRS})
target_link_directories(domoticz PRIVATE ${MINIZIP_LIBRARY_DIRS})
target_link_libraries(domoticz ${MINIZIP_LIBRARIES})
- target_include_directories(domoticztester PRIVATE ${MINIZIP_INCLUDE_DIRS})
- target_link_directories(domoticztester PRIVATE ${MINIZIP_LIBRARY_DIRS})
- target_link_libraries(domoticztester ${MINIZIP_LIBRARIES})
ELSE(MINIZIP_FOUND)
MESSAGE(FATAL_ERROR "MINIZIP not found on your system! try 'sudo apt-get install minizip-dev'")
ENDIF(MINIZIP_FOUND)
@@ -630,7 +613,6 @@
find_library(MD_LIBRARY NAMES md)
IF(MD_LIBRARY)
target_link_libraries(domoticz ${MD_LIBRARY})
- target_link_libraries(domoticztester ${MD_LIBRARY})
ENDIF(MD_LIBRARY)
ELSE()
message(STATUS "OPENSSL library found at: ${OPENSSL_LIBRARIES}")
@@ -638,7 +620,6 @@
add_definitions(-DWITH_TLS)
include_directories(${OPENSSL_INCLUDE_DIR})
target_link_libraries(domoticz ${OPENSSL_LIBRARIES})
- target_link_libraries(domoticztester ${OPENSSL_LIBRARIES})
ENDIF()
#
@@ -779,7 +760,6 @@
ENDIF(TELLDUSCORE_INCLUDE)
target_link_libraries(domoticz ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${MINIZIP_LIBRARIES} ${CURL_LIBRARIES} pthread ${MQTT_LIBRARIES} ${LUA_LIBRARIES} ${CMAKE_DL_LIBS} ${TELLDUS_LIBRARIES})
-target_link_libraries(domoticztester ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${MINIZIP_LIBRARIES} ${CURL_LIBRARIES} pthread ${MQTT_LIBRARIES} ${LUA_LIBRARIES} ${CMAKE_DL_LIBS} ${TELLDUS_LIBRARIES})
IF(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
target_link_libraries(domoticz -lresolv)
@@ -789,13 +769,11 @@
target_link_libraries(domoticz ${EXECINFO_LIBRARIES})
ELSE()
target_link_libraries(domoticz -lrt -lresolv ${EXECINFO_LIBRARIES})
- target_link_libraries(domoticztester -lrt -lresolv ${EXECINFO_LIBRARIES})
ENDIF()
IF(USE_PRECOMPILED_HEADER)
message(STATUS "Using precompiled headers")
target_precompile_headers(domoticz PRIVATE "main/stdafx.h")
- target_precompile_headers(domoticztester PRIVATE "main/stdafx.h")
ENDIF(USE_PRECOMPILED_HEADER)
IF(CMAKE_COMPILER_IS_GNUCXX)

View File

@ -1056,6 +1056,7 @@ domoticz/plugins/examples/Mutli-Threaded.py
domoticz/plugins/examples/Pinger.py
domoticz/plugins/examples/RAVEn.py
domoticz/plugins/examples/UDP Discovery.py
domoticz/plugins/examples/Web Socket Client.py
domoticz/scripts/_domoticz_main
domoticz/scripts/_domoticz_main.bat
domoticz/scripts/buienradar_rain_example.pl
@ -1092,6 +1093,7 @@ domoticz/scripts/lua_parsers/example.lua
domoticz/scripts/lua_parsers/example_json.lua
domoticz/scripts/lua_parsers/example_owm.lua
domoticz/scripts/lua_parsers/example_xml.lua
domoticz/scripts/lua_parsers/readme.txt
domoticz/scripts/python/domoticz.py
domoticz/scripts/python/googlepubsub.py
domoticz/scripts/python/reloader.py
@ -1127,6 +1129,7 @@ domoticz/scripts/update_domoticz
domoticz/server_cert.pem
domoticz/updatedomo
domoticz/www/app/AboutController.js
domoticz/www/app/ApplicationsController.js
domoticz/www/app/CamController.js
domoticz/www/app/CustomIconsController.js
domoticz/www/app/DPFibaroController.js
@ -1195,6 +1198,8 @@ domoticz/www/app/hardware/extra/MQTTParams.html
domoticz/www/app/hardware/extra/MQTTParams.js
domoticz/www/app/hardware/setup/BleBox.html
domoticz/www/app/hardware/setup/BleBox.js
domoticz/www/app/hardware/setup/EnOceanESP3.html
domoticz/www/app/hardware/setup/EnOceanESP3.js
domoticz/www/app/hardware/setup/Kodi.html
domoticz/www/app/hardware/setup/Kodi.js
domoticz/www/app/hardware/setup/MySensors.html
@ -1266,6 +1271,7 @@ domoticz/www/app/timers/DeviceTimersController.js
domoticz/www/app/timers/SceneTimersController.js
domoticz/www/app/timers/components.js
domoticz/www/app/timers/factories.js
domoticz/www/app/timers/planning.js
domoticz/www/css/bootstrap-responsive.css
domoticz/www/css/bootstrap.css
domoticz/www/css/colpick.css
@ -1305,6 +1311,7 @@ domoticz/www/css/jquery-ui-timepicker-addon.css
domoticz/www/css/jquery.dataTables.min.css
domoticz/www/css/jquery.uix.multiselect.css
domoticz/www/css/legacy.css
domoticz/www/css/planning.css
domoticz/www/css/remote.css
domoticz/www/css/style.css
domoticz/www/css/ui-darkness/images/animated-overlay.gif
@ -1326,14 +1333,32 @@ domoticz/www/css/ui-darkness/jquery-ui.min.css
domoticz/www/css/ui-grid.min.css
domoticz/www/css/wheelcolorpicker.css
domoticz/www/favicon.ico
domoticz/www/font-awesome/css/all.css
domoticz/www/font-awesome/css/all.min.css
domoticz/www/font-awesome/css/brands.css
domoticz/www/font-awesome/css/brands.min.css
domoticz/www/font-awesome/css/fontawesome.css
domoticz/www/font-awesome/css/fontawesome.min.css
domoticz/www/font-awesome/css/regular.css
domoticz/www/font-awesome/css/regular.min.css
domoticz/www/font-awesome/css/solid.css
domoticz/www/font-awesome/css/solid.min.css
domoticz/www/font-awesome/webfonts/fa-solid-900.eot
domoticz/www/font-awesome/webfonts/fa-solid-900.svg
domoticz/www/font-awesome/css/svg-with-js.css
domoticz/www/font-awesome/css/svg-with-js.min.css
domoticz/www/font-awesome/css/v4-font-face.css
domoticz/www/font-awesome/css/v4-font-face.min.css
domoticz/www/font-awesome/css/v4-shims.css
domoticz/www/font-awesome/css/v4-shims.min.css
domoticz/www/font-awesome/css/v5-font-face.css
domoticz/www/font-awesome/css/v5-font-face.min.css
domoticz/www/font-awesome/webfonts/fa-brands-400.ttf
domoticz/www/font-awesome/webfonts/fa-brands-400.woff2
domoticz/www/font-awesome/webfonts/fa-regular-400.ttf
domoticz/www/font-awesome/webfonts/fa-regular-400.woff2
domoticz/www/font-awesome/webfonts/fa-solid-900.ttf
domoticz/www/font-awesome/webfonts/fa-solid-900.woff
domoticz/www/font-awesome/webfonts/fa-solid-900.woff2
domoticz/www/html5.appcache
domoticz/www/font-awesome/webfonts/fa-v4compatibility.ttf
domoticz/www/font-awesome/webfonts/fa-v4compatibility.woff2
domoticz/www/i18n/domoticz-ar.json.gz
domoticz/www/i18n/domoticz-bg.json.gz
domoticz/www/i18n/domoticz-bs.json.gz
@ -1413,7 +1438,6 @@ domoticz/www/images/Door48_Off.png
domoticz/www/images/Door48_On.png
domoticz/www/images/Down48.png
domoticz/www/images/Down48_2.png
domoticz/www/images/Fan.png
domoticz/www/images/Fan48_Off.png
domoticz/www/images/Fan48_On.png
domoticz/www/images/Fireplace.png
@ -1575,6 +1599,7 @@ domoticz/www/images/evohome/TemporaryOverride.png
domoticz/www/images/evohome/TemporaryOverrideInv.png
domoticz/www/images/expand16.png
domoticz/www/images/failed.png
domoticz/www/images/fan.png
domoticz/www/images/favorite.png
domoticz/www/images/floorplans/example.jpg
domoticz/www/images/forward_disabled.png
@ -1611,9 +1636,14 @@ domoticz/www/images/logo/114.png
domoticz/www/images/logo/144.png
domoticz/www/images/logo/152.png
domoticz/www/images/logo/180.png
domoticz/www/images/logo/192.png
domoticz/www/images/logo/256.png
domoticz/www/images/logo/384.png
domoticz/www/images/logo/512.png
domoticz/www/images/logo/57.png
domoticz/www/images/logo/72.png
domoticz/www/images/logo/76.png
domoticz/www/images/logo/maskable_icon.png
domoticz/www/images/logo192.png
domoticz/www/images/logout.png
domoticz/www/images/lux.png
@ -1823,7 +1853,6 @@ domoticz/www/js/highcharts/modules/xrange.js.gz
domoticz/www/js/highcharts/themes/dark-unica.js.gz
domoticz/www/js/html5shiv.js.gz
domoticz/www/js/i18next-1.8.0.min.js.gz
domoticz/www/js/jquery-3.5.1.min.js.gz
domoticz/www/js/jquery-3.6.0.min.js.gz
domoticz/www/js/jquery-ui-timepicker-addon.js.gz
domoticz/www/js/jquery-ui.min.js.gz
@ -1846,10 +1875,12 @@ domoticz/www/js/noty/noty.min.js.gz
domoticz/www/js/noty/relax.css
domoticz/www/js/require.min.js.gz
domoticz/www/js/respond.min.js.gz
domoticz/www/js/sw-toolbox.js
domoticz/www/js/ui-bootstrap.min.js.gz
domoticz/www/js/ui-grid.min.js.gz
domoticz/www/js/wow.min.js.gz
domoticz/www/js/zip-without-map.sh
domoticz/www/manifest.json
domoticz/www/media/1x1.gif
domoticz/www/media/click.mp3
domoticz/www/media/click.wav
@ -1896,6 +1927,7 @@ domoticz/www/secpanel/media/key.ogg
domoticz/www/secpanel/media/wrongcode.aac
domoticz/www/secpanel/media/wrongcode.mp3
domoticz/www/secpanel/media/wrongcode.ogg
domoticz/www/service-worker.js
domoticz/www/styles/dark-th3me/base.css
domoticz/www/styles/dark-th3me/custom.css
domoticz/www/styles/dark-th3me/custom.js
@ -1932,6 +1964,7 @@ domoticz/www/switch_icons.txt
domoticz/www/templates/custom.example
domoticz/www/templates/readme.txt
domoticz/www/views/about.html
domoticz/www/views/applications.html
domoticz/www/views/cam.html
domoticz/www/views/customicons.html
domoticz/www/views/dashboard.html
@ -1946,6 +1979,7 @@ domoticz/www/views/forecast.html
domoticz/www/views/frontpage.html
domoticz/www/views/frontpage_example.html
domoticz/www/views/history.html
domoticz/www/views/inc_topbar.html
domoticz/www/views/lights.html
domoticz/www/views/log.html
domoticz/www/views/login.html