gentoo auto-resync : 13:02:2025 - 00:12:52

4 files changed, 105 insertions, 2 deletions

diff --git a/net-analyzer/pinger/Manifest b/net-analyzer/pinger/Manifest
index c78e7f1e9b6f..08d297bccd11 100644
--- a/net-analyzer/pinger/Manifest
+++ b/net-analyzer/pinger/Manifest
@@ -1,6 +1,8 @@
 AUX pinger-0.33-clang16.patch 268 BLAKE2B 7195ed569c9f5a5c290f7c1980707dc25da0f336db0d7ff3fb7227b6b58970180a5aff65ab4efdab79ded6a6a53711a8f5ad3d3104ff7ccc24a8fdc82e5ac4f8 SHA512 95ad9bf8d42b8faa2e44743b593cab46c79b25e092e733a431f1872deee3f01b1617db4c95aa7db7cb0c41490d7eaad4567bcc81dc14356e6cc20678b236717a
 AUX pinger-0.33-gentoo.patch 2488 BLAKE2B a94bf31ad31089f5a8686cc316437984c570677ce60cff01a4ce517f1557256cdc3c440049c68aebd642c4d92d76b29cd56ef18da1d9161e06dac20504ce4207 SHA512 7ebda41ab5caf068476e82f181893b688a0c211cc3e26750517e2cdd4db872bfba4b8d389708bb39fedf103d29cb5b98be3ba0064cd73453735ece3a68776730
+AUX pinger-0.33-interface_ncurses-fix-C23-compat.patch 997 BLAKE2B 8f49a7eda17a6cec31ae52b9134eeee5c49e310b1197f11dc8f668132a3d05501ef27e3cbb05bb1293c3864c86162c8a4935a59c62976b2e3d28028a1a0223ab SHA512 b6d7c08a6fa5a3f368bdec52dde0c7cd16bae164b987015031e6bbf3f40a61f944f82a766593a9224ed1b5d244c8a8c1a8f69c0f52acc9476e4b8eca5939d047
+AUX pinger-0.33-interface_ncurses-fix-Wformat-security.patch 2010 BLAKE2B abb7b73c11afa04312c2a35eec80a1d470629a475cfb426f63c05378f074134e58176408403d23e8b04164e67f54838fea2462348b559a609728473ef839da0e SHA512 f8be3732940a8aff1618d17292ab0527e2814f16e9b5d79967dc1ca8943b28f10f4dc87b258bebfd31ee862b88b9d7ce5c4fbe9daa90ad14c924932f021e0596
 AUX pinger-0.33-musl-int-types.patch 5192 BLAKE2B 273eaea87fdc0763483a03145e4d98e877acf13ae37811b1efdc4d5b49987d542f889769109fda4376cc486298b08b4373ac26cfbb5b1757fc868a48d378823a SHA512 7aaaca7aa6a3e116b494bce388e63e99f8239afe44ab582abce356f29e000097e12615b248a4701c9637204b74c0585dcf60a7433ebcf49bb8d6c00910c5a8a3
 DIST pinger-0.33.tar.gz 247827 BLAKE2B 6139044be634438945c92a431b97276b5556b513a948a675d6d70c73e4e22d08a58b9cf6607170f804354c18371af54a222b0e064cc1c8275ba77f67ddbd6699 SHA512 fff07599ef91fbdcff9be7806eca57a71e8e6fac7e9afc67c4147e6246b0bcdadf379de28f87054dbe7c409955c0e0ddeae7f529e954231bea0cfb39e4e29bc1
-EBUILD pinger-0.33-r1.ebuild 1161 BLAKE2B e92fa57b77b8b98ca0228c35bd776acb79c2c71068d2e401c5e92aaafe883b92ecb69b6bad12f4796a2b7b17ce920ca13646117632cfc25f9867385d6f04e0ab SHA512 8903e01c871f89550762de968a43528a5deea188197f74604c77f82ad68a2512381d958a41ed1bce8c277d9282cd950f866cb97ff19f1d19b357878b87306e99
+EBUILD pinger-0.33-r2.ebuild 1285 BLAKE2B d1dbe69aea5802ff66e7d41380597776ee3dcd06f61939e6db1c88d39d5b1ae2520c42ddf18c7dadef24b8d70dfee560b9799d5f447ccfcb19472d5cf7dc70fa SHA512 7d864aff017e0d1b8f0a2e383a57a3009849203d0134f33b22f638e7f9b97de96f59f8137a7fc90469a96e9d7ce47908116e0dc12ebf798e0f67d04fe893e083
 MISC metadata.xml 478 BLAKE2B d44f500d43bb193fa7c0ace6b8ccc58de5c1c57bb40804272c3bf893bf4ec5d8555ed9668eaa91151297a27db138404d755c5ade15374e6358df9e5369355e43 SHA512 1c4f0de91fafca3e2df1496dfabe073f62e9cc05be8eca51ab1faf907faa028adbfd80083c55e76e55d5fabe9e2ce8a2cd2bdd5750ca0eda0fd0724f2b9f03e0
