svn commit: r372160 - in head/net/dhcpcd: . files

[Pawel Pekala]

Author: pawel
Date: Tue Nov  4 17:59:53 2014
New Revision: 372160
URL: https://svnweb.freebsd.org/changeset/ports/372160
QAT: https://qat.redports.org/buildarchive/r372160/

Log:
  - Update to version 6.5.1, add pkg-message [1]
  - Prevent config overwrite by using @sample keyword [2]
  
  PR:		194486 [1], 194449 [2]
  Submitted by:	maintainer [1], guyyur at gmail.com [2]
  Approved by:	maintainer [2]

Added:
  head/net/dhcpcd/files/patch-dhcpcd.conf   (contents, props changed)
  head/net/dhcpcd/pkg-message   (contents, props changed)
Modified:
  head/net/dhcpcd/Makefile
  head/net/dhcpcd/distinfo
  head/net/dhcpcd/pkg-plist

Modified: head/net/dhcpcd/Makefile
==============================================================================
--- head/net/dhcpcd/Makefile	Tue Nov  4 17:49:16 2014	(r372159)
+++ head/net/dhcpcd/Makefile	Tue Nov  4 17:59:53 2014	(r372160)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dhcpcd
-PORTVERSION=	6.4.3
+PORTVERSION=	6.5.1
 CATEGORIES=	net
 MASTER_SITES=	http://roy.marples.name/downloads/dhcpcd/ \
 		LOCAL/delphij
@@ -16,4 +16,8 @@ USES=		tar:bzip2
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	dhcpcd
 
+post-install:
+	${MV} ${STAGEDIR}${PREFIX}/etc/dhcpcd.conf \
+		${STAGEDIR}${PREFIX}/etc/dhcpcd.conf.sample
+
 .include <bsd.port.mk>

Modified: head/net/dhcpcd/distinfo
==============================================================================
--- head/net/dhcpcd/distinfo	Tue Nov  4 17:49:16 2014	(r372159)
+++ head/net/dhcpcd/distinfo	Tue Nov  4 17:59:53 2014	(r372160)
@@ -1,2 +1,2 @@
-SHA256 (dhcpcd-6.4.3.tar.bz2) = 36ad01619ee81ac3815467d0157c38a14f5db464371326e97f719be362d5ab9c
-SIZE (dhcpcd-6.4.3.tar.bz2) = 149927
+SHA256 (dhcpcd-6.5.1.tar.bz2) = 37d3860a3787b656ae2d1a64855e2dede4460956b979304c14192ada3b550e78
+SIZE (dhcpcd-6.5.1.tar.bz2) = 156068

Added: head/net/dhcpcd/files/patch-dhcpcd.conf
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/dhcpcd/files/patch-dhcpcd.conf	Tue Nov  4 17:59:53 2014	(r372160)
@@ -0,0 +1,16 @@
+Disable private SLAAC addresses as that would cause dhcpcd to own the routes
+by default.
+
+See http://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194485
+
+--- dhcpcd.conf.orig	2014-10-20 14:32:57.000000000 +0100
++++ dhcpcd.conf	2014-10-20 14:33:37.000000000 +0100
+@@ -34,7 +34,7 @@
+ 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.

Added: head/net/dhcpcd/pkg-message
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/dhcpcd/pkg-message	Tue Nov  4 17:59:53 2014	(r372160)
@@ -0,0 +1,4 @@
+The default FreeBSD kernel does not allow userland to provide IPv6
+Prefix Routes, which dhcpcd needs to do when running the default configuration.
+
+See http://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194485 for a patch.

Modified: head/net/dhcpcd/pkg-plist
==============================================================================
--- head/net/dhcpcd/pkg-plist	Tue Nov  4 17:49:16 2014	(r372159)
+++ head/net/dhcpcd/pkg-plist	Tue Nov  4 17:59:53 2014	(r372160)
@@ -1,4 +1,4 @@
-%%ETCDIR%%.conf
+ at sample etc/dhcpcd.conf.sample
 libexec/dhcpcd-hooks/01-test
 libexec/dhcpcd-hooks/02-dump
 libexec/dhcpcd-hooks/10-mtu
@@ -14,4 +14,3 @@ man/man5/dhcpcd.conf.5.gz
 man/man8/dhcpcd-run-hooks.8.gz
 man/man8/dhcpcd.8.gz
 sbin/dhcpcd
- at dirrmtry libexec/dhcpcd-hooks