From 29aabba0ea759c6a2864ff5631735b67ee38e5e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Feb 2020 18:44:56 +0000 Subject: gentoo resync : 05.02.2020 --- net-analyzer/sniffit/Manifest | 3 +- .../sniffit/files/sniffit-0.4.0-fno-common.patch | 181 +++++++++++++++++++++ net-analyzer/sniffit/sniffit-0.4.0.ebuild | 1 + 3 files changed, 184 insertions(+), 1 deletion(-) create 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 959751a8f237..b6a9cbcce58e 100644 --- a/net-analyzer/sniffit/Manifest +++ b/net-analyzer/sniffit/Manifest @@ -1,9 +1,10 @@ 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.4.0.tar.gz 59640 BLAKE2B 0cb335e7fc308155d0b3b3163695745ba1b0b71f212341238074d80782d99b12ed3f4991eed766161bfb65aeffe8bbf5e8e71a987b431fd414ac34ab0be416ab SHA512 a31c39859ab308f3ad4bf2f32a61d0f419ed6ad5d1668efc79e996c4a99557e511fc0b36c21e30316cfa82217fb10fd16d4e3473f5f1fdd70cdeba959d643aab DIST sniffit.0.3.7.beta.tar.gz 212419 BLAKE2B 938f4eb775cfd0c604ec107573b8e4bba93fc60b40428ae3894b008fa4eaee3c9bf1ef29daf28caef4f22c4574faf2c6a8e3e8c32b7f84d643b8364ab31412ab SHA512 b32d1f17d589ee1d1afc7986640a2b9f451cdb26ee2d077db1eaec1bb77ed353bbbb6a79bd25f915b3a40b7a279f9fc7855706150ec3a24f8937a152ac91b8d1 EBUILD sniffit-0.3.7-r4.ebuild 792 BLAKE2B 91723d785619de8ab8de16708d365e07a43310e093cae0f3b794d5b38054588a9760cf9c26639feef7cb83f612aacfe08b804ff585ec2b01469ac54105254c12 SHA512 2f44f2881473aa1744c62b68d6eab2f4eebf9470a17a069430bf9c2fdaef1c755de543c42d9153d975cc1bef7a848ae8b78398a56f1400c4d1280d5ddc344d35 -EBUILD sniffit-0.4.0.ebuild 587 BLAKE2B 70f3b41f380075af20c2ce630bf4752a424d48badd00ce10aff803bc8a938b2e9990f5e47b9f0df82a6ffb1a88bace06ffeb193b7c7d313b1e3fea15934783cf SHA512 590199b70c414ffd649e7db6f790be0aea3395a1de705a50edc652b18e38573b96ade3271a1cb40fd6d925fa043f3f56b8c5f04214ca16664f61d903822b485d +EBUILD sniffit-0.4.0.ebuild 631 BLAKE2B d2411739bbf645031179c22bb82cb6ee485e46aa3e6f73de1ec75e0e38d8700bdafd40ff6fd7e76bbaca72c87bfcf03f46d2cc7d170534289094840250d36675 SHA512 7ca9b61f2da0120d31737c9936901506ec5c51353a500f64efda06d97d4829449b883dec644e48057cfd402661ad93b03b528aa26ca24669936c0d662f2fa94a MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 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 000000000000..6a576acf1d2b --- /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 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); diff --git a/net-analyzer/sniffit/sniffit-0.4.0.ebuild b/net-analyzer/sniffit/sniffit-0.4.0.ebuild index a4e8e10f5060..6761ff0d80e0 100644 --- a/net-analyzer/sniffit/sniffit-0.4.0.ebuild +++ b/net-analyzer/sniffit/sniffit-0.4.0.ebuild @@ -19,6 +19,7 @@ DEPEND=" ${RDEPEND} " PATCHES=( + "${FILESDIR}"/${PN}-0.4.0-fno-common.patch "${FILESDIR}"/${PN}-0.4.0-tinfo.patch ) S=${WORKDIR}/${PN}-${P} -- cgit v1.2.3