gentoo auto-resync : 03:12:2024 - 02:07:18

3 files changed, 64 insertions, 14 deletions

diff --git a/net-misc/tinyssh/Manifest b/net-misc/tinyssh/Manifest
index 4cda1b99452c..c5434c816f1b 100644
--- a/net-misc/tinyssh/Manifest
+++ b/net-misc/tinyssh/Manifest
@@ -4,6 +4,8 @@ AUX tinyssh.initd 807 BLAKE2B e133e79f49fef0f65e9230cbc7fca2d541261652a4acb07a6a
 AUX tinyssh.service 214 BLAKE2B c02041eeb9109fef53a5d08f66d1807eb545d1da1dd9f38f4da4e07860e1fe80bc58a15bed98b7dfc8a9205e1d8852a0d726afc6fe256b187c75212834778f8f SHA512 220c2507b329bc4e4d38caccce8f278ee61d2b9ed6874f36c8e69785edb5021cbb2796d6f5bb51b60d45f1f00306799f5ffbdb26d83fe6db14f69198d4e27d43
 AUX tinyssh.socket 222 BLAKE2B 4bc71c8a1f8c45280350324af7c53f891f937b6854bf9647086db7339dd89a47254a8d9f3ced88352ce76cab0d02c326f2109e38c87f81b86336703336bd2a49 SHA512 e3cfb592135d8e1f99781ce17ed580a1854dd70bc8102971ef61654ec32933ae1e8e40f5cb79440b21115764fd301c18b25d59dc722367819f8991cb386dabbc
 DIST tinyssh-20241111.tar.gz 263324 BLAKE2B 81fbf6b3af4f6ef72acf1a339c4b0b6e7dce0aa3afee4947aa93ac45120836ff0febcf13dcbaea43be0dc4eb1e80c47a0a3b7dcfc8e4b00ad6577c1b366593ae SHA512 52716b6f8998f41180080a33cce0bcb3ff5eb1648b4c61b9ff99c3070f95c1900ab62bc23b30353905d146d557b2550b393c940f25a51d174648951cbc7ec2fc
+DIST tinyssh-20241201.tar.gz 301611 BLAKE2B de8a7cabecc9ab134adfb5e7e2eba840c47901b9d7720650f6421e4a130447784a66bb9033ab50ecc204966095ebc3cb02d9de18aef5ed0f8f4befdb6af189a2 SHA512 aa0641f92209bce1f1842c13338a053b3d46510280e891d94d7ec48304b621a4fd116abe7e46ad366ee894461e0f8db1e0458db82170622487868cdf4fdb8c66
 EBUILD tinyssh-20241111.ebuild 1639 BLAKE2B 120b3915cbf57df05f2777a2daed8aa2b64611db31850c31faad7c05b224ea5103ffefb9a9f0593666ae96f00dfa04a4e92654decb4069bca5363eb77a54a7bf SHA512 ee8bcf5a7b939f7ae10c96a5153e6cedacb6011d18c8cc00a2cc1c4d0ebd45203b63fb35e0b33c7f03a6b32676c333d8188167c23ec1353bcd99585c58a280c2
-EBUILD tinyssh-99999999.ebuild 1639 BLAKE2B 120b3915cbf57df05f2777a2daed8aa2b64611db31850c31faad7c05b224ea5103ffefb9a9f0593666ae96f00dfa04a4e92654decb4069bca5363eb77a54a7bf SHA512 ee8bcf5a7b939f7ae10c96a5153e6cedacb6011d18c8cc00a2cc1c4d0ebd45203b63fb35e0b33c7f03a6b32676c333d8188167c23ec1353bcd99585c58a280c2
+EBUILD tinyssh-20241201.ebuild 1237 BLAKE2B 23c6e3f6c2b42e9999026264082eb08874f3d0f091aedc61af24abe75110070d381cea9cb1a1b2d8de5dfe241a741d019901b0f40f80934647a29e708d1afeae SHA512 b9f2c2b1cee02ede58cb92863ef407c3a7763cd19566cc4ad73aff5f849f29b01be240764c6f810388bfe8bba7f538df56d68758f58d9d658f98830cab2b4bde
+EBUILD tinyssh-99999999.ebuild 1237 BLAKE2B 23c6e3f6c2b42e9999026264082eb08874f3d0f091aedc61af24abe75110070d381cea9cb1a1b2d8de5dfe241a741d019901b0f40f80934647a29e708d1afeae SHA512 b9f2c2b1cee02ede58cb92863ef407c3a7763cd19566cc4ad73aff5f849f29b01be240764c6f810388bfe8bba7f538df56d68758f58d9d658f98830cab2b4bde
 MISC metadata.xml 2107 BLAKE2B 6e166d2ea373129eb377c030dac7eae8ac06937cdd4ffd2c1afdc4abae691569be7ae5a46a634e9c2a4c13bbfbc915285ee8244f13d88d2219f94dbca38da58f SHA512 845cc482edd4e62a12e3cf3d01699b2e44d4ac9424170c7b867719c5c400aaafd5cb150866f4af309c208211dbba80a52e52bb72ec09d4cf7bbb4a4556a60232
diff --git a/net-misc/tinyssh/tinyssh-20241201.ebuild b/net-misc/tinyssh/tinyssh-20241201.ebuild
new file mode 100644
index 000000000000..a4aed4b70c61
--- /dev/null
+++ b/net-misc/tinyssh/tinyssh-20241201.ebuild
@@ -0,0 +1,60 @@
+# 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"
+
+RDEPEND="
+	${DEPEND}
+	sys-apps/ucspi-tcp
+"
+
+src_prepare() {
+	default
+
+	echo 'gentoo-autoheaders: $(AUTOHEADERS)' >> Makefile || die
+}
+
+src_configure() {
+	tc-export CC
+
+	emake gentoo-autoheaders
+
+	local i
+	for i in has*.log
+	do
+		einfo "$i"
+		cat "$i"
+	done
+}
+
+src_install() {
+	einstalldocs
+	emake install DESTDIR="${D}" PREFIX=/usr
+
+	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
index e1c07e90c588..a4aed4b70c61 100644
--- a/net-misc/tinyssh/tinyssh-99999999.ebuild
+++ b/net-misc/tinyssh/tinyssh-99999999.ebuild
@@ -18,11 +18,6 @@ fi
 LICENSE="CC0-1.0"
 SLOT="0"
 
-IUSE="+sodium"
-
-DEPEND="
-	sodium? ( dev-libs/libsodium:= )
-"
 RDEPEND="
 	${DEPEND}
 	sys-apps/ucspi-tcp
@@ -35,14 +30,7 @@ src_prepare() {
 }
 
 src_configure() {
-	tc-export PKG_CONFIG CC
-
-	if use sodium
-	then
-		# -I${includedir}/sodium needed as tinyssh uses `#include <randombytes.h>` rather than `#include <sodium.h>`
-		export CFLAGS="${CFLAGS} $("${PKG_CONFIG}" --cflags libsodium) -I$("${PKG_CONFIG}" --variable=includedir libsodium)/sodium/"
-		export LDFLAGS="${LDFLAGS} $("${PKG_CONFIG}" --libs libsodium)"
-	fi
+	tc-export CC
 
 	emake gentoo-autoheaders