Date: Thu, 23 Apr 2026 16:02:41 +0000 From: Yusuf Yaman <nxjoseph@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: Michael Pape <git@pe82.de> Subject: git: 1b109ddf6ef8 - main - net/teddycloud: Update 0.6.7 => 0.6.8 Message-ID: <69ea42a1.39497.73a35250@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by nxjoseph: URL: https://cgit.FreeBSD.org/ports/commit/?id=1b109ddf6ef871616c44ef6bc0c063d232a3476c commit 1b109ddf6ef871616c44ef6bc0c063d232a3476c Author: Michael Pape <git@pe82.de> AuthorDate: 2026-04-03 11:46:14 +0000 Commit: Yusuf Yaman <nxjoseph@FreeBSD.org> CommitDate: 2026-04-23 15:59:14 +0000 net/teddycloud: Update 0.6.7 => 0.6.8 Changelog: https://github.com/toniebox-reverse-engineering/teddycloud/releases/tag/tc_v0.6.8 Port changes: * Replace several source code patch files with CFLAGS instead. * Replace long paths with DATADIR and ETCDIR instead. * Pet portlint: remove empty line between *_DEPENDS. * Convert pkg-message to files/pkg-message.in and fix typo. PR: 294230 Reported by: Michael Pape <freebsd@pe82.de> (maintainer) Approved by: vvd (co-mentor) --- net/teddycloud/Makefile | 23 ++++++++++++---------- net/teddycloud/distinfo | 10 +++++----- net/teddycloud/files/patch-include_json__helper.h | 11 ----------- net/teddycloud/files/patch-src_contentJson.c | 13 ------------ net/teddycloud/files/patch-src_handler__api.c | 18 ----------------- net/teddycloud/files/patch-src_home__assistant.c | 19 ------------------ net/teddycloud/files/patch-src_main.c | 14 ------------- .../files/patch-src_tonie__audio__playlist.c | 14 ------------- net/teddycloud/files/patch-src_toniesJson.c | 15 -------------- .../{pkg-message => files/pkg-message.in} | 10 +++++----- net/teddycloud/pkg-plist | 12 ++++++----- 11 files changed, 30 insertions(+), 129 deletions(-) diff --git a/net/teddycloud/Makefile b/net/teddycloud/Makefile index c969558188ca..5f5d83e8963d 100644 --- a/net/teddycloud/Makefile +++ b/net/teddycloud/Makefile @@ -1,6 +1,6 @@ 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` @@ -20,7 +20,6 @@ NOT_FOR_ARCHS_REASON= 32bit targets do not build due to type issues. Upstream li BUILD_DEPENDS= curl:ftp/curl \ protoc-c:devel/protobuf-c - LIB_DEPENDS= libcjson.so:devel/libcjson \ libogg.so:audio/libogg \ libopus.so:audio/opus @@ -43,23 +42,27 @@ 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/ diff --git a/net/teddycloud/distinfo b/net/teddycloud/distinfo index 3122b91b7814..6a00752bbb83 100644 --- a/net/teddycloud/distinfo +++ b/net/teddycloud/distinfo @@ -1,12 +1,12 @@ -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 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 <cjson/cJSON.h> -+ - #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 <cjson/cJSON.h> -+ - #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 <stdint.h> - #include <string.h> - #include <stdio.h> -+#include <cjson/cJSON.h> - - #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 <string.h> - #include <math.h> -+#include <cjson/cJSON.h> - - #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 <stdint.h> - #include <math.h> - #include <getopt.h> -+#include <cjson/cJSON.h> - - #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 <cjson/cJSON.h> -+ - #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 <cjson/cJSON.h> -+ - #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 @@ -2,16 +2,16 @@ { type: install message: <<EOM Teddycloud will require exclusive access to following ports: -80: HTTP port for the webinterface -8443: HTTPS port for the webinterface -443: HTTPS API port for Toniebox API +80: HTTP port for the webinterface +8443: HTTPS port for the webinterface +443: HTTPS API port for Toniebox API If you have already daemons running using these ports like nginx, apache, haproxy it is best to bind an alias IP (second ip) to your network card and use that exclusively with teddycloud. You can tell teddycloud to use this IP. -At first you must start teddycloud that the config file /usr/local/etc/teddycloud/config.ini is created with command: +At first you must start teddycloud that the config file %%ETCDIR%%/config.ini is created with command: teddycloud After this you can change the IP teddycloud is using: @@ -21,7 +21,7 @@ To start teddycloud at startup: sysrc teddycloudd_enable="YES" To start in background: -service teddycloud start +service teddycloudd start EOM } ] diff --git a/net/teddycloud/pkg-plist b/net/teddycloud/pkg-plist index 7f5676f69908..4f978d3f3467 100644 --- a/net/teddycloud/pkg-plist +++ b/net/teddycloud/pkg-plist @@ -287,7 +287,7 @@ bin/teddycloud %%DATADIR%%/data/www/web/assets/ZA-DsWnrAmj.js %%DATADIR%%/data/www/web/assets/ZM-CdkX6WZ3.js %%DATADIR%%/data/www/web/assets/ZW-B1PpRcC0.js -%%DATADIR%%/data/www/web/assets/browser-ponyfill-touFzT30.js +%%DATADIR%%/data/www/web/assets/browser-ponyfill-BheGAKqy.js %%DATADIR%%/data/www/web/assets/cc3200-B-jSkbsy.jpg %%DATADIR%%/data/www/web/assets/cc3200_debugPort-CUfuhKbo.jpg %%DATADIR%%/data/www/web/assets/cc3200_installCfwFlashUpload-D3jB7q0q.png @@ -313,8 +313,8 @@ bin/teddycloud %%DATADIR%%/data/www/web/assets/esp32s2-NL0-Ytlx.js %%DATADIR%%/data/www/web/assets/esp32s3-wh7ZIwIl.js %%DATADIR%%/data/www/web/assets/esp8266-DjSL4SI8.js -%%DATADIR%%/data/www/web/assets/index-ChpkR0Rj.js -%%DATADIR%%/data/www/web/assets/index-zRaEDlqF.css +%%DATADIR%%/data/www/web/assets/index-DkJUiIwA.css +%%DATADIR%%/data/www/web/assets/index-DmtT6wdd.js %%DATADIR%%/data/www/web/assets/logo-aw46LCqE.png %%DATADIR%%/data/www/web/assets/openTB_step1_1-4vwQGflo.png %%DATADIR%%/data/www/web/assets/openTB_step1_2-DIZc5DI4.png @@ -334,8 +334,10 @@ bin/teddycloud %%DATADIR%%/data/www/web/assets/stub_flasher_32s2-DLJQYVPj.js %%DATADIR%%/data/www/web/assets/stub_flasher_32s3-B0-qH3ON.js %%DATADIR%%/data/www/web/assets/stub_flasher_8266-Bxnk_IeY.js -%%DATADIR%%/data/www/web/assets/tb-esp32-uart-BDPWj6EB.png -%%DATADIR%%/data/www/web/assets/tb-esp32-uart-clamp-D_86EMpu.png +%%DATADIR%%/data/www/web/assets/tb-esp32-uart-CHoWstoN.png +%%DATADIR%%/data/www/web/assets/tb-esp32-uart-clamp-BFu61mq3.png +%%DATADIR%%/data/www/web/assets/tb2_pcb-Bq8sz-dX.png +%%DATADIR%%/data/www/web/assets/tb2_pcb_preview-B7uVqVQW.png %%DATADIR%%/data/www/web/assets/uart_3v3-5V_jumper_black-BW2kS97B.jpg %%DATADIR%%/data/www/web/assets/uart_3v3-5V_jumper_switch-Cl7yHFlu.jpg %%DATADIR%%/data/www/web/assets/uart_3v3-5V_jumper_yellow-d4JFD7jo.jpghome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69ea42a1.39497.73a35250>