* [gentoo-commits] repo/gentoo:master commit in: net-misc/tinyssh/
@ 2023-07-26 8:41 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2023-07-26 8:41 UTC (permalink / raw
To: gentoo-commits
commit: 4e5709ef2baaed3fc97fc2c968aa8965469cb3ae
Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Wed Jul 26 08:28:47 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 26 08:41:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e5709ef
net-misc/tinyssh: Use pkg-config instead of hardcoding libsodium flags
Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>
Closes: https://github.com/gentoo/gentoo/pull/32045
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/tinyssh/tinyssh-20230101.ebuild | 10 ++++++----
net-misc/tinyssh/tinyssh-99999999.ebuild | 10 ++++++----
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/net-misc/tinyssh/tinyssh-20230101.ebuild b/net-misc/tinyssh/tinyssh-20230101.ebuild
index 6a91309a999d..4b288ff014ec 100644
--- a/net-misc/tinyssh/tinyssh-20230101.ebuild
+++ b/net-misc/tinyssh/tinyssh-20230101.ebuild
@@ -40,13 +40,15 @@ src_prepare() {
}
src_compile() {
+ tc-export PKG_CONFIG
+
if use sodium
then
emake \
- CC="$(tc-getCC)"
- LIBS="-lsodium" \
- CFLAGS="${CFLAGS} -I/usr/include/sodium" \
- LDFLAGS="${LDFLAGS} -L/usr/lib"
+ CC="$(tc-getCC)" \
+ LIBS="$("${PKG_CONFIG}" --libs libsodium)" \
+ CFLAGS="${CFLAGS} $("${PKG_CONFIG}" --cflags libsodium)" \
+ LDFLAGS="${LDFLAGS}"
else
emake CC="$(tc-getCC)"
fi
diff --git a/net-misc/tinyssh/tinyssh-99999999.ebuild b/net-misc/tinyssh/tinyssh-99999999.ebuild
index 6a91309a999d..4b288ff014ec 100644
--- a/net-misc/tinyssh/tinyssh-99999999.ebuild
+++ b/net-misc/tinyssh/tinyssh-99999999.ebuild
@@ -40,13 +40,15 @@ src_prepare() {
}
src_compile() {
+ tc-export PKG_CONFIG
+
if use sodium
then
emake \
- CC="$(tc-getCC)"
- LIBS="-lsodium" \
- CFLAGS="${CFLAGS} -I/usr/include/sodium" \
- LDFLAGS="${LDFLAGS} -L/usr/lib"
+ CC="$(tc-getCC)" \
+ LIBS="$("${PKG_CONFIG}" --libs libsodium)" \
+ CFLAGS="${CFLAGS} $("${PKG_CONFIG}" --cflags libsodium)" \
+ LDFLAGS="${LDFLAGS}"
else
emake CC="$(tc-getCC)"
fi
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/tinyssh/
@ 2024-01-07 0:36 Yixun Lan
0 siblings, 0 replies; 8+ messages in thread
From: Yixun Lan @ 2024-01-07 0:36 UTC (permalink / raw
To: gentoo-commits
commit: 596d63fd68b5aedbb29cc51a4bfe1ef8caf9056d
Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Thu Jan 4 02:01:51 2024 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sun Jan 7 00:34:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=596d63fd
net-misc/tinyssh: drop 20230101
Closes: https://github.com/gentoo/gentoo/pull/34632
Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
net-misc/tinyssh/Manifest | 1 -
net-misc/tinyssh/tinyssh-20230101.ebuild | 73 --------------------------------
2 files changed, 74 deletions(-)
diff --git a/net-misc/tinyssh/Manifest b/net-misc/tinyssh/Manifest
index 5d54a5ceaa82..2bd2ee5a59e1 100644
--- a/net-misc/tinyssh/Manifest
+++ b/net-misc/tinyssh/Manifest
@@ -1,2 +1 @@
-DIST tinyssh-20230101.tar.gz 249091 BLAKE2B 5efb6eab07c136763ab27588661618763d2ca174dce4b0f4b5fd5dcca56044f8361342de780931070cff8efe43f6efa68eaf912e9ae38febfcff733f79e23018 SHA512 6beaf266058a89a78c710abd1a02feff0641a93d0d92aa07a1ad1ba3f6b3344bc312bb5a4cd5c06c6dcc83d25e48a801f9cfcfbb3de0f73904f36d32d4430482
DIST tinyssh-20240101.tar.gz 249848 BLAKE2B 228547c6f4acae3b77a338df1ced3a49e0b4c72257ce081b3b50941c29c5a39a0b1623f6aefce2721b9dde9fae03cb8c1c87b6b019658d578ddcca99e0a021f5 SHA512 b48561cfc11bb6d2e9b1c805c9dfc36be5f1bbbf04a455b8db3f02b5b8df15e420fcd93d58fb23526baaf0fd70e9969deca261152a656015f12a433a61092e90
diff --git a/net-misc/tinyssh/tinyssh-20230101.ebuild b/net-misc/tinyssh/tinyssh-20230101.ebuild
deleted file mode 100644
index 4b288ff014ec..000000000000
--- a/net-misc/tinyssh/tinyssh-20230101.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
-"
-
-src_prepare() {
- # Leave optimization level to user CFLAGS
- sed -i 's/-Os -fomit-frame-pointer -funroll-loops//g' ./conf-cc || die
-
- # 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
- emake \
- CC="$(tc-getCC)" \
- LIBS="$("${PKG_CONFIG}" --libs libsodium)" \
- CFLAGS="${CFLAGS} $("${PKG_CONFIG}" --cflags libsodium)" \
- 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."
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/tinyssh/
@ 2024-01-07 0:36 Yixun Lan
0 siblings, 0 replies; 8+ messages in thread
From: Yixun Lan @ 2024-01-07 0:36 UTC (permalink / raw
To: gentoo-commits
commit: 1bcc59a0043c07b7aeaf3bfb3b40503fa55d4a9b
Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Thu Jan 4 01:57:46 2024 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sun Jan 7 00:34:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bcc59a0
net-misc/tinyssh: add 20240101
Adds kex-strict-s-v00 <AT> openssh.com support, required to mitigate
CVE-2023-48795 aka Terrapin.
Links: https://github.com/advisories/GHSA-45x7-px36-x8w8
Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
net-misc/tinyssh/Manifest | 1 +
net-misc/tinyssh/tinyssh-20240101.ebuild | 73 ++++++++++++++++++++++++++++++++
2 files changed, 74 insertions(+)
diff --git a/net-misc/tinyssh/Manifest b/net-misc/tinyssh/Manifest
index 4b4495c26cdb..5d54a5ceaa82 100644
--- a/net-misc/tinyssh/Manifest
+++ b/net-misc/tinyssh/Manifest
@@ -1 +1,2 @@
DIST tinyssh-20230101.tar.gz 249091 BLAKE2B 5efb6eab07c136763ab27588661618763d2ca174dce4b0f4b5fd5dcca56044f8361342de780931070cff8efe43f6efa68eaf912e9ae38febfcff733f79e23018 SHA512 6beaf266058a89a78c710abd1a02feff0641a93d0d92aa07a1ad1ba3f6b3344bc312bb5a4cd5c06c6dcc83d25e48a801f9cfcfbb3de0f73904f36d32d4430482
+DIST tinyssh-20240101.tar.gz 249848 BLAKE2B 228547c6f4acae3b77a338df1ced3a49e0b4c72257ce081b3b50941c29c5a39a0b1623f6aefce2721b9dde9fae03cb8c1c87b6b019658d578ddcca99e0a021f5 SHA512 b48561cfc11bb6d2e9b1c805c9dfc36be5f1bbbf04a455b8db3f02b5b8df15e420fcd93d58fb23526baaf0fd70e9969deca261152a656015f12a433a61092e90
diff --git a/net-misc/tinyssh/tinyssh-20240101.ebuild b/net-misc/tinyssh/tinyssh-20240101.ebuild
new file mode 100644
index 000000000000..5164323fe0c6
--- /dev/null
+++ b/net-misc/tinyssh/tinyssh-20240101.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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
+"
+
+src_prepare() {
+ # Leave optimization level to user CFLAGS
+ sed -i 's/-Os -fomit-frame-pointer -funroll-loops//g' ./conf-cc || die
+
+ # 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
+ emake \
+ CC="$(tc-getCC)" \
+ LIBS="$("${PKG_CONFIG}" --libs libsodium)" \
+ CFLAGS="${CFLAGS} $("${PKG_CONFIG}" --cflags libsodium)" \
+ 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."
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/tinyssh/
@ 2024-02-28 7:07 Joonas Niilola
0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2024-02-28 7:07 UTC (permalink / raw
To: gentoo-commits
commit: 75511eb3156d07a9383a540593064079e0aaa33a
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 07:02:20 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 07:02:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75511eb3
net-misc/tinyssh: revbump due to implicit-function-declaration fix
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-misc/tinyssh/{tinyssh-20240101.ebuild => tinyssh-20240101-r1.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/net-misc/tinyssh/tinyssh-20240101.ebuild b/net-misc/tinyssh/tinyssh-20240101-r1.ebuild
similarity index 100%
rename from net-misc/tinyssh/tinyssh-20240101.ebuild
rename to net-misc/tinyssh/tinyssh-20240101-r1.ebuild
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/tinyssh/
@ 2024-08-30 7:33 Joonas Niilola
0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2024-08-30 7:33 UTC (permalink / raw
To: gentoo-commits
commit: e12ade455b9e37ff0e60123086bcd195ba3309b3
Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Fri Aug 23 19:55:47 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 07:33:05 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e12ade45
net-misc/tinyssh: fix include path to sodium
Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>
Closes: https://github.com/gentoo/gentoo/pull/38273
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../{tinyssh-20240101-r1.ebuild => tinyssh-20240101-r2.ebuild} | 5 +++--
net-misc/tinyssh/tinyssh-99999999.ebuild | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/net-misc/tinyssh/tinyssh-20240101-r1.ebuild b/net-misc/tinyssh/tinyssh-20240101-r2.ebuild
similarity index 86%
rename from net-misc/tinyssh/tinyssh-20240101-r1.ebuild
rename to net-misc/tinyssh/tinyssh-20240101-r2.ebuild
index 442fb8e5f171..db7411fdc4a4 100644
--- a/net-misc/tinyssh/tinyssh-20240101-r1.ebuild
+++ b/net-misc/tinyssh/tinyssh-20240101-r2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit systemd toolchain-funcs
@@ -46,10 +46,11 @@ src_compile() {
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)" \
+ CFLAGS="${CFLAGS} $("${PKG_CONFIG}" --cflags libsodium) -I$("${PKG_CONFIG}" --variable=includedir libsodium)/sodium/" \
LDFLAGS="${LDFLAGS}"
else
emake CC="$(tc-getCC)"
diff --git a/net-misc/tinyssh/tinyssh-99999999.ebuild b/net-misc/tinyssh/tinyssh-99999999.ebuild
index 0edea200702b..9d2ed3e6c433 100644
--- a/net-misc/tinyssh/tinyssh-99999999.ebuild
+++ b/net-misc/tinyssh/tinyssh-99999999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit systemd toolchain-funcs
@@ -45,10 +45,11 @@ src_compile() {
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)" \
+ CFLAGS="${CFLAGS} $("${PKG_CONFIG}" --cflags libsodium) -I$("${PKG_CONFIG}" --variable=includedir libsodium)/sodium/" \
LDFLAGS="${LDFLAGS}"
else
emake CC="$(tc-getCC)"
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/tinyssh/
@ 2024-08-30 7:33 Joonas Niilola
0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2024-08-30 7:33 UTC (permalink / raw
To: gentoo-commits
commit: 68f6052b7a9d1098e0c6b8dbab223261712be68d
Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Fri Aug 23 20:09:39 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 07:33:05 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68f6052b
net-misc/tinyssh: synchronize live ebuild
Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-misc/tinyssh/tinyssh-99999999.ebuild | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/net-misc/tinyssh/tinyssh-99999999.ebuild b/net-misc/tinyssh/tinyssh-99999999.ebuild
index 4b288ff014ec..0edea200702b 100644
--- a/net-misc/tinyssh/tinyssh-99999999.ebuild
+++ b/net-misc/tinyssh/tinyssh-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/tinyssh/
@ 2024-11-23 16:54 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2024-11-23 16:54 UTC (permalink / raw
To: gentoo-commits
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}"
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/tinyssh/
@ 2024-11-23 16:54 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2024-11-23 16:54 UTC (permalink / raw
To: gentoo-commits
commit: ff33eb6f5fb5988a4563810346f347876c069857
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 23 16:48:44 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 16:54:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff33eb6f
net-misc/tinyssh: small style tweaks
Not invasive ones, more general Gentoo style ones:
* use 'local i'
* use ${x}
And add a missing die.
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/tinyssh/tinyssh-20241111.ebuild | 5 +++--
net-misc/tinyssh/tinyssh-99999999.ebuild | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/net-misc/tinyssh/tinyssh-20241111.ebuild b/net-misc/tinyssh/tinyssh-20241111.ebuild
index 07aeb225e8ec..e1c07e90c588 100644
--- a/net-misc/tinyssh/tinyssh-20241111.ebuild
+++ b/net-misc/tinyssh/tinyssh-20241111.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
src_prepare() {
default
- echo 'gentoo-autoheaders: $(AUTOHEADERS)' >> Makefile
+ echo 'gentoo-autoheaders: $(AUTOHEADERS)' >> Makefile || die
}
src_configure() {
@@ -46,6 +46,7 @@ src_configure() {
emake gentoo-autoheaders
+ local i
for i in has*.log
do
einfo "$i"
@@ -55,7 +56,7 @@ src_configure() {
src_install() {
einstalldocs
- emake install DESTDIR="$D" PREFIX=/usr
+ 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 07aeb225e8ec..e1c07e90c588 100644
--- a/net-misc/tinyssh/tinyssh-99999999.ebuild
+++ b/net-misc/tinyssh/tinyssh-99999999.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
src_prepare() {
default
- echo 'gentoo-autoheaders: $(AUTOHEADERS)' >> Makefile
+ echo 'gentoo-autoheaders: $(AUTOHEADERS)' >> Makefile || die
}
src_configure() {
@@ -46,6 +46,7 @@ src_configure() {
emake gentoo-autoheaders
+ local i
for i in has*.log
do
einfo "$i"
@@ -55,7 +56,7 @@ src_configure() {
src_install() {
einstalldocs
- emake install DESTDIR="$D" PREFIX=/usr
+ emake install DESTDIR="${D}" PREFIX=/usr
newinitd "${FILESDIR}/${PN}.initd" "${PN}"
newconfd "${FILESDIR}/${PN}.confd" "${PN}"
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-11-23 16:54 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-26 8:41 [gentoo-commits] repo/gentoo:master commit in: net-misc/tinyssh/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-01-07 0:36 Yixun Lan
2024-01-07 0:36 Yixun Lan
2024-02-28 7:07 Joonas Niilola
2024-08-30 7:33 Joonas Niilola
2024-08-30 7:33 Joonas Niilola
2024-11-23 16:54 Sam James
2024-11-23 16:54 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox