diff --git a/net/teddycloud/Makefile b/net/teddycloud/Makefile index c969558188ca..5f5d83e8963d 100644 --- a/net/teddycloud/Makefile +++ b/net/teddycloud/Makefile @@ -1,73 +1,76 @@ PORTNAME= teddycloud DISTVERSIONPREFIX= tc_v -DISTVERSION= 0.6.7 +DISTVERSION= 0.6.8 CATEGORIES= net # Get the latest commit hashes here: https://github.com/toniebox-reverse-engineering/tonies-json/commits/release/ # NOTE: remove the existing tonies.json and tonieboxes.json from DISTDIR before you do a `make makesum` MASTER_SITES= https://raw.githubusercontent.com/toniebox-reverse-engineering/tonies-json/cd5f06d9183470867822d0773ddc0de519d3d46e/:toniesjson DISTFILES= tonies.json:toniesjson \ tonieboxes.json:toniesjson EXTRACT_ONLY= ${DISTFILES:N*\:toniesjson:C/\:.*//} MAINTAINER= freebsd@pe82.de COMMENT= Alternative cloud server for the Toniebox WWW= https://tonies-wiki.revvox.de/docs/tools/teddycloud/ LICENSE= GPLv2+ NOT_FOR_ARCHS= armv6 armv7 i386 powerpc powerpcspe NOT_FOR_ARCHS_REASON= 32bit targets do not build due to type issues. Upstream library assumes FreeBSD to be 64bit. BUILD_DEPENDS= curl:ftp/curl \ protoc-c:devel/protobuf-c - LIB_DEPENDS= libcjson.so:devel/libcjson \ libogg.so:audio/libogg \ libopus.so:audio/opus USES= dos2unix gmake USE_GCC= yes USE_GITHUB= yes GH_ACCOUNT= toniebox-reverse-engineering:DEFAULT,teddycloud_web \ Oryx-Embedded:cyclone_common,cyclone_crypto,cyclone_ssl,cyclone_tcp GH_PROJECT= teddycloud_web:teddycloud_web \ Common:cyclone_common CycloneCRYPTO:cyclone_crypto \ CycloneSSL:cyclone_ssl CycloneTCP:cyclone_tcp GH_SUBDIR= teddycloud_web:teddycloud_web \ cyclone/common:cyclone_common cyclone/cyclone_crypto:cyclone_crypto \ cyclone/cyclone_ssl:cyclone_ssl cyclone/cyclone_tcp:cyclone_tcp # find versions here clone the repository and switch to tag # git submodule update # git submodule GH_TAGNAME= tcw_v${DISTVERSION}:teddycloud_web \ v2.4.4:cyclone_common,cyclone_crypto,cyclone_ssl,cyclone_tcp USE_RC_SUBR= teddycloudd -MAKE_ENV+= CONFIG_RUNTIME_BASE_PATH=${PREFIX}/etc/teddycloud \ - RUNTIME_BASE_PATH=${PREFIX}/share/teddycloud \ +MAKE_ENV+= CONFIG_RUNTIME_BASE_PATH=${ETCDIR}\ + RUNTIME_BASE_PATH=${DATADIR} \ NO_SANITIZERS=1 \ GIT_DIRTY=0 \ - GIT_BUILD_TIME="2026-01-11 11:47:28 +0000" \ - GIT_SHORT_SHA=5b59a82 \ - GIT_SHA=5b59a82ae6c2fd8d8501ea0fe1da2e775fb8eff0 \ + GIT_BUILD_TIME="2026-03-31 06:31:59 +0000" \ + GIT_SHORT_SHA=312d500 \ + GIT_SHA=312d500402d0a386441b11bb620141cdae2006d6 \ GIT_TAG=tc_v${DISTVERSION} \ WEB_GIT_DIRTY=0 \ - WEB_GIT_BUILD_TIME="2026-01-11 12:46:00 +0100" \ - WEB_GIT_SHORT_SHA=fa6babd \ - WEB_GIT_SHA=fa6babd8487afba90e391f23714d8435574562a5 \ + WEB_GIT_BUILD_TIME="2026-03-30 10:17:35 +0200" \ + WEB_GIT_SHORT_SHA=50d2c4e \ + WEB_GIT_SHA=50d2c4e768a4d8c0686c45db63abb156a3a25a5f \ WEB_GIT_TAG=tcw_v${DISTVERSION} # This did reliably fail due to some unknown deps when using parallel build MAKE_JOBS_UNSAFE= yes ALL_TARGET= preinstall +CFLAGS+= -I${LOCALBASE}/include/cjson + +SUB_FILES= pkg-message + pre-install: @${CP} ${DISTFILES:M*\:toniesjson:C/\:.*//:S,^,${_DISTDIR}/,} ${WRKSRC}/install/pre/config/ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/install/pre/teddycloud ${STAGEDIR}${PREFIX}/bin @(cd ${WRKSRC}/install/pre && \ ${COPYTREE_SHARE} "certs data" ${STAGEDIR}${DATADIR}) @(cd ${WRKSRC}/install/pre/config && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) ${MKDIR} ${STAGEDIR}${ETCDIR} .include diff --git a/net/teddycloud/distinfo b/net/teddycloud/distinfo index 3122b91b7814..6a00752bbb83 100644 --- a/net/teddycloud/distinfo +++ b/net/teddycloud/distinfo @@ -1,17 +1,17 @@ -TIMESTAMP = 1769203899 +TIMESTAMP = 1775215558 SHA256 (tonies.json) = bcf1633744f731998b26249b59b37f57905af533739ec24227e19169fe7b33cd SIZE (tonies.json) = 5854525 SHA256 (tonieboxes.json) = 64ef4f28973d410e49274efc22e70ffb26ddb8e54b1750332bb853b273410439 SIZE (tonieboxes.json) = 3022 -SHA256 (toniebox-reverse-engineering-teddycloud-tc_v0.6.7_GH0.tar.gz) = 6afd7f7b430b68cbfb01a146c5e48a6d3557e4ca46601a7d4904e63d5412dfb9 -SIZE (toniebox-reverse-engineering-teddycloud-tc_v0.6.7_GH0.tar.gz) = 15462180 -SHA256 (toniebox-reverse-engineering-teddycloud_web-tcw_v0.6.7_GH0.tar.gz) = a99b63eefe8df4d9881df0c59a778010abf129c0b578adee5ee8b298c3585d94 -SIZE (toniebox-reverse-engineering-teddycloud_web-tcw_v0.6.7_GH0.tar.gz) = 10479749 +SHA256 (toniebox-reverse-engineering-teddycloud-tc_v0.6.8_GH0.tar.gz) = 0fa8b592238042043017956b59f645fc70dd8f4139e0a4251f554e1ddafa7726 +SIZE (toniebox-reverse-engineering-teddycloud-tc_v0.6.8_GH0.tar.gz) = 16265365 +SHA256 (toniebox-reverse-engineering-teddycloud_web-tcw_v0.6.8_GH0.tar.gz) = 53a4ee08699469b754b554a8666970e95c929cbd1c276db00d57a26f0dfa7070 +SIZE (toniebox-reverse-engineering-teddycloud_web-tcw_v0.6.8_GH0.tar.gz) = 11273602 SHA256 (Oryx-Embedded-Common-v2.4.4_GH0.tar.gz) = a94348845ce224fe825086bb0fa7a1598897e532d5088e3af1145314ff01945d SIZE (Oryx-Embedded-Common-v2.4.4_GH0.tar.gz) = 50454 SHA256 (Oryx-Embedded-CycloneCRYPTO-v2.4.4_GH0.tar.gz) = b61a06eedd3c71c4d5b66273682717ceb52b7dda2db51d1e156babb501f6fe79 SIZE (Oryx-Embedded-CycloneCRYPTO-v2.4.4_GH0.tar.gz) = 1002666 SHA256 (Oryx-Embedded-CycloneSSL-v2.4.4_GH0.tar.gz) = 2c157a27facb550ff455025439cec47df7ee187e19a52588fa20415c104c10b9 SIZE (Oryx-Embedded-CycloneSSL-v2.4.4_GH0.tar.gz) = 234959 SHA256 (Oryx-Embedded-CycloneTCP-v2.4.4_GH0.tar.gz) = e334aadacbd6ddcc7a17f2a1dd0d03b8029c7ba23fd789f2397b04284fee37a0 SIZE (Oryx-Embedded-CycloneTCP-v2.4.4_GH0.tar.gz) = 2361810 diff --git a/net/teddycloud/files/patch-include_json__helper.h b/net/teddycloud/files/patch-include_json__helper.h deleted file mode 100644 index 992e2c82f071..000000000000 --- a/net/teddycloud/files/patch-include_json__helper.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/json_helper.h.orig 2026-01-23 20:45:38 UTC -+++ include/json_helper.h -@@ -1,6 +1,7 @@ - #pragma once - --#include "cJSON.h" -+#include -+ - #include "debug.h" - - char *jsonGetString(cJSON *jsonElement, char *name); diff --git a/net/teddycloud/files/patch-src_contentJson.c b/net/teddycloud/files/patch-src_contentJson.c deleted file mode 100644 index b169baabb18a..000000000000 --- a/net/teddycloud/files/patch-src_contentJson.c +++ /dev/null @@ -1,13 +0,0 @@ ---- src/contentJson.c.orig 2026-01-23 20:44:06 UTC -+++ src/contentJson.c -@@ -1,8 +1,9 @@ -+#include -+ - #include "contentJson.h" - - #include "settings.h" - #include "debug.h" --#include "cJSON.h" - #include "net_config.h" - #include "server_helpers.h" - #include "toniesJson.h" diff --git a/net/teddycloud/files/patch-src_handler__api.c b/net/teddycloud/files/patch-src_handler__api.c deleted file mode 100644 index 654979580a67..000000000000 --- a/net/teddycloud/files/patch-src_handler__api.c +++ /dev/null @@ -1,18 +0,0 @@ ---- src/handler_api.c.orig 2026-01-23 20:46:20 UTC -+++ src/handler_api.c -@@ -5,6 +5,7 @@ - #include - #include - #include -+#include - - #include "path.h" - #include "path_ext.h" -@@ -16,7 +17,6 @@ - #include "settings.h" - #include "stats.h" - #include "returncodes.h" --#include "cJSON.h" - #include "toniefile.h" - #include "toniesJson.h" - #include "fs_ext.h" diff --git a/net/teddycloud/files/patch-src_home__assistant.c b/net/teddycloud/files/patch-src_home__assistant.c deleted file mode 100644 index c5fb4fc3cc35..000000000000 --- a/net/teddycloud/files/patch-src_home__assistant.c +++ /dev/null @@ -1,19 +0,0 @@ ---- src/home_assistant.c.orig 2026-01-23 20:47:15 UTC -+++ src/home_assistant.c -@@ -1,6 +1,7 @@ - - #include - #include -+#include - - #include "platform.h" - #include "debug.h" -@@ -8,8 +9,6 @@ - #include "home_assistant.h" - #include "macros.h" - #include "mqtt.h" -- --#include "cJSON.h" - - static int32_t coerce_int32(float value, int32_t min, int32_t max) - { diff --git a/net/teddycloud/files/patch-src_main.c b/net/teddycloud/files/patch-src_main.c deleted file mode 100644 index 55666d94b88c..000000000000 --- a/net/teddycloud/files/patch-src_main.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/main.c.orig 2026-01-23 20:47:56 UTC -+++ src/main.c -@@ -7,10 +7,10 @@ - #include - #include - #include -+#include - - #include "error.h" - #include "debug.h" --#include "cJSON.h" - #include "esp32.h" - - #include "version.h" diff --git a/net/teddycloud/files/patch-src_tonie__audio__playlist.c b/net/teddycloud/files/patch-src_tonie__audio__playlist.c deleted file mode 100644 index d26eb2e097de..000000000000 --- a/net/teddycloud/files/patch-src_tonie__audio__playlist.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/tonie_audio_playlist.c.orig 2026-01-23 20:51:18 UTC -+++ src/tonie_audio_playlist.c -@@ -1,9 +1,10 @@ -+#include -+ - #include "tonie_audio_playlist.h" - - #include "fs_port.h" - #include "toniefile.h" - #include "server_helpers.h" --#include "cJSON.h" - #include "json_helper.h" - #include "handler.h" - diff --git a/net/teddycloud/files/patch-src_toniesJson.c b/net/teddycloud/files/patch-src_toniesJson.c deleted file mode 100644 index 40ae0955ac69..000000000000 --- a/net/teddycloud/files/patch-src_toniesJson.c +++ /dev/null @@ -1,15 +0,0 @@ ---- src/toniesJson.c.orig 2026-01-23 20:52:16 UTC -+++ src/toniesJson.c -@@ -1,10 +1,11 @@ -+#include -+ - #include "toniesJson.h" - #include "fs_port.h" - #include "os_port.h" - #include "settings.h" - #include "cache.h" - #include "debug.h" --#include "cJSON.h" - #include "handler.h" - #include "cloud_request.h" - #include "server_helpers.h" diff --git a/net/teddycloud/pkg-message b/net/teddycloud/files/pkg-message.in similarity index 68% rename from net/teddycloud/pkg-message rename to net/teddycloud/files/pkg-message.in index ac425a3cd868..19a6f6f9166c 100644 --- a/net/teddycloud/pkg-message +++ b/net/teddycloud/files/pkg-message.in @@ -1,27 +1,27 @@ [ { type: install message: <