[gentoo-commits] repo/gentoo:master commit in: net-misc/tinyssh/files/, net-misc/tinyssh/

2024-02-27 Thread Joonas Niilola 
commit: 2b4ac4bd6ae654d14218883ac7a298cd1d2d5b42
Author: Haelwenn (lanodan) Monnier  hacktivis  me>
AuthorDate: Fri Feb  2 17:12:53 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Feb 28 07:01:47 2024 +
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  hacktivis.me>
Signed-off-by: Joonas Niilola  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 ..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

[gentoo-commits] repo/gentoo:master commit in: net-misc/tinyssh/files/, net-misc/tinyssh/

2024-02-27 Thread Joonas Niilola 
commit: d0be1841c349cb0e132483f3448fb02e4479aa8c
Author: Haelwenn (lanodan) Monnier  hacktivis  me>
AuthorDate: Fri Feb  2 17:13:35 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Feb 28 07:01:47 2024 +
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  hacktivis.me>
Closes: https://github.com/gentoo/gentoo/pull/35150
Signed-off-by: Joonas Niilola  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 ..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" 
+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"
 )

[gentoo-commits] repo/gentoo:master commit in: net-misc/tinyssh/files/, net-misc/tinyssh/

2023-07-25 Thread Sam James 
commit: f6e4cf7a86620913736c8e38d22db48d2e0d61a3
Author: Haelwenn (lanodan) Monnier  hacktivis  me>
AuthorDate: Sun Jul  9 20:15:26 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 26 06:28:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6e4cf7a

net-misc/tinyssh: new package, add 20230101, 

Signed-off-by: Haelwenn (lanodan) Monnier  hacktivis.me>
Closes: https://github.com/gentoo/gentoo/pull/31817
Signed-off-by: Sam James  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-.ebuild   | 71 ++
 9 files changed, 253 insertions(+)

diff --git a/net-misc/tinyssh/Manifest b/net-misc/tinyssh/Manifest
new file mode 100644
index ..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 ..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 ..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 ..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 ..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 ..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 ..3c123417d9f8
--- /dev/null
+++ b/net-misc/tinyssh/metadata.xml
@@ -0,0 +1,43 @@
+
+https://www.gentoo.org/dtd/metadata.dtd";>
+
+  
+cont...@hacktivis.me
+  
+  
+proxy-ma...@gentoo.org
+Proxy Maintainers
+  
+  
+Use dev-libs/libsodium for 
cryptography
+  
+  
+janmojzis/tinyssh
+https://github.com/janmojzis/tinyssh/issues
+  
+  
+Features