Attachment #169195 for bug #208702

View | Details | Raw Unified | Return to bug 208702
Collapse All | Expand All

Lines 2-8 Link Here

(-)dhcpcd/Makefile (-1 / +1 lines)
2	# $FreeBSD: head/net/dhcpcd/Makefile 406968 2016-01-23 12:22:06Z pi $	2	# $FreeBSD: head/net/dhcpcd/Makefile 406968 2016-01-23 12:22:06Z pi $
3		3
4	PORTNAME= dhcpcd	4	PORTNAME= dhcpcd
5	PORTVERSION= 6.10.1	5	PORTVERSION= 6.10.2
6	CATEGORIES= net	6	CATEGORIES= net
7	MASTER_SITES= http://roy.marples.name/downloads/dhcpcd/ \	7	MASTER_SITES= http://roy.marples.name/downloads/dhcpcd/ \
8	http://roy.aydogan.net/dhcpcd/ \	8	http://roy.aydogan.net/dhcpcd/ \

Lines 1-2 Link Here

(-)dhcpcd/distinfo (-2 / +2 lines)
1	SHA256 (dhcpcd-6.10.1.tar.xz) = 284abf8c3be0580bbac5eaca95359346ab0d78d4072317b6ce87cc68f2e8ae7b	1	SHA256 (dhcpcd-6.10.2.tar.xz) = 64a0ff84ba7f1e820b2ccfe08980b3b73e96bb072274b21de523f1da83a94e09
2	SIZE (dhcpcd-6.10.1.tar.xz) = 180112	2	SIZE (dhcpcd-6.10.2.tar.xz) = 184512




ifn="$2"
command="%%PREFIX%%/sbin/dhcpcd"
command_args="$ifn"
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}:/usr/local/sbin
}

load_rc_config $name
load_rc_config network

if [ -n "$ifn" ]; then
	if ! dhcpif $ifn; then
		err 1 "$ifn is not enabled for DHCP"
	fi
fi

run_rc_command "$1"




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	2016-01-07 16:47:19 UTC
+++ dhcpcd.conf
@@ -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

Lines 1-4 Link Here

(-)dhcpcd/pkg-message (-1 / +3 lines)
1	The default FreeBSD kernel does not allow userland to provide IPv6	1	The default FreeBSD kernel does not allow userland to provide IPv6
2	Prefix Routes, which dhcpcd needs to do when running the default configuration.	2	Prefix Routes when the kernel is handling Router Advertisements.
		3	The default dhcpcd configuration will disable the kernel from handling
		4	Router Advertisements.
3		5
4	See http://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194485 for a patch.	6	See http://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194485 for a patch.

Return to bug 208702

Lines 11-36 Link Here

(-)dhcpcd/files/dhcpcd.in (-10 / +14 lines)
11	ifn="$2"	11	ifn="$2"
12	command="%%PREFIX%%/sbin/dhcpcd"	12	command="%%PREFIX%%/sbin/dhcpcd"
13	command_args="$ifn"	13	command_args="$ifn"
14	pidfile="/var/run/dhcpcd-$ifn.pid"	14	if [ -n "$ifn" ]; then
		15	specific="$(get_if_var $ifn dhcpcd_flags_IF)"
		16	if [ -z "$flags" -a -n "$specific" ]; then
		17	rc_flags="$specific"
		18	fi
		19	pidfile="/var/run/dhcpcd-$ifn.pid"
		20	else
		21	pidfile="$($command -P $rc_flags)"
		22	fi
15	start_precmd="dhcpcd_precmd"	23	start_precmd="dhcpcd_precmd"
16		24
17	dhcpcd_precmd()	25	dhcpcd_precmd()
18	{	26	{
19	# Override for $ifn specific flags (see rc.subr for $flags setting)
20	specific=`get_if_var $ifn dhcpcd_flags_IF`
21	if [ -z "$flags" -a -n "$specific" ]; then
22	rc_flags=$specific
23	fi
24
25	# dhcpcd may need local binaries	27	# dhcpcd may need local binaries
26	export PATH=${PATH}:%%PREFIX%%/sbin	28	export PATH=${PATH}:/usr/local/sbin
27	}	29	}
28		30
29	load_rc_config $name	31	load_rc_config $name
30	load_rc_config network	32	load_rc_config network
31		33
32	if ! dhcpif $ifn; then	34	if [ -n "$ifn" ]; then
33	return 1	35	if ! dhcpif $ifn; then
		36	err 1 "$ifn is not enabled for DHCP"
		37	fi
34	fi	38	fi
35		39
36	run_rc_command "$1"	40	run_rc_command "$1"

Lines 1-13 Link Here

(-)dhcpcd/files/patch-dhcpcd.conf (-13 lines)
1	Disable private SLAAC addresses as that would cause dhcpcd to own the routes
2	by default.
3
4	See http://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194485
5
6	--- dhcpcd.conf.orig 2016-01-07 16:47:19 UTC
7	+++ dhcpcd.conf
8	@@ -35,4 +35,4 @@ option interface_mtu
9	require dhcp_server_identifier
10
11	# Generate Stable Private IPv6 Addresses instead of hardware based ones
12	-slaac private
13	+#slaac private