From 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 14 Dec 2020 13:26:14 +0000 Subject: gentoo resync : 14.12.2020 --- net-analyzer/sniffit/Manifest | 4 - .../sniffit/files/sniffit-0.3.7-gentoo.patch | 31 ---- .../sniffit/files/sniffit-0.3.7-misc.patch | 120 -------------- .../sniffit/files/sniffit-0.3.7-tinfo.patch | 38 ----- .../sniffit/files/sniffit-0.4.0-fno-common.patch | 181 --------------------- 5 files changed, 374 deletions(-) delete mode 100644 net-analyzer/sniffit/files/sniffit-0.3.7-gentoo.patch delete mode 100644 net-analyzer/sniffit/files/sniffit-0.3.7-misc.patch delete mode 100644 net-analyzer/sniffit/files/sniffit-0.3.7-tinfo.patch delete mode 100644 net-analyzer/sniffit/files/sniffit-0.4.0-fno-common.patch (limited to 'net-analyzer/sniffit') diff --git a/net-analyzer/sniffit/Manifest b/net-analyzer/sniffit/Manifest index 532884180d60..8e8a8a1575c4 100644 --- a/net-analyzer/sniffit/Manifest +++ b/net-analyzer/sniffit/Manifest @@ -1,7 +1,3 @@ -AUX sniffit-0.3.7-gentoo.patch 1164 BLAKE2B 0d35dab5ae42180ae0eab4133f2a5c752d39fbf20577b06d697ea2bcfa745c3fa51b2318e5043783eea0c54c398478f8939d050fcb9a6c28aa4e3ac483f09135 SHA512 e71684e0be70228c347fe61afdee7e6bf0f116b0ecb603ed4dd6838f457b5b480092ac735297ce64f84f9c8858b5b11d7a1e746c0790380fbf6f7cf8d9875865 -AUX sniffit-0.3.7-misc.patch 2957 BLAKE2B 7315c4f977642819cb7ccff3f1337d5d3f0ee4a298a6984338a44cd8f1295a6a490aeb89e4d06d61c863665f67ca8894951fe4a3d1d52d226895581d84038e49 SHA512 d07298642bab1903c7a93a2b076dcf2cf50a2a5ef5b05e7e9abacaa88cff3089c9028e7721cacbc403b992ad170f64976e83835e441b44e6ac69ee0753e2714e -AUX sniffit-0.3.7-tinfo.patch 1063 BLAKE2B 8d3b781c7c71201639ba77e8dadb063dd85d7bd0a04c4717bb2f6dbad8b2245f2a43b6c563567f813e76f2bc3dab5d414081cd8c337a8ff81e4bab3856d7cd29 SHA512 d4959d6c27928c3d3f85fdfdfb1afd4f7ad24000adb61f565fef68b46b46aba96b61572177db058875dc3a70154223cb620077e6681c8a7f62483e614f8e92c6 -AUX sniffit-0.4.0-fno-common.patch 6287 BLAKE2B 6480ee02366d834b9a6097a36023dd2ea707fc85ba2f6e5dae75cdd6e05c1107ed26ff869d57557d2ac3d3f850e21d99c1eec6d8028ecc7dc8257adae16265e0 SHA512 3b293d71c3b9b9c05d6d2077f6cc759f469af91c0dffe243dbfe75ba93677f18f24e62b78d2a2ca3b5ac99aac318da6802ec4e5c3012569c428662f40fe7f355 AUX sniffit-0.4.0-tinfo.patch 434 BLAKE2B 15295b6ed19928dcbf9f3905278cb3e3390bcf34feb7eb59ac438bba61459625376b6a9c2903605fd4a232db42ce9b782d50a2ebd43b1fa0a1e83b886daaa7ac SHA512 27d5e6fa9bc786b5a3018d26613131e257e5f4cfe0e688b1868857521d7aa931b41319dee7abfd6ef8d76c24f28bfef699c48e82df6e24c90507e1ee462e47d6 DIST sniffit-0.5.tar.gz 60074 BLAKE2B 55d2a65da3801cab4e612a8d1a1770c00abfa44555779ee29dc7358d9636e0b2a3f1e291bc64234588089967510bff99f5a9831d8acc01dacb080d7341081372 SHA512 cf6f4a1d396d47e0fa51cb527e8f64cc4f9af5f83121728ce6cbfb6a11509899e52a6c01f0dd20b0d3b92a567991390d9a616151c9496d4f2d764608ef3542bc EBUILD sniffit-0.5.ebuild 583 BLAKE2B 2203a79bd787f3669c808478a1b3cad5593fb7b2b68b9b856f674f41fa5cc8cb6c3f05fe064a59b3099bb3b2f241fbdac618738d25e7b980d33053f41a37966e SHA512 63dc04674e45be650d1376afee4306005e8815cd3e32009575aab5f50c689e4832bb250fa884beb4c1aefc1c9bbdfd475eb82559e3fd513b2f89d06527d4b660 diff --git a/net-analyzer/sniffit/files/sniffit-0.3.7-gentoo.patch b/net-analyzer/sniffit/files/sniffit-0.3.7-gentoo.patch deleted file mode 100644 index c226b6f00d45..000000000000 --- a/net-analyzer/sniffit/files/sniffit-0.3.7-gentoo.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -10,13 +10,13 @@ - LIBS = @LIBS@ - DEFS = @DEFS@ - OS_OPT = @OS_OPT@ --OBJ_FLAG = -w -O2 -c --OBJ_OPT = -I./libpcap -L./libpcap --EXE_FLAG = -w -O2 -o sniffit --EXE_OPT = -I./libpcap -L./libpcap -lpcap -+OBJ_FLAG = $(CFLAGS) -c -+OBJ_OPT = -I/usr/include/pcap -L/usr/lib -+EXE_FLAG = $(CFLAGS) $(LDFLAGS) -o sniffit -+EXE_OPT = -I/usr/include/pcap -lpcap - EXE_OBJ = sn_packets.o sn_generation.o sn_interface.o sn_cfgfile.o \ - sn_logfile.o sn_resolv.o --DEP_FILES = sn_config.h ./libpcap/pcap.h sn_data.h sn_defines.h sn_plugins.h \ -+DEP_FILES = sn_config.h sn_data.h sn_defines.h sn_plugins.h \ - sn_analyse.c sn_conn_desc.c \ - sn_packets.o \ - sn_generation.o sn_interface.o sn_cfgfile.o sn_logfile.o \ -@@ -26,9 +26,7 @@ - @echo "Succesfull compilation..." - - sniffit: $(SNIFFIT) $(DEP_FILES) -- cd libpcap; make; cd .. - $(CC) $(EXE_FLAG) $(SNIFFIT) $(EXE_OBJ) $(EXE_OPT) $(LIBS) $(DEFS) $(OS_OPT) -- strip sniffit - - sn_cfgfile.o: sn_cfgfile.h sn_cfgfile.c sn_defines.h sn_structs.h sn_config.h - $(CC) $(OBJ_FLAG) sn_cfgfile.c $(OBJ_OPT) $(DEFS) diff --git a/net-analyzer/sniffit/files/sniffit-0.3.7-misc.patch b/net-analyzer/sniffit/files/sniffit-0.3.7-misc.patch deleted file mode 100644 index ff84cd7d2259..000000000000 --- a/net-analyzer/sniffit/files/sniffit-0.3.7-misc.patch +++ /dev/null @@ -1,120 +0,0 @@ ---- a/sn_cfgfile.h -+++ b/sn_cfgfile.h -@@ -10,3 +10,4 @@ - void make_nr_dot (char *); - void interprete_line (char *); - void read_cfg_file (char *); -+char *strlower (char *); ---- a/sn_structs.h -+++ b/sn_structs.h -@@ -67,7 +67,7 @@ - struct snif_mask /* struct for mask */ - { - _32_bit source_ip, destination_ip; -- _32_bit short source_port, destination_port; -+ _32_bit source_port, destination_port; - }; - - /* (packet generation) */ ---- a/sn_analyse.c -+++ b/sn_analyse.c -@@ -1,6 +1,9 @@ - /* Analyse traffic for logging mode */ - /* - by: Brecht Claerhout */ - -+#include -+#include -+ - const unsigned char *data; - memcpy(&tcphead,header,sizeof(struct TCP_header)); - ---- a/sn_cfgfile.c -+++ b/sn_cfgfile.c -@@ -3,6 +3,11 @@ - /* - improvements: Shudoh Kazuyuki */ - - #include -+#include -+#include "sn_interface.h" -+#include -+#include -+#include - #include /* for getservbyname() */ - - #include "sn_config.h" ---- a/sn_conn_desc.c -+++ b/sn_conn_desc.c -@@ -1,6 +1,8 @@ - /* Connection description detection file */ - /* - by: Brecht Claerhout */ - -+#include -+#include - - /* Simple PORT BASED detection */ - ---- a/sn_generation.c -+++ b/sn_generation.c -@@ -6,12 +6,16 @@ - #ifdef INCLUDE_INTERFACE - #ifdef GENERATION - #include -+#include -+#include - #include - #include - #include "sn_curses.h" - #include "sn_defines.h" - #include "sn_structs.h" - #include "sn_generation.h" -+#include "sn_interface.h" /* input_field() */ -+#include "sn_packets.h" /* in_cksum() */ - - extern volatile int screen_busy; - ---- a/sniffit.0.3.7.c -+++ b/sniffit.0.3.7.c -@@ -4,6 +4,9 @@ - #include "sn_config.h" /* Config header file */ - - #include -+#include -+#include -+#include - #include - #include - #include ---- a/sn_interface.c -+++ b/sn_interface.c -@@ -6,6 +6,9 @@ - #ifdef INCLUDE_INTERFACE - #include - #include -+#include -+#include -+#include - #include - #include - #include "sn_curses.h" ---- a/sn_logfile.c -+++ b/sn_logfile.c -@@ -4,6 +4,9 @@ - #include "sn_config.h" - - #include -+#include /* exit() */ -+#include /* strcpy() */ -+#include /* time() ctime() */ - #include - #include - #include "sn_defines.h" ---- a/sn_packets.c -+++ b/sn_packets.c -@@ -5,6 +5,7 @@ - #include "sn_defines.h" - #include "sn_structs.h" - #include -+#include /* memcpy() strcpy() */ - - extern int PROTO_HEAD; - extern char NO_CHKSUM; diff --git a/net-analyzer/sniffit/files/sniffit-0.3.7-tinfo.patch b/net-analyzer/sniffit/files/sniffit-0.3.7-tinfo.patch deleted file mode 100644 index b82835049687..000000000000 --- a/net-analyzer/sniffit/files/sniffit-0.3.7-tinfo.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -5,30 +5,15 @@ - - AC_INIT(sniffit.h) - --dnl Config of libpcap --AC_CONFIG_SUBDIRS(libpcap) -- - dnl Check the C compiler - AC_PROG_CC - - dnl Check NCURSES availability --NCURSES_PATH=/usr/include:/usr/include/ncurses:/usr/include/curses:/usr/local/include:/usr/local/include/ncurses:/usr/local/include/curses:./:./ncurses.h --ncurses_warn=0 --AC_CHECK_LIB(ncurses,main,,ncurses_warn=1) -- --AC_PATH_PROGS(NCURSES_LOCATION,ncurses.h,no,$NCURSES_PATH) --if test "$NCURSES_LOCATION" != no; then -- echo "#include \"$NCURSES_LOCATION\"" >sn_curses.h -- AC_DEFINE(HAVE_NCURSES_H,1) --else -- ncurses_warn=1 --fi -- --dnl Print warning for interactive mode --if test $ncurses_warn -ne 0; then -- AC_MSG_WARN(Interactive mode (-i/-I) will NOT be supported.!) -- AC_MSG_WARN(Install ncurses!) --fi -+PKG_CHECK_MODULES(ncurses,ncurses,main, -+ LIBS="$LIBS $ncurses_LIBS" -+ echo "#include " > sn_curses.h -+ AC_DEFINE(HAVE_NCURSES_H), -+ AC_MSG_ERROR([ncurses not found])) - - dnl Check Shared Memory support - AC_CHECK_FUNCS(shmget) 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 deleted file mode 100644 index 6a576acf1d2b..000000000000 --- a/net-analyzer/sniffit/files/sniffit-0.4.0-fno-common.patch +++ /dev/null @@ -1,181 +0,0 @@ ---- 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 box_window data_box, main_box, mask_box, packets_box; -+int Pid; -+char *logging_device; - - - /*** Screen Parameters ***/ --extern int MASK_WINDOW_ROWS, MASK_WINDOW_COLS, MAIN_WINDOW_ROWS, MAIN_WINDOW_COLS; --extern int INFO_WINDOW_ROWS, INFO_WINDOW_COLS, DATA_WINDOW_ROWS, DATA_WINDOW_COLS; --extern int INFO_WINDOW_X, INFO_WINDOW_Y, MASK_WINDOW_X, MASK_WINDOW_Y; --extern int DATA_WINDOW_X, DATA_WINDOW_Y; -+int MASK_WINDOW_ROWS, MASK_WINDOW_COLS, MAIN_WINDOW_ROWS, MAIN_WINDOW_COLS; -+int INFO_WINDOW_ROWS, INFO_WINDOW_COLS, DATA_WINDOW_ROWS, DATA_WINDOW_COLS; -+int INFO_WINDOW_X, INFO_WINDOW_Y, MASK_WINDOW_X, MASK_WINDOW_Y; -+int DATA_WINDOW_X, DATA_WINDOW_Y; - - - /*** Sreen operations ***/ ---- a/src/sn_interface.h -+++ b/src/sn_interface.h -@@ -1,9 +1,46 @@ - /* Sniffit Data File */ - -+#include -+#include -+#include - #include "pcap.h" - - typedef void (*sig_hand)(int ); /* sighandler_t gave errors, weird */ - -+/*** global stuff ********/ -+extern unsigned int *IP_nr_of_packets; -+extern 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; -+extern 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; -+ -+ -+/*** Screen Parameters ***/ -+extern int MASK_WINDOW_ROWS, MASK_WINDOW_COLS, MAIN_WINDOW_ROWS, MAIN_WINDOW_COLS; -+extern int INFO_WINDOW_ROWS, INFO_WINDOW_COLS, DATA_WINDOW_ROWS, DATA_WINDOW_COLS; -+extern int INFO_WINDOW_X, INFO_WINDOW_Y, MASK_WINDOW_X, MASK_WINDOW_Y; -+extern int DATA_WINDOW_X, DATA_WINDOW_Y; -+ - int add_itemlist(char *, char *, char *); - void child_exit (void); - void clear_shared_mem(char); -- cgit v1.2.3