diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-08-30 12:00:55 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-08-30 12:00:55 +0100 |
| commit | 2e8abb8c82f14dd064991a1afd337b2f022b37f6 (patch) | |
| tree | d600b9d779be602cd4b6e93bf715ec8fba07624c /net-misc/tinyssh | |
| parent | adcf4f8116a4a850dae301fb4dbcd7b71cb35975 (diff) | |
gentoo auto-resync : 30:08:2024 - 12:00:55
Diffstat (limited to 'net-misc/tinyssh')
| -rw-r--r-- | net-misc/tinyssh/Manifest | 4 | ||||
| -rw-r--r-- | net-misc/tinyssh/tinyssh-20240101-r2.ebuild (renamed from net-misc/tinyssh/tinyssh-20240101-r1.ebuild) | 5 | ||||
| -rw-r--r-- | net-misc/tinyssh/tinyssh-99999999.ebuild | 14 |
3 files changed, 13 insertions, 10 deletions
diff --git a/net-misc/tinyssh/Manifest b/net-misc/tinyssh/Manifest index e55c697828c0..bd166b5313d7 100644 --- a/net-misc/tinyssh/Manifest +++ b/net-misc/tinyssh/Manifest @@ -6,6 +6,6 @@ AUX tinyssh.initd 807 BLAKE2B e133e79f49fef0f65e9230cbc7fca2d541261652a4acb07a6a AUX tinyssh.service 214 BLAKE2B c02041eeb9109fef53a5d08f66d1807eb545d1da1dd9f38f4da4e07860e1fe80bc58a15bed98b7dfc8a9205e1d8852a0d726afc6fe256b187c75212834778f8f SHA512 220c2507b329bc4e4d38caccce8f278ee61d2b9ed6874f36c8e69785edb5021cbb2796d6f5bb51b60d45f1f00306799f5ffbdb26d83fe6db14f69198d4e27d43 AUX tinyssh.socket 222 BLAKE2B 4bc71c8a1f8c45280350324af7c53f891f937b6854bf9647086db7339dd89a47254a8d9f3ced88352ce76cab0d02c326f2109e38c87f81b86336703336bd2a49 SHA512 e3cfb592135d8e1f99781ce17ed580a1854dd70bc8102971ef61654ec32933ae1e8e40f5cb79440b21115764fd301c18b25d59dc722367819f8991cb386dabbc DIST tinyssh-20240101.tar.gz 249848 BLAKE2B 228547c6f4acae3b77a338df1ced3a49e0b4c72257ce081b3b50941c29c5a39a0b1623f6aefce2721b9dde9fae03cb8c1c87b6b019658d578ddcca99e0a021f5 SHA512 b48561cfc11bb6d2e9b1c805c9dfc36be5f1bbbf04a455b8db3f02b5b8df15e420fcd93d58fb23526baaf0fd70e9969deca261152a656015f12a433a61092e90 -EBUILD tinyssh-20240101-r1.ebuild 1712 BLAKE2B f1e95b425be38a5cd431721cc1ac2fc6e14588326b35b35e569bcdf9ac9a9748d00309e37d6b778ec53de8efae8096eeca377c8e916c311bb19a98e6bae255fa SHA512 10d49feabdcda3cb984e68156e759be65a0985153561ce9175bec380ca1adac11873064d2fa7c24d1c892c5ad6135a43421db9827623fd877307cdf648c29c3f -EBUILD tinyssh-99999999.ebuild 1723 BLAKE2B a88a2ae7721664524098e9f2bcf301e7e16d3bc161505b03999d499b5ca1604a0e09489c069cc256a8af5d17c295c3b6e960cb445f0eb1f0c1e0a8ffcd916792 SHA512 4d9215ab5ba4fa6bebfe6cd9be2bdee7c9202194a3c1c2023f492cea0f389d136f0f1d7bd25b342eb37926693b84b2fc32e5e22f673f8ab2a84a048a24766fa1 +EBUILD tinyssh-20240101-r2.ebuild 1895 BLAKE2B 359a09a4b665b6081db414af2b77e9450cc66bae8256a4437792df733061b3e376f54811abb9a6f2292f8127f8b5198e366d065b04ea12bcc8206f443854ef80 SHA512 d29aac74abc210a20b8785615b267e8a96f4953507df3e09e06856c44570c973f1d6314c92197340707a9e5dc5a5546d325d556c4f28202f2b557aff614b84f4 +EBUILD tinyssh-99999999.ebuild 1853 BLAKE2B 42603829346e6c5194fb31e642ef230949d98cad81734bfe6c08809aebd2aacbc180799228f8d58686116fa49492077342cf4b9d6026f15aa875898829af0b50 SHA512 95d80af4561f3bb4b09c4e8a608c80af8fa5d459c9fa59fb1d57edb38aac70b27d9d6d14e4ec5a78346200a7cb99f9845e9b391a0c3e3a0bdb34b69a51b64401 MISC metadata.xml 2107 BLAKE2B 6e166d2ea373129eb377c030dac7eae8ac06937cdd4ffd2c1afdc4abae691569be7ae5a46a634e9c2a4c13bbfbc915285ee8244f13d88d2219f94dbca38da58f SHA512 845cc482edd4e62a12e3cf3d01699b2e44d4ac9424170c7b867719c5c400aaafd5cb150866f4af309c208211dbba80a52e52bb72ec09d4cf7bbb4a4556a60232 diff --git a/net-misc/tinyssh/tinyssh-20240101-r1.ebuild b/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 4b288ff014ec..9d2ed3e6c433 100644 --- a/net-misc/tinyssh/tinyssh-99999999.ebuild +++ b/net-misc/tinyssh/tinyssh-99999999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd toolchain-funcs @@ -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 @@ -44,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)" |