gentoo Easter resync : 12.04.2020

3 files changed, 116 insertions, 1 deletions

diff --git a/net-analyzer/ipband/Manifest b/net-analyzer/ipband/Manifest
index 3a096ab38768..14155df43543 100644
--- a/net-analyzer/ipband/Manifest
+++ b/net-analyzer/ipband/Manifest
@@ -1,7 +1,8 @@
+AUX ipband-0.8.1-fno-common.patch 5046 BLAKE2B 15d70bd5f9280cab53f17cf93536c7c53ac87e268d6c05df2908fa92c2102d23a52438a6f025c84ecf9e72a0b862cee70ff4f7933549ffc09d728828bef6b3b3 SHA512 c22daa264f3a85da2bbb32f336c49491fac5ef2be44044a5d0195b80e7051c0b84161face018c70ebccdf59861b6c831257d9ab9bfe9a980f9185bbd43be579a
 AUX ipband-0.8.1-gentoo.patch 353 BLAKE2B 5f8b29a75aba4c673bf6573df4f03f864d636bfa63a63e3c49c212d71a8b70f13f04940f9112f47fd4d6317654366a6dafafc0f55011c6ad957419e96b17dcfb SHA512 4d07dfeac19d5c7e0f82007082ef902c5b736aaf26d53dda2c66941f198e9dc0c1c1506c939eae7a491891c3b5bf988cdba37366d5b21005a66503b835fda16e
 AUX ipband-0.8.1-postfix.patch 447 BLAKE2B 4c9f9b89b401e3530be636b87c9ece2fe80b63a60627e1eaf4909ec9cd63b6d21bed34ed30354b4466d959cdd866253d8316db75172061580c18775c8fda318a SHA512 9f7948e6bbaba4c7bf9c0fde4c21735a176b522a5765f8c05b4747dabdef1a80f600d2dbb95a24561346edde294f5ad8f3d60a139130149fa320f03701fee9a3
 AUX ipband-init 449 BLAKE2B 5307c6e1aa5c0d1165737a3ad2c01eeb3ef338ac30ef8496973cc5c1d340b0e805093bf357ebd84c7970aa9f6b36cc048fed1911809b69e06e18466c65d4470b SHA512 0a95f80bbfcc26c089a196ba359812a3292e08f378e94140605d2e4d378c60528af013738268055028c40d45b769317f6f631f1af9330f983172c92180999467
 DIST ipband-0.8.1.tgz 36675 BLAKE2B ab0bab6a455fd7fc8193be8b94d7de6c8a781cf3ad7b3a79866deb5fddff834dd5e752163e55007d34c0852fc8ba7ff5b20095b9d5d62bb0db7ca62c72c83b72 SHA512 66347652fee7c7426620260ae615de2f4cfeedacac21d606643e4ae8da204cc81780bfd3f4062a16a9172a78a4a7799fc97e0141750ed26b0e21c8ac2eab3c4f
 EBUILD ipband-0.8.1-r1.ebuild 735 BLAKE2B af55a858f1663175871afb4fc64bc16e87403c2208d1769c5e50b4991f6f8f6cfe76a9a6ed62bf5956cc87283f9a48993d1612eff33226d2233f278ab5388f44 SHA512 6439330ff316aea465e36cc46aaa7b975fe1d80be4c48cab259b907f2cf442338b3f7507b4d08b3cbf045b6c9f148918719ada77edbc9d8d898dcf1944c19e55
