[gentoo-commits] repo/gentoo:master commit in: www-apps/ttyd/
commit: cd709503204aeb073204a2cbc97412db06a1c181 Author: Mike Pagano gentoo org> AuthorDate: Thu Apr 18 19:42:25 2024 + Commit: Mike Pagano gentoo org> CommitDate: Thu Apr 18 19:42:25 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd709503 www-apps/ttyd: Minor qa fixes Signed-off-by: Mike Pagano gentoo.org> www-apps/ttyd/ttyd-1.7.7.ebuild | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/www-apps/ttyd/ttyd-1.7.7.ebuild b/www-apps/ttyd/ttyd-1.7.7.ebuild index 3fdbd114e567..c8e5e4ed0059 100644 --- a/www-apps/ttyd/ttyd-1.7.7.ebuild +++ b/www-apps/ttyd/ttyd-1.7.7.ebuild @@ -18,10 +18,10 @@ else KEYWORDS="~amd64" fi +S="${WORKDIR}/${PN}-${MY_PV}" LICENSE="MIT" SLOT="0" IUSE="mbedtls" - DEPEND=" dev-libs/json-c:= dev-libs/libuv:= @@ -31,8 +31,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -S="${WORKDIR}/${PN}-${MY_PV}" - src_install() { cmake_src_install
[gentoo-commits] repo/gentoo:master commit in: www-apps/ttyd/
commit: b483bd21fbc3a0542ad6de2748e8d95c2a2c4d34 Author: Mike Pagano gentoo org> AuthorDate: Thu Apr 18 19:44:51 2024 + Commit: Mike Pagano gentoo org> CommitDate: Thu Apr 18 19:44:51 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b483bd21 www-apps/ttyd: Minor qa fixes Signed-off-by: Mike Pagano gentoo.org> www-apps/ttyd/ttyd-.ebuild | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/www-apps/ttyd/ttyd-.ebuild b/www-apps/ttyd/ttyd-.ebuild index 3fdbd114e567..c8e5e4ed0059 100644 --- a/www-apps/ttyd/ttyd-.ebuild +++ b/www-apps/ttyd/ttyd-.ebuild @@ -18,10 +18,10 @@ else KEYWORDS="~amd64" fi +S="${WORKDIR}/${PN}-${MY_PV}" LICENSE="MIT" SLOT="0" IUSE="mbedtls" - DEPEND=" dev-libs/json-c:= dev-libs/libuv:= @@ -31,8 +31,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -S="${WORKDIR}/${PN}-${MY_PV}" - src_install() { cmake_src_install
[gentoo-commits] repo/gentoo:master commit in: www-apps/ttyd/
commit: 2a91fd5dfcc8b9a53b0ec2ac2636df786bcf4f84 Author: Mike Pagano gentoo org> AuthorDate: Thu Apr 18 19:43:38 2024 + Commit: Mike Pagano gentoo org> CommitDate: Thu Apr 18 19:43:38 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a91fd5d www-apps/ttyd: Minor QA fixes Signed-off-by: Mike Pagano gentoo.org> www-apps/ttyd/ttyd-1.7.4-r1.ebuild | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/www-apps/ttyd/ttyd-1.7.4-r1.ebuild b/www-apps/ttyd/ttyd-1.7.4-r1.ebuild index a5ecb9226066..19cbc8e5a9d8 100644 --- a/www-apps/ttyd/ttyd-1.7.4-r1.ebuild +++ b/www-apps/ttyd/ttyd-1.7.4-r1.ebuild @@ -18,10 +18,10 @@ else KEYWORDS="amd64" fi +S="${WORKDIR}/${PN}-${MY_PV}" LICENSE="MIT" SLOT="0" IUSE="mbedtls" - DEPEND=" dev-libs/json-c:= dev-libs/libuv:= @@ -31,8 +31,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -S="${WORKDIR}/${PN}-${MY_PV}" - src_install() { cmake_src_install
[gentoo-commits] repo/gentoo:master commit in: www-apps/ttyd/
commit: 6afc3cddd1b788302162dc8324e9e265698840d6 Author: Mike Pagano gentoo org> AuthorDate: Mon Apr 8 16:39:03 2024 + Commit: Mike Pagano gentoo org> CommitDate: Mon Apr 8 16:39:03 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6afc3cdd www-apps/ttyd: drop 1.7.4 Signed-off-by: Mike Pagano gentoo.org> www-apps/ttyd/ttyd-1.7.4.ebuild | 40 1 file changed, 40 deletions(-) diff --git a/www-apps/ttyd/ttyd-1.7.4.ebuild b/www-apps/ttyd/ttyd-1.7.4.ebuild deleted file mode 100644 index f8f684ac77b4.. --- a/www-apps/ttyd/ttyd-1.7.4.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2024 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} == "" ]]; 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 -}
[gentoo-commits] repo/gentoo:master commit in: www-apps/ttyd/
commit: b3ee15a748e9b24e4b5f2361edc644020b87d078 Author: Mike Pagano gentoo org> AuthorDate: Sun Mar 31 16:21:45 2024 + Commit: Mike Pagano gentoo org> CommitDate: Sun Mar 31 16:21:45 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3ee15a7 www-apps/ttyd: stabilize 1.7.4-r1 for amd64 Signed-off-by: Mike Pagano gentoo.org> www-apps/ttyd/ttyd-1.7.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www-apps/ttyd/ttyd-1.7.4-r1.ebuild b/www-apps/ttyd/ttyd-1.7.4-r1.ebuild index 3fdbd114e567..a5ecb9226066 100644 --- a/www-apps/ttyd/ttyd-1.7.4-r1.ebuild +++ b/www-apps/ttyd/ttyd-1.7.4-r1.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == "" ]]; then inherit git-r3 else SRC_URI="https://github.com/tsl0922/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="amd64" fi LICENSE="MIT"
[gentoo-commits] repo/gentoo:master commit in: www-apps/ttyd/
commit: 654f6f738f96c43eda19d96c1b128add2a9fa278 Author: Mike Pagano gentoo org> AuthorDate: Sat Mar 30 22:56:06 2024 + Commit: Mike Pagano gentoo org> CommitDate: Sat Mar 30 22:56:06 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=654f6f73 www-apps/ttyd: add 1.7.7 Signed-off-by: Mike Pagano gentoo.org> www-apps/ttyd/Manifest | 1 + www-apps/ttyd/ttyd-1.7.7.ebuild | 42 + 2 files changed, 43 insertions(+) diff --git a/www-apps/ttyd/Manifest b/www-apps/ttyd/Manifest index 71c8cb1fc368..0b831bb22551 100644 --- a/www-apps/ttyd/Manifest +++ b/www-apps/ttyd/Manifest @@ -1 +1,2 @@ DIST ttyd-1.7.4.tar.gz 603483 BLAKE2B 745ad302fdf17f31d941d3ae4b69b70257f87f3b6d624f3678e83269901577370fc6296726d8b2c61e94469f9970257b1192bcc2299fb0855bd0f3ea5960a498 SHA512 bbaa56389c224db9438b6dcce696deb0eeedfdf9b3a68cbc4c01c155340f71558e1d90c3fabe9a52de180728792b8dc7deed0c3512acdc246d651270d7fb82c6 +DIST ttyd-1.7.7.tar.gz 621347 BLAKE2B 6d6524437fcbde1141c3a256eb1fc21877df1b67586b18053ca05f98202cdd95ac1daf968700e93ff2287b72c93a1195aecf1c424f995c30c619a3b55d3690e4 SHA512 0cc643223c603dfbd32bc8233e6d2b8d59efd0b1208ef684277ff690fd92ca9ce242b8ea229a5621c43301ce99f95ee56fbe1f3b8df47329be89c3d0658d7663 diff --git a/www-apps/ttyd/ttyd-1.7.7.ebuild b/www-apps/ttyd/ttyd-1.7.7.ebuild new file mode 100644 index ..3fdbd114e567 --- /dev/null +++ b/www-apps/ttyd/ttyd-1.7.7.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2024 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} == "" ]]; 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" +IUSE="mbedtls" + +DEPEND=" + dev-libs/json-c:= + dev-libs/libuv:= + net-libs/libwebsockets:=[libuv,mbedtls=,ssl] + sys-libs/zlib:= + !mbedtls? ( dev-libs/openssl:= ) +" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${PN}-${MY_PV}" + +src_install() { + cmake_src_install + + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + newconfd "${FILESDIR}/${PN}.confd" "${PN}" + systemd_dounit "${FILESDIR}"/${PN}.service +}
[gentoo-commits] repo/gentoo:master commit in: www-apps/ttyd/
commit: d19cb57201ce6c6ea4a7da5646cd02a9a8b579fa Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Sun Jan 21 09:38:56 2024 + Commit: Mike Pagano gentoo org> CommitDate: Sun Jan 28 22:42:18 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d19cb572 www-apps/ttyd: fix deps and install 1. Unless 'net-libs/libwebsockets[mbedtls]' is installed, ttyd links with 'dev-libs/openssl:=', so dependency on it should be added. 2. Use 'cmake_src_install' to install the binary and manpage. Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> Closes: https://github.com/gentoo/gentoo/pull/34937 Signed-off-by: Mike Pagano gentoo.org> www-apps/ttyd/metadata.xml | 3 +++ www-apps/ttyd/{ttyd-.ebuild => ttyd-1.7.4-r1.ebuild} | 10 ++ www-apps/ttyd/ttyd-.ebuild | 10 ++ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/www-apps/ttyd/metadata.xml b/www-apps/ttyd/metadata.xml index cbc3ff79c423..6941e9b4ef09 100644 --- a/www-apps/ttyd/metadata.xml +++ b/www-apps/ttyd/metadata.xml @@ -4,6 +4,9 @@ mpag...@gentoo.org + + Use mbedTLS replacement for OpenSSL + tsl0922/ttyd diff --git a/www-apps/ttyd/ttyd-.ebuild b/www-apps/ttyd/ttyd-1.7.4-r1.ebuild similarity index 83% copy from www-apps/ttyd/ttyd-.ebuild copy to www-apps/ttyd/ttyd-1.7.4-r1.ebuild index adbcac55b7f7..3fdbd114e567 100644 --- a/www-apps/ttyd/ttyd-.ebuild +++ b/www-apps/ttyd/ttyd-1.7.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,20 +20,22 @@ fi LICENSE="MIT" SLOT="0" +IUSE="mbedtls" DEPEND=" dev-libs/json-c:= dev-libs/libuv:= - net-libs/libwebsockets:=[libuv,ssl] + net-libs/libwebsockets:=[libuv,mbedtls=,ssl] sys-libs/zlib:= + !mbedtls? ( dev-libs/openssl:= ) " RDEPEND="${DEPEND}" S="${WORKDIR}/${PN}-${MY_PV}" src_install() { - dobin ../${P}_build/${PN} - doman man/*.1 + cmake_src_install + newinitd "${FILESDIR}/${PN}.initd" "${PN}" newconfd "${FILESDIR}/${PN}.confd" "${PN}" systemd_dounit "${FILESDIR}"/${PN}.service diff --git a/www-apps/ttyd/ttyd-.ebuild b/www-apps/ttyd/ttyd-.ebuild index adbcac55b7f7..3fdbd114e567 100644 --- a/www-apps/ttyd/ttyd-.ebuild +++ b/www-apps/ttyd/ttyd-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,20 +20,22 @@ fi LICENSE="MIT" SLOT="0" +IUSE="mbedtls" DEPEND=" dev-libs/json-c:= dev-libs/libuv:= - net-libs/libwebsockets:=[libuv,ssl] + net-libs/libwebsockets:=[libuv,mbedtls=,ssl] sys-libs/zlib:= + !mbedtls? ( dev-libs/openssl:= ) " RDEPEND="${DEPEND}" S="${WORKDIR}/${PN}-${MY_PV}" src_install() { - dobin ../${P}_build/${PN} - doman man/*.1 + cmake_src_install + newinitd "${FILESDIR}/${PN}.initd" "${PN}" newconfd "${FILESDIR}/${PN}.confd" "${PN}" systemd_dounit "${FILESDIR}"/${PN}.service
[gentoo-commits] repo/gentoo:master commit in: www-apps/ttyd/
commit: b94052d2b16dcf8be734c216aa9386d23cd41d61 Author: Mike Pagano gentoo org> AuthorDate: Sat Jan 6 19:24:16 2024 + Commit: Mike Pagano gentoo org> CommitDate: Sat Jan 6 19:24:16 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b94052d2 www-apps/ttyd: stabilize 1.7.4 for amd64 Signed-off-by: Mike Pagano gentoo.org> www-apps/ttyd/ttyd-1.7.4.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www-apps/ttyd/ttyd-1.7.4.ebuild b/www-apps/ttyd/ttyd-1.7.4.ebuild index adbcac55b7f7..f8f684ac77b4 100644 --- a/www-apps/ttyd/ttyd-1.7.4.ebuild +++ b/www-apps/ttyd/ttyd-1.7.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,7 +15,7 @@ if [[ ${PV} == "" ]]; then inherit git-r3 else SRC_URI="https://github.com/tsl0922/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="amd64" fi LICENSE="MIT"
[gentoo-commits] repo/gentoo:master commit in: www-apps/ttyd/
commit: ba6dfb2ee793f947a679354e9a334bf06a0be5f5 Author: Mike Pagano gentoo org> AuthorDate: Wed Oct 25 17:23:20 2023 + Commit: Mike Pagano gentoo org> CommitDate: Wed Oct 25 17:23:20 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba6dfb2e www-apps/ttyd: drop 1.7.3-r1 Signed-off-by: Mike Pagano gentoo.org> www-apps/ttyd/Manifest | 1 - www-apps/ttyd/ttyd-1.7.3-r1.ebuild | 40 -- 2 files changed, 41 deletions(-) diff --git a/www-apps/ttyd/Manifest b/www-apps/ttyd/Manifest index 883fcd4ae400..71c8cb1fc368 100644 --- a/www-apps/ttyd/Manifest +++ b/www-apps/ttyd/Manifest @@ -1,2 +1 @@ -DIST ttyd-1.7.3.tar.gz 579492 BLAKE2B 14b66dbe83c0ccb601a6e3bf35a804f69f679387c9aca2f55a055dda85b2e3a396ddb4f9a3fb56575d0554837faf1d5c090cf66f4e7571201323659db3feb0b7 SHA512 e0900e2b4620095717d0f32206d08177ce74bc2f24cd9c20793cc2e370a8ee961272b73698b0dda857360703df20378c080293dfdfd287ae863801d338c8b2a4 DIST ttyd-1.7.4.tar.gz 603483 BLAKE2B 745ad302fdf17f31d941d3ae4b69b70257f87f3b6d624f3678e83269901577370fc6296726d8b2c61e94469f9970257b1192bcc2299fb0855bd0f3ea5960a498 SHA512 bbaa56389c224db9438b6dcce696deb0eeedfdf9b3a68cbc4c01c155340f71558e1d90c3fabe9a52de180728792b8dc7deed0c3512acdc246d651270d7fb82c6 diff --git a/www-apps/ttyd/ttyd-1.7.3-r1.ebuild b/www-apps/ttyd/ttyd-1.7.3-r1.ebuild deleted file mode 100644 index adbcac55b7f7.. --- a/www-apps/ttyd/ttyd-1.7.3-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# 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} == "" ]]; 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 -}
[gentoo-commits] repo/gentoo:master commit in: www-apps/ttyd/files/, www-apps/ttyd/
commit: 1ac92d67ea84589610be27ce2ad7deeca90aff43 Author: Mike Pagano gentoo org> AuthorDate: Tue Oct 3 22:42:04 2023 + Commit: Mike Pagano gentoo org> CommitDate: Tue Oct 3 22:42:26 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ac92d67 www-apps/ttyd: add 1.7.4 Signed-off-by: Mike Pagano gentoo.org> www-apps/ttyd/Manifest | 1 + www-apps/ttyd/files/ttyd.confd | 17 - www-apps/ttyd/files/ttyd.service | 2 +- www-apps/ttyd/ttyd-1.7.4.ebuild | 40 4 files changed, 54 insertions(+), 6 deletions(-) diff --git a/www-apps/ttyd/Manifest b/www-apps/ttyd/Manifest index 4039ce4e90bd..883fcd4ae400 100644 --- a/www-apps/ttyd/Manifest +++ b/www-apps/ttyd/Manifest @@ -1 +1,2 @@ DIST ttyd-1.7.3.tar.gz 579492 BLAKE2B 14b66dbe83c0ccb601a6e3bf35a804f69f679387c9aca2f55a055dda85b2e3a396ddb4f9a3fb56575d0554837faf1d5c090cf66f4e7571201323659db3feb0b7 SHA512 e0900e2b4620095717d0f32206d08177ce74bc2f24cd9c20793cc2e370a8ee961272b73698b0dda857360703df20378c080293dfdfd287ae863801d338c8b2a4 +DIST ttyd-1.7.4.tar.gz 603483 BLAKE2B 745ad302fdf17f31d941d3ae4b69b70257f87f3b6d624f3678e83269901577370fc6296726d8b2c61e94469f9970257b1192bcc2299fb0855bd0f3ea5960a498 SHA512 bbaa56389c224db9438b6dcce696deb0eeedfdf9b3a68cbc4c01c155340f71558e1d90c3fabe9a52de180728792b8dc7deed0c3512acdc246d651270d7fb82c6 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, --credentialCredential for Basic Authentication (format: username:password) +#-U, --socket-owner User owner of the UNIX domain socket file, when enabled (eg: user:group) +#-c, --credentialCredential 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, --signalSignal 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=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-caSSL 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 ..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
[gentoo-commits] repo/gentoo:master commit in: www-apps/ttyd/
commit: 7f667b7bb4289a251ed1cb22a2164d0ba4ff5309 Author: Sam James gentoo org> AuthorDate: Fri May 5 08:12:47 2023 + Commit: Sam James gentoo org> CommitDate: Fri May 5 08:18:22 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f667b7b www-apps/ttyd: fix RDEPEND Was missing RDEPEND=... so was blank. Also drop git from and cmake from BDEPEND, the eclasses should handle that. Signed-off-by: Sam James gentoo.org> www-apps/ttyd/{ttyd-1.7.3.ebuild => ttyd-1.7.3-r1.ebuild} | 5 ++--- www-apps/ttyd/ttyd-.ebuild| 6 ++ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/www-apps/ttyd/ttyd-1.7.3.ebuild b/www-apps/ttyd/ttyd-1.7.3-r1.ebuild similarity index 96% rename from www-apps/ttyd/ttyd-1.7.3.ebuild rename to www-apps/ttyd/ttyd-1.7.3-r1.ebuild index 80b189a914d4..adbcac55b7f7 100644 --- a/www-apps/ttyd/ttyd-1.7.3.ebuild +++ b/www-apps/ttyd/ttyd-1.7.3-r1.ebuild @@ -21,14 +21,13 @@ fi LICENSE="MIT" SLOT="0" -BDEPEND="dev-util/cmake" - DEPEND=" dev-libs/json-c:= dev-libs/libuv:= net-libs/libwebsockets:=[libuv,ssl] sys-libs/zlib:= - " +" +RDEPEND="${DEPEND}" S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/www-apps/ttyd/ttyd-.ebuild b/www-apps/ttyd/ttyd-.ebuild index 14c795388490..adbcac55b7f7 100644 --- a/www-apps/ttyd/ttyd-.ebuild +++ b/www-apps/ttyd/ttyd-.ebuild @@ -21,15 +21,13 @@ fi LICENSE="MIT" SLOT="0" -BDEPEND="dev-util/cmake" - DEPEND=" - dev-vcs/git:= dev-libs/json-c:= dev-libs/libuv:= net-libs/libwebsockets:=[libuv,ssl] sys-libs/zlib:= - " +" +RDEPEND="${DEPEND}" S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: www-apps/ttyd/files/, www-apps/ttyd/
commit: 97ee15648f49af75108356a4a8033b61de46ef58 Author: Mike Pagano gentoo org> AuthorDate: Thu May 4 22:49:38 2023 + Commit: Mike Pagano gentoo org> CommitDate: Thu May 4 22:49:38 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97ee1564 www-apps/ttyd: new package, add 1.7.3, ttyd, a simple command-line tool for sharing terminal over the web Signed-off-by: Mike Pagano gentoo.org> www-apps/ttyd/Manifest | 1 + www-apps/ttyd/files/ttyd.confd | 29 +++ www-apps/ttyd/files/ttyd.initd | 14 ++ www-apps/ttyd/files/ttyd.service | 10 ++ www-apps/ttyd/metadata.xml | 10 ++ www-apps/ttyd/ttyd-1.7.3.ebuild | 41 +++ www-apps/ttyd/ttyd-.ebuild | 42 7 files changed, 147 insertions(+) diff --git a/www-apps/ttyd/Manifest b/www-apps/ttyd/Manifest new file mode 100644 index ..4039ce4e90bd --- /dev/null +++ b/www-apps/ttyd/Manifest @@ -0,0 +1 @@ +DIST ttyd-1.7.3.tar.gz 579492 BLAKE2B 14b66dbe83c0ccb601a6e3bf35a804f69f679387c9aca2f55a055dda85b2e3a396ddb4f9a3fb56575d0554837faf1d5c090cf66f4e7571201323659db3feb0b7 SHA512 e0900e2b4620095717d0f32206d08177ce74bc2f24cd9c20793cc2e370a8ee961272b73698b0dda857360703df20378c080293dfdfd287ae863801d338c8b2a4 diff --git a/www-apps/ttyd/files/ttyd.confd b/www-apps/ttyd/files/ttyd.confd new file mode 100644 index ..57d24e3fb394 --- /dev/null +++ b/www-apps/ttyd/files/ttyd.confd @@ -0,0 +1,29 @@ +# conf.d file for ttyd + +# Please check man 1 ttyd for more information about the options +# +# 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, --credentialCredential for Basic Authentication (format: username:password) +#-u, --uid User id to run with +#-g, --gid Group id to run with +#-s, --signalSignal 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 +#-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 +#-m, --max-clients Maximum clients to support (default: 0, no limit) +#-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 +#-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-caSSL CA file path for client certificate verification +#-d, --debug Set log level (default: 7) +# login--- Login with system accounts + +TTYD_OPTS="login" diff --git a/www-apps/ttyd/files/ttyd.initd b/www-apps/ttyd/files/ttyd.initd new file mode 100644 index ..9d1afdec19da --- /dev/null +++ b/www-apps/ttyd/files/ttyd.initd @@ -0,0 +1,14 @@ +#!/sbin/openrc-run +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +name="ttyd daemon" +pidfile="/var/run/ttyd.pid" +command="/usr/bin/ttyd" +command_args="${TTYD_OPTS}" +command_background="true" +start_stop_daemon_args="-b" + +depend() { + use logger +} diff --git a/www-apps/ttyd/files/ttyd.service b/www-apps/ttyd/files/ttyd.service new file mode 100644 index ..caa95ab1a910 --- /dev/null +++ b/www-apps/ttyd/files/ttyd.service @@ -0,0 +1,10 @@ +[Unit] +Description=Terminal over HTTP + +[Service] +User=root +ExecStart=/usr/bin/ttyd -p 9000 login +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/www-apps/ttyd/metadata.xml b/www-apps/ttyd/metadata.xml new file mode 100644 index ..cbc3ff79c423 --- /dev/null +++ b/www-apps/ttyd/metadata.xml @@ -0,0 +1,10 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + + mpag...@gentoo.org + + + tsl0922/ttyd + + diff --git a/www-apps/ttyd/ttyd-1.7.3.ebuild b/www-apps/ttyd/ttyd-1.7.3.ebuild new file mode 100644 index ..80b189a914d4 --- /dev/null +++ b/www-apps/ttyd/ttyd-1.7.3.ebuild @@ -0,0 +1,41 @@ +# 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