diff --git a/net-analyzer/pinger/files/pinger-0.33-interface_ncurses-fix-C23-compat.patch b/net-analyzer/pinger/files/pinger-0.33-interface_ncurses-fix-C23-compat.patch
new file mode 100644
index 000000000000..41ae74b87a9c
--- /dev/null
+++ b/net-analyzer/pinger/files/pinger-0.33-interface_ncurses-fix-C23-compat.patch
@@ -0,0 +1,39 @@
+From a6392be483562043f9e06273a2b1e34b64b5eb13 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 12 Feb 2025 15:24:41 +0000
+Subject: [PATCH 1/2] interface_ncurses: fix C23 compat
+
+adjust_size is called as a signal handler so needs to take an int param;
+just define one and throw it away.
+
+Bug: https://bugs.gentoo.org/944034
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ src/interface_ncurses.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/interface_ncurses.c b/src/interface_ncurses.c
+index f3ffc53..28d2ce5 100644
+--- a/src/interface_ncurses.c
++++ b/src/interface_ncurses.c
+@@ -23,7 +23,7 @@ int new_cols, new_rows;
+ #endif
+ 
+ #if CAN_RESIZE
+-void adjust_size();
++void adjust_size(int);
+ int size_changed = 0;
+ #endif
+ 
+@@ -519,7 +519,7 @@ void ncurses_gui_loop(hosts_data * hosts, int *stop_loop)
+ 
+ /* Resize terminal if necessary */
+ #if CAN_RESIZE
+-void adjust_size()
++void adjust_size(int unused)
+ {
+     struct winsize size;
+ 
+-- 
+2.48.1
+
diff --git a/net-analyzer/pinger/files/pinger-0.33-interface_ncurses-fix-Wformat-security.patch b/net-analyzer/pinger/files/pinger-0.33-interface_ncurses-fix-Wformat-security.patch
new file mode 100644
index 000000000000..5586ac0308a1
--- /dev/null
+++ b/net-analyzer/pinger/files/pinger-0.33-interface_ncurses-fix-Wformat-security.patch
@@ -0,0 +1,60 @@
+From d464aa2a165adcf42c37d87e38ea3796ee56d485 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 12 Feb 2025 15:25:15 +0000
+Subject: [PATCH 2/2] interface_ncurses: fix -Wformat-security
+
+Newer ncurses has format attributes which trigger this.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ src/interface_ncurses.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/interface_ncurses.c b/src/interface_ncurses.c
+index 28d2ce5..a7496d2 100644
+--- a/src/interface_ncurses.c
++++ b/src/interface_ncurses.c
+@@ -188,7 +188,7 @@ void show_host_status(host_data * host, int colpair, int attr, char *statstr,
+         attroff(attr);
+         /* print time */
+         get_currtime_str(NULL, time_str);
+-        mvprintw(0, COLS - 8, time_str);
++        mvprintw(0, COLS - 8, "%s", time_str);
+         refresh();
+     }
+ }
+@@ -319,11 +319,11 @@ void print_header(char *title)
+     printw("%s", line);
+     move(0, HDR_LINE_X_START);
+     sprintf(line, "Pinger v%s", VERSION);
+-    printw(line);
++    printw("%s", line);
+     title_start = strlen(line) + HDR_LINE_X_START + 1;
+     sprintf(line, _("'q' key to quit"));
+     move(0, COLS - strlen(line) - 9);   /* 1 + clock width */
+-    printw(line);
++    printw("%s", line);
+     title_maxlen = COLS - strlen(line) - 9 - title_start;
+     if ((title_maxlen > 4) && (title != NULL)) {
+         title_len = strlen(title);
+@@ -342,7 +342,7 @@ void print_header(char *title)
+         for (idx = 0; idx < strlen(title_with_brackets); idx++)
+             if (title_with_brackets[idx] == '%')
+                 title_with_brackets[idx] = ':';
+-        printw(title_with_brackets);
++        printw("%s", title_with_brackets);
+     }
+ //if (title != NULL) free(title);
+     if (title_with_brackets != NULL)
+@@ -351,7 +351,7 @@ void print_header(char *title)
+     attron(A_BOLD);
+     move(0, COLS - 8);
+     get_currtime_str(NULL, line);
+-    printw(line);
++    printw("%s", line);
+     free(line);
+ 
+     move(1, 0);
+-- 
+2.48.1
+
diff --git a/net-analyzer/pinger/pinger-0.33-r1.ebuild b/net-analyzer/pinger/pinger-0.33-r2.ebuild
index 38ed420ff7df..ef60082f3865 100644
--- a/net-analyzer/pinger/pinger-0.33-r1.ebuild
+++ b/net-analyzer/pinger/pinger-0.33-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,6 +36,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-musl-int-types.patch
 	"${FILESDIR}"/${P}-clang16.patch
+	"${FILESDIR}"/${P}-interface_ncurses-fix-C23-compat.patch
+	"${FILESDIR}"/${P}-interface_ncurses-fix-Wformat-security.patch
 )
 
 src_prepare() {