-EBUILD ipband-0.8.1-r2.ebuild 688 BLAKE2B 5ad5bb6ac1f1ff1762b1674840d7c4a96582f3d794cfc80483746db5e2ac3b876b2c66d76922c71e9f19dfd055bd4477f742e9d6bd61931473ec25bf6016a691 SHA512 b6ea6049a91f24400e2403e4fe32dfcd884f48ca04d431c891ed8e9768406287321645c17fd72ab6f99eeae7daee9e816cd0647c93a5574c0a98fe12328c5209
+EBUILD ipband-0.8.1-r2.ebuild 725 BLAKE2B b221424abc864193473068eae1ffbe8788855b16ba2f53456d5bbdb477c10b6265a4a829b8766d494444af193e29ae977f5e3e54790c019da8de322df522dce4 SHA512 6a6459f90c73453d6309c204b90dc90e85abfa8f6b0d897e4754bce5803f00962ed3aa73c3c763fb9f83627543bc5feb40faea117651636cd8a845956f6a9649
 MISC metadata.xml 356 BLAKE2B 2a7264932ec2f44d0f36309d4c4cdcac45257f4d5fd6d61a6feda0f8ba2be066ef497b4021dc27f7802271d1ed3d7bba0e8a41d44a123c5eac7f6f6a6004b804 SHA512 6c8c90ab34232d8be24772a9dca38941823d65270cff167a9ac3eff89c00d447e881fa2dade1201dccece369a7c6e52fb265ff15e33799c8fccfe3adf2c56399
