mrrl

commit d8fb295cf003eb938cf0ff6ddbf113de2eb15e9f
parent c8208b2075a3fe5e83e922714b63586e4ac9904c
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Tue, 11 Nov 2025 01:53:54 +0000

tinyssh

Diffstat:
M
templates/pkg/tinyssh
 | 
11
++++++++++-
M
variants/ccx-x86_64/default.environment
 | 
2
+-
M
variants/ccx-x86_64/tinyssh
 | 
8
+++++++-
M
variants/ccx-x86_64/userspace.environment
 | 
4
++--
M
variants/root-x86_64/default.environment
 | 
2
+-
M
variants/root-x86_64/tinyssh
 | 
8
+++++++-
M
variants/root-x86_64/userspace.environment
 | 
4
++--

7 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/templates/pkg/tinyssh b/templates/pkg/tinyssh
@@ -7,6 +7,11 @@
 #+{{pkg_install_name("busybox-diffutils")}}
 #@untar:-z:{{downloads["https://github.com/janmojzis/tinyssh/archive/refs/tags/"~pkg_version~".tar.gz"]}}:.
 {% endblock package_deps %}
+{% block prepare -%}
+{{ super() -}}
+sed -i 's|/sbin|/command|; s|/share/man/|/man/|' Makefile
+
+{% endblock prepare %}
 {% block build -%}
 build_env_static
 {{make}}
@@ -22,5 +27,9 @@ check_static command/tinysshd-makekeys
 {% endblock check %}
 {% block genlinks_begin %}
 	x["./command/tinysshd"]=1
-	x["./command/tinysshd-makekeys"]=1
+	x["./command/tinysshd-makekey"]=1
+	x["./command/tinysshd-printkey"]=1
+	x["./man/man8/tinysshd.8"]=1
+	x["./man/man8/tinysshd-makekey.8"]=1
+	x["./man/man8/tinysshd-printkey.8"]=1
 {% endblock genlinks_begin %}
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -86,7 +86,7 @@
 #+nawk.e4d02d09a25319411ab52938892bddcd7f7b715f21da1757ded6b98c56780811
 #+squashfs-tools.dc473cbcc9137cefd0d45d7da5520b8e91a2582a1cc7bd1695418c4d7f4e3fcc
 #+mandoc.041f7379850d818d1fe3915fb18c57b15c15605d70eb37a50bca8cbb85ce1a34
-#+tinyssh.4d3bf98f61e15fcd7a507894d94ebf81db347202142d0316c18ee3d8c83a45e2
+#+tinyssh.e5b2346ffa3eacea5bbc68c0d846d0c45162f9a6623511b44d145d80e1e8419b
 #+system-config.30ae03a96b216cf17a2c63a437c184fcd16bea4b82de6e00e88bd50737d3cb13
 #+system-config-rc.c3b55f453abdcfe9d4f7d7c5f7512755333e9c8fa2eafc5cbe45ec37e7d51630
 #+system-config-scripts.560351526ce133330803cd8653a6bc30e43e31338a794070a0d7ef679fbb9f79
diff --git a/variants/ccx-x86_64/tinyssh b/variants/ccx-x86_64/tinyssh
@@ -58,6 +58,8 @@ check_static() {
 prefix=/home/ccx/versions/$pthbs_package
 dest=${pthbs_destdir%/}${prefix}
 cd 'tinyssh-20250501'
+sed -i 's|/sbin|/command|; s|/share/man/|/man/|' Makefile
+
 
 
 build_env_static
@@ -75,7 +77,11 @@ cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 find -type d -o -print | awk -F/ '
 BEGIN {
 	x["./command/tinysshd"]=1
-	x["./command/tinysshd-makekeys"]=1
+	x["./command/tinysshd-makekey"]=1
+	x["./command/tinysshd-printkey"]=1
+	x["./man/man8/tinysshd.8"]=1
+	x["./man/man8/tinysshd-makekey.8"]=1
+	x["./man/man8/tinysshd-printkey.8"]=1
 }
 
 function r1(s) {
diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment
@@ -86,4 +86,4 @@
 #+nawk.e4d02d09a25319411ab52938892bddcd7f7b715f21da1757ded6b98c56780811
 #+squashfs-tools.dc473cbcc9137cefd0d45d7da5520b8e91a2582a1cc7bd1695418c4d7f4e3fcc
 #+mandoc.041f7379850d818d1fe3915fb18c57b15c15605d70eb37a50bca8cbb85ce1a34
-#+tinyssh.4d3bf98f61e15fcd7a507894d94ebf81db347202142d0316c18ee3d8c83a45e2-
\ No newline at end of file
+#+tinyssh.e5b2346ffa3eacea5bbc68c0d846d0c45162f9a6623511b44d145d80e1e8419b+
\ No newline at end of file
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -86,7 +86,7 @@
 #+nawk.027a855f9a315e50ae9794f569c1009012298e0ca101460ab1189ab1e87a536b
 #+squashfs-tools.3709841b2a7fb047746b6fba97d121ff5562313dcf931a1cc52127715e3877bc
 #+mandoc.b4490f63fc1316ad2c3bae4f38bf64fa58945586da6485811f1183a01f2a8e92
-#+tinyssh.61b867705313e16b0e54554cd896f3610c1a85367babe162d5c76e21acf83807
+#+tinyssh.4b449d64fc85ac1ed4de4288dab6b3f3ff3df045205973f90bda8c8c2981e8f5
 #+system-config.2f0130974f0e967b6a723a20a797aac82a53b9d72a17632c831eea91cece7486
 #+system-config-rc.3683c44183f40a826359d33b59796a6f82a4228706d05943f32b422eae6a5fc7
 #+system-config-scripts.dcaa5fe77baeda61721cace675f21abcbe0989c31569104aa34ccd6c3cfbc9d3
diff --git a/variants/root-x86_64/tinyssh b/variants/root-x86_64/tinyssh
@@ -58,6 +58,8 @@ check_static() {
 prefix=/versions/$pthbs_package
 dest=${pthbs_destdir%/}${prefix}
 cd 'tinyssh-20250501'
+sed -i 's|/sbin|/command|; s|/share/man/|/man/|' Makefile
+
 
 
 build_env_static
@@ -75,7 +77,11 @@ cd "$pthbs_destdir/versions/$pthbs_package"
 find -type d -o -print | awk -F/ '
 BEGIN {
 	x["./command/tinysshd"]=1
-	x["./command/tinysshd-makekeys"]=1
+	x["./command/tinysshd-makekey"]=1
+	x["./command/tinysshd-printkey"]=1
+	x["./man/man8/tinysshd.8"]=1
+	x["./man/man8/tinysshd-makekey.8"]=1
+	x["./man/man8/tinysshd-printkey.8"]=1
 }
 
 function r1(s) {
diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment
@@ -86,4 +86,4 @@
 #+nawk.027a855f9a315e50ae9794f569c1009012298e0ca101460ab1189ab1e87a536b
 #+squashfs-tools.3709841b2a7fb047746b6fba97d121ff5562313dcf931a1cc52127715e3877bc
 #+mandoc.b4490f63fc1316ad2c3bae4f38bf64fa58945586da6485811f1183a01f2a8e92
-#+tinyssh.61b867705313e16b0e54554cd896f3610c1a85367babe162d5c76e21acf83807-
\ No newline at end of file
+#+tinyssh.4b449d64fc85ac1ed4de4288dab6b3f3ff3df045205973f90bda8c8c2981e8f5+
\ No newline at end of file