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

4 files changed, 267 insertions, 6 deletions

diff --git a/net-misc/smbc/Manifest b/net-misc/smbc/Manifest
index 95a8b09a898f..b07433753787 100644
--- a/net-misc/smbc/Manifest
+++ b/net-misc/smbc/Manifest
@@ -1,8 +1,10 @@
+AUX 0001-Fix-signal-handlers.patch 2313 BLAKE2B e10dd427ee36d1ae539000b8ff8873c294db53970cd84f9268e903ec65c3d7b0fc8d035eae083cfa6666e2302eaeabb1104d6ccbbf3e3c32c92a0e1c33594fc4 SHA512 dd582723c65466d0357e7e9424cba46076097c8c6a3a8cdf5c88aadf9dfc1fe47d66f3ca90e1b2a3b11b5f01132bcac03ca6068152e5da835f47a18173ca119e
+AUX 0002-Fix-Wformat-security.patch 4797 BLAKE2B 0e1e94aa3c5ebe67cfac3d7ae83bce337dda421f8f231352c867e8b4da84d7f09e48c9cb05dc1136c0136d62953fc8f426c61643a94189cb5638c0e9c6a95249 SHA512 1f033fed62e652453e74ddb1f92c1198d8e79f63dbcb48c3e5e80f259117f3ada025f9ab04bf18379e727bc4fdae5d6eec75548ea2f26aee19c67f72ae913cda
 AUX smbc-1.2.2-cflags.patch 323 BLAKE2B cd95f0d01e1a0f000c362544420fb55e9fed0b2786a05c2ecf90ce8066ea94c4e0e949f8b9cbdac2471ea2e5599675a51c2176c1c2a303eb3d04160d959935dc SHA512 c9cde82726e201c3a9b118ef5c34816cffc82c00b6122352797f57f5366bc8fd12d4827bcf0f895056dd8417f4ecdb48d1e607046adca62fbe2c5fd8adcc75f9
 AUX smbc-1.2.2-multiple-definitions-gcc10.patch 2191 BLAKE2B e0cb38b0799d87d78c152bd7227dd8c73e074deff608cb7ec870dc90574118f4558e6bc5c7a417a1e8154a52a9787a8873ab413c3825053c04c39b221bfedab2 SHA512 3ce7d6b76cba3abcf52a4efb2e4cc012788a3f1c182cc046a2395d3fd9f42f3d0fea49854ca02840af8eb5093684c51f973c09437957b0df6f779b258251e7ae
 AUX smbc-1.2.2-samba4-includes.patch 2402 BLAKE2B 966fcbf20522e8bd5fdb349e65551c9d37cffe091800c6c29e3b10d74dfba512e31e43a2841c05e1cb1ab9222f0009d1f301cc6e01ec960d2fcc9b3fe972b8a6 SHA512 0cd27c9c4b2ab8b749ee779b7fcba4a321979602ebabd29c65dfef15f2d7fec3ffd38efeef5868fc0cfc44412b83b5f37acf21586fae3b2ee7cd8879d0ee3dba
 AUX smbc-1.2.2-size_t.patch 551 BLAKE2B c4cd80f4af3285cdca7e6a5c9812742d6a662856bb986f11d395a5d4a44e3210c1087c976b4e0055768401b99fda6de081c330a1429a901fb4adcd461108934f SHA512 f445ec293a0bda038493faca823266aff96d4e2f41cf8ed5a64beae2b4e1e941ab8de9dab966328f77be9199ba5f8655006d5aabbfcdbd28cb842966f068fbaa
 AUX smbc-1.2.2-tinfo.patch 480 BLAKE2B 6b882d6f2b39b7b0876b632382c6ab073918fe3e1d37ec908c8d3d460b3d4ad0fd671a33675bf543ce4304ace59d6b58851ab786bd1bbcca055933f021864557 SHA512 b210ad4e3607429131f5ba6b3fc79ea179cb4c5cc0316ca327f82f59aceac1a0e1157d5376cd374b0142458ee8e821ce33d07ee47e9c7dd8481d9c2e3ed4f70b
 DIST smbc-1.2.2.tgz 977908 BLAKE2B 481bf7e16b8f6d89abd62e619a13a8692ce1f3ed169a1b3c35864a2a66f2cf10753d7d4151f95acc3428ad628b5888a12f452836297d18f9c8b3ce1d17550010 SHA512 4625ba6bb6b3ffe818826d4af4da0fcb2e516e1ed62ee15ace4cf04d5176d238c5107d349f595809048bafc38d571448e1f1f170ed061dfc8f698836b52e2b84
