diff options
| author | Pawel Pekala <pawel@FreeBSD.org> | 2014-11-04 17:59:53 +0000 |
|---|---|---|
| committer | Pawel Pekala <pawel@FreeBSD.org> | 2014-11-04 17:59:53 +0000 |
| commit | d2a94f242434a73d512f929cd24d46baf24173e4 (patch) | |
| tree | 30c312b5abca61e4c45d29f22cbce3e5cfa76243 /net/dhcpcd | |
| parent | 0ea2df7e0ca1d4c20cf68e0db0c9edfde56f17f4 (diff) | |
| download | ports-d2a94f242434a73d512f929cd24d46baf24173e4.tar.gz ports-d2a94f242434a73d512f929cd24d46baf24173e4.zip | |
- 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@gmail.com [2]
Approved by: maintainer [2]
Notes
Notes:
svn path=/head/; revision=372160
Diffstat (limited to 'net/dhcpcd')
| -rw-r--r-- | net/dhcpcd/Makefile | 6 | ||||
| -rw-r--r-- | net/dhcpcd/distinfo | 4 | ||||
| -rw-r--r-- | net/dhcpcd/files/patch-dhcpcd.conf | 16 | ||||
| -rw-r--r-- | net/dhcpcd/pkg-message | 4 | ||||
| -rw-r--r-- | net/dhcpcd/pkg-plist | 3 |
5 files changed, 28 insertions, 5 deletions
diff --git a/net/dhcpcd/Makefile b/net/dhcpcd/Makefile index e8c6f60c1d6c..a10c6f5d0161 100644 --- a/net/dhcpcd/Makefile +++ b/net/dhcpcd/Makefile @@ -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> diff --git a/net/dhcpcd/distinfo b/net/dhcpcd/distinfo index 06777079b549..3dfb06edd50d 100644 --- a/net/dhcpcd/distinfo +++ b/net/dhcpcd/distinfo @@ -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 diff --git a/net/dhcpcd/files/patch-dhcpcd.conf b/net/dhcpcd/files/patch-dhcpcd.conf new file mode 100644 index 000000000000..37600f3ceaf1 --- /dev/null +++ b/net/dhcpcd/files/patch-dhcpcd.conf @@ -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. diff --git a/net/dhcpcd/pkg-message b/net/dhcpcd/pkg-message new file mode 100644 index 000000000000..25ede5c4556b --- /dev/null +++ b/net/dhcpcd/pkg-message @@ -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. diff --git a/net/dhcpcd/pkg-plist b/net/dhcpcd/pkg-plist index ab46408a21c3..beb0c7e47508 100644 --- a/net/dhcpcd/pkg-plist +++ b/net/dhcpcd/pkg-plist @@ -1,4 +1,4 @@ -%%ETCDIR%%.conf +@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 -@dirrmtry libexec/dhcpcd-hooks |