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

["Sam James" <sam@gentoo.org>]

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."
-}