* [gentoo-commits] repo/gentoo:master commit in: net-misc/tinyssh/files/, net-misc/tinyssh/
@ 2023-07-26 6:32 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-07-26 6:32 UTC (permalink / raw
To: gentoo-commits
commit: f6e4cf7a86620913736c8e38d22db48d2e0d61a3
Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Sun Jul 9 20:15:26 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 26 06:28:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6e4cf7a
net-misc/tinyssh: new package, add 20230101, 99999999
Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>
Closes: https://github.com/gentoo/gentoo/pull/31817
Signed-off-by: Sam James <sam <AT> gentoo.org>
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 | 43 ++++++++++++++++
net-misc/tinyssh/tinyssh-20230101.ebuild | 71 ++++++++++++++++++++++++++
net-misc/tinyssh/tinyssh-99999999.ebuild | 71 ++++++++++++++++++++++++++
9 files changed, 253 insertions(+)
diff --git a/net-misc/tinyssh/Manifest b/net-misc/tinyssh/Manifest
new file mode 100644
index 000000000000..4b4495c26cdb
--- /dev/null
+++ b/net-misc/tinyssh/Manifest
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000000..841a516ce390
--- /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 000000000000..d1aefde2be9f
--- /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 000000000000..095a7f4e1056
--- /dev/null
+++ b/net-misc/tinyssh/files/tinyssh.initd
@@ -0,0 +1,30 @@
+#!/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
new file mode 100644
index 000000000000..f0fe93be778b
--- /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 000000000000..9ca2b16b3fa4
--- /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 000000000000..3c123417d9f8
--- /dev/null
+++ b/net-misc/tinyssh/metadata.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>contact@hacktivis.me</email>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <use>
+ <flag name="sodium">Use <pkg>dev-libs/libsodium</pkg> for cryptography</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">janmojzis/tinyssh</remote-id>
+ <bugs-to>https://github.com/janmojzis/tinyssh/issues</bugs-to>
+ </upstream>
+ <longdescription lang="en">
+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
+ </longdescription>
+</pkgmetadata>
diff --git a/net-misc/tinyssh/tinyssh-20230101.ebuild b/net-misc/tinyssh/tinyssh-20230101.ebuild
new file mode 100644
index 000000000000..6a91309a999d
--- /dev/null
+++ b/net-misc/tinyssh/tinyssh-20230101.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 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
new file mode 100644
index 000000000000..6a91309a999d
--- /dev/null
+++ b/net-misc/tinyssh/tinyssh-99999999.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 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."
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-misc/tinyssh/files/, net-misc/tinyssh/
@ 2024-02-28 7:07 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2024-02-28 7:07 UTC (permalink / raw
To: gentoo-commits
commit: d0be1841c349cb0e132483f3448fb02e4479aa8c
Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Fri Feb 2 17:13:35 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 07:01:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0be1841
net-misc/tinyssh: C99 compatibility
Closes: https://bugs.gentoo.org/923493
Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>
Closes: https://github.com/gentoo/gentoo/pull/35150
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-misc/tinyssh/files/tinyssh-20240101_c99.patch | 33 +++++++++++++++++++++++
net-misc/tinyssh/tinyssh-20240101.ebuild | 1 +
2 files changed, 34 insertions(+)
diff --git a/net-misc/tinyssh/files/tinyssh-20240101_c99.patch b/net-misc/tinyssh/files/tinyssh-20240101_c99.patch
new file mode 100644
index 000000000000..38b2e845eaa5
--- /dev/null
+++ b/net-misc/tinyssh/files/tinyssh-20240101_c99.patch
@@ -0,0 +1,33 @@
+From ae059fda00c11236a32499f105e803f962d1e243 Mon Sep 17 00:00:00 2001
+From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
+Date: Tue, 9 Jan 2024 19:51:14 +0100
+Subject: [PATCH] packet_put: Add missing bug.h include for global_die
+
+```
+packet_put.c:53:9: error: call to undeclared function 'global_die'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
+ global_die(111);
+ ^
+1 error generated.
+```
+
+Upstream: https://github.com/janmojzis/tinyssh/pull/84
+
+---
+ tinyssh/packet_put.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tinyssh/packet_put.c b/tinyssh/packet_put.c
+index 17e8d84..7f46ff6 100644
+--- a/tinyssh/packet_put.c
++++ b/tinyssh/packet_put.c
+@@ -6,6 +6,7 @@ Public domain.
+
+ #include "uint32_pack_big.h"
+ #include "buf.h"
++#include "bug.h"
+ #include "sshcrypto.h"
+ #include "ssh.h"
+ #include "log.h"
+--
+2.41.0
+
diff --git a/net-misc/tinyssh/tinyssh-20240101.ebuild b/net-misc/tinyssh/tinyssh-20240101.ebuild
index 0edea200702b..442fb8e5f171 100644
--- a/net-misc/tinyssh/tinyssh-20240101.ebuild
+++ b/net-misc/tinyssh/tinyssh-20240101.ebuild
@@ -29,6 +29,7 @@ RDEPEND="
"
PATCHES=(
+ "${FILESDIR}/tinyssh-20240101_c99.patch"
"${FILESDIR}/tinyssh-20240101_conf_cflags.patch"
)
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-misc/tinyssh/files/, net-misc/tinyssh/
@ 2024-02-28 7:07 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2024-02-28 7:07 UTC (permalink / raw
To: gentoo-commits
commit: 2b4ac4bd6ae654d14218883ac7a298cd1d2d5b42
Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Fri Feb 2 17:12:53 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 07:01:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b4ac4bd
net-misc/tinyssh: respect user CFLAGS
Closes: https://bugs.gentoo.org/887897
Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-misc/tinyssh/files/tinyssh-20240101_conf_cflags.patch | 10 ++++++++++
net-misc/tinyssh/tinyssh-20240101.ebuild | 7 ++++---
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/net-misc/tinyssh/files/tinyssh-20240101_conf_cflags.patch b/net-misc/tinyssh/files/tinyssh-20240101_conf_cflags.patch
new file mode 100644
index 000000000000..8dd35d91b828
--- /dev/null
+++ b/net-misc/tinyssh/files/tinyssh-20240101_conf_cflags.patch
@@ -0,0 +1,10 @@
+diff --git a/conf-cflags b/conf-cflags
+--- a/conf-cflags
++++ b/conf-cflags
+@@ -15,6 +15,3 @@
+ -fstack-protector-strong
+ -fwrapv
+ -fno-strict-overflow
+--Os
+--fomit-frame-pointer
+--funroll-loops
diff --git a/net-misc/tinyssh/tinyssh-20240101.ebuild b/net-misc/tinyssh/tinyssh-20240101.ebuild
index 5164323fe0c6..0edea200702b 100644
--- a/net-misc/tinyssh/tinyssh-20240101.ebuild
+++ b/net-misc/tinyssh/tinyssh-20240101.ebuild
@@ -28,10 +28,11 @@ RDEPEND="
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
+PATCHES=(
+ "${FILESDIR}/tinyssh-20240101_conf_cflags.patch"
+)
+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/make-tinyssh\.sh/make-tinysshcc.sh/g' ./Makefile || die
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-misc/tinyssh/files/, net-misc/tinyssh/
@ 2024-11-23 16:54 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-11-23 16:54 UTC (permalink / raw
To: gentoo-commits
commit: a232e7f54d90497a110ce4b78fa209778319494a
Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Tue Nov 12 04:30:51 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 16:54:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a232e7f5
net-misc/tinyssh: drop 20240101-r2
Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>
Closes: https://github.com/gentoo/gentoo/pull/39281
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/tinyssh/Manifest | 1 -
net-misc/tinyssh/files/tinyssh-20240101_c99.patch | 33 ----------
.../files/tinyssh-20240101_conf_cflags.patch | 10 ---
net-misc/tinyssh/tinyssh-20240101-r2.ebuild | 76 ----------------------
4 files changed, 120 deletions(-)
diff --git a/net-misc/tinyssh/Manifest b/net-misc/tinyssh/Manifest
index f924b1dc6fea..ba2bf36ba47a 100644
--- a/net-misc/tinyssh/Manifest
+++ b/net-misc/tinyssh/Manifest
@@ -1,2 +1 @@
-DIST tinyssh-20240101.tar.gz 249848 BLAKE2B 228547c6f4acae3b77a338df1ced3a49e0b4c72257ce081b3b50941c29c5a39a0b1623f6aefce2721b9dde9fae03cb8c1c87b6b019658d578ddcca99e0a021f5 SHA512 b48561cfc11bb6d2e9b1c805c9dfc36be5f1bbbf04a455b8db3f02b5b8df15e420fcd93d58fb23526baaf0fd70e9969deca261152a656015f12a433a61092e90
DIST tinyssh-20241111.tar.gz 263324 BLAKE2B 81fbf6b3af4f6ef72acf1a339c4b0b6e7dce0aa3afee4947aa93ac45120836ff0febcf13dcbaea43be0dc4eb1e80c47a0a3b7dcfc8e4b00ad6577c1b366593ae SHA512 52716b6f8998f41180080a33cce0bcb3ff5eb1648b4c61b9ff99c3070f95c1900ab62bc23b30353905d146d557b2550b393c940f25a51d174648951cbc7ec2fc
diff --git a/net-misc/tinyssh/files/tinyssh-20240101_c99.patch b/net-misc/tinyssh/files/tinyssh-20240101_c99.patch
deleted file mode 100644
index 38b2e845eaa5..000000000000
--- a/net-misc/tinyssh/files/tinyssh-20240101_c99.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From ae059fda00c11236a32499f105e803f962d1e243 Mon Sep 17 00:00:00 2001
-From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
-Date: Tue, 9 Jan 2024 19:51:14 +0100
-Subject: [PATCH] packet_put: Add missing bug.h include for global_die
-
-```
-packet_put.c:53:9: error: call to undeclared function 'global_die'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
- global_die(111);
- ^
-1 error generated.
-```
-
-Upstream: https://github.com/janmojzis/tinyssh/pull/84
-
----
- tinyssh/packet_put.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tinyssh/packet_put.c b/tinyssh/packet_put.c
-index 17e8d84..7f46ff6 100644
---- a/tinyssh/packet_put.c
-+++ b/tinyssh/packet_put.c
-@@ -6,6 +6,7 @@ Public domain.
-
- #include "uint32_pack_big.h"
- #include "buf.h"
-+#include "bug.h"
- #include "sshcrypto.h"
- #include "ssh.h"
- #include "log.h"
---
-2.41.0
-
diff --git a/net-misc/tinyssh/files/tinyssh-20240101_conf_cflags.patch b/net-misc/tinyssh/files/tinyssh-20240101_conf_cflags.patch
deleted file mode 100644
index 8dd35d91b828..000000000000
--- a/net-misc/tinyssh/files/tinyssh-20240101_conf_cflags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/conf-cflags b/conf-cflags
---- a/conf-cflags
-+++ b/conf-cflags
-@@ -15,6 +15,3 @@
- -fstack-protector-strong
- -fwrapv
- -fno-strict-overflow
---Os
---fomit-frame-pointer
---funroll-loops
diff --git a/net-misc/tinyssh/tinyssh-20240101-r2.ebuild b/net-misc/tinyssh/tinyssh-20240101-r2.ebuild
deleted file mode 100644
index db7411fdc4a4..000000000000
--- a/net-misc/tinyssh/tinyssh-20240101-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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
-"
-
-PATCHES=(
- "${FILESDIR}/tinyssh-20240101_c99.patch"
- "${FILESDIR}/tinyssh-20240101_conf_cflags.patch"
-)
-
-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/make-tinyssh\.sh/make-tinysshcc.sh/g' ./Makefile || die
-
- default
-}
-
-src_compile() {
- tc-export PKG_CONFIG
-
- if use sodium
- then
- # -I${includedir}/sodium needed as tinyssh uses `#include "crypto_auth_hmacsha256.h"` rather than `#include <sodium.h>`
- emake \
- CC="$(tc-getCC)" \
- LIBS="$("${PKG_CONFIG}" --libs libsodium)" \
- CFLAGS="${CFLAGS} $("${PKG_CONFIG}" --cflags libsodium) -I$("${PKG_CONFIG}" --variable=includedir libsodium)/sodium/" \
- LDFLAGS="${LDFLAGS}"
- 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."
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-11-23 16:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-26 6:32 [gentoo-commits] repo/gentoo:master commit in: net-misc/tinyssh/files/, net-misc/tinyssh/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-02-28 7:07 Joonas Niilola
2024-02-28 7:07 Joonas Niilola
2024-11-23 16:54 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox