gentoo auto-resync : 04:10:2023 - 05:50:30

5 files changed, 57 insertions, 8 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 176176e4efe4..dfe71a1525ce 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/ttyd/Manifest b/www-apps/ttyd/Manifest
index da64a05e1324..6b449ebbdfb9 100644
--- a/www-apps/ttyd/Manifest
+++ b/www-apps/ttyd/Manifest
@@ -1,7 +1,9 @@
-AUX ttyd.confd 1715 BLAKE2B 935298b712e2b52d98e7f811cd386497c34643933b86a4920f7744cd5fb6f2aadf3ac3b1ddb4567db526a9d7b079a7660f482609e955fb23f24b686e52cb7c9f SHA512 3eb0c9c71cb18e65c2a42c07581b7593441a4781bd1a94010e891ef1970babac5d78b3966b4e8bab95f6d67c3d1f03e4a75839b933d0dc0bf98e2fd2d52844ad
+AUX ttyd.confd 2351 BLAKE2B 971fa19f54c194c3791a464d065ac1c4074bf8d1b16170704b87b7d8f50bbd265ba913656c4e4d06ba1b5413df50d422f6eebbaef6cd7b0760d94f1043e57e34 SHA512 15f7372961ac0e7805d7f72d37a254011dfa0822d4252e6a7ad3bec852d1da951d1bf21421a997e01702eb7bf3476d8e110d9f89cec62666ace6d0d11971dc2e
 AUX ttyd.initd 308 BLAKE2B 9d78f775a0e529d55cddfd92488829d2aa79f2321b5f70c54649a8a6faeffb0ceaa899cf19187c6b51919092348659cb1d930bf144921dab65e1f007c6ef0054 SHA512 a955068ab20f06165c10af89ae7e02c38f24247f7b7a5aa86da38cf4361555c6bb009a76e34d1ff6fb41df2555d91d42bc1494a2324c30a89098fdf312015e35
-AUX ttyd.service 152 BLAKE2B 2f57682dec6a2d7df5d36955abcb71ad37df4878ad89be286777e91a35a1761680a41725b22fdfa2df863bb1fbd7d712e836ede92da0c4ed41a78dd3c38a8196 SHA512 4141f3d12fba354ec1e84f7200f006dc3bc65ccd798b95d991b7b0d45f619605599b9ef635aa532477acf2dc82604df85b959b7f22de1057b20e9b1025fd4a2c
+AUX ttyd.service 155 BLAKE2B 6be520f7b88c5e8b7e6dada0a923eff285743d5b97c995fc924da153d70641e0706b86a5a91bc6d2054ced4f1044a12584108262b916b948250cdbf092094aec SHA512 381d9dd122b7aca028e813e5369d8a8260165483e1c232ca1f6614d8d5d7bba069102c754c61813496461ce5c038a0ef7564026ea4373d7b5579af8b64995cf6
 DIST ttyd-1.7.3.tar.gz 579492 BLAKE2B 14b66dbe83c0ccb601a6e3bf35a804f69f679387c9aca2f55a055dda85b2e3a396ddb4f9a3fb56575d0554837faf1d5c090cf66f4e7571201323659db3feb0b7 SHA512 e0900e2b4620095717d0f32206d08177ce74bc2f24cd9c20793cc2e370a8ee961272b73698b0dda857360703df20378c080293dfdfd287ae863801d338c8b2a4
+DIST ttyd-1.7.4.tar.gz 603483 BLAKE2B 745ad302fdf17f31d941d3ae4b69b70257f87f3b6d624f3678e83269901577370fc6296726d8b2c61e94469f9970257b1192bcc2299fb0855bd0f3ea5960a498 SHA512 bbaa56389c224db9438b6dcce696deb0eeedfdf9b3a68cbc4c01c155340f71558e1d90c3fabe9a52de180728792b8dc7deed0c3512acdc246d651270d7fb82c6
 EBUILD ttyd-1.7.3-r1.ebuild 864 BLAKE2B 2349ccfc0bfb56699ec7b1a30f3e15d6825e33df6d751bdb0adb8b475e044f7fe0c1b255f94610f8000f1c8724ffc6634469951e0522fad4b6a8ee086a7058da SHA512 59b3e6aac334d3ac88ede9aca1e65356742817c631274ea08033730d1a1b203b35147ef9c90da6811201e0635ca07c57f7156740cfdb9d389d838263d3785ac9
