Attachment 169195 Details for Bug 208702 – Patch to net/dhcpcd to update to 6.10.2

[patch] Patch to net/dhcpcd to update to 6.10.2

ports-dhcpcd-6.10.2.patch (text/plain), 3.13 KB, created by roy on 2016-04-11 16:05:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: roy

Created: 2016-04-11 16:05:29 UTC

Size: 3.13 KB

patch

obsolete

>diff -uNr dhcpcd.orig/Makefile dhcpcd/Makefile
>--- dhcpcd.orig/Makefile	2016-01-23 12:22:06.000000000 +0000
>+++ dhcpcd/Makefile	2016-04-11 16:33:25.443715000 +0100
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/net/dhcpcd/Makefile 406968 2016-01-23 12:22:06Z pi $
> 
> 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/ \
>diff -uNr dhcpcd.orig/distinfo dhcpcd/distinfo
>--- dhcpcd.orig/distinfo	2016-01-23 12:22:06.000000000 +0000
>+++ dhcpcd/distinfo	2016-04-11 16:42:53.291855000 +0100
>@@ -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
>diff -uNr dhcpcd.orig/files/dhcpcd.in dhcpcd/files/dhcpcd.in
>--- dhcpcd.orig/files/dhcpcd.in	2014-01-24 00:14:07.000000000 +0000
>+++ dhcpcd/files/dhcpcd.in	2016-04-11 16:54:50.243263000 +0100
>@@ -11,26 +11,30 @@
> 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"
>diff -uNr dhcpcd.orig/files/patch-dhcpcd.conf dhcpcd/files/patch-dhcpcd.conf
>--- dhcpcd.orig/files/patch-dhcpcd.conf	2016-01-08 01:31:35.000000000 +0000
>+++ dhcpcd/files/patch-dhcpcd.conf	1970-01-01 01:00:00.000000000 +0100
>@@ -1,13 +0,0 @@
>-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
>diff -uNr dhcpcd.orig/pkg-message dhcpcd/pkg-message
>--- dhcpcd.orig/pkg-message	2014-11-04 17:59:53.000000000 +0000
>+++ dhcpcd/pkg-message	2016-04-11 16:47:15.286036000 +0100
>@@ -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.

Actions: View | Diff

Attachments on bug 208702: 169195