From 42d54acd9086743b6a021a5372fe3bc3f6c4b7a7 Mon Sep 17 00:00:00 2001 From: csev1755 <49533775+csev1755@users.noreply.github.com> Date: Mon, 17 Mar 2025 08:30:58 -0500 Subject: [PATCH] Update onvif-simple-server --- .../01-enable-mbedtls-only.patch | 30 +++++++++++-------- .../onvif-simple-server.mk | 2 +- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/general/package/onvif-simple-server/01-enable-mbedtls-only.patch b/general/package/onvif-simple-server/01-enable-mbedtls-only.patch index 413e9b42..fc82a406 100644 --- a/general/package/onvif-simple-server/01-enable-mbedtls-only.patch +++ b/general/package/onvif-simple-server/01-enable-mbedtls-only.patch @@ -1,21 +1,27 @@ ---- a/Makefile 2023-07-04 13:52:08.000000000 +0300 -+++ b/Makefile 2023-07-11 00:10:53.987288000 +0300 -@@ -3,15 +3,9 @@ - OBJECTS_O = onvif_simple_server.o device_service.o media_service.o ptz_service.o events_service.o fault.o conf.o utils.o log.o ezxml_wrapper.o ezxml/ezxml.o +--- a/Makefile 2025-03-16 13:50:47.328101721 -0500 ++++ b/Makefile 2025-03-16 13:50:44.034101970 -0500 +@@ -4,21 +4,9 @@ + OBJECTS_O = onvif_simple_server.o device_service.o media_service.o media2_service.o ptz_service.o events_service.o deviceio_service.o fault.o conf.o utils_zlib.o log.o ezxml_wrapper.o ezxml/ezxml.o OBJECTS_N = onvif_notify_server.o conf.o utils.o log.o ezxml_wrapper.o ezxml/ezxml.o OBJECTS_W = wsd_simple_server.o utils.o log.o ezxml_wrapper.o ezxml/ezxml.o --ifdef HAVE_MBEDTLS --INCLUDE = -DHAVE_MBEDTLS -Iextras/mbedtls/include -ffunction-sections -fdata-sections -lrt --LIBS_O = -Wl,--gc-sections extras/mbedtls/library/libmbedcrypto.a -lpthread -lrt --LIBS_N = -Wl,--gc-sections extras/mbedtls/library/libmbedcrypto.a -lpthread -lrt +-ifdef HAVE_WOLFSSL +-INCLUDE = -DHAVE_WOLFSSL -ffunction-sections -fdata-sections +-LIBS_O = -Wl,--gc-sections -lwolfssl -lz -lpthread -lrt +-LIBS_N = -Wl,--gc-sections -lwolfssl -lpthread -lrt -else --INCLUDE = -Iextras/libtomcrypt/src/headers -ffunction-sections -fdata-sections -lrt --LIBS_O = -Wl,--gc-sections extras/libtomcrypt/libtomcrypt.a -lpthread -lrt --LIBS_N = -Wl,--gc-sections extras/libtomcrypt/libtomcrypt.a -lpthread -lrt +-ifdef HAVE_MBEDTLS +-INCLUDE = -DHAVE_MBEDTLS -ffunction-sections -fdata-sections +-LIBS_O = -Wl,--gc-sections -lmbedcrypto -lz -lpthread -lrt +-LIBS_N = -Wl,--gc-sections -lmbedcrypto -lpthread -lrt +-else +-INCLUDE = -ffunction-sections -fdata-sections +-LIBS_O = -Wl,--gc-sections -ltomcrypt -lz -lpthread -lrt +-LIBS_N = -Wl,--gc-sections -ltomcrypt -lpthread -lrt +-endif -endif +INCLUDE = -DHAVE_MBEDTLS -ffunction-sections -fdata-sections -lrt +LIBS_O = -Wl,--gc-sections -lmbedtls -lmbedcrypto -lpthread -lrt +LIBS_N = -Wl,--gc-sections -lmbedtls -lmbedcrypto -lpthread -lrt LIBS_W = -Wl,--gc-sections - all: onvif_simple_server onvif_notify_server wsd_simple_server + ifdef USE_ZLIB diff --git a/general/package/onvif-simple-server/onvif-simple-server.mk b/general/package/onvif-simple-server/onvif-simple-server.mk index 4891b140..692327c6 100644 --- a/general/package/onvif-simple-server/onvif-simple-server.mk +++ b/general/package/onvif-simple-server/onvif-simple-server.mk @@ -5,7 +5,7 @@ ################################################################################ ONVIF_SIMPLE_SERVER_SITE = $(call github,roleoroleo,onvif_simple_server,$(ONVIF_SIMPLE_SERVER_VERSION)) -ONVIF_SIMPLE_SERVER_VERSION = 0130fb5f035ec42f77481b6920bcb975086797aa +ONVIF_SIMPLE_SERVER_VERSION = e2370712b333068afb08051fe3046aa2324148ff ONVIF_SIMPLE_SERVER_DEPENDENCIES = mbedtls ONVIF_SIMPLE_SERVER_LICENSE = MIT