diff --git a/net-analyzer/ipband/files/ipband-0.8.1-fno-common.patch b/net-analyzer/ipband/files/ipband-0.8.1-fno-common.patch
new file mode 100644
index 000000000000..4a5fe78fcc49
--- /dev/null
+++ b/net-analyzer/ipband/files/ipband-0.8.1-fno-common.patch
@@ -0,0 +1,113 @@
+--- a/ipband.h
++++ b/ipband.h
+@@ -174,40 +174,40 @@
+ extern char pcap_version[];
+ 
+ /* Internal use */
+-int    isig_m; 			/* Interupt flag for capture loop */
+-int    preload_m;		/* Subnets are preloaded flag */
+-char   *pcapdev_m;		/* Device to listen to */
+-pcap_t *pcapfile_m;		/* Pcap input file descriptor */
+-int    pcapoffset_m;		/* IP header offset */
+-time_t started_m;		/* Time when we started */
++extern int    isig_m; 			/* Interupt flag for capture loop */
++extern int    preload_m;		/* Subnets are preloaded flag */
++extern char   *pcapdev_m;		/* Device to listen to */
++extern pcap_t *pcapfile_m;		/* Pcap input file descriptor */
++extern int    pcapoffset_m;		/* IP header offset */
++extern time_t started_m;		/* Time when we started */
+ 
+-ll_srvc_t *ll_tcp_cache;	/* Resolved tcp services cache */
+-ll_srvc_t *ll_udp_cache;	/* Resolved udp services cache */
++extern ll_srvc_t *ll_tcp_cache;	/* Resolved tcp services cache */
++extern ll_srvc_t *ll_udp_cache;	/* Resolved udp services cache */
+ 
+ 
+ /* Variables holding option values */
+-int    debug_m; 		/* Debug option */
+-int    do_html;			/* Generate HTML output */
+-char   *filtercmd_m;		/* Pcap filter string */
+-char   *repfname_m; 		/* Subnet report output file */
+-char   *htmlfname_m; 		/* HTML report output file */
+-char   *htmltitle_m;		/* HTML Title */
+-int    mask_m;			/* Network aggregation mask bits */
+-int    cycle_m;			/* Number of sec to average data */
+-int    rcycle_m;		/* How long in sec bandwidth
+-				   threshold may be exceeded */
+-float  thresh_m;		/* Bandwidth threshold in kBps */
+-int    fork_m;			/* Fork flag */
+-int    top_m;			/* No of top connections in report */
+-char   *config_m;		/* Config file name */
+-char   *mailto_m;		/* E-mail address for reporting */
+-char   *mailfoot_m;		/* Footer file for e-mail report */
+-char   *mtastring_m;		/* MTA command string */
+-int    report_aggr_m;		/* Flag to report aggr exceed time */
+-int    promisc_m;		/* Use promiscious mode? */
+-int    *iplist_m;		/* List of local networks */
+-int    niplist_m;		/* Number of local networks */
+-int    lenadj_m;		/* IP packet length adjustment in bytes */
++extern int    debug_m; 		/* Debug option */
++extern int    do_html;			/* Generate HTML output */
++extern char   *filtercmd_m;		/* Pcap filter string */
++extern char   *repfname_m; 		/* Subnet report output file */
++extern char   *htmlfname_m; 		/* HTML report output file */
++extern char   *htmltitle_m;		/* HTML Title */
++extern int    mask_m;			/* Network aggregation mask bits */
++extern int    cycle_m;			/* Number of sec to average data */
++extern int    rcycle_m;		/* How long in sec bandwidth
++ 							   threshold may be exceeded */
++extern float  thresh_m;		/* Bandwidth threshold in kBps */
++extern int    fork_m;			/* Fork flag */
++extern int    top_m;			/* No of top connections in report */
++extern char   *config_m;		/* Config file name */
++extern char   *mailto_m;		/* E-mail address for reporting */
++extern char   *mailfoot_m;		/* Footer file for e-mail report */
++extern char   *mtastring_m;		/* MTA command string */
++extern int    report_aggr_m;		/* Flag to report aggr exceed time */
++extern int    promisc_m;		/* Use promiscious mode? */
++extern int    *iplist_m;		/* List of local networks */
++extern int    niplist_m;		/* Number of local networks */
++extern int    lenadj_m;		/* IP packet length adjustment in bytes */
+ 
+ 
+ /*
+--- a/main.c
++++ b/main.c
+@@ -26,6 +26,37 @@
+ 
+ #include "ipband.h" 
+ 
++/* Internal use */
++int    isig_m; 			/* Interupt flag for capture loop */
++int    preload_m;		/* Subnets are preloaded flag */
++char   *pcapdev_m;		/* Device to listen to */
++pcap_t *pcapfile_m;		/* Pcap input file descriptor */
++int    pcapoffset_m;		/* IP header offset */
++time_t started_m;		/* Time when we started */
++
++/* Variables holding option values */
++int    debug_m; 		/* Debug option */
++int    do_html;			/* Generate HTML output */
++char   *filtercmd_m;		/* Pcap filter string */
++char   *repfname_m; 		/* Subnet report output file */
++char   *htmlfname_m; 		/* HTML report output file */
++char   *htmltitle_m;		/* HTML Title */
++int    mask_m;			/* Network aggregation mask bits */
++int    cycle_m;			/* Number of sec to average data */
++int    rcycle_m;		/* How long in sec bandwidth
++ 							   threshold may be exceeded */
++float  thresh_m;		/* Bandwidth threshold in kBps */
++int    fork_m;			/* Fork flag */
++int    top_m;			/* No of top connections in report */
++char   *config_m;		/* Config file name */
++char   *mailto_m;		/* E-mail address for reporting */
++char   *mailfoot_m;		/* Footer file for e-mail report */
++char   *mtastring_m;		/* MTA command string */
++int    report_aggr_m;		/* Flag to report aggr exceed time */
++int    promisc_m;		/* Use promiscious mode? */
++int    *iplist_m;		/* List of local networks */
++int    niplist_m;		/* Number of local networks */
++int    lenadj_m;		/* IP packet length adjustment in bytes */
+ 
+ /* Initialize here and not in set_defaults() in case the latter called
+    _after_ the structures are created */
diff --git a/net-analyzer/ipband/ipband-0.8.1-r2.ebuild b/net-analyzer/ipband/ipband-0.8.1-r2.ebuild
index 6d65e278291e..c0d621602ceb 100644
--- a/net-analyzer/ipband/ipband-0.8.1-r2.ebuild
+++ b/net-analyzer/ipband/ipband-0.8.1-r2.ebuild
@@ -21,6 +21,7 @@ RDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-postfix.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_configure() {