- Update to 0.14.1

- Convert to OptionsNG

2 files changed, 29 insertions, 11 deletions

diff --git a/net-mgmt/pmacct/files/patch-src__isis__sockunion.c b/net-mgmt/pmacct/files/patch-src__isis__sockunion.c
deleted file mode 100644
index 9ecc400eff6c..000000000000
--- a/net-mgmt/pmacct/files/patch-src__isis__sockunion.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/isis/sockunion.c.orig	2012-04-26 16:51:31.000000000 -0400
-+++ ./src/isis/sockunion.c	2012-04-26 16:51:56.000000000 -0400
-@@ -625,7 +625,7 @@
- 	struct sockaddr_dl *sdl;
- 
- 	sdl = (struct sockaddr_dl *)&(su->sa);
--	printf ("link#%d\n", sdl->sdl_index);
-+	//printf ("link#%d\n", sdl->sdl_index);
-       }
-       break;
- #endif /* AF_LINK */
diff --git a/net-mgmt/pmacct/files/patch-src__pretag_handlers.c b/net-mgmt/pmacct/files/patch-src__pretag_handlers.c
new file mode 100644
index 000000000000..e7ee036bca96
--- /dev/null
+++ b/net-mgmt/pmacct/files/patch-src__pretag_handlers.c
@@ -0,0 +1,29 @@
+--- ./src/pretag_handlers.c.orig	2012-08-03 23:29:51.000000000 -0400
++++ ./src/pretag_handlers.c	2012-08-03 23:30:23.000000000 -0400
+@@ -1067,7 +1067,7 @@
+   if (entry->last_matched == PRETAG_BGP_NEXTHOP) return FALSE;
+ 
+   /* check network-related primitives against fallback scenarios */
+-  if (!evaluate_lm_method(pptrs, TRUE, config.nfacctd_net, NF_NET_KEEP)) return;
++  if (!evaluate_lm_method(pptrs, TRUE, config.nfacctd_net, NF_NET_KEEP)) return 0;
+ 
+   switch(hdr->version) {
+   case 9:
+@@ -1100,7 +1100,7 @@
+   int ret = -1;
+ 
+   /* check network-related primitives against fallback scenarios */
+-  if (!evaluate_lm_method(pptrs, TRUE, config.nfacctd_net, NF_NET_BGP)) return;
++  if (!evaluate_lm_method(pptrs, TRUE, config.nfacctd_net, NF_NET_BGP)) return 0;
+ 
+   if (dst_ret) {
+     if (pptrs->bgp_nexthop_info)
+@@ -1660,7 +1660,7 @@
+   SFSample *sample = (SFSample *) pptrs->f_data;
+ 
+   /* check network-related primitives against fallback scenarios */
+-  if (!evaluate_lm_method(pptrs, TRUE, config.nfacctd_net, NF_NET_KEEP)) return;
++  if (!evaluate_lm_method(pptrs, TRUE, config.nfacctd_net, NF_NET_KEEP)) return 0;
+ 
+   if (entry->bgp_nexthop.a.family == AF_INET) {
+     if (!memcmp(&entry->bgp_nexthop.a.address.ipv4, &sample->bgp_nextHop.address.ip_v4, 4)) return (FALSE | entry->bgp_nexthop.neg);