net/dhcpcd: update 6.9.4 -> 6.10.0

Changes:
*  --noption requires an argument
*  optimise the ARP BPF filter, thanks to Nate Karstens
*  send gratuitous ARP each time we apply our IP address
*  fix truncation of hostnames based on the short hostname option
*  improve routing and address management by always loading all interfaces,
   routes and addresses even for interfaces we are not directly working on
*  timezone, lookup-hostname, wpa_supplicant and YP hooks are no longer
   installed by default but are installed to an example directory
*  fix compile on kFreeBSD
   thanks to Christoph Egger for providing a temporary build host
*  improve error logging of packet parsing
*  fix ignoring routing messages generated by dhcpcd just before forking
*  fix handling of rapid commit messages (allow ACK after DISCOVER)
*  add PROBE state so we can easily reject DHCP messages received during
   the ARP probe phase
*  fix CVE-2016-1503
*  fix CVE-2016-1504

PR:		206015
Submitted by:	Roy Marples <roy@marples.name> (maintainer)
Security:	CVE-2016-1504
Security:	CVE-2016-1503
Security:	https://vuxml.FreeBSD.org/freebsd/df587aa2-b5a5-11e5-9728-002590263bf5.html
MFH:		2016Q1

4 files changed, 10 insertions, 12 deletions

diff --git a/net/dhcpcd/Makefile b/net/dhcpcd/Makefile
index 26cbdc9ef718..e6b42057d3a0 100644
--- a/net/dhcpcd/Makefile
+++ b/net/dhcpcd/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dhcpcd
-PORTVERSION=	6.9.4
+PORTVERSION=	6.10.0
 CATEGORIES=	net
 MASTER_SITES=	http://roy.marples.name/downloads/dhcpcd/ \
 		http://roy.aydogan.net/dhcpcd/ \
@@ -17,6 +17,7 @@ LICENSE=	BSD2CLAUSE
 USES=		cpe tar:xz
 CPE_VENDOR=	dhcpcd_project
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/examples
 USE_RC_SUBR=	dhcpcd
 
 post-install:
diff --git a/net/dhcpcd/distinfo b/net/dhcpcd/distinfo
index af5c464daedd..906fda1828e4 100644
--- a/net/dhcpcd/distinfo
+++ b/net/dhcpcd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dhcpcd-6.9.4.tar.xz) = c3f3ff7473ef158a1e71db9aea7424df2c3477ad064e2b542f27948a5abc9ba0
-SIZE (dhcpcd-6.9.4.tar.xz) = 178632
+SHA256 (dhcpcd-6.10.0.tar.xz) = ab56af9b2e86913c55a965cb0f835e87749df78318564acf90d5d698f413ad35
+SIZE (dhcpcd-6.10.0.tar.xz) = 179804
diff --git a/net/dhcpcd/files/patch-dhcpcd.conf b/net/dhcpcd/files/patch-dhcpcd.conf
index 74cf87164ba9..9c18804e5430 100644
--- a/net/dhcpcd/files/patch-dhcpcd.conf
+++ b/net/dhcpcd/files/patch-dhcpcd.conf
@@ -3,14 +3,11 @@ by default.
 
 See http://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194485
 
---- dhcpcd.conf.orig	  2015-05-02 23:07:59 UTC
+--- dhcpcd.conf.orig	2016-01-07 16:47:19 UTC
 +++ dhcpcd.conf
-@@ -34,7 +34,7 @@
+@@ -35,4 +35,4 @@ option interface_mtu
  require dhcp_server_identifier
  
  # Generate Stable Private IPv6 Addresses instead of hardware based ones
 -slaac private
 +#slaac private
- 
- # A hook script is provided to lookup the hostname if not set by the DHCP
- # server, but it should not be run by default.
diff --git a/net/dhcpcd/pkg-plist b/net/dhcpcd/pkg-plist
index 3f2eecb91dd9..2e27fe4e4e59 100644
--- a/net/dhcpcd/pkg-plist
+++ b/net/dhcpcd/pkg-plist
@@ -1,15 +1,15 @@
 @sample etc/dhcpcd.conf.sample
 libexec/dhcpcd-hooks/01-test
 libexec/dhcpcd-hooks/02-dump
-libexec/dhcpcd-hooks/10-wpa_supplicant
-libexec/dhcpcd-hooks/15-timezone
 libexec/dhcpcd-hooks/20-resolv.conf
-libexec/dhcpcd-hooks/29-lookup-hostname
 libexec/dhcpcd-hooks/30-hostname
 libexec/dhcpcd-hooks/50-ntp.conf
-libexec/dhcpcd-hooks/50-ypbind
 libexec/dhcpcd-run-hooks
 man/man5/dhcpcd.conf.5.gz
 man/man8/dhcpcd-run-hooks.8.gz
 man/man8/dhcpcd.8.gz
 sbin/dhcpcd
+share/examples/dhcpcd/hooks/10-wpa_supplicant
+share/examples/dhcpcd/hooks/15-timezone
+share/examples/dhcpcd/hooks/29-lookup-hostname
+share/examples/dhcpcd/hooks/50-ypbind