+EBUILD ttyd-1.7.4.ebuild 864 BLAKE2B 2349ccfc0bfb56699ec7b1a30f3e15d6825e33df6d751bdb0adb8b475e044f7fe0c1b255f94610f8000f1c8724ffc6634469951e0522fad4b6a8ee086a7058da SHA512 59b3e6aac334d3ac88ede9aca1e65356742817c631274ea08033730d1a1b203b35147ef9c90da6811201e0635ca07c57f7156740cfdb9d389d838263d3785ac9
 EBUILD ttyd-9999.ebuild 864 BLAKE2B 2349ccfc0bfb56699ec7b1a30f3e15d6825e33df6d751bdb0adb8b475e044f7fe0c1b255f94610f8000f1c8724ffc6634469951e0522fad4b6a8ee086a7058da SHA512 59b3e6aac334d3ac88ede9aca1e65356742817c631274ea08033730d1a1b203b35147ef9c90da6811201e0635ca07c57f7156740cfdb9d389d838263d3785ac9
 MISC metadata.xml 295 BLAKE2B 013599ca9cf89c3ca42d5adeea70d32f852bf090085eba9525ccfd3e1af91df4235eaebc252ac2d4c1474cd27a15a5fc5a735196979acb73d3ca3a9f2ed090d0 SHA512 8b4defd8be6208c50bba2dc4902d1b4c10bfa4bb4ef255e5736ca9f20f9f7a476c53f6f4cdfa47d839791fe7fda79128ce975592ca400b94e250ad2f9663295c
diff --git a/www-apps/ttyd/files/ttyd.confd b/www-apps/ttyd/files/ttyd.confd
index 57d24e3fb394..8e614522b436 100644
--- a/www-apps/ttyd/files/ttyd.confd
+++ b/www-apps/ttyd/files/ttyd.confd
@@ -5,12 +5,15 @@
 # Some of the meaningful options are:
 #    -p, --port              Port to listen (default: 7681, use `0` for random port)
 #    -i, --interface         Network interface to bind (eg: eth0), or UNIX domain socket path (eg: /var/run/ttyd.sock)
-#    -c, --credential        Credential for Basic Authentication (format: username:password)
+#    -U, --socket-owner      User owner of the UNIX domain socket file, when enabled (eg: user:group)
+#    -c, --credential        Credential for basic authentication (format: username:password)
+#    -H, --auth-header       HTTP Header name for auth proxy, this will configure ttyd to let a HTTP reverse proxy handle authentication
 #    -u, --uid               User id to run with
 #    -g, --gid               Group id to run with
 #    -s, --signal            Signal to send to the command when exit it (default: 1, SIGHUP)
-#    -r, --reconnect         Time to reconnect for the client in seconds (default: 10)
-#    -R, --readonly          Do not allow clients to write to the TTY
+#    -w, --cwd               Working directory to be set for the child program
+#    -a, --url-arg           Allow client to send command line arguments in URL (eg: http://localhost:7681?arg=foo&arg=bar)
+#    -W, --writable          Allow clients to write to the TTY (readonly by default)
 #    -t, --client-option     Send option to client (format: key=value), repeat to add more options
 #    -T, --terminal-type     Terminal type to report, default: xterm-256color
 #    -O, --check-origin      Do not allow websocket connection from different origin
@@ -18,12 +21,16 @@
 #    -o, --once              Accept only one client and exit on disconnection
 #    -B, --browser           Open terminal with the default system browser
 #    -I, --index             Custom index.html path
+#    -b, --base-path         Expected base path for requests coming from a reverse proxy (eg: /mounted/here, max length: 128)
+#    -P, --ping-interval     Websocket ping interval(sec) (default: 5)
 #    -6, --ipv6              Enable IPv6 support
 #    -S, --ssl               Enable SSL
 #    -C, --ssl-cert          SSL certificate file path
 #    -K, --ssl-key           SSL key file path
 #    -A, --ssl-ca            SSL CA file path for client certificate verification
 #    -d, --debug             Set log level (default: 7)
-#   login 	  --- Login with system accounts 
+#    -v, --version           Print the version and exit
+#    -h, --help              Print this text and exit
 
-TTYD_OPTS="login"
+
+TTYD_OPTS="-W login"
diff --git a/www-apps/ttyd/files/ttyd.service b/www-apps/ttyd/files/ttyd.service
index caa95ab1a910..d1d7e92461a4 100644
--- a/www-apps/ttyd/files/ttyd.service
+++ b/www-apps/ttyd/files/ttyd.service
@@ -3,7 +3,7 @@ Description=Terminal over HTTP
 
 [Service]
 User=root
-ExecStart=/usr/bin/ttyd -p 9000 login
+ExecStart=/usr/bin/ttyd -W -p 9000 login
 Restart=on-abort
 
 [Install]
diff --git a/www-apps/ttyd/ttyd-1.7.4.ebuild b/www-apps/ttyd/ttyd-1.7.4.ebuild
new file mode 100644
index 000000000000..adbcac55b7f7
--- /dev/null
+++ b/www-apps/ttyd/ttyd-1.7.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd
+
+MY_PV="$(ver_rs 3 '-')"
+
+DESCRIPTION="ttyd, a simple command-line tool for sharing terminal over the web"
+HOMEPAGE="https://github.com/tsl0922/ttyd"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/tsl0922/ttyd.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/tsl0922/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+DEPEND="
+	dev-libs/json-c:=
+	dev-libs/libuv:=
+	net-libs/libwebsockets:=[libuv,ssl]
+	sys-libs/zlib:=
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_install() {
+	dobin ../${P}_build/${PN}
+	doman man/*.1
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}