Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 17 Apr 2016 01:17:55 +0000 (UTC)
From:      Jason Unovitch <junovitch@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r413487 - in branches/2016Q2/net/dhcpcd: . files
Message-ID:  <201604170117.u3H1HtED006558@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: junovitch
Date: Sun Apr 17 01:17:55 2016
New Revision: 413487
URL: https://svnweb.freebsd.org/changeset/ports/413487

Log:
  MFH: r413437
  
  net/dhcpcd: 6.10.1 -> 6.10.2
  
  Changes:
  - Add fix for CVE-2014-7913.
  - eloop performance and API improvements.
  - Don't send a blank hostname.
  - Prefix Delegation default value fixes.
  - Prefix Delegation suffix is now configurable.
  - dhcpcd.conf now allows embedded comments.
  - IPv6 static address support.
  - ipv6ra_accept_nopublic has been removed, all prefixes now accepted.
  - Remove pidfile handling from dhcpcd and use pidfile_lock(3).
    If not available, use a compat shim.
  - Fix changing routes on BSD.
  
  Specific to FreeBSD ports package:
  - dhcpcd rc.d script now supports starting as a service (dhcpcd_enable=YES)
    as well as handling per interface if needed from devd.
  - The patch to dhcpcd.conf has been removed and the pkg-message adjusted to
    match the more recent findings in bug #194485
  
  PR:		208702
  Submitted by:	roy@marples.name (maintainer)
  Approved by:	ports-secteam (with hat)
  Security:	CVE-2014-7913
  Security:	https://vuxml.FreeBSD.org/freebsd/6ec9f210-0404-11e6-9aee-bc5ff4fb5ea1.html

Deleted:
  branches/2016Q2/net/dhcpcd/files/patch-dhcpcd.conf
Modified:
  branches/2016Q2/net/dhcpcd/Makefile
  branches/2016Q2/net/dhcpcd/distinfo
  branches/2016Q2/net/dhcpcd/files/dhcpcd.in
  branches/2016Q2/net/dhcpcd/pkg-message
Directory Properties:
  branches/2016Q2/   (props changed)

Modified: branches/2016Q2/net/dhcpcd/Makefile
==============================================================================
--- branches/2016Q2/net/dhcpcd/Makefile	Sun Apr 17 01:16:22 2016	(r413486)
+++ branches/2016Q2/net/dhcpcd/Makefile	Sun Apr 17 01:17:55 2016	(r413487)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dhcpcd
-PORTVERSION=	6.10.1
+PORTVERSION=	6.10.2
 CATEGORIES=	net
 MASTER_SITES=	http://roy.marples.name/downloads/dhcpcd/ \
 		http://roy.aydogan.net/dhcpcd/ \

Modified: branches/2016Q2/net/dhcpcd/distinfo
==============================================================================
--- branches/2016Q2/net/dhcpcd/distinfo	Sun Apr 17 01:16:22 2016	(r413486)
+++ branches/2016Q2/net/dhcpcd/distinfo	Sun Apr 17 01:17:55 2016	(r413487)
@@ -1,2 +1,2 @@
-SHA256 (dhcpcd-6.10.1.tar.xz) = 284abf8c3be0580bbac5eaca95359346ab0d78d4072317b6ce87cc68f2e8ae7b
-SIZE (dhcpcd-6.10.1.tar.xz) = 180112
+SHA256 (dhcpcd-6.10.2.tar.xz) = 64a0ff84ba7f1e820b2ccfe08980b3b73e96bb072274b21de523f1da83a94e09
+SIZE (dhcpcd-6.10.2.tar.xz) = 184512

Modified: branches/2016Q2/net/dhcpcd/files/dhcpcd.in
==============================================================================
--- branches/2016Q2/net/dhcpcd/files/dhcpcd.in	Sun Apr 17 01:16:22 2016	(r413486)
+++ branches/2016Q2/net/dhcpcd/files/dhcpcd.in	Sun Apr 17 01:17:55 2016	(r413487)
@@ -11,26 +11,30 @@ name="dhcpcd"
 ifn="$2"
 command="%%PREFIX%%/sbin/dhcpcd"
 command_args="$ifn"
-pidfile="/var/run/dhcpcd-$ifn.pid"
+if [ -n "$ifn" ]; then
+	specific="$(get_if_var $ifn dhcpcd_flags_IF)"
+	if [ -z "$flags" -a -n "$specific" ]; then
+		rc_flags="$specific"
+	fi
+	pidfile="/var/run/dhcpcd-$ifn.pid"
+else
+	pidfile="$($command -P $rc_flags)"
+fi
 start_precmd="dhcpcd_precmd"
 
 dhcpcd_precmd()
 {
-	# Override for $ifn specific flags (see rc.subr for $flags setting)
-	specific=`get_if_var $ifn dhcpcd_flags_IF`
-	if [ -z "$flags" -a -n "$specific" ]; then
-		rc_flags=$specific
-	fi
-
 	# dhcpcd may need local binaries
-	export PATH=${PATH}:%%PREFIX%%/sbin
+	export PATH=${PATH}:/usr/local/sbin
 }
 
 load_rc_config $name
 load_rc_config network
 
-if ! dhcpif $ifn; then
-	return 1
+if [ -n "$ifn" ]; then
+	if ! dhcpif $ifn; then
+		err 1 "$ifn is not enabled for DHCP"
+	fi
 fi
 
 run_rc_command "$1"

Modified: branches/2016Q2/net/dhcpcd/pkg-message
==============================================================================
--- branches/2016Q2/net/dhcpcd/pkg-message	Sun Apr 17 01:16:22 2016	(r413486)
+++ branches/2016Q2/net/dhcpcd/pkg-message	Sun Apr 17 01:17:55 2016	(r413487)
@@ -1,4 +1,6 @@
 The default FreeBSD kernel does not allow userland to provide IPv6
-Prefix Routes, which dhcpcd needs to do when running the default configuration.
+Prefix Routes when the kernel is handling Router Advertisements.
+The default dhcpcd configuration will disable the kernel from handling
+Router Advertisements.
 
 See http://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194485 for a patch.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604170117.u3H1HtED006558>