From d9bf06f908a6d412a928a0f8fc3549ed253cbc5e Mon Sep 17 00:00:00 2001
From: mglae <mglmail@arcor.de>
Date: Mon, 18 Mar 2024 19:30:08 +0100
Subject: [PATCH 1/3] service.ttyd: convert settings file and language name to
 current version

---
 .../strings.po                                |  0
 .../ttyd/source/resources/settings.xml        | 26 ++++++++++++++-----
 2 files changed, 20 insertions(+), 6 deletions(-)
 rename packages/addons/service/ttyd/source/resources/language/{English => resource.language.en_gb}/strings.po (100%)

diff --git a/packages/addons/service/ttyd/source/resources/language/English/strings.po b/packages/addons/service/ttyd/source/resources/language/resource.language.en_gb/strings.po
similarity index 100%
rename from packages/addons/service/ttyd/source/resources/language/English/strings.po
rename to packages/addons/service/ttyd/source/resources/language/resource.language.en_gb/strings.po
diff --git a/packages/addons/service/ttyd/source/resources/settings.xml b/packages/addons/service/ttyd/source/resources/settings.xml
index ebfca1f73a..97e4eecf65 100644
--- a/packages/addons/service/ttyd/source/resources/settings.xml
+++ b/packages/addons/service/ttyd/source/resources/settings.xml
@@ -1,7 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<settings>
-  <category label="30000">
-    <setting id="TTYD_WEBPORT" type="text" label="30001" default="11111" />
-    <setting id="TTYD_NOLOGIN" type="bool" label="30002" default="false" />
-  </category>
+<?xml version="1.0" ?>
+<settings version="1">
+	<section id="service.ttyd">
+		<category id="settings" label="30000" help="">
+			<group id="1">
+				<setting id="TTYD_WEBPORT" type="string" label="30001" help="">
+					<level>0</level>
+					<default>11111</default>
+					<control type="edit" format="string">
+						<heading>30001</heading>
+					</control>
+				</setting>
+				<setting id="TTYD_NOLOGIN" type="boolean" label="30002" help="">
+					<level>0</level>
+					<default>false</default>
+					<control type="toggle"/>
+				</setting>
+			</group>
+		</category>
+	</section>
 </settings>

From 26d1839cb6663aeb4213344a9f1255cb1e926537 Mon Sep 17 00:00:00 2001
From: mglae <mglmail@arcor.de>
Date: Mon, 18 Mar 2024 19:30:48 +0100
Subject: [PATCH 2/3] service.ttyd: start script and service fix and
 improvements

- -W is required since 1.7.4 to disable ttyd read only mode
- one level log history
- simpify ExecStart
- slightly increment timeouts
---
 packages/addons/service/ttyd/source/bin/ttyd.start          | 5 ++---
 .../service/ttyd/source/system.d/service.ttyd.service       | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/addons/service/ttyd/source/bin/ttyd.start b/packages/addons/service/ttyd/source/bin/ttyd.start
index 86282af996..b7010d7e2d 100755
--- a/packages/addons/service/ttyd/source/bin/ttyd.start
+++ b/packages/addons/service/ttyd/source/bin/ttyd.start
@@ -7,8 +7,6 @@
 
 oe_setup_addon service.ttyd
 
-chmod a+x $ADDON_DIR/bin/*
-
 LD_LIBRARY_PATH=$ADDON_DIR/lib.private:$LD_LIBRARY_PATH
 
 if [ "$TTYD_NOLOGIN" = "true" ]; then
@@ -17,4 +15,5 @@ elif [ "$TTYD_NOLOGIN" = "false" ]; then
   TTYD_NOLOGIN="login root"
 fi
 
-exec $ADDON_DIR/bin/ttyd -O -T xterm -p ${TTYD_WEBPORT} ${TTYD_NOLOGIN} &>$ADDON_HOME/service.log
+[ -f "$ADDON_HOME/service.log" ] && mv -f "$ADDON_HOME/service.log" "$ADDON_HOME/service.old.log"
+exec $ADDON_DIR/bin/ttyd -W -O -T xterm -p ${TTYD_WEBPORT} ${TTYD_NOLOGIN} &>$ADDON_HOME/service.log
diff --git a/packages/addons/service/ttyd/source/system.d/service.ttyd.service b/packages/addons/service/ttyd/source/system.d/service.ttyd.service
index 958842770d..00f2be969a 100644
--- a/packages/addons/service/ttyd/source/system.d/service.ttyd.service
+++ b/packages/addons/service/ttyd/source/system.d/service.ttyd.service
@@ -3,10 +3,10 @@ Description=ttyd
 After=graphical.target
 
 [Service]
-ExecStart=/bin/sh -c "exec sh /storage/.kodi/addons/service.ttyd/bin/ttyd.start"
-TimeoutStopSec=1
+ExecStart=/storage/.kodi/addons/service.ttyd/bin/ttyd.start
+TimeoutStopSec=2
 Restart=always
-RestartSec=2
+RestartSec=4
 StartLimitInterval=0
 Type=exec
 

From 7fdfa15a21f31428b8702fd4537772aa58f31eee Mon Sep 17 00:00:00 2001
From: mglae <mglmail@arcor.de>
Date: Mon, 18 Mar 2024 19:31:29 +0100
Subject: [PATCH 3/3] ttyd: update addon (1)

---
 packages/addons/service/ttyd/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/addons/service/ttyd/package.mk b/packages/addons/service/ttyd/package.mk
index c9477cfcc9..f1139dd3d2 100644
--- a/packages/addons/service/ttyd/package.mk
+++ b/packages/addons/service/ttyd/package.mk
@@ -4,7 +4,7 @@
 PKG_NAME="ttyd"
 PKG_VERSION="1.7.4"
 PKG_SHA256="300d8cef4b0b32b0ec30d7bf4d3721a5d180e22607f9467a95ab7b6d9652ca9b"
-PKG_REV="0"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/tsl0922/ttyd"