[gentoo-commits] gentoo-x86 commit in net-misc/dhcpcd: ChangeLog dhcpcd-3.1.6-r1.ebuild

[Roy Marples (uberlord)]

uberlord    07/10/17 09:45:54

  Modified:             ChangeLog dhcpcd-3.1.6-r1.ebuild
  Log:
  Add zeroconf use flag and document behaviour, #196088
  (Portage version: 2.1.3.12)

Revision  Changes    Path
1.167                net-misc/dhcpcd/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dhcpcd/ChangeLog?rev=1.167&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dhcpcd/ChangeLog?rev=1.167&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dhcpcd/ChangeLog?r1=1.166&r2=1.167

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- ChangeLog	11 Oct 2007 09:48:53 -0000	1.166
+++ ChangeLog	17 Oct 2007 09:45:54 -0000	1.167
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/dhcpcd
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.166 2007/10/11 09:48:53 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.167 2007/10/17 09:45:54 uberlord Exp $
+
+  17 Oct 2007; Roy Marples <uberlord@g.o> dhcpcd-3.1.6-r1.ebuild:
+  Add zeroconf use flag and document behaviour, #196088
 
 *dhcpcd-3.1.6-r1 (11 Oct 2007)
 *dhcpcd-3.1.5-r1 (11 Oct 2007)



1.2                  net-misc/dhcpcd/dhcpcd-3.1.6-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dhcpcd/dhcpcd-3.1.6-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dhcpcd/dhcpcd-3.1.6-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dhcpcd/dhcpcd-3.1.6-r1.ebuild?r1=1.1&r2=1.2

Index: dhcpcd-3.1.6-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-3.1.6-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dhcpcd-3.1.6-r1.ebuild	11 Oct 2007 09:28:01 -0000	1.1
+++ dhcpcd-3.1.6-r1.ebuild	17 Oct 2007 09:45:54 -0000	1.2
@@ -1,17 +1,19 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-3.1.6-r1.ebuild,v 1.1 2007/10/11 09:28:01 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-3.1.6-r1.ebuild,v 1.2 2007/10/17 09:45:54 uberlord Exp $
 
 inherit toolchain-funcs
 
 DESCRIPTION="A DHCP client"
 HOMEPAGE="http://dhcpcd.berlios.de"
 SRC_URI="http://download.berlios.de/${PN}/${P}.tar.bz2"
-
 LICENSE="GPL-2"
-SLOT="0"
+
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="vram"
+
+SLOT="0"
+EAPI="1"
+IUSE="vram +zeroconf"
 
 DEPEND=""
 PROVIDE="virtual/dhcpc"
@@ -28,10 +30,21 @@
 		echo "#define NTPDRIFTFILE \"/var/lib/ntp/ntp.drift\""
 	} >> config.h
 
+	if use zeroconf; then
+		einfo "ZeroConf support enabled"
+	else
+		einfo "Disabling zeroconf support"
+		{
+			echo
+			echo "/* User indicated no zeroconf support */"
+			echo "#undef ENABLE_IPV4LL"
+		} >> config.h
+	fi
+
 	# Disable DUID support if we have volatile storage.
 	# LiveCD's *should* enable this USE flag
 	if use vram; then
-		einfo "Disabling DUID support in dhcpcd"
+		einfo "Disabling DUID support"
 		{
 			echo
 			echo "/* User indicated volatile ram storage */"
@@ -52,17 +65,27 @@
 }
 
 pkg_postinst() {
-	use vram && return 0
+	if use zeroconf; then
+		ewarn "You have installed dhcpcd with zeroconf support."
+		einfo "This means that it will always obtain an IP address even if no"
+		einfo "DHCP server can be contacted, which will break any existing"
+		einfo "failover support you may have configured in your net configuration."
+		einfo "This behaviour can be controlled with the -L flag."
+		einfo "See the dhcpcd man page for more details."
+	fi
 
-	ewarn "You have installed dhcpcd with DUID support."
-	einfo "This means that we will generate a DUID in /var/lib/dhcpcd/dhcpcd.duid"
-	einfo "This is generated from a MAC address of the card and a timestamp."
-	einfo "It will be used in every subsequent DHCP transaction, along with a IAID"
-	einfo "in the ClientID option. This is required by RFC 4361."
-	echo
-	ewarn "Some DHCP server implementations require a MAC address only in the"
-	ewarn "ClientID field. These DHCP servers should be updated to be RFC"
-	ewarn "conformant. If you cannot do this, you can revert to the old"
-	ewarn "behaviour by using the -I '' option OR building dhcpcd with the"
-	ewarn "vram USE flag enabled."
+	if ! use vram; then
+		use zeroconf && echo
+		ewarn "You have installed dhcpcd with DUID support."
+		einfo "This means that we will generate a DUID in /var/lib/dhcpcd/dhcpcd.duid"
+		einfo "This is generated from a MAC address of the card and a timestamp."
+		einfo "It will be used in every subsequent DHCP transaction, along with a IAID"
+		einfo "in the ClientID option. This is required by RFC 4361."
+		echo
+		ewarn "Some DHCP server implementations require a MAC address only in the"
+		ewarn "ClientID field. These DHCP servers should be updated to be RFC"
+		ewarn "conformant. If you cannot do this, you can revert to the old"
+		ewarn "behaviour by using the -I '' option OR building dhcpcd with the"
+		ewarn "vram USE flag enabled."
+	fi
 }



-- 
gentoo-commits@g.o mailing list