gentoo auto-resync : 28:02:2024 - 11:40:46

5 files changed, 51 insertions, 4 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 8cc1d5f870ff..96ced7da43d8 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/tinyssh/Manifest b/net-misc/tinyssh/Manifest
index b89c1eaaceaf..e55c697828c0 100644
--- a/net-misc/tinyssh/Manifest
+++ b/net-misc/tinyssh/Manifest
@@ -1,9 +1,11 @@
+AUX tinyssh-20240101_c99.patch 899 BLAKE2B a08fadcb958a2e15b68b04c7e39e733ccd71186d18e0786f942ea2dd29c04c4e2446bc6d2d8894e50b65e3cae5e95e00aae6cd0acdd5305e440f564df164c42c SHA512 bd3e1356473862a1453183c85e81618380bad741f8bc3a0c8e82a0f859094ba707b1e4fa54ffc7cb83a4b8ad808e9167581969bd3f098733003e5d567640d2a5
+AUX tinyssh-20240101_conf_cflags.patch 193 BLAKE2B f453b0ce527d04fcba68d53a73690ab0c7020f23afc92902f742deaa10dad42448f52a603d16f417e0b63f8e0deec683b95f557a8bcf3f2ba8916aa478b37a45 SHA512 a932e6345236d14178f5294743221bfc1a7136825607d2e80c03e7baa56dc6db5291bef13ad294f6f2509ca554067acd77c6049999757a51f2e9ccea9e2246d1
 AUX tinyssh-makekey.service 186 BLAKE2B 2e433a22acb4c29a620a7d42b473536f88de1934af8d67bf7c8ca5d18989d85235cd6a7fee0c543c10792f354fc0266d93bdf11b48889046b8ef06fd628945ae SHA512 b890e6e61f88fa3f738ad042ecc5c5712449b7afb3849203b2528a27b9b6ac43d03f6656386cf3cdbc8ad4b3c205fcc3362a84f8894a3cf6edf77e2e689cb7e4
 AUX tinyssh.confd 184 BLAKE2B 6165de2e40d5025eba45390b95dc41f6056c1f4886dc4c60dc81e0973037fb249d9dfe7551c0828f9c9991085b675615c92e41e1185bec303edb63dd94c15d34 SHA512 9cda5967554a04547dce75ecaba9c09328a171998889ec821bfc8f1e9d30e115763d3a75a1572f5d4d829630e0c7146f0827dbc84ac876d533e8e7b99556aa24
 AUX tinyssh.initd 807 BLAKE2B e133e79f49fef0f65e9230cbc7fca2d541261652a4acb07a6aeedb45aa40293334afa9c85328de91917c840d6bf56e56602b551d925ab98d44a7da5584eae984 SHA512 519b7849b18375a3fb99d65a0a335f72d01192d4b40c70fc40554b931811b394537bf65c7aa7a177d1b93577d71322a63fe2d9bce3717a89a36b759a013156c9
 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.ebuild 1723 BLAKE2B ce5b7c8c2f6bdcddaade6a5c78533c199f3979fe0956321db47b8fb89d7768d12e73aa642a2a8ce8c6bad79ee16949be948d149f0ae9743a6fd91d1da47d7fe4 SHA512 f60ff31f43a96f69ac3f32370b52352966e76295e70233a70c117e7f0703814ceaf6e98e77ad01bbbc868afafd9a44545d39185d3a547ba882c050c18c59c8da
+EBUILD tinyssh-20240101-r1.ebuild 1712 BLAKE2B f1e95b425be38a5cd431721cc1ac2fc6e14588326b35b35e569bcdf9ac9a9748d00309e37d6b778ec53de8efae8096eeca377c8e916c311bb19a98e6bae255fa SHA512 10d49feabdcda3cb984e68156e759be65a0985153561ce9175bec380ca1adac11873064d2fa7c24d1c892c5ad6135a43421db9827623fd877307cdf648c29c3f
 EBUILD tinyssh-99999999.ebuild 1723 BLAKE2B a88a2ae7721664524098e9f2bcf301e7e16d3bc161505b03999d499b5ca1604a0e09489c069cc256a8af5d17c295c3b6e960cb445f0eb1f0c1e0a8ffcd916792 SHA512 4d9215ab5ba4fa6bebfe6cd9be2bdee7c9202194a3c1c2023f492cea0f389d136f0f1d7bd25b342eb37926693b84b2fc32e5e22f673f8ab2a84a048a24766fa1
 MISC metadata.xml 2107 BLAKE2B 6e166d2ea373129eb377c030dac7eae8ac06937cdd4ffd2c1afdc4abae691569be7ae5a46a634e9c2a4c13bbfbc915285ee8244f13d88d2219f94dbca38da58f SHA512 845cc482edd4e62a12e3cf3d01699b2e44d4ac9424170c7b867719c5c400aaafd5cb150866f4af309c208211dbba80a52e52bb72ec09d4cf7bbb4a4556a60232
diff --git a/net-misc/tinyssh/files/tinyssh-20240101_c99.patch b/net-misc/tinyssh/files/tinyssh-20240101_c99.patch
new file mode 100644
index 000000000000..38b2e845eaa5
--- /dev/null
+++ b/net-misc/tinyssh/files/tinyssh-20240101_c99.patch
@@ -0,0 +1,33 @@
+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
new file mode 100644
index 000000000000..8dd35d91b828
--- /dev/null
+++ b/net-misc/tinyssh/files/tinyssh-20240101_conf_cflags.patch
@@ -0,0 +1,10 @@
+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.ebuild b/net-misc/tinyssh/tinyssh-20240101-r1.ebuild
index 5164323fe0c6..442fb8e5f171 100644
--- a/net-misc/tinyssh/tinyssh-20240101.ebuild
+++ b/net-misc/tinyssh/tinyssh-20240101-r1.ebuild
@@ -28,10 +28,12 @@ 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_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