diff options
-rw-r--r-- | net-mgmt/ndpmon/Makefile | 4 | ||||
-rw-r--r-- | net-mgmt/ndpmon/distinfo | 6 | ||||
-rw-r--r-- | net-mgmt/ndpmon/files/patch-monitoring.h | 16 | ||||
-rw-r--r-- | net-mgmt/ndpmon/files/patch-monitoring__na.h | 16 | ||||
-rw-r--r-- | net-mgmt/ndpmon/files/patch-monitoring__ns.h | 16 | ||||
-rw-r--r-- | net-mgmt/ndpmon/files/patch-monitoring__ra.h | 16 | ||||
-rw-r--r-- | net-mgmt/ndpmon/files/patch-monitoring__rd.h | 16 | ||||
-rw-r--r-- | net-mgmt/ndpmon/files/patch-ndpmon.c | 13 | ||||
-rw-r--r-- | net-mgmt/ndpmon/files/patch-ndpmon.h | 14 | ||||
-rw-r--r-- | net-mgmt/ndpmon/files/patch-parser.c | 19 | ||||
-rw-r--r-- | net-mgmt/ndpmon/files/patch-print__packet__info.h | 16 | ||||
-rw-r--r-- | net-mgmt/ndpmon/files/patch-utils.h | 14 |
12 files changed, 8 insertions, 158 deletions
diff --git a/net-mgmt/ndpmon/Makefile b/net-mgmt/ndpmon/Makefile index a917d7328694..fd3ccb0dfbd2 100644 --- a/net-mgmt/ndpmon/Makefile +++ b/net-mgmt/ndpmon/Makefile @@ -6,7 +6,7 @@ # PORTNAME= ndpmon -PORTVERSION= 1.1b +PORTVERSION= 1.2 CATEGORIES= net-mgmt ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -17,8 +17,10 @@ COMMENT= On-link icmpv6 message monitoring and reporting daemon USE_GNOME= libxml2 USE_PERL5_RUN= yes +WRKSRC= ${WRKDIR}/${PORTNAME} GNU_CONFIGURE= yes +CONFIGURE_ENV= OSTYPE=FreeBSD MAN8= ndpmon.8 PORTDOCS= INSTALL README diff --git a/net-mgmt/ndpmon/distinfo b/net-mgmt/ndpmon/distinfo index e02ba21303ba..2c71b891aa3f 100644 --- a/net-mgmt/ndpmon/distinfo +++ b/net-mgmt/ndpmon/distinfo @@ -1,3 +1,3 @@ -MD5 (ndpmon-1.1b.tgz) = d7d4b3397938d6a716ed6bfae4cc1e06 -SHA256 (ndpmon-1.1b.tgz) = a01b9511defbedebef05a2c614a05ba05e8bd83461e5e239af72607a62ca95b2 -SIZE (ndpmon-1.1b.tgz) = 281973 +MD5 (ndpmon-1.2.tgz) = 4073e4b4d0a9031572a2988760622116 +SHA256 (ndpmon-1.2.tgz) = 9e7239a59d33348bd7a69150bc34c7877916e9afecb58314c5e319d23447a2ef +SIZE (ndpmon-1.2.tgz) = 234792 diff --git a/net-mgmt/ndpmon/files/patch-monitoring.h b/net-mgmt/ndpmon/files/patch-monitoring.h deleted file mode 100644 index ae736cd83feb..000000000000 --- a/net-mgmt/ndpmon/files/patch-monitoring.h +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- monitoring.h.orig -+++ monitoring.h -@@ -36,8 +36,9 @@ - - #include <time.h> - -+#include <sys/types.h> - #include <netinet/in.h> --#include <netinet/ether.h> -+#include <net/ethernet.h> - #include <netinet/ip6.h> - #include <netinet/icmp6.h> - #include <string.h> diff --git a/net-mgmt/ndpmon/files/patch-monitoring__na.h b/net-mgmt/ndpmon/files/patch-monitoring__na.h deleted file mode 100644 index 272d4a0e40a2..000000000000 --- a/net-mgmt/ndpmon/files/patch-monitoring__na.h +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- monitoring_na.h.orig -+++ monitoring_na.h -@@ -34,7 +34,9 @@ - #ifndef _MONITORING_NA_ - #define _MONITORING_NA_ 1 - --#include <netinet/ether.h> -+#include <sys/types.h> -+#include <netinet/in.h> -+#include <net/ethernet.h> - #include <netinet/ip6.h> - #include <netinet/icmp6.h> - diff --git a/net-mgmt/ndpmon/files/patch-monitoring__ns.h b/net-mgmt/ndpmon/files/patch-monitoring__ns.h deleted file mode 100644 index a765356b8306..000000000000 --- a/net-mgmt/ndpmon/files/patch-monitoring__ns.h +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- monitoring_ns.h.orig -+++ monitoring_ns.h -@@ -33,7 +33,9 @@ - #ifndef _MONITORING_NS_ - #define _MONITORING_NS_ 1 - --#include <netinet/ether.h> -+#include <sys/types.h> -+#include <netinet/in.h> -+#include <net/ethernet.h> - #include <netinet/ip6.h> - #include <netinet/icmp6.h> - #include <netinet/in.h> diff --git a/net-mgmt/ndpmon/files/patch-monitoring__ra.h b/net-mgmt/ndpmon/files/patch-monitoring__ra.h deleted file mode 100644 index 77a8cd0c32ac..000000000000 --- a/net-mgmt/ndpmon/files/patch-monitoring__ra.h +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- monitoring_ra.h.orig -+++ monitoring_ra.h -@@ -33,7 +33,9 @@ - #ifndef _MONITORING_RA_ - #define _MONITORING_RA_ 1 - --#include <netinet/ether.h> -+#include <sys/types.h> -+#include <net/ethernet.h> -+#include <netinet/in.h> - #include <netinet/ip6.h> - #include <netinet/icmp6.h> - diff --git a/net-mgmt/ndpmon/files/patch-monitoring__rd.h b/net-mgmt/ndpmon/files/patch-monitoring__rd.h deleted file mode 100644 index a4ac42af78c4..000000000000 --- a/net-mgmt/ndpmon/files/patch-monitoring__rd.h +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- monitoring_rd.h.orig -+++ monitoring_rd.h -@@ -33,7 +33,9 @@ - #ifndef _MONITORING_RD_ - #define _MONITORING_RD_ 1 - --#include <netinet/ether.h> -+#include <sys/types.h> -+#include <netinet/in.h> -+#include <net/ethernet.h> - #include <netinet/ip6.h> - #include <netinet/icmp6.h> - diff --git a/net-mgmt/ndpmon/files/patch-ndpmon.c b/net-mgmt/ndpmon/files/patch-ndpmon.c index ee5a1fe75872..4d183a8eaa44 100644 --- a/net-mgmt/ndpmon/files/patch-ndpmon.c +++ b/net-mgmt/ndpmon/files/patch-ndpmon.c @@ -16,14 +16,5 @@ $FreeBSD$ +char dtd_path[128] = "%%PREFIX%%/share/ndpmon/neighbor_list.dtd"; +char dtd_config_path[128] = "%%PREFIX%%/share/ndpmon/config_ndpmon.dtd"; - #ifdef _MACRESOLUTION_ - manufacturer_t *manuf = NULL; -@@ -438,7 +438,7 @@ - - - /* open device for reading */ -- descr = pcap_open_live(interface,BUFSIZ,1,-1,errbuf); -+ descr = pcap_open_live(interface,BUFSIZ,1,1000,errbuf); - if(descr == NULL) - { - fprintf(stderr,"pcap_open_live(): %s\n",errbuf); exit(1); + struct action_selector action_low_pri, action_high_pri; + int use_reverse_hostlookups; diff --git a/net-mgmt/ndpmon/files/patch-ndpmon.h b/net-mgmt/ndpmon/files/patch-ndpmon.h deleted file mode 100644 index eefd911bfed7..000000000000 --- a/net-mgmt/ndpmon/files/patch-ndpmon.h +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- ndpmon.h.orig -+++ ndpmon.h -@@ -38,7 +38,7 @@ - - #include <netinet/in.h> - #include <netinet/if_ether.h> --#include <netinet/ether.h> -+#include <net/ethernet.h> - #include <netinet/ip6.h> - #include <netinet/icmp6.h> - #include <net/ethernet.h> diff --git a/net-mgmt/ndpmon/files/patch-parser.c b/net-mgmt/ndpmon/files/patch-parser.c deleted file mode 100644 index e60e172b5191..000000000000 --- a/net-mgmt/ndpmon/files/patch-parser.c +++ /dev/null @@ -1,19 +0,0 @@ - -$FreeBSD$ - ---- parser.c.orig -+++ parser.c -@@ -65,11 +65,13 @@ - /** note: it may be a good option to save values, and restore - * them when exiting - */ -+ /* - write_proc("/proc/sys/net/ipv6/conf/all/autoconf",flag); - write_proc("/proc/sys/net/ipv6/conf/all/accept_ra",flag); - write_proc("/proc/sys/net/ipv6/conf/all/accept_ra_defrtr",flag); - write_proc("/proc/sys/net/ipv6/conf/all/accept_ra_pinfo",flag); - write_proc("/proc/sys/net/ipv6/conf/all/accept_redirects",flag); -+ */ - } - - xmlXPathFreeObject (xmlobject); diff --git a/net-mgmt/ndpmon/files/patch-print__packet__info.h b/net-mgmt/ndpmon/files/patch-print__packet__info.h deleted file mode 100644 index cd634471f4fc..000000000000 --- a/net-mgmt/ndpmon/files/patch-print__packet__info.h +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- print_packet_info.h.orig -+++ print_packet_info.h -@@ -37,7 +37,9 @@ - - #include <stdio.h> - #include <stdlib.h> --#include <netinet/ether.h> -+#include <sys/types.h> -+#include <netinet/in.h> -+#include <net/ethernet.h> - #include <netinet/ip6.h> - #include <netinet/icmp6.h> - diff --git a/net-mgmt/ndpmon/files/patch-utils.h b/net-mgmt/ndpmon/files/patch-utils.h deleted file mode 100644 index 31a666f302ec..000000000000 --- a/net-mgmt/ndpmon/files/patch-utils.h +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- utils.h.orig -+++ utils.h -@@ -36,7 +36,7 @@ - #define ETHERNET_SIZE 14 /* ethernet headers are 14 bytes */ - #define IPV6_SIZE 40 /* ipv6 headers without fragment ... are 40 bytes */ - #define ICMP6_HEADER_SIZE 8 --#define ETHERTYPE_IPV6 0x86dd -+/*#define ETHERTYPE_IPV6 0x86dd */ - - /*Size to build char* address in a readable form*/ - #define IP6_STR_SIZE 40 /*xxxx:xxxx:xxx:xxxx:xxxx:xxxx:xxxx:xxxx*/ |