-EBUILD smbc-1.2.2-r3.ebuild 1056 BLAKE2B 5748d83baee8a2b19e257161e2c8d59d4a5c0defcb64f0552189a72c911dc019f7fafcd33a42f5910ce817aafd0af505cf95de73eb962dee0d2d5fefbb6049e5 SHA512 49287f420c7a74b5b5ac31325528a0af5787d2c9e3c4d676fd30aeb5471432c570fa4286a4240b1e68ce8a18857e406da2be4bedfef836dbfae4d70c9e968dbb
+EBUILD smbc-1.2.2-r4.ebuild 1155 BLAKE2B b64c14904d226ad3961e0c7db990373db8f2596cf48be67f1bcae1034b8e0a01acda2bf94e10a00116512d1231d10358364a9877390dd37b1e9cfc81d111f604 SHA512 bad5d94c5c31d0aa887beec613ba714346e100e34514ff3e3009f0ea114bc541b51f1d6ebb594204fb958efed4c4c07cf698f792d528cad0ac9b42d224b947cc
 MISC metadata.xml 654 BLAKE2B 76fc9dd16ca740785c49b93f5591c22b8807acac539de44e8308ebb72c1d89bf530a4771ab776ba3f99a9ea1772b68affc563e5737089e6a396b5de96048c228 SHA512 de2aabeb6f8eebf8cdbae578e7fbbfc7e98561093fa2cd2c8263d1bc164be57536ec1bdbfc89c4af9316f9aafa231f997f52e4f6b0d6079f4a94470bff418050
diff --git a/net-misc/smbc/files/0001-Fix-signal-handlers.patch b/net-misc/smbc/files/0001-Fix-signal-handlers.patch
new file mode 100644
index 000000000000..3e4ece3bef0c
--- /dev/null
+++ b/net-misc/smbc/files/0001-Fix-signal-handlers.patch
@@ -0,0 +1,104 @@
+From 1d9dc54aea5a36aa43ce3bb5d5a013121fbd25ab Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 12 Feb 2025 16:04:02 +0000
+Subject: [PATCH 1/2] Fix signal handlers
+
+They need to take an argument but we don't use it.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ src/smbc.c | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/src/smbc.c b/src/smbc.c
+index 41a3d28..86349d0 100644
+--- a/src/smbc.c
++++ b/src/smbc.c
+@@ -251,9 +251,9 @@ void RwinRedrawWithData();
+ void RcompareTwoIndexFile(int RfdNew, int RfdOld, int RfdMessage);
+ int RtryDownloadUpload();
+ void RtryLockFileAndCreateIndexFile();
+-void RsigAlarm();
+-void RsigTerm();
+-void RsigSEGV();
++void RsigAlarm(int unused);
++void RsigTerm(int unused);
++void RsigSEGV(int unused);
+ char *RgetSmallPath(char *Rhost);
+ 
+ //-------------------------------------------------------------
+@@ -1196,7 +1196,7 @@ RmanageList()
+     {
+       if (!RdownloadListTmp) {
+         RDBG("smbc: RmanageList RpaintList - error expected next record\n"); 
+-        RsigTerm();
++        RsigTerm(0);
+       }
+       mvwhline(RwinCol1, ++Rk, 0, 32, 1);
+       mvwhline(RwinCol2, Rk, 0, 32, 1);
+@@ -1354,7 +1354,7 @@ RmanageList()
+   }
+ 
+   void 
+-  RsigAlarmManageWindow() 
++  RsigAlarmManageWindow(int unused) 
+   {
+     RDBG("RmanageList : RsigAlarmManageWindow alarm\n");
+     RdoWindowResizeDownloadList();
+@@ -5543,7 +5543,7 @@ RcreateFindListIndex(int Isave, char *Igroup, char *Ihost, char *Ipath, char *Id
+ }
+ 
+ void 
+-RsigTerm()
++RsigTerm(int unused)
+ {
+   int Ri;
+ 
+@@ -5602,7 +5602,7 @@ RsigTerm()
+ }
+ 
+ void 
+-RsigCHLD()
++RsigCHLD(int unused)
+ {
+   waitpid(RchildId, NULL, WNOHANG);
+ }
+@@ -6393,7 +6393,7 @@ RsendWinpopupInput(char *RgroupInput)
+ }
+ 
+ void 
+-RsigSEGV()
++RsigSEGV(int unused)
+ {
+   int Rres = errno;
+ 
+@@ -6404,7 +6404,7 @@ RsigSEGV()
+   RDBG("\n");
+   RDBG("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+   Rerror = 1;
+-  RsigTerm();
++  RsigTerm(0);
+   exit(Rres);
+ }
+ 
+@@ -6819,7 +6819,7 @@ RtryDownloadUpload()
+ }
+ 
+ void 
+-RsigAlarm()
++RsigAlarm(int unused)
+ {
+   char RinsertChar = 1;
+ 
+@@ -8220,7 +8220,7 @@ RDBG("smbc: main 100\n");
+  Rfree(RfileNameMessagePrim);
+  Rfree(RsmbcLockFile);
+  RDBG("----stop 2----\n");
+- RsigTerm();
++ RsigTerm(0);
+  RfreeDebug();
+  return(0);
+ }
+-- 
+2.48.1
+
diff --git a/net-misc/smbc/files/0002-Fix-Wformat-security.patch b/net-misc/smbc/files/0002-Fix-Wformat-security.patch
new file mode 100644
index 000000000000..357856b0516d
--- /dev/null
+++ b/net-misc/smbc/files/0002-Fix-Wformat-security.patch
@@ -0,0 +1,150 @@
+From 0f514db1868a34839a673257543a00383a5183df Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 12 Feb 2025 16:07:23 +0000
+Subject: [PATCH 2/2] Fix -Wformat-security
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ src/dulist.c |  2 +-
+ src/fnet.c   | 14 +++++++-------
+ src/smbc.c   | 16 ++++++++--------
+ 3 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/src/dulist.c b/src/dulist.c
+index 23c0024..c353acc 100644
+--- a/src/dulist.c
++++ b/src/dulist.c
+@@ -200,7 +200,7 @@ RShowAllItemsFromDUlist(int RnrDulist)
+         Rstraddtoend(&RstrT, "/");
+         Rstraddtoend(&RstrT, Rdls->filename);
+         Rstraddtoend(&RstrT, "\n");
+-        printf(to_scr(RstrT));
++        printf("%s", to_scr(RstrT));
+         Rfree(RstrT);
+         RfreeOneTTdownloadAndGoToFirst(&Rdls);
+       }
+diff --git a/src/fnet.c b/src/fnet.c
+index cc401af..7c35d2e 100644
+--- a/src/fnet.c
++++ b/src/fnet.c
+@@ -184,7 +184,7 @@ void
+ refreshw(WINDOW *win, char *buf)
+ {
+   werase(win);
+-  mvwprintw(win, 1, 1, buf);
++  mvwprintw(win, 1, 1, "%s", buf);
+ }
+ 
+ int 
+@@ -407,7 +407,7 @@ RmvwprintwCenter(WINDOW *win, int i, char *str)
+   int y, x;
+ 
+   getmaxyx(win, y, x);
+-  mvwprintw(win, i, x/2-strlen(str)/2, str);
++  mvwprintw(win, i, x/2-strlen(str)/2, "%s", str);
+   wrefresh(win);
+ }
+ 
+@@ -427,7 +427,7 @@ refreshTxtInWin(WINDOW *win, int y, int x, char *buf, int winSize, int startidx,
+     wattron(win, COLOR_PAIR(colorPair));
+   mvwhline(win, y, x+xDelta, ' ', winSize-xDelta);
+   wattron(win, attr);
+-  mvwprintw(win, y, x+xDelta, str+startidx);
++  mvwprintw(win, y, x+xDelta, "%s", str+startidx);
+   wattroff(win, attr);
+   if (colorPair != -1) 
+     wattroff(win, COLOR_PAIR(colorPair));
+@@ -474,7 +474,7 @@ refreshTxtInWinCursor(WINDOW *win, int y, int x, char *buf, int winSize, int sta
+   Rstr = strdup(Rbuf+startidx);
+   Rstr[xCursor-startidx] = 0;
+   RDBG("fnet refreshTxtInWinCursor 1: Rstr = \""); RDBG(Rstr); RDBG("\"\n");
+-  mvwprintw(win, y, x, Rstr);
++  mvwprintw(win, y, x, "%s", Rstr);
+   Rprinted = strlen(Rstr);
+   Rfree(Rstr);
+    
+@@ -500,7 +500,7 @@ refreshTxtInWinCursor(WINDOW *win, int y, int x, char *buf, int winSize, int sta
+     RDBG("fnet refreshTxtInWinCursor 23\n");
+   }
+   RDBG("fnet refreshTxtInWinCursor 29: Rstr = \""); RDBG(Rstr); RDBG("\"\n");
+-  mvwprintw(win, y, x+Rprinted, Rstr);
++  mvwprintw(win, y, x+Rprinted, "%s", Rstr);
+   Rfree(Rstr);
+   wattroff(win, A_REVERSE);
+   Rprinted++;
+@@ -514,7 +514,7 @@ refreshTxtInWinCursor(WINDOW *win, int y, int x, char *buf, int winSize, int sta
+     if (winSize-Rprinted < strlen(Rstr))
+        Rstr[winSize-Rprinted] = 0;
+     RDBG("fnet refreshTxtInWinCursor 3: Rstr = \""); RDBG(Rstr); RDBG("\"\n");
+-    mvwprintw(win, y, x+Rprinted, Rstr);
++    mvwprintw(win, y, x+Rprinted, "%s", Rstr);
+     Rfree(Rstr);
+   }
+ 
+@@ -929,7 +929,7 @@ Rmvwprintw(WINDOW *win, int y, int x, const char *fmt)
+   }
+   RDBG("fnet: RmvwprintwAddPercent fmt = |"); RDBG((char *)fmt); RDBG("|\n");
+   RDBG("fnet: RmvwprintwAddPercent Rc1 = |"); RDBG(Rc1); RDBG("|\n");
+-  mvwprintw(win, y, x, Rc1);
++  mvwprintw(win, y, x, "%s", Rc1);
+   Ri = strlen(Rc1);
+   Rfree(Rc1);
+   RDBG("fnet: RmvwprintwAddPercent end\n");
+diff --git a/src/smbc.c b/src/smbc.c
+index 86349d0..d2fbb07 100644
+--- a/src/smbc.c
++++ b/src/smbc.c
+@@ -2174,7 +2174,7 @@ RwinRedraw()
+   mvwhline(RwinLeftTop, 0, 0, 0, RxHalf-2);
+   mvwhline(RwinRightTop, 0, 0, 0, RxHalf-2);
+   mvwprintw(RwinHead, 0, 0,"Samba Commander %s", VERSION);
+-  mvwprintw(RwinHead, 0, RmainWinX-Rstrlen(Rm108), Rm108);
++  mvwprintw(RwinHead, 0, RmainWinX-Rstrlen(Rm108), "%s", Rm108);
+   mvwhline(RwinLeft, 2, 1, 0, RxHalf-2);
+   mvwhline(RwinLeft, 2, 1, 0, RxHalf-2);
+   mvwvline(RwinLeftList, 0, 1, 0, RmainWinY-6);
+@@ -3615,9 +3615,9 @@ RreadRcfile()
+   Rstraddtoend(&Rfile, "/.smbc/smbcrc");
+   if (access(Rfile, F_OK) != 0) 
+   {
+-    printf(Rm242, Rfile);
+-    printf(Rm243);
+-    printf(Rm244);
++    printf("%s", Rm242, Rfile);
++    printf("%s", Rm243);
++    printf("%s", Rm244);
+     return;
+   }
+   Rfd = open(Rfile, O_RDONLY);
+@@ -5575,8 +5575,8 @@ RsigTerm(int unused)
+   endwin();
+   if (!Ri) 
+   {
+-    printf(Rm156);
+-    printf(Rm157);
++    printf("%s", Rm156);
++    printf("%s", Rm157);
+   }
+   if ((RmainWinX < 80) || (RmainWinY < 25)) 
+     printf(Rm158, RmainWinX, RmainWinY);
+@@ -5589,7 +5589,7 @@ RsigTerm(int unused)
+   if (Rerror) 
+   {
+     printf("**********************************************************\n");
+-    printf(Rm159);
++    printf("%s", Rm159);
+     printf("**********************************************************\n");
+   }
+ 
+@@ -6990,7 +6990,7 @@ main(int argc,char *argv[])
+  {
+    fprintf(stderr, Rm175, errno);
+    if (errno == 2) 
+-     fprintf(stderr, Rm176);
++     fprintf(stderr, "%s", Rm176);
+    exit(0);
+  }
+ 
+-- 
+2.48.1
+
diff --git a/net-misc/smbc/smbc-1.2.2-r3.ebuild b/net-misc/smbc/smbc-1.2.2-r4.ebuild
index 67bb75f96311..6799dc8a4a58 100644
--- a/net-misc/smbc/smbc-1.2.2-r3.ebuild
+++ b/net-misc/smbc/smbc-1.2.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,17 +15,22 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="nls debug"
 
 BDEPEND="virtual/pkgconfig"
-DEPEND="dev-libs/popt
+DEPEND="
+	dev-libs/popt
 	net-fs/samba
-	sys-libs/ncurses
-	nls? ( sys-devel/gettext )"
+	sys-libs/ncurses:=
+	nls? ( sys-devel/gettext )
+"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-cflags.patch
+PATCHES=(
+	"${FILESDIR}"/${P}-cflags.patch
 	"${FILESDIR}"/${P}-size_t.patch
 	"${FILESDIR}"/${P}-samba4-includes.patch
 	"${FILESDIR}"/${P}-multiple-definitions-gcc10.patch
 	"${FILESDIR}"/${P}-tinfo.patch
+	"${FILESDIR}"/0001-Fix-signal-handlers.patch
+	"${FILESDIR}"/0002-Fix-Wformat-security.patch
 )
 
 src_prepare() {