[gentoo-commits] repo/proj/guru:dev commit in: net-misc/tinyssh/, net-misc/tinyssh/files/
commit: 20a2fab0dc81d5a2bf6d80b17df42b6a25b8e66b Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Wed Jul 26 09:00:24 2023 + Commit: Anna Vyalkova sysrq in> CommitDate: Wed Jul 26 09:00:56 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=20a2fab0 net-misc/tinyssh: treeclean (moved to ::gentoo) Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> net-misc/tinyssh/Manifest | 2 - net-misc/tinyssh/files/tinyssh-makekey.service | 8 --- net-misc/tinyssh/files/tinyssh.confd | 7 --- net-misc/tinyssh/files/tinyssh.initd | 30 --- net-misc/tinyssh/files/tinyssh.service | 9 net-misc/tinyssh/files/tinyssh.socket | 13 - net-misc/tinyssh/metadata.xml | 40 --- net-misc/tinyssh/tinyssh-20220801.ebuild | 71 -- net-misc/tinyssh/tinyssh-20230101.ebuild | 71 -- net-misc/tinyssh/tinyssh-.ebuild | 71 -- 10 files changed, 322 deletions(-) diff --git a/net-misc/tinyssh/Manifest b/net-misc/tinyssh/Manifest deleted file mode 100644 index a02f1ece6..0 --- a/net-misc/tinyssh/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST tinyssh-20220801.tar.gz 249071 BLAKE2B 77509d2e2c7f84d675bb1f64df6ee7925e5c1f3f1be998b8438fa6e63954fca5dcbc724eb9993f22267f23e840e5f66077d48dfaba0f8d3c0b4b51d5098b457f SHA512 fe9f45f7a06c7c30d56a2ce32e656b1d3a8d12ccdb99dfd4087a145fdf4c5b54a1f1739f5a83dc8158f1164f36c89c6e349b370e1946ca0cfc81d27cae143135 -DIST tinyssh-20230101.tar.gz 249091 BLAKE2B 5efb6eab07c136763ab27588661618763d2ca174dce4b0f4b5fd5dcca56044f8361342de780931070cff8efe43f6efa68eaf912e9ae38febfcff733f79e23018 SHA512 6beaf266058a89a78c710abd1a02feff0641a93d0d92aa07a1ad1ba3f6b3344bc312bb5a4cd5c06c6dcc83d25e48a801f9cfcfbb3de0f73904f36d32d4430482 diff --git a/net-misc/tinyssh/files/tinyssh-makekey.service b/net-misc/tinyssh/files/tinyssh-makekey.service deleted file mode 100644 index 841a516ce..0 --- a/net-misc/tinyssh/files/tinyssh-makekey.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=TinySSH Key Generation -ConditionPathIsDirectory=!/etc/tinyssh/keys - -[Service] -ExecStart=/usr/sbin/tinysshd-makekey /etc/tinyssh/keys -Type=oneshot -RemainAfterExit=true diff --git a/net-misc/tinyssh/files/tinyssh.confd b/net-misc/tinyssh/files/tinyssh.confd deleted file mode 100644 index d1aefde2b..0 --- a/net-misc/tinyssh/files/tinyssh.confd +++ /dev/null @@ -1,7 +0,0 @@ -# TinySSH config file for /etc/init.d/tinyssh - -#TINYSSH_PORT="22" -#TINYSSH_IP="0.0.0.0" -#TINYSSH_CONFDIR="/etc/tinyssh" -#TINYSSH_KEYDIR="${TINYSSH_CONFDIR}/keys" -#TINYSSH_OPTS="-l -v" diff --git a/net-misc/tinyssh/files/tinyssh.initd b/net-misc/tinyssh/files/tinyssh.initd deleted file mode 100644 index 095a7f4e1..0 --- a/net-misc/tinyssh/files/tinyssh.initd +++ /dev/null @@ -1,30 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -TINYSSH_CONFDIR="${TINYSSH_CONFDIR:-/etc/tinyssh}" -TINYSSH_KEYDIR="${TINYSSH_KEYDIR:-${TINYSSH_CONFDIR}/keys}" - -TINYSSHD="/usr/sbin/tinysshd" -MAKEKEY="${TINYSSHD}-makekey" -PRINTKEY="/usr/bin/tinysshd-printkey" - -command="/usr/bin/tcpserver" -command_args="-HRDl0 ${TINYSSH_IP:-0.0.0.0} ${TINYSSH_PORT:-22} - ${TINYSSHD} ${TINYSSH_OPTS:--l -v} ${TINYSSH_KEYDIR}" -command_background=yes -pidfile="/run/${RC_SVCNAME}.pid" -start_stop_daemon_args="${SSD_OPTS}" - -depend() { - use net -} - -start_pre() { - if [ "${RC_CMD}" != "restart" ]; then - checkpath -d "${TINYSSH_CONFDIR}" - if ! ${PRINTKEY} "${TINYSSH_KEYDIR}" >/dev/null 2>&1; then - ${MAKEKEY} "${TINYSSH_KEYDIR}" || return 1 - fi - fi -} diff --git a/net-misc/tinyssh/files/tinyssh.service b/net-misc/tinyssh/files/tinyssh.service deleted file mode 100644 index f0fe93be7..0 --- a/net-misc/tinyssh/files/tinyssh.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=TinySSH Per-Connection Daemon -Documentation=https://tinyssh.org -After=tinyssh-makekey.service - -[Service] -ExecStart=/usr/sbin/tinysshd /etc/tinyssh/keys -StandardInput=socket -StandardError=journal diff --git a/net-misc/tinyssh/files/tinyssh.socket b/net-misc/tinyssh/files/tinyssh.socket deleted file mode 100644 index 9ca2b16b3..0 --- a/net-misc/tinyssh/files/tinyssh.socket +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=TinySSH service (socket-activated) -Documentation=https://tinyssh.org -Wants=tinyssh-makekey.service - -[Socket] -ListenStream=%i -Accept=true -KeepAlive=true -IPTOS=low-delay - -[Install] -WantedBy=sockets.target diff --git a/net-misc/tinyssh/metadata.xml b/net-misc/tinyssh/metadata.xml deleted file mode 100644 index 6c2fd29f7..0 --- a/net-misc/tinyssh/metadata.xml +++ /dev/null @@ -1,40 +0,0 @@ - -ht
[gentoo-commits] repo/proj/guru:dev commit in: net-misc/tinyssh/
commit: 9f92dcbfc481d575480b9f6df2b82270c7baf08c Author: Haelwenn (lanodan) Monnier hacktivis me> AuthorDate: Sun Jan 1 21:27:12 2023 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Sun Jan 1 21:27:57 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9f92dcbf net-misc/tinyssh: add 20230101 Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me> net-misc/tinyssh/Manifest | 1 + net-misc/tinyssh/{tinyssh-.ebuild => tinyssh-20230101.ebuild} | 4 ++-- net-misc/tinyssh/tinyssh-.ebuild | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/net-misc/tinyssh/Manifest b/net-misc/tinyssh/Manifest index 739578697..a02f1ece6 100644 --- a/net-misc/tinyssh/Manifest +++ b/net-misc/tinyssh/Manifest @@ -1 +1,2 @@ DIST tinyssh-20220801.tar.gz 249071 BLAKE2B 77509d2e2c7f84d675bb1f64df6ee7925e5c1f3f1be998b8438fa6e63954fca5dcbc724eb9993f22267f23e840e5f66077d48dfaba0f8d3c0b4b51d5098b457f SHA512 fe9f45f7a06c7c30d56a2ce32e656b1d3a8d12ccdb99dfd4087a145fdf4c5b54a1f1739f5a83dc8158f1164f36c89c6e349b370e1946ca0cfc81d27cae143135 +DIST tinyssh-20230101.tar.gz 249091 BLAKE2B 5efb6eab07c136763ab27588661618763d2ca174dce4b0f4b5fd5dcca56044f8361342de780931070cff8efe43f6efa68eaf912e9ae38febfcff733f79e23018 SHA512 6beaf266058a89a78c710abd1a02feff0641a93d0d92aa07a1ad1ba3f6b3344bc312bb5a4cd5c06c6dcc83d25e48a801f9cfcfbb3de0f73904f36d32d4430482 diff --git a/net-misc/tinyssh/tinyssh-.ebuild b/net-misc/tinyssh/tinyssh-20230101.ebuild similarity index 96% copy from net-misc/tinyssh/tinyssh-.ebuild copy to net-misc/tinyssh/tinyssh-20230101.ebuild index 99c90d3e6..cd991afca 100644 --- a/net-misc/tinyssh/tinyssh-.ebuild +++ b/net-misc/tinyssh/tinyssh-20230101.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ else KEYWORDS="~amd64 ~x86" fi -LICENSE="public-domain" +LICENSE="CC0-1.0" SLOT="0" IUSE="+sodium" diff --git a/net-misc/tinyssh/tinyssh-.ebuild b/net-misc/tinyssh/tinyssh-.ebuild index 99c90d3e6..cd991afca 100644 --- a/net-misc/tinyssh/tinyssh-.ebuild +++ b/net-misc/tinyssh/tinyssh-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ else KEYWORDS="~amd64 ~x86" fi -LICENSE="public-domain" +LICENSE="CC0-1.0" SLOT="0" IUSE="+sodium"
[gentoo-commits] repo/proj/guru:dev commit in: net-misc/tinyssh/
commit: 2aa3d2f13a0d6e893123515df790565103b6b506 Author: Haelwenn (lanodan) Monnier hacktivis me> AuthorDate: Sun Jan 1 21:20:36 2023 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Sun Jan 1 21:27:57 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2aa3d2f1 net-misc/tinyssh: drop 20220222 Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me> net-misc/tinyssh/Manifest| 1 - net-misc/tinyssh/tinyssh-20220222.ebuild | 71 2 files changed, 72 deletions(-) diff --git a/net-misc/tinyssh/Manifest b/net-misc/tinyssh/Manifest index 3e400bcbb..739578697 100644 --- a/net-misc/tinyssh/Manifest +++ b/net-misc/tinyssh/Manifest @@ -1,2 +1 @@ -DIST tinyssh-20220222.tar.gz 248788 BLAKE2B cabcd12d3cd6d862fea9c4cba03b72ed2edebe2584feb5cdcff9294b05f41e553fb1f9f127306a63890bc6481eb88b04953f357cf9c505e4678f85f7a38128c9 SHA512 ff6285abd5a963a031cb21fbfdd8fe38e7d7a4d17b053ebc2abeb503fdd2afb5d3a3c0921ea53624ae3d8c29cd64a7fa6810e2c053aaf4d2ad949d7c4ba21ad0 DIST tinyssh-20220801.tar.gz 249071 BLAKE2B 77509d2e2c7f84d675bb1f64df6ee7925e5c1f3f1be998b8438fa6e63954fca5dcbc724eb9993f22267f23e840e5f66077d48dfaba0f8d3c0b4b51d5098b457f SHA512 fe9f45f7a06c7c30d56a2ce32e656b1d3a8d12ccdb99dfd4087a145fdf4c5b54a1f1739f5a83dc8158f1164f36c89c6e349b370e1946ca0cfc81d27cae143135 diff --git a/net-misc/tinyssh/tinyssh-20220222.ebuild b/net-misc/tinyssh/tinyssh-20220222.ebuild deleted file mode 100644 index 27fb9b615..0 --- a/net-misc/tinyssh/tinyssh-20220222.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd toolchain-funcs - -DESCRIPTION="A small SSH server with state-of-the-art cryptography" -HOMEPAGE="https://tinyssh.org"; -if [[ "${PV}" == "" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/janmojzis/tinyssh.git"; -else - SRC_URI="https://github.com/janmojzis/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="public-domain" -SLOT="0" - -IUSE="+sodium" - -DEPEND=" - sodium? ( dev-libs/libsodium ) -" -RDEPEND=" - ${DEPEND} - sys-apps/ucspi-tcp -" - -src_prepare() { - # Leave optimization level to user CFLAGS - sed -i 's/-Os -fomit-frame-pointer -funroll-loops//g' ./conf-cc || die - - # Use make-tinysshcc.sh script, which has no tests and doesn't execute - # binaries. See https://github.com/janmojzis/tinyssh/issues/2 - sed -i 's/make-tinyssh\.sh/make-tinysshcc.sh/g' ./Makefile || die - - default -} - -src_compile() { - if use sodium - then - emake \ - CC="$(tc-getCC)" - LIBS="-lsodium" \ - CFLAGS="${CFLAGS} -I/usr/include/sodium" \ - LDFLAGS="${LDFLAGS} -L/usr/lib" - else - emake CC="$(tc-getCC)" - fi -} - -src_install() { - dosbin build/bin/tinysshd{,-makekey} - dobin build/bin/tinysshd-printkey - doman man/* - - newinitd "${FILESDIR}/${PN}.initd" "${PN}" - newconfd "${FILESDIR}/${PN}.confd" "${PN}" - - systemd_newunit "${FILESDIR}/${PN}.service" "${PN}@.service" - systemd_newunit "${FILESDIR}/${PN}.socket" "${PN}@.socket" - systemd_dounit "${FILESDIR}/${PN}-makekey.service" -} - -pkg_postinst() { - einfo "TinySSH is in beta stage, and ready for production use." - einfo "See https://tinyssh.org for more information." -}
[gentoo-commits] repo/proj/guru:dev commit in: net-misc/tinyssh/
commit: fb186ccf872eaf2f989f2bc6232f934bae18fc36 Author: Haelwenn (lanodan) Monnier hacktivis me> AuthorDate: Tue Aug 2 10:31:47 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Tue Aug 2 10:32:08 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fb186ccf net-misc/tinyssh: add 20220801, drop 20210601 Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me> net-misc/tinyssh/Manifest | 2 +- net-misc/tinyssh/{tinyssh-20210601.ebuild => tinyssh-20220801.ebuild} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net-misc/tinyssh/Manifest b/net-misc/tinyssh/Manifest index 68aaf0e1a..3e400bcbb 100644 --- a/net-misc/tinyssh/Manifest +++ b/net-misc/tinyssh/Manifest @@ -1,2 +1,2 @@ -DIST tinyssh-20210601.tar.gz 248047 BLAKE2B e661ee41443fec2474a7e0b8d2291a8c81e4852ac1cb51599de2ba748fe7fba9c81478fe616f6878e8e16577dd3a1e3c748613c47627c04733e3f42015297260 SHA512 e49397fc6edce093d9a5697f3a21f18cfbb257e532c0548e9a12be28eab09bf319bdf0fef0606831e826fd6845f604347e5bc1c089f0904eb4e5ab46c339 DIST tinyssh-20220222.tar.gz 248788 BLAKE2B cabcd12d3cd6d862fea9c4cba03b72ed2edebe2584feb5cdcff9294b05f41e553fb1f9f127306a63890bc6481eb88b04953f357cf9c505e4678f85f7a38128c9 SHA512 ff6285abd5a963a031cb21fbfdd8fe38e7d7a4d17b053ebc2abeb503fdd2afb5d3a3c0921ea53624ae3d8c29cd64a7fa6810e2c053aaf4d2ad949d7c4ba21ad0 +DIST tinyssh-20220801.tar.gz 249071 BLAKE2B 77509d2e2c7f84d675bb1f64df6ee7925e5c1f3f1be998b8438fa6e63954fca5dcbc724eb9993f22267f23e840e5f66077d48dfaba0f8d3c0b4b51d5098b457f SHA512 fe9f45f7a06c7c30d56a2ce32e656b1d3a8d12ccdb99dfd4087a145fdf4c5b54a1f1739f5a83dc8158f1164f36c89c6e349b370e1946ca0cfc81d27cae143135 diff --git a/net-misc/tinyssh/tinyssh-20210601.ebuild b/net-misc/tinyssh/tinyssh-20220801.ebuild similarity index 97% rename from net-misc/tinyssh/tinyssh-20210601.ebuild rename to net-misc/tinyssh/tinyssh-20220801.ebuild index df6be2ec4..27fb9b615 100644 --- a/net-misc/tinyssh/tinyssh-20210601.ebuild +++ b/net-misc/tinyssh/tinyssh-20220801.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7
[gentoo-commits] repo/proj/guru:dev commit in: net-misc/tinyssh/files/
commit: 5a6d63e70e52ecfaeebc9011d1dbedf36c719112 Author: Alessandro Barbieri gmail com> AuthorDate: Thu Apr 28 08:01:33 2022 + Commit: Alessandro Barbieri gmail com> CommitDate: Thu Apr 28 08:01:33 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5a6d63e7 net-misc/tinyssh: fix header Signed-off-by: Alessandro Barbieri gmail.com> net-misc/tinyssh/files/tinyssh.initd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/tinyssh/files/tinyssh.initd b/net-misc/tinyssh/files/tinyssh.initd index 2fc28e5f7..095a7f4e1 100644 --- a/net-misc/tinyssh/files/tinyssh.initd +++ b/net-misc/tinyssh/files/tinyssh.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 TINYSSH_CONFDIR="${TINYSSH_CONFDIR:-/etc/tinyssh}"
[gentoo-commits] repo/proj/guru:dev commit in: net-misc/tinyssh/
commit: de82925208bfeb2db7fbd5649a7c231c6c17c637 Author: Ronny (tastytea) Gutbrod tastytea de> AuthorDate: Mon Mar 7 13:59:27 2022 + Commit: Ronny Gutbrod tastytea de> CommitDate: Mon Mar 7 13:59:27 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=de829252 net-misc/tinyssh: Fix copyright year Signed-off-by: Ronny (tastytea) Gutbrod tastytea.de> net-misc/tinyssh/tinyssh-20220222.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/tinyssh/tinyssh-20220222.ebuild b/net-misc/tinyssh/tinyssh-20220222.ebuild index df6be2ec4..27fb9b615 100644 --- a/net-misc/tinyssh/tinyssh-20220222.ebuild +++ b/net-misc/tinyssh/tinyssh-20220222.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7
[gentoo-commits] repo/proj/guru:dev commit in: net-misc/tinyssh/
commit: d76526be2acf0fa9a8e7519344e542ee393d2a51 Author: Haelwenn (lanodan) Monnier hacktivis me> AuthorDate: Sun Feb 27 12:05:05 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Sun Feb 27 12:05:44 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d76526be net-misc/tinyssh: version bump, 20220222 Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me> net-misc/tinyssh/Manifest| 1 + net-misc/tinyssh/tinyssh-20220222.ebuild | 71 2 files changed, 72 insertions(+) diff --git a/net-misc/tinyssh/Manifest b/net-misc/tinyssh/Manifest index eb7da3e1f..68aaf0e1a 100644 --- a/net-misc/tinyssh/Manifest +++ b/net-misc/tinyssh/Manifest @@ -1 +1,2 @@ DIST tinyssh-20210601.tar.gz 248047 BLAKE2B e661ee41443fec2474a7e0b8d2291a8c81e4852ac1cb51599de2ba748fe7fba9c81478fe616f6878e8e16577dd3a1e3c748613c47627c04733e3f42015297260 SHA512 e49397fc6edce093d9a5697f3a21f18cfbb257e532c0548e9a12be28eab09bf319bdf0fef0606831e826fd6845f604347e5bc1c089f0904eb4e5ab46c339 +DIST tinyssh-20220222.tar.gz 248788 BLAKE2B cabcd12d3cd6d862fea9c4cba03b72ed2edebe2584feb5cdcff9294b05f41e553fb1f9f127306a63890bc6481eb88b04953f357cf9c505e4678f85f7a38128c9 SHA512 ff6285abd5a963a031cb21fbfdd8fe38e7d7a4d17b053ebc2abeb503fdd2afb5d3a3c0921ea53624ae3d8c29cd64a7fa6810e2c053aaf4d2ad949d7c4ba21ad0 diff --git a/net-misc/tinyssh/tinyssh-20220222.ebuild b/net-misc/tinyssh/tinyssh-20220222.ebuild new file mode 100644 index 0..df6be2ec4 --- /dev/null +++ b/net-misc/tinyssh/tinyssh-20220222.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd toolchain-funcs + +DESCRIPTION="A small SSH server with state-of-the-art cryptography" +HOMEPAGE="https://tinyssh.org"; +if [[ "${PV}" == "" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/janmojzis/tinyssh.git"; +else + SRC_URI="https://github.com/janmojzis/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="public-domain" +SLOT="0" + +IUSE="+sodium" + +DEPEND=" + sodium? ( dev-libs/libsodium ) +" +RDEPEND=" + ${DEPEND} + sys-apps/ucspi-tcp +" + +src_prepare() { + # Leave optimization level to user CFLAGS + sed -i 's/-Os -fomit-frame-pointer -funroll-loops//g' ./conf-cc || die + + # Use make-tinysshcc.sh script, which has no tests and doesn't execute + # binaries. See https://github.com/janmojzis/tinyssh/issues/2 + sed -i 's/make-tinyssh\.sh/make-tinysshcc.sh/g' ./Makefile || die + + default +} + +src_compile() { + if use sodium + then + emake \ + CC="$(tc-getCC)" + LIBS="-lsodium" \ + CFLAGS="${CFLAGS} -I/usr/include/sodium" \ + LDFLAGS="${LDFLAGS} -L/usr/lib" + else + emake CC="$(tc-getCC)" + fi +} + +src_install() { + dosbin build/bin/tinysshd{,-makekey} + dobin build/bin/tinysshd-printkey + doman man/* + + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + newconfd "${FILESDIR}/${PN}.confd" "${PN}" + + systemd_newunit "${FILESDIR}/${PN}.service" "${PN}@.service" + systemd_newunit "${FILESDIR}/${PN}.socket" "${PN}@.socket" + systemd_dounit "${FILESDIR}/${PN}-makekey.service" +} + +pkg_postinst() { + einfo "TinySSH is in beta stage, and ready for production use." + einfo "See https://tinyssh.org for more information." +}
[gentoo-commits] repo/proj/guru:dev commit in: net-misc/tinyssh/
commit: 9bb70039272f8454fe155332d04608b4d09e71c3 Author: Haelwenn (lanodan) Monnier hacktivis me> AuthorDate: Tue Jun 1 05:47:03 2021 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Sun Jun 13 08:15:30 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9bb70039 net-misc/tinyssh: clean version bump, 20210601 Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me> net-misc/tinyssh/Manifest | 2 +- net-misc/tinyssh/{tinyssh-20210319.ebuild => tinyssh-20210601.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/tinyssh/Manifest b/net-misc/tinyssh/Manifest index 3c80b682b..eb7da3e1f 100644 --- a/net-misc/tinyssh/Manifest +++ b/net-misc/tinyssh/Manifest @@ -1 +1 @@ -DIST tinyssh-20210319.tar.gz 245451 BLAKE2B fdbb41281edde704d660de07b9a01b48aa1fd17c596b1e7ecbe46ccc804f3499036845781c736c39d99911bcdc6aefc2b1fe354ea40972dbff55a24121629a1f SHA512 e839355fdae241ff90a2cbc95219141a2e12b2efaeb8631f2a1f7400868d93998843da5170146b13de6e10d5098acfea0ef55a0154c5fe22a093f67d4fa7ce0e +DIST tinyssh-20210601.tar.gz 248047 BLAKE2B e661ee41443fec2474a7e0b8d2291a8c81e4852ac1cb51599de2ba748fe7fba9c81478fe616f6878e8e16577dd3a1e3c748613c47627c04733e3f42015297260 SHA512 e49397fc6edce093d9a5697f3a21f18cfbb257e532c0548e9a12be28eab09bf319bdf0fef0606831e826fd6845f604347e5bc1c089f0904eb4e5ab46c339 diff --git a/net-misc/tinyssh/tinyssh-20210319.ebuild b/net-misc/tinyssh/tinyssh-20210601.ebuild similarity index 100% rename from net-misc/tinyssh/tinyssh-20210319.ebuild rename to net-misc/tinyssh/tinyssh-20210601.ebuild
[gentoo-commits] repo/proj/guru:dev commit in: net-misc/tinyssh/
commit: 837e98bcf50fee35bf2f4d5769f05b41cd168cb2 Author: Haelwenn (lanodan) Monnier hacktivis me> AuthorDate: Wed May 12 18:43:47 2021 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Wed May 12 18:43:47 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=837e98bc net-misc/tinyssh: Add live ebuild Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me> net-misc/tinyssh/tinyssh-20210319.ebuild | 9 +++-- .../tinyssh/{tinyssh-20210319.ebuild => tinyssh-.ebuild} | 9 +++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/net-misc/tinyssh/tinyssh-20210319.ebuild b/net-misc/tinyssh/tinyssh-20210319.ebuild index 1fccc0e22..113721602 100644 --- a/net-misc/tinyssh/tinyssh-20210319.ebuild +++ b/net-misc/tinyssh/tinyssh-20210319.ebuild @@ -7,11 +7,16 @@ inherit systemd DESCRIPTION="A small SSH server with state-of-the-art cryptography" HOMEPAGE="https://tinyssh.org"; -SRC_URI="https://github.com/janmojzis/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +if [[ "${PV}" == "" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/janmojzis/tinyssh.git"; +else + SRC_URI="https://github.com/janmojzis/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi LICENSE="public-domain" SLOT="0" -KEYWORDS="~amd64 ~x86" IUSE="+sodium" diff --git a/net-misc/tinyssh/tinyssh-20210319.ebuild b/net-misc/tinyssh/tinyssh-.ebuild similarity index 86% copy from net-misc/tinyssh/tinyssh-20210319.ebuild copy to net-misc/tinyssh/tinyssh-.ebuild index 1fccc0e22..48d90965d 100644 --- a/net-misc/tinyssh/tinyssh-20210319.ebuild +++ b/net-misc/tinyssh/tinyssh-.ebuild @@ -7,11 +7,16 @@ inherit systemd DESCRIPTION="A small SSH server with state-of-the-art cryptography" HOMEPAGE="https://tinyssh.org"; -SRC_URI="https://github.com/janmojzis/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +if [[ "${PV}" == "" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/janmojzis/tinyssh.git"; +else + SRC_URI="https://github.com/janmojzis/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi LICENSE="public-domain" SLOT="0" -KEYWORDS="~amd64 ~x86" IUSE="+sodium"
[gentoo-commits] repo/proj/guru:dev commit in: net-misc/tinyssh/
commit: 26a977ee328620f1220b965890ff5aa9f9009905 Author: Hans Fredrik Nordhaug gmail com> AuthorDate: Fri Apr 23 09:24:16 2021 + Commit: Hans Fredrik Nordhaug gmail com> CommitDate: Fri Apr 23 09:25:06 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=26a977ee net-misc/tinyssh: Updating to 20210319 Closes: https://bugs.gentoo.org/785199 Closes: https://bugs.gentoo.org/781698 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Hans Fredrik Nordhaug gmail.com> net-misc/tinyssh/Manifest | 2 +- .../{tinyssh-20190101.ebuild => tinyssh-20210319.ebuild} | 11 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/net-misc/tinyssh/Manifest b/net-misc/tinyssh/Manifest index b697c8266..3c80b682b 100644 --- a/net-misc/tinyssh/Manifest +++ b/net-misc/tinyssh/Manifest @@ -1 +1 @@ -DIST tinyssh-20190101.tar.gz 244848 BLAKE2B a115bca82db020970a1cd8dd27f65f0d586f291fdcbcd786802babaa82befddd39ec8651dd4d6ebc3503e8c4e5903a335a6b14dc2957bae5519e4a7dee6fd495 SHA512 bf3829a71c29e8b0d5c2a145be9dfaf05efb1b98932f34f19f76e07871da4be10022bdde4c57ca49557b69931077b451bc2efbeab38d8ef24151fb73990f1012 +DIST tinyssh-20210319.tar.gz 245451 BLAKE2B fdbb41281edde704d660de07b9a01b48aa1fd17c596b1e7ecbe46ccc804f3499036845781c736c39d99911bcdc6aefc2b1fe354ea40972dbff55a24121629a1f SHA512 e839355fdae241ff90a2cbc95219141a2e12b2efaeb8631f2a1f7400868d93998843da5170146b13de6e10d5098acfea0ef55a0154c5fe22a093f67d4fa7ce0e diff --git a/net-misc/tinyssh/tinyssh-20190101.ebuild b/net-misc/tinyssh/tinyssh-20210319.ebuild similarity index 84% rename from net-misc/tinyssh/tinyssh-20190101.ebuild rename to net-misc/tinyssh/tinyssh-20210319.ebuild index 1ad54dd70..1fccc0e22 100644 --- a/net-misc/tinyssh/tinyssh-20190101.ebuild +++ b/net-misc/tinyssh/tinyssh-20210319.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -29,7 +29,7 @@ src_prepare() { # Use make-tinysshcc.sh script, which has no tests and doesn't execute # binaries. See https://github.com/janmojzis/tinyssh/issues/2 - sed -i 's/tinyssh/tinysshcc/g' ./Makefile || die + sed -i 's/make-tinyssh\.sh/make-tinysshcc.sh/g' ./Makefile || die default } @@ -38,11 +38,12 @@ src_compile() { if use sodium then emake \ + CC="$(tc-getCC)" LIBS="-lsodium" \ - CFLAGS="$CFLAGS -I/usr/include/sodium" \ - LDFLAGS="-L/usr/lib" + CFLAGS="${CFLAGS} -I/usr/include/sodium" \ + LDFLAGS="${LDFLAGS} -L/usr/lib" else - emake + emake CC="$(tc-getCC)" fi }
[gentoo-commits] repo/proj/guru:dev commit in: net-misc/tinyssh/files/, net-misc/tinyssh/
commit: 9557f9c0c7051fde4e28bf59ee8a238175847ee1 Author: Haelwenn (lanodan) Monnier hacktivis me> AuthorDate: Sat Apr 4 22:00:35 2020 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Sat Apr 4 22:00:35 2020 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9557f9c0 net-misc/tinyssh: Import from ::lanodanOverlay Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me> net-misc/tinyssh/Manifest | 1 + net-misc/tinyssh/files/tinyssh-makekey.service | 8 net-misc/tinyssh/files/tinyssh.confd | 7 +++ net-misc/tinyssh/files/tinyssh.initd | 30 net-misc/tinyssh/files/tinyssh.service | 9 net-misc/tinyssh/files/tinyssh.socket | 13 ++ net-misc/tinyssh/metadata.xml | 19 net-misc/tinyssh/tinyssh-20190101.ebuild | 65 ++ 8 files changed, 152 insertions(+) diff --git a/net-misc/tinyssh/Manifest b/net-misc/tinyssh/Manifest new file mode 100644 index 000..b697c82 --- /dev/null +++ b/net-misc/tinyssh/Manifest @@ -0,0 +1 @@ +DIST tinyssh-20190101.tar.gz 244848 BLAKE2B a115bca82db020970a1cd8dd27f65f0d586f291fdcbcd786802babaa82befddd39ec8651dd4d6ebc3503e8c4e5903a335a6b14dc2957bae5519e4a7dee6fd495 SHA512 bf3829a71c29e8b0d5c2a145be9dfaf05efb1b98932f34f19f76e07871da4be10022bdde4c57ca49557b69931077b451bc2efbeab38d8ef24151fb73990f1012 diff --git a/net-misc/tinyssh/files/tinyssh-makekey.service b/net-misc/tinyssh/files/tinyssh-makekey.service new file mode 100644 index 000..841a516 --- /dev/null +++ b/net-misc/tinyssh/files/tinyssh-makekey.service @@ -0,0 +1,8 @@ +[Unit] +Description=TinySSH Key Generation +ConditionPathIsDirectory=!/etc/tinyssh/keys + +[Service] +ExecStart=/usr/sbin/tinysshd-makekey /etc/tinyssh/keys +Type=oneshot +RemainAfterExit=true diff --git a/net-misc/tinyssh/files/tinyssh.confd b/net-misc/tinyssh/files/tinyssh.confd new file mode 100644 index 000..d1aefde --- /dev/null +++ b/net-misc/tinyssh/files/tinyssh.confd @@ -0,0 +1,7 @@ +# TinySSH config file for /etc/init.d/tinyssh + +#TINYSSH_PORT="22" +#TINYSSH_IP="0.0.0.0" +#TINYSSH_CONFDIR="/etc/tinyssh" +#TINYSSH_KEYDIR="${TINYSSH_CONFDIR}/keys" +#TINYSSH_OPTS="-l -v" diff --git a/net-misc/tinyssh/files/tinyssh.initd b/net-misc/tinyssh/files/tinyssh.initd new file mode 100644 index 000..2fc28e5 --- /dev/null +++ b/net-misc/tinyssh/files/tinyssh.initd @@ -0,0 +1,30 @@ +#!/sbin/openrc-run +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +TINYSSH_CONFDIR="${TINYSSH_CONFDIR:-/etc/tinyssh}" +TINYSSH_KEYDIR="${TINYSSH_KEYDIR:-${TINYSSH_CONFDIR}/keys}" + +TINYSSHD="/usr/sbin/tinysshd" +MAKEKEY="${TINYSSHD}-makekey" +PRINTKEY="/usr/bin/tinysshd-printkey" + +command="/usr/bin/tcpserver" +command_args="-HRDl0 ${TINYSSH_IP:-0.0.0.0} ${TINYSSH_PORT:-22} + ${TINYSSHD} ${TINYSSH_OPTS:--l -v} ${TINYSSH_KEYDIR}" +command_background=yes +pidfile="/run/${RC_SVCNAME}.pid" +start_stop_daemon_args="${SSD_OPTS}" + +depend() { + use net +} + +start_pre() { + if [ "${RC_CMD}" != "restart" ]; then + checkpath -d "${TINYSSH_CONFDIR}" + if ! ${PRINTKEY} "${TINYSSH_KEYDIR}" >/dev/null 2>&1; then + ${MAKEKEY} "${TINYSSH_KEYDIR}" || return 1 + fi + fi +} diff --git a/net-misc/tinyssh/files/tinyssh.service b/net-misc/tinyssh/files/tinyssh.service new file mode 100644 index 000..f0fe93b --- /dev/null +++ b/net-misc/tinyssh/files/tinyssh.service @@ -0,0 +1,9 @@ +[Unit] +Description=TinySSH Per-Connection Daemon +Documentation=https://tinyssh.org +After=tinyssh-makekey.service + +[Service] +ExecStart=/usr/sbin/tinysshd /etc/tinyssh/keys +StandardInput=socket +StandardError=journal diff --git a/net-misc/tinyssh/files/tinyssh.socket b/net-misc/tinyssh/files/tinyssh.socket new file mode 100644 index 000..9ca2b16 --- /dev/null +++ b/net-misc/tinyssh/files/tinyssh.socket @@ -0,0 +1,13 @@ +[Unit] +Description=TinySSH service (socket-activated) +Documentation=https://tinyssh.org +Wants=tinyssh-makekey.service + +[Socket] +ListenStream=%i +Accept=true +KeepAlive=true +IPTOS=low-delay + +[Install] +WantedBy=sockets.target diff --git a/net-misc/tinyssh/metadata.xml b/net-misc/tinyssh/metadata.xml new file mode 100644 index 000..bf058f0 --- /dev/null +++ b/net-misc/tinyssh/metadata.xml @@ -0,0 +1,19 @@ + +http://www.gentoo.org/dtd/metadata.dtd";> + + + cont...@hacktivis.me + Haelwenn (lanodan) Monnier + + + janmojzis/tinyssh + https://github.com/janmojzis/tinyssh/issues + + + TinySSH is a minimalistic and secure SSH server which + implements only a subset of SSHv2 features. + + + Use dev-libs/libsodium for cryptography + + diff --git a/net-misc/tinyssh/tinyssh-2019