[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sniffit/files/, net-analyzer/sniffit/
commit: 46c56624cb102d92322d978909f853e0d2e6870a
Author: Sam James gentoo org>
AuthorDate: Sat Oct 1 00:21:14 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 1 00:21:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46c56624
net-analyzer/sniffit: fix build w/ Clang 16
Closes: https://bugs.gentoo.org/870997
Signed-off-by: Sam James gentoo.org>
.../files/sniffit-0.5.0-implicit-func-decl.patch | 50 ++
.../{sniffit-0.5.ebuild => sniffit-0.5-r1.ebuild} | 16 ---
2 files changed, 59 insertions(+), 7 deletions(-)
diff --git a/net-analyzer/sniffit/files/sniffit-0.5.0-implicit-func-decl.patch
b/net-analyzer/sniffit/files/sniffit-0.5.0-implicit-func-decl.patch
new file mode 100644
index ..e6ee580d6e33
--- /dev/null
+++ b/net-analyzer/sniffit/files/sniffit-0.5.0-implicit-func-decl.patch
@@ -0,0 +1,50 @@
+https://github.com/resurrecting-open-source-projects/sniffit/pull/3
+
+From a05340968343d9f61f57506ed00bff0a62d3f38e Mon Sep 17 00:00:00 2001
+From: Sam James
+Date: Thu, 28 Jul 2022 12:14:44 +0100
+Subject: [PATCH] Fix -Wimplicit-function-declaration
+
+--- a/src/sn_cfgfile.c
b/src/sn_cfgfile.c
+@@ -2,6 +2,7 @@
+ /* - by : Brecht Claerhout */
+ /* - improvements: Shudoh Kazuyuki */
+
++#include
+ #include
+ #include
+ #include
+--- a/src/sn_generation.c
b/src/sn_generation.c
+@@ -13,7 +13,9 @@
+ #include "sn_curses.h"
+ #include "sn_defines.h"
+ #include "sn_structs.h"
++#include "sn_packets.h"
+ #include "sn_generation.h"
++#include "sn_interface.h"
+
+ extern volatile int screen_busy;
+
+--- a/src/sn_interface.c
b/src/sn_interface.c
+@@ -4,6 +4,7 @@
+ #include "sn_config.h"
+
+ #ifdef INCLUDE_INTERFACE
++#include
+ #include
+ #include
+ #include
+--- a/src/sniffit.c
b/src/sniffit.c
+@@ -3,6 +3,7 @@
+
+ #include "sn_config.h"/* Config header file */
+
++#include
+ #include
+ #include
+ #include
+
diff --git a/net-analyzer/sniffit/sniffit-0.5.ebuild
b/net-analyzer/sniffit/sniffit-0.5-r1.ebuild
similarity index 77%
rename from net-analyzer/sniffit/sniffit-0.5.ebuild
rename to net-analyzer/sniffit/sniffit-0.5-r1.ebuild
index 3be66ceda23e..1247440f794f 100644
--- a/net-analyzer/sniffit/sniffit-0.5.ebuild
+++ b/net-analyzer/sniffit/sniffit-0.5-r1.ebuild
@@ -1,27 +1,29 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
+
inherit autotools
DESCRIPTION="Interactive Packet Sniffer"
HOMEPAGE="https://github.com/resurrecting-open-source-projects/sniffit";
SRC_URI="https://github.com/resurrecting-open-source-projects/sniffit/archive/${P}.tar.gz";
-SLOT="0"
+S="${WORKDIR}"/${PN}-${P}
+
LICENSE="BSD"
+SLOT="0"
KEYWORDS="amd64 ppc sparc x86"
RDEPEND="
net-libs/libpcap
>=sys-libs/ncurses-5.2
"
-DEPEND="
- ${RDEPEND}
-"
+DEPEND="${RDEPEND}"
+
PATCHES=(
"${FILESDIR}"/${PN}-0.4.0-tinfo.patch
+ "${FILESDIR}"/${PN}-0.5.0-implicit-func-decl.patch
)
-S=${WORKDIR}/${PN}-${P}
src_prepare() {
default
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sniffit/files/, net-analyzer/sniffit/
commit: 457fd2e783ff78605a8811bd088b407e8d41df7d Author: Jeroen Roovers gentoo org> AuthorDate: Fri Jan 31 21:58:40 2020 + Commit: Jeroen Roovers gentoo org> CommitDate: Fri Jan 31 21:58:58 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=457fd2e7 net-analyzer/sniffit: Fix CFLAGS=-fno-common Package-Manager: Portage-2.3.86, Repoman-2.3.20 Closes: https://bugs.gentoo.org/show_bug.cgi?id=707406 Signed-off-by: Jeroen Roovers gentoo.org> .../sniffit/files/sniffit-0.4.0-fno-common.patch | 181 + net-analyzer/sniffit/sniffit-0.4.0.ebuild | 1 + 2 files changed, 182 insertions(+) diff --git a/net-analyzer/sniffit/files/sniffit-0.4.0-fno-common.patch b/net-analyzer/sniffit/files/sniffit-0.4.0-fno-common.patch new file mode 100644 index 000..6a576acf1d2 --- /dev/null +++ b/net-analyzer/sniffit/files/sniffit-0.4.0-fno-common.patch @@ -0,0 +1,181 @@ +--- a/src/sn_data.h b/src/sn_data.h +@@ -101,7 +101,7 @@ + char IP[256]; + unsigned long SNIFLEN;/* bytes we need to snif */ + short DEST_PORT, SRC_PORT; /* destination port */ +-char non_printable, *logging_device; ++char non_printable; + + / Global data (packets) */ + int PROTO_HEAD;/* Base Protocol head length (ethernet, PPP ,) */ +@@ -147,43 +147,6 @@ + / Global data (plugins) */ + char Plugin_Active[10]; + +-/ Global data (interactive) */ +-#ifdef INCLUDE_INTERFACE +- +-/ shared memory pointers / +-char *SHARED, *connection_data, *timing, *running_connections, +-*logged_connections; +-int *LISTlength, *DATAlength, memory_id; +-unsigned int *TCP_nr_of_packets, *ICMP_nr_of_packets, *UDP_nr_of_packets; +-unsigned int *IP_nr_of_packets; +-unsigned long *TCP_bytes_in_packets, *UDP_bytes_in_packets; +-int *DESC_LEN; +- +-/ data structures ***/ +-struct snif_mask *mask; +-struct shared_logged_conn *log_conn; +-FILE *log_dev_stream; +-struct stat log_dev_stat; +- +-volatile int LOGGING=0, screen_busy=0; +-char PACKET_INFO; +-int POINTpos=0, LISTpos=0; +-unsigned char COLOR_AVAIL=0; +- +-/ screen **/ +-int MASK_WINDOW_ROWS, MASK_WINDOW_COLS; +-int MAIN_WINDOW_ROWS, MAIN_WINDOW_COLS; +-int INFO_WINDOW_ROWS, INFO_WINDOW_COLS; +-int DATA_WINDOW_ROWS, DATA_WINDOW_COLS; +-int INFO_WINDOW_X, INFO_WINDOW_Y; +-int MASK_WINDOW_X, MASK_WINDOW_Y; +-int DATA_WINDOW_X, DATA_WINDOW_Y; +- +-WINDOW *menu_window; +-struct box_window data_box, main_box, mask_box, packets_box; +-int Pid=0; +-#endif +- + /* DEBUG section */ + #ifdef DEBUG + FILE *debug_dev; +--- a/src/sn_global.h b/src/sn_global.h +@@ -4,7 +4,6 @@ + /* currently some option data */ + + char SNIFMODE, DUMPMODE, PROTOCOLS, ASC, WILDCARD, CFG_FILE, NO_CHKSUM; +-char INTERACTIVE_EXTEND; + int LOGPARAM; + /* All option shit */ + +--- a/src/sn_interface.c b/src/sn_interface.c +@@ -18,37 +18,37 @@ + #include "sn_generation.h" + #include "sn_resolv.h" + +-/*** extern stuff / +-extern char *SHARED, *connection_data, *timing, *running_connections, ++/*** global stuff / ++char *SHARED, *connection_data, *timing, *running_connections, + *logged_connections; +-extern int *LISTlength, *DATAlength, memory_id; +-extern unsigned int *TCP_nr_of_packets, *ICMP_nr_of_packets, *UDP_nr_of_packets; unsigned int *IP_nr_of_packets; +-extern unsigned long *TCP_bytes_in_packets, *UDP_bytes_in_packets; +-extern int *DESC_LEN; /* For the connection desciption */ +- +-extern char INTERACTIVE_EXTEND; +- +-extern struct snif_mask *mask; +-extern struct shared_logged_conn *log_conn; +-extern FILE *log_dev_stream; +-extern struct stat log_dev_stat; +- +-extern volatile int LOGGING, screen_busy; +-extern char PACKET_INFO; +-extern int POINTpos, LISTpos; +-extern unsigned char COLOR_AVAIL; +- +-extern WINDOW *menu_window; +-extern struct box_window data_box, main_box, mask_box, packets_box; +-extern int Pid; +-extern char *logging_device; ++int *LISTlength, *DATAlength, memory_id; ++unsigned int *TCP_nr_of_packets, *ICMP_nr_of_packets, *UDP_nr_of_packets; unsigned int *IP_nr_of_packets; ++unsigned long *TCP_bytes_in_packets, *UDP_bytes_in_packets; ++int *DESC_LEN; /* For the connection desciption */ ++ ++char INTERACTIVE_EXTEND; ++ ++struct snif_mask *mask; ++struct shared_logged_conn *log_conn; ++FILE *log_dev_stream; ++struct stat log_dev_stat; ++ ++volatile int LOGGING, screen_busy; ++char PACKET_INFO; ++int POINTpos, LISTpos; ++unsigned char COLOR_AVAIL; ++ ++WINDOW *menu_window; ++struct
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sniffit/files/, net-analyzer/sniffit/
commit: b128965e89ea6cb24e072c0b8b634c3b763f9614
Author: Jeroen Roovers gentoo org>
AuthorDate: Wed Jan 1 23:57:36 2020 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Wed Jan 1 23:58:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b128965e
net-analyzer/sniffit: Fix patch filename
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jeroen Roovers gentoo.org>
.../files/{sniffit-0.4.4-tinfo.patch => sniffit-0.4.0-tinfo.patch}| 0
net-analyzer/sniffit/sniffit-0.4.0.ebuild | 4 ++--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/sniffit/files/sniffit-0.4.4-tinfo.patch
b/net-analyzer/sniffit/files/sniffit-0.4.0-tinfo.patch
similarity index 100%
rename from net-analyzer/sniffit/files/sniffit-0.4.4-tinfo.patch
rename to net-analyzer/sniffit/files/sniffit-0.4.0-tinfo.patch
diff --git a/net-analyzer/sniffit/sniffit-0.4.0.ebuild
b/net-analyzer/sniffit/sniffit-0.4.0.ebuild
index 33937675b70..3c7a5c0489f 100644
--- a/net-analyzer/sniffit/sniffit-0.4.0.ebuild
+++ b/net-analyzer/sniffit/sniffit-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,7 +19,7 @@ DEPEND="
${RDEPEND}
"
PATCHES=(
- "${FILESDIR}"/${PN}-0.4.4-tinfo.patch
+ "${FILESDIR}"/${PN}-0.4.0-tinfo.patch
)
S=${WORKDIR}/${PN}-${P}
