public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/tinyssh/
Date: Sat, 23 Nov 2024 16:54:45 +0000 (UTC)	[thread overview]
Message-ID: <1732380843.91ddbe6aa350937b49c1b895342d2e4d1337c40c.sam@gentoo> (raw)

commit:     91ddbe6aa350937b49c1b895342d2e4d1337c40c
Author:     Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Tue Nov 12 04:24:20 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=91ddbe6a

net-misc/tinyssh: add 20241111

Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/tinyssh/Manifest                          |  1 +
 ...ssh-99999999.ebuild => tinyssh-20241111.ebuild} | 38 ++++++++++------------
 net-misc/tinyssh/tinyssh-99999999.ebuild           | 38 ++++++++++------------
 3 files changed, 35 insertions(+), 42 deletions(-)

diff --git a/net-misc/tinyssh/Manifest b/net-misc/tinyssh/Manifest
index 2bd2ee5a59e1..f924b1dc6fea 100644
--- a/net-misc/tinyssh/Manifest
+++ b/net-misc/tinyssh/Manifest
@@ -1 +1,2 @@
 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/tinyssh-99999999.ebuild b/net-misc/tinyssh/tinyssh-20241111.ebuild
similarity index 58%
copy from net-misc/tinyssh/tinyssh-99999999.ebuild
copy to net-misc/tinyssh/tinyssh-20241111.ebuild
index 9d2ed3e6c433..07aeb225e8ec 100644
--- a/net-misc/tinyssh/tinyssh-99999999.ebuild
+++ b/net-misc/tinyssh/tinyssh-20241111.ebuild
@@ -28,38 +28,34 @@ RDEPEND="
 	sys-apps/ucspi-tcp
 "
 
-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
-
 	default
+
+	echo 'gentoo-autoheaders: $(AUTOHEADERS)' >> Makefile
 }
 
-src_compile() {
-	tc-export PKG_CONFIG
+src_configure() {
+	tc-export PKG_CONFIG CC
 
 	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)"
+		# -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
+
+	emake gentoo-autoheaders
+
+	for i in has*.log
+	do
+		einfo "$i"
+		cat "$i"
+	done
 }
 
 src_install() {
-	dosbin build/bin/tinysshd{,-makekey}
-	dobin build/bin/tinysshd-printkey
-	doman man/*
+	einstalldocs
+	emake install DESTDIR="$D" PREFIX=/usr
 
 	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
 	newconfd "${FILESDIR}/${PN}.confd" "${PN}"

diff --git a/net-misc/tinyssh/tinyssh-99999999.ebuild b/net-misc/tinyssh/tinyssh-99999999.ebuild
index 9d2ed3e6c433..07aeb225e8ec 100644
--- a/net-misc/tinyssh/tinyssh-99999999.ebuild
+++ b/net-misc/tinyssh/tinyssh-99999999.ebuild
@@ -28,38 +28,34 @@ RDEPEND="
 	sys-apps/ucspi-tcp
 "
 
-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
-
 	default
+
+	echo 'gentoo-autoheaders: $(AUTOHEADERS)' >> Makefile
 }
 
-src_compile() {
-	tc-export PKG_CONFIG
+src_configure() {
+	tc-export PKG_CONFIG CC
 
 	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)"
+		# -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
+
+	emake gentoo-autoheaders
+
+	for i in has*.log
+	do
+		einfo "$i"
+		cat "$i"
+	done
 }
 
 src_install() {
-	dosbin build/bin/tinysshd{,-makekey}
-	dobin build/bin/tinysshd-printkey
-	doman man/*
+	einstalldocs
+	emake install DESTDIR="$D" PREFIX=/usr
 
 	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
 	newconfd "${FILESDIR}/${PN}.confd" "${PN}"


             reply	other threads:[~2024-11-23 16:54 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-23 16:54 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-05-15 17:48 [gentoo-commits] repo/gentoo:master commit in: net-misc/tinyssh/ Viorel Munteanu
2025-05-15 17:48 Viorel Munteanu
2025-04-21 14:14 Viorel Munteanu
2025-04-21 14:14 Viorel Munteanu
2025-03-31 12:58 Joonas Niilola
2025-03-31 12:58 Joonas Niilola
2024-12-02 14:50 Sam James
2024-11-23 16:54 Sam James
2024-08-30  7:33 Joonas Niilola
2024-08-30  7:33 Joonas Niilola
2024-02-28  7:07 Joonas Niilola
2024-01-07  0:36 Yixun Lan
2024-01-07  0:36 Yixun Lan
2023-07-26  8:41 Sam James

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1732380843.91ddbe6aa350937b49c1b895342d2e4d1337c40c.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox