[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nast/files/, net-analyzer/nast/

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nast/files/, net-analyzer/nast/

[Jeroen Roovers]

commit:     a296a6e0fb0afca044415ecea3ad172b4726629e
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 31 10:11:40 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Jan 31 10:13:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a296a6e0

net-analyzer/nast: Remove file checks from configure (bug #646196 by Jan Psota).

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 net-analyzer/nast/files/nast-0.2.0-gentoo.patch | 133 ++++++++++++++----------
 net-analyzer/nast/nast-0.2.0-r2.ebuild          |  41 ++++++++
 2 files changed, 120 insertions(+), 54 deletions(-)

diff --git a/net-analyzer/nast/files/nast-0.2.0-gentoo.patch b/net-analyzer/nast/files/nast-0.2.0-gentoo.patch
index f8f05ab3a16..015354e5186 100644
--- a/net-analyzer/nast/files/nast-0.2.0-gentoo.patch
+++ b/net-analyzer/nast/files/nast-0.2.0-gentoo.patch
@@ -1,79 +1,104 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -84,14 +84,14 @@
+@@ -83,22 +83,6 @@
+ # -- libnet --
  #
  
- filechk="yes"
+-filechk="yes"
 -AC_CHECK_FILE(/usr/lib/libnet.a,, filechk="no")
-+AC_CHECK_FILE(/usr/lib/libnet.so,, filechk="no")
- if test "$filechk" = "no"; then
+-if test "$filechk" = "no"; then
 - AC_CHECK_FILE(/usr/local/lib/libnet.a, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
-+ AC_CHECK_FILE(/usr/local/lib/libnet.so, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
- fi
- 
- if test "$filechk" = "no"; then AC_MSG_ERROR([
- 
+-fi
+-
+-if test "$filechk" = "no"; then AC_MSG_ERROR([
+-
 -Libnet archive file (libnet.a) not found in /usr or /usr/local!
-+Libnet archive file (libnet.so) not found in /usr or /usr/local!
- 
- Libnet-1.1.x Packet Shaping Library is required.
- You can download it from official web site: http://www.packetfactory.net/libnet
-@@ -111,14 +111,14 @@
+-
+-Libnet-1.1.x Packet Shaping Library is required.
+-You can download it from official web site: http://www.packetfactory.net/libnet
+-
+-])
+-fi
+-
+ AC_CHECK_LIB(net, libnet_name2addr4,, AC_MSG_ERROR([
+ 
+ Libnet-1.1.x Packet Shaping Library not found! It's required.
+@@ -110,22 +94,6 @@
+ # -- libpcap --
  #
  
- filechk="yes"
+-filechk="yes"
 -AC_CHECK_FILE(/usr/lib/libpcap.a,, filechk="no")
-+AC_CHECK_FILE(/usr/lib/libpcap.so,, filechk="no")
- if test "$filechk" = "no"; then
+-if test "$filechk" = "no"; then
 - AC_CHECK_FILE(/usr/local/lib/libpcap.a, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
-+ AC_CHECK_FILE(/usr/local/lib/libpcap.so, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
- fi
- 
- if test "$filechk" = "no"; then AC_MSG_ERROR([
- 
+-fi
+-
+-if test "$filechk" = "no"; then AC_MSG_ERROR([
+-
 -Libpcap archive file (libpcap.a) not found in /usr or /usr/local!
-+Libpcap archive file (libpcap.so) not found in /usr or /usr/local!
- 
- Libpcap-0.7.1 Packet Capture Library is required. 
- You can download it from official web site: http://www.tcpdump.org/#current
-@@ -137,16 +137,18 @@
+-
+-Libpcap-0.7.1 Packet Capture Library is required. 
+-You can download it from official web site: http://www.tcpdump.org/#current
+-
+-])
+-fi
+-
+ AC_CHECK_LIB(pcap, pcap_dispatch,, AC_MSG_ERROR([
+ 
+ Libpcap-0.7.1 Packet Capture Library not found! It's required. 
+@@ -137,25 +105,7 @@
  # -- libncurses support --
  #
  
-+PKG_CHECK_MODULES(ncurses,ncurses,[LIBS="$LIBS $ncurses_LIBS"],)
-+
- filechk="yes"
+-filechk="yes"
 -AC_CHECK_FILE(/usr/lib/libncurses.a,, filechk="no")
-+AC_CHECK_FILE(/usr/lib/libncurses.so,, filechk="no")
- if test "$filechk" = "no"; then
+-if test "$filechk" = "no"; then
 - AC_CHECK_FILE(/usr/local/lib/libncurses.a, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
-+ AC_CHECK_FILE(/usr/local/lib/libncurses.so, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
- fi
- 
- if test "$filechk" = "no"; 
- then AC_MSG_WARN([
- 
+-fi
+-
+-if test "$filechk" = "no"; 
+-then AC_MSG_WARN([
+-
 -Libncurses archive file (libncurses.a) not found in /usr or /usr/local!
-+Libncurses archive file (libncurses.so) not found in /usr or /usr/local!
+-
+-Ncurses library (*) not found in your system.
+-You can download it from official web site: http://www.gnu.org/software/ncurses/ncurses.html
+-(*): CRT screen handling and optimization package
+-
+-Building without ncurses menu support (-G flag will doesn't work)
+-
+-])
+-fi
++PKG_CHECK_MODULES(ncurses,ncurses,[LIBS="$LIBS $ncurses_LIBS"],)
  
- Ncurses library (*) not found in your system.
- You can download it from official web site: http://www.gnu.org/software/ncurses/ncurses.html
-@@ -174,15 +176,15 @@
+ ENABLE_NCRS="no"
+ AC_CHECK_LIB(ncurses, initscr, ENABLE_NCRS="yes"; NCURSES=ncurses/n_nast.o; LIBS="-lncurses $LIBS"; AC_DEFINE(HAVE_LIBNCURSES), AC_MSG_RESULT([
+@@ -173,28 +123,6 @@
+ #  --lmenu support--
  #
  
- filechk="yes"
+-filechk="yes"
 -AC_CHECK_FILE(/usr/lib/libmenu.a,, filechk="no")
-+AC_CHECK_FILE(/usr/lib/libmenu.so,, filechk="no")
- if test "$filechk" = "no"; then
+-if test "$filechk" = "no"; then
 - AC_CHECK_FILE(/usr/local/lib/libmenu.a, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
-+ AC_CHECK_FILE(/usr/local/lib/libmenu.so, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include")
- fi
- 
- if test "$filechk" = "no"; 
- then AC_MSG_WARN([
- 
+-fi
+-
+-if test "$filechk" = "no"; 
+-then AC_MSG_WARN([
+-
 -Menu archive file (libncurses.a) not found in /usr or /usr/local!
-+Menu archive file (libncurses.so) not found in /usr or /usr/local!
- 
+-
+-
+-Menu library (*) not found in your system.
+-You can download it from official web site: http://www.gnu.org/software/ncurses/ncurses.html
+-(*): CRT screen handling and optimization package
+-
+-
+-Building without ncurses menu support (-G flag will doesn't work)
+-])
+-
+-fi
+-
+ ENABLE_NCRS="no"
+ AC_CHECK_LIB(menu, menu_opts_off, ENABLE_NCRS="yes"; MENU=ncurses/n_menu.o; LIBS="-lmenu $LIBS"; AC_DEFINE(HAVE_LIBMENU), AC_MSG_RESULT([
  
- Menu library (*) not found in your system.

diff --git a/net-analyzer/nast/nast-0.2.0-r2.ebuild b/net-analyzer/nast/nast-0.2.0-r2.ebuild
new file mode 100644
index 00000000000..a922979f560
--- /dev/null
+++ b/net-analyzer/nast/nast-0.2.0-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="NAST - Network Analyzer Sniffer Tool"
+HOMEPAGE="https://sourceforge.net/projects/nast.berlios/"
+SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="ncurses"
+
+RDEPEND="
+	>=net-libs/libnet-1.1.1
+	net-libs/libpcap
+	ncurses? ( >=sys-libs/ncurses-5.4 )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dosbin nast
+	doman nast.8
+	dodoc AUTHORS BUGS CREDITS ChangeLog NCURSES_README README TODO
+}

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nast/files/, net-analyzer/nast/

[Sam James]

commit:     091ffea0fba395a2e090098ac142e29c0f1fbd9e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 15:37:43 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 15:45:00 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=091ffea0

net-analyzer/nast: fix modern C issue, -Wformat-security

Closes: https://bugs.gentoo.org/944402
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../nast/files/0001-Fix-signal-handler.patch       | 43 ++++++++++++++++
 .../nast/files/0002-Fix-Wformat-security.patch     | 58 ++++++++++++++++++++++
 .../{nast-0.2.0-r3.ebuild => nast-0.2.0-r4.ebuild} |  4 +-
 3 files changed, 104 insertions(+), 1 deletion(-)

diff --git a/net-analyzer/nast/files/0001-Fix-signal-handler.patch b/net-analyzer/nast/files/0001-Fix-signal-handler.patch
new file mode 100644
index 000000000000..7961649e7db6
--- /dev/null
+++ b/net-analyzer/nast/files/0001-Fix-signal-handler.patch
@@ -0,0 +1,43 @@
+From eff649cd681e52b953dcf37065a7035246930858 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 12 Feb 2025 15:32:37 +0000
+Subject: [PATCH 1/2] Fix signal handler
+
+Signal handlers need to take an argument.
+
+Bug: https://bugs.gentoo.org/944402
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ common.c       | 2 +-
+ include/nast.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/common.c b/common.c
+index 5649295..f2b60f4 100644
+--- a/common.c
++++ b/common.c
+@@ -226,7 +226,7 @@ void openfile(void)
+ }
+ 
+ /* signal handler */
+-void sigexit()
++void sigexit(int unused)
+ {
+ #ifdef HAVE_LIBNCURSES
+ # include <ncurses.h>
+diff --git a/include/nast.h b/include/nast.h
+index f5cd047..a65a404 100644
+--- a/include/nast.h
++++ b/include/nast.h
+@@ -73,7 +73,7 @@ int car (char *dev, int lg);
+ int run_bc (char *dev, char *filter);
+ 
+ /* other functions*/
+-void sigexit();
++void sigexit(int unused);
+ void openfile(void);
+ void bkg(void);
+ 
+-- 
+2.48.1
+

diff --git a/net-analyzer/nast/files/0002-Fix-Wformat-security.patch b/net-analyzer/nast/files/0002-Fix-Wformat-security.patch
new file mode 100644
index 000000000000..039950a6344e
--- /dev/null
+++ b/net-analyzer/nast/files/0002-Fix-Wformat-security.patch
@@ -0,0 +1,58 @@
+From 63598f0194ec0b291af30d8d7b3ee7bab1cd0928 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 12 Feb 2025 15:35:13 +0000
+Subject: [PATCH 2/2] Fix -Wformat-security
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ bcount.c         | 2 +-
+ ncurses/n_nast.c | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/bcount.c b/bcount.c
+index 3130188..7987ac6 100644
+--- a/bcount.c
++++ b/bcount.c
+@@ -153,7 +153,7 @@ void bytecounting ()
+ 	     else icons++;
+ 
+              sprintf (value, "%Ld", number);
+-	     printf (value);
++	     printf ("%s", value);
+ 
+ 	     /* calculate space */
+ 	     if (strlen(value) < 6) printf ("\t\t");
+diff --git a/ncurses/n_nast.c b/ncurses/n_nast.c
+index 3e02859..ba50f2f 100644
+--- a/ncurses/n_nast.c
++++ b/ncurses/n_nast.c
+@@ -641,7 +641,7 @@ void title(void)
+    title = subwin(stdscr,3,COLS,0,0);
+    wbkgd(title,COLOR_PAIR(1));
+    box(title,0,0);
+-   mvwprintw(title,1,(COLS-sizeof(TITLE))/2, TITLE);
++   mvwprintw(title,1,(COLS-sizeof(TITLE))/2, "%s", TITLE);
+    wrefresh(title);
+ }
+ 
+@@ -748,7 +748,7 @@ void pop_up_win(void)
+    pop_up = newwin(17,55,(LINES-17)/2,(COLS-55)/2);
+    wbkgd(pop_up,COLOR_PAIR(4));
+    box(pop_up,0,0);
+-   mvwprintw(pop_up,0,(55 -strlen(message))/2, message);
++   mvwprintw(pop_up,0,(55 -strlen(message))/2, "%s", message);
+    wrefresh(pop_up);
+ }
+ 
+@@ -759,7 +759,7 @@ void help_win(void)
+    help = newwin(23,67,(LINES-23)/2,(COLS-67)/2);
+    wbkgd(help,COLOR_PAIR(4));
+    box(help,0,0);
+-   mvwprintw(help,0,(67 -strlen(message))/2, message);
++   mvwprintw(help,0,(67 -strlen(message))/2, "%s", message);
+    wrefresh(help);
+ }
+ 
+-- 
+2.48.1
+

diff --git a/net-analyzer/nast/nast-0.2.0-r3.ebuild b/net-analyzer/nast/nast-0.2.0-r4.ebuild
similarity index 86%
rename from net-analyzer/nast/nast-0.2.0-r3.ebuild
rename to net-analyzer/nast/nast-0.2.0-r4.ebuild
index fa2602d1b025..7417306e5b69 100644
--- a/net-analyzer/nast/nast-0.2.0-r3.ebuild
+++ b/net-analyzer/nast/nast-0.2.0-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
@@ -24,6 +24,8 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/0001-Fix-signal-handler.patch
+	"${FILESDIR}"/0002-Fix-Wformat-security.patch
 )
 
 src_prepare() {