From e45697264ed7c726178a5e7935e613584ace9b5a Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Wed, 26 Jul 2023 10:09:51 +0200 Subject: [PATCH 1/5] dev-hare/hare-ssh: add 0_pre20230623 Fixes missing keyworded lib for 49064acd96abee4dfb1738cf983def64041bf2b9 Signed-off-by: Haelwenn (lanodan) Monnier --- dev-hare/hare-ssh/Manifest | 1 + .../hare-ssh/hare-ssh-0_pre20230623.ebuild | 30 +++++++++++++++++++ dev-hare/hare-ssh/hare-ssh-9999.ebuild | 20 +++++++++---- 3 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 dev-hare/hare-ssh/Manifest create mode 100644 dev-hare/hare-ssh/hare-ssh-0_pre20230623.ebuild diff --git a/dev-hare/hare-ssh/Manifest b/dev-hare/hare-ssh/Manifest new file mode 100644 index 0000000000..a478705022 --- /dev/null +++ b/dev-hare/hare-ssh/Manifest @@ -0,0 +1 @@ +DIST hare-ssh-9fe392eb4478dc26680c8c5c42deb87d192447db.tar.gz 32799 BLAKE2B 94bc993415f76c41d711b06f38504df012982bc13528f6a88bc4fad7c601578c8ff5abdbc86cae60ff2965c14898da5aa2b02a301af10583de9b49d8229d24fe SHA512 9f14229630330878ca7b8a9935c82fd0c6b547918d662591b0871314c7df86aee32e55fda7273bee3c6ae04d3c75acc628edd500e735272af3609b2bdabeaaec diff --git a/dev-hare/hare-ssh/hare-ssh-0_pre20230623.ebuild b/dev-hare/hare-ssh/hare-ssh-0_pre20230623.ebuild new file mode 100644 index 0000000000..60e2146008 --- /dev/null +++ b/dev-hare/hare-ssh/hare-ssh-0_pre20230623.ebuild @@ -0,0 +1,30 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ "${PV}" = 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/hare-ssh" + SLOT="0" +else + EGIT_COMMIT="9fe392eb4478dc26680c8c5c42deb87d192447db" + MY_P="${PN}-${EGIT_COMMIT}" + SRC_URI="https://git.sr.ht/~sircmpwn/hare-ssh/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz" + S="${WORKDIR}/${MY_P}" + SLOT="0/${PV}" + + KEYWORDS="~amd64 ~arm64 ~riscv" +fi + +DESCRIPTION="SSH library for Hare" +HOMEPAGE="https://git.sr.ht/~sircmpwn/hare-ssh" +LICENSE="MPL-2.0" + +RDEPEND="<=dev-lang/hare-0_pre20220922" +DEPEND="${DEPEND}" + +src_prepare() { + default + sed -i 's;^PREFIX=.*;PREFIX=/usr;' Makefile || die +} diff --git a/dev-hare/hare-ssh/hare-ssh-9999.ebuild b/dev-hare/hare-ssh/hare-ssh-9999.ebuild index 1a123cd621..60e2146008 100644 --- a/dev-hare/hare-ssh/hare-ssh-9999.ebuild +++ b/dev-hare/hare-ssh/hare-ssh-9999.ebuild @@ -1,17 +1,27 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit git-r3 +if [[ "${PV}" = 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/hare-ssh" + SLOT="0" +else + EGIT_COMMIT="9fe392eb4478dc26680c8c5c42deb87d192447db" + MY_P="${PN}-${EGIT_COMMIT}" + SRC_URI="https://git.sr.ht/~sircmpwn/hare-ssh/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz" + S="${WORKDIR}/${MY_P}" + SLOT="0/${PV}" + + KEYWORDS="~amd64 ~arm64 ~riscv" +fi DESCRIPTION="SSH library for Hare" HOMEPAGE="https://git.sr.ht/~sircmpwn/hare-ssh" -EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/hare-ssh" LICENSE="MPL-2.0" -SLOT="0" -RDEPEND="dev-lang/hare" +RDEPEND="<=dev-lang/hare-0_pre20220922" DEPEND="${DEPEND}" src_prepare() { From 9fc661ab5ce952688ae815d4f3193817caa01a90 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Wed, 26 Jul 2023 10:12:36 +0200 Subject: [PATCH 2/5] Revert "app-admin/himitsu-ssh: unkeyword 0.2 for ~amd64" This reverts commit a0e9422597bccfb222f8c217790f0dc317a73434. Signed-off-by: Haelwenn (lanodan) Monnier --- app-admin/himitsu-ssh/himitsu-ssh-0.2.ebuild | 2 +- app-admin/himitsu-ssh/himitsu-ssh-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-admin/himitsu-ssh/himitsu-ssh-0.2.ebuild b/app-admin/himitsu-ssh/himitsu-ssh-0.2.ebuild index 389b242991..11a4670335 100644 --- a/app-admin/himitsu-ssh/himitsu-ssh-0.2.ebuild +++ b/app-admin/himitsu-ssh/himitsu-ssh-0.2.ebuild @@ -8,7 +8,7 @@ if [[ "${PV}" = "9999" ]]; then EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/himitsu-ssh" else SRC_URI="https://git.sr.ht/~sircmpwn/himitsu-ssh/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="" + KEYWORDS="~amd64" fi DESCRIPTION="SSH integration for Himitsu" diff --git a/app-admin/himitsu-ssh/himitsu-ssh-9999.ebuild b/app-admin/himitsu-ssh/himitsu-ssh-9999.ebuild index 389b242991..11a4670335 100644 --- a/app-admin/himitsu-ssh/himitsu-ssh-9999.ebuild +++ b/app-admin/himitsu-ssh/himitsu-ssh-9999.ebuild @@ -8,7 +8,7 @@ if [[ "${PV}" = "9999" ]]; then EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/himitsu-ssh" else SRC_URI="https://git.sr.ht/~sircmpwn/himitsu-ssh/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="" + KEYWORDS="~amd64" fi DESCRIPTION="SSH integration for Himitsu" From d9806303b513db0fbf77e4d4da30ba695dade69d Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Wed, 26 Jul 2023 10:15:43 +0200 Subject: [PATCH 3/5] dev-hare/hare-ssh: Remove bogus dev-lang/hare version requirements Signed-off-by: Haelwenn (lanodan) Monnier --- dev-hare/hare-ssh/hare-ssh-0_pre20230623.ebuild | 2 +- dev-hare/hare-ssh/hare-ssh-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-hare/hare-ssh/hare-ssh-0_pre20230623.ebuild b/dev-hare/hare-ssh/hare-ssh-0_pre20230623.ebuild index 60e2146008..d8951cdb40 100644 --- a/dev-hare/hare-ssh/hare-ssh-0_pre20230623.ebuild +++ b/dev-hare/hare-ssh/hare-ssh-0_pre20230623.ebuild @@ -21,7 +21,7 @@ DESCRIPTION="SSH library for Hare" HOMEPAGE="https://git.sr.ht/~sircmpwn/hare-ssh" LICENSE="MPL-2.0" -RDEPEND="<=dev-lang/hare-0_pre20220922" +RDEPEND="dev-lang/hare" DEPEND="${DEPEND}" src_prepare() { diff --git a/dev-hare/hare-ssh/hare-ssh-9999.ebuild b/dev-hare/hare-ssh/hare-ssh-9999.ebuild index 60e2146008..d8951cdb40 100644 --- a/dev-hare/hare-ssh/hare-ssh-9999.ebuild +++ b/dev-hare/hare-ssh/hare-ssh-9999.ebuild @@ -21,7 +21,7 @@ DESCRIPTION="SSH library for Hare" HOMEPAGE="https://git.sr.ht/~sircmpwn/hare-ssh" LICENSE="MPL-2.0" -RDEPEND="<=dev-lang/hare-0_pre20220922" +RDEPEND="dev-lang/hare" DEPEND="${DEPEND}" src_prepare() { From e91e36941ff3cafc8136bfe9b9760e4e965b7a37 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Wed, 26 Jul 2023 13:59:22 +0500 Subject: [PATCH 4/5] dev-python/mistletoe: treeclean duplicate Signed-off-by: Anna (cybertailor) Vyalkova --- dev-python/mistletoe/Manifest | 2 -- dev-python/mistletoe/metadata.xml | 22 ------------------- dev-python/mistletoe/mistletoe-1.0.1.ebuild | 21 ------------------ .../mistletoe/mistletoe-1.1.0-r1.ebuild | 20 ----------------- 4 files changed, 65 deletions(-) delete mode 100644 dev-python/mistletoe/Manifest delete mode 100644 dev-python/mistletoe/metadata.xml delete mode 100644 dev-python/mistletoe/mistletoe-1.0.1.ebuild delete mode 100644 dev-python/mistletoe/mistletoe-1.1.0-r1.ebuild diff --git a/dev-python/mistletoe/Manifest b/dev-python/mistletoe/Manifest deleted file mode 100644 index 20023c52d0..0000000000 --- a/dev-python/mistletoe/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST mistletoe-1.0.1.tar.gz 48898 BLAKE2B e20d6c07e4796ebacc417e9153a2ebd59fa5baa1594887ca66eff8eac40352660f0fe2eb55dd400ee6b54b7c902307e3f16caef81094fb451a12da4f84197e6b SHA512 09a879a26c2d1f6664cb1cc1c5e40bb55a54858693dfca8c77c0caa9f85216b3fd27c3e9143ddf98406f0b7aa75651ff0fb498403d2e5b237fe8b885d660bc8f -DIST mistletoe-1.1.0.tar.gz 58192 BLAKE2B f8e046ac85925269ba6d69356a3478f57495914c09d792d348cd8d9bfae25fb0b9d6a337eb791a61e017c41e71fe33e23ceabd8d9b4711da67198472e3b1b09e SHA512 b7e022e24e8e85f3ecc40ad05e65fd3e17229a2e4410fe8216b10ee3d46b568efe4a9df1a7d0fc224f818f8372b4b71ae0b59c540c38ae7f4af97c471e249377 diff --git a/dev-python/mistletoe/metadata.xml b/dev-python/mistletoe/metadata.xml deleted file mode 100644 index a88739f5ea..0000000000 --- a/dev-python/mistletoe/metadata.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - julien@jroy.ca - Julien Roy - - mistletoe is a Markdown parser in pure Python, designed to be fast, spec-compliant and fully customizable. - -Apart from being the fastest CommonMark-compliant Markdown parser implementation in pure Python, mistletoe also supports easy definitions of custom tokens. Parsing Markdown into an abstract syntax tree also allows us to swap out renderers for different output formats, without touching any of the core components. - - - miyuchina - mi@afteryu.me - - https://github.com/miyuchina/mistletoe/releases - https://github.com/miyuchina/mistletoe/blob/master/dev-guide.md - https://github.com/miyuchina/mistletoe/issues - miyuchina/mistletoe - mistletoe - - diff --git a/dev-python/mistletoe/mistletoe-1.0.1.ebuild b/dev-python/mistletoe/mistletoe-1.0.1.ebuild deleted file mode 100644 index 785d7cc692..0000000000 --- a/dev-python/mistletoe/mistletoe-1.0.1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_USE_PEP517=setuptools - -inherit distutils-r1 pypi - -DESCRIPTION="A fast, extensible and spec-compliant Markdown parser in pure Python." -HOMEPAGE="https://github.com/miyuchina/mistletoe" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND="" -DEPEND="${RDEPEND}" - -distutils_enable_tests pytest diff --git a/dev-python/mistletoe/mistletoe-1.1.0-r1.ebuild b/dev-python/mistletoe/mistletoe-1.1.0-r1.ebuild deleted file mode 100644 index 16777ea07e..0000000000 --- a/dev-python/mistletoe/mistletoe-1.1.0-r1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_USE_PEP517=setuptools - -inherit distutils-r1 pypi - -DESCRIPTION="A fast, extensible and spec-compliant Markdown parser in pure Python." -HOMEPAGE="https://github.com/miyuchina/mistletoe" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -BDEPEND="test? ( dev-python/parameterized[${PYTHON_USEDEP}] )" - -distutils_enable_tests pytest From 20a2fab0dc81d5a2bf6d80b17df42b6a25b8e66b Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Wed, 26 Jul 2023 14:00:24 +0500 Subject: [PATCH 5/5] net-misc/tinyssh: treeclean (moved to ::gentoo) Signed-off-by: Anna (cybertailor) Vyalkova --- net-misc/tinyssh/Manifest | 2 - .../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-99999999.ebuild | 71 ------------------- 10 files changed, 322 deletions(-) delete mode 100644 net-misc/tinyssh/Manifest delete mode 100644 net-misc/tinyssh/files/tinyssh-makekey.service delete mode 100644 net-misc/tinyssh/files/tinyssh.confd delete mode 100644 net-misc/tinyssh/files/tinyssh.initd delete mode 100644 net-misc/tinyssh/files/tinyssh.service delete mode 100644 net-misc/tinyssh/files/tinyssh.socket delete mode 100644 net-misc/tinyssh/metadata.xml delete mode 100644 net-misc/tinyssh/tinyssh-20220801.ebuild delete mode 100644 net-misc/tinyssh/tinyssh-20230101.ebuild delete mode 100644 net-misc/tinyssh/tinyssh-99999999.ebuild diff --git a/net-misc/tinyssh/Manifest b/net-misc/tinyssh/Manifest deleted file mode 100644 index a02f1ece62..0000000000 --- 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 841a516ce3..0000000000 --- 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 d1aefde2be..0000000000 --- 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 095a7f4e10..0000000000 --- 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 f0fe93be77..0000000000 --- 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 9ca2b16b3f..0000000000 --- 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 6c2fd29f73..0000000000 --- a/net-misc/tinyssh/metadata.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - contact@hacktivis.me - Haelwenn (lanodan) Monnier - - - janmojzis/tinyssh - https://github.com/janmojzis/tinyssh/issues - - -Features - - easy auditable - TinySSH has less than 100000 words of code - no dynamic memory allocation - TinySSH has all memory statically allocated (less than 1MB) - simple configuration - TinySSH can’t be misconfigured - reusing code - TinySSH is reusing libraries from CurveCP implementation - reusing software - TinySSH is using tcpserver/systemd socket/inetd for TCP connection - limited amount of features - TinySSH doesn’t have features such: SSH1 protocol, compression, … - no older cryptographic primitives - rsa, dsa, classic diffie-hellman, hmac-md5, hmac-sha1, 3des, arcfour, … - no copyright restrictions - TinySSH is in the public domain (see the licence) - no dependency on OpenSSL - TinySSH has its own crypto library compatible with NaCl, Libsodium - speed - TinySSH can be also compiled using high-speed NaCl library instead of internal. - -Security features - - cryptographic library (minimum 128-bit security, side-channel attack resistant, state-of-the-art crypto, …) - public-key authentication only (no password or hostbased authentication) - -Crypto primitives - - State-of-the-art crypto: ssh-ed25519, curve25519-sha256@libssh.org, chacha20-poly1305@openssh.com - Older standard: ecdsa-sha2-nistp256, ecdh-sha2-nistp256, aes256-ctr, hmac-sha2-256 removed in version 20190101 - Postquantum crypto: sntrup4591761x25519-sha512@tinyssh.org, chacha20-poly1305@openssh.com - - - Use dev-libs/libsodium for cryptography - - diff --git a/net-misc/tinyssh/tinyssh-20220801.ebuild b/net-misc/tinyssh/tinyssh-20220801.ebuild deleted file mode 100644 index 27fb9b6155..0000000000 --- a/net-misc/tinyssh/tinyssh-20220801.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}" == "9999" ]]; 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." -} diff --git a/net-misc/tinyssh/tinyssh-20230101.ebuild b/net-misc/tinyssh/tinyssh-20230101.ebuild deleted file mode 100644 index cd991afca4..0000000000 --- a/net-misc/tinyssh/tinyssh-20230101.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}" == "99999999" ]]; 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="CC0-1.0" -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." -} diff --git a/net-misc/tinyssh/tinyssh-99999999.ebuild b/net-misc/tinyssh/tinyssh-99999999.ebuild deleted file mode 100644 index cd991afca4..0000000000 --- a/net-misc/tinyssh/tinyssh-99999999.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}" == "99999999" ]]; 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="CC0-1.0" -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." -}