Add a patch to stop using a fallback interface when using BPF.

5 files changed, 69 insertions, 21 deletions

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index 4bc136602cdf..16821f87ea75 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/dhcp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.118 2006/09/13 09:21:30 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.119 2006/09/20 12:23:29 uberlord Exp $
+
+  20 Sep 2006; Roy Marples <uberlord@gentoo.org>
+  +files/dhcp-3.0.5-bpf-nofallback.patch, dhcp-3.0.5_rc2.ebuild,
+  dhcp-3.1.0_alpha1.ebuild:
+  Add a patch to stop using a fallback interface when using BPF.
+  This allows >1 instance of dhclient to run on BSD.
 
   13 Sep 2006; Roy Marples <uberlord@gentoo.org> dhcp-3.0.4-r2.ebuild,
   dhcp-3.0.5_rc2.ebuild, dhcp-3.1.0_alpha1.ebuild:
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 24d3fcd85275..2b8cd141a973 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -66,6 +66,10 @@ AUX dhcp-3.0.4-dhclient-stdin-conf.patch 2176 RMD160 fae08899f6b57da3ec7ab0068e2
 MD5 f47ef574359340021a78f5c2f67e4954 files/dhcp-3.0.4-dhclient-stdin-conf.patch 2176
 RMD160 fae08899f6b57da3ec7ab0068e288bbdf2fbf2ae files/dhcp-3.0.4-dhclient-stdin-conf.patch 2176
 SHA256 80141fe71e52774f1c7b1a02f2cbd49bc646f19753ceefc1c3605104df0cae5f files/dhcp-3.0.4-dhclient-stdin-conf.patch 2176
+AUX dhcp-3.0.5-bpf-nofallback.patch 1473 RMD160 1a5ece77cb481416935b0d2eea53e85dc4c4ee93 SHA1 d4cad638075a98606e07c633551c8a1d2f78f2e7 SHA256 b215c5ff4a282b475f28168250c05bbbc85e7c37e7af92616571d499b8c14da6
+MD5 223f1d74612d89f327d0afaaa08d34bb files/dhcp-3.0.5-bpf-nofallback.patch 1473
+RMD160 1a5ece77cb481416935b0d2eea53e85dc4c4ee93 files/dhcp-3.0.5-bpf-nofallback.patch 1473
+SHA256 b215c5ff4a282b475f28168250c05bbbc85e7c37e7af92616571d499b8c14da6 files/dhcp-3.0.5-bpf-nofallback.patch 1473
 AUX dhcp-3.1.0a1-dhclient-resolvconf.patch 10328 RMD160 672eb37b32486655a027b37b4c37d103c6e87c15 SHA1 a882cdc741637f921d15238d6761ff8e45ddb8f4 SHA256 f662f98eefe57a5c21cbbcefc6d092c7b60a239b59f10942fe13560ed684889c
 MD5 207562d42d2fc7ec3cb5e5b86f5ca41d files/dhcp-3.1.0a1-dhclient-resolvconf.patch 10328
 RMD160 672eb37b32486655a027b37b4c37d103c6e87c15 files/dhcp-3.1.0a1-dhclient-resolvconf.patch 10328
@@ -102,10 +106,10 @@ EBUILD dhcp-3.0.4-r2.ebuild 7221 RMD160 d13d26bbd33d0fe85808590469895c388d08345e
 MD5 53484e87af57cfd9d4a08ab643a2ef89 dhcp-3.0.4-r2.ebuild 7221
 RMD160 d13d26bbd33d0fe85808590469895c388d08345e dhcp-3.0.4-r2.ebuild 7221
 SHA256 29b1d5c0b563826395dc30d10c5f4c077b16115d531f4231e218dc42fa855391 dhcp-3.0.4-r2.ebuild 7221
-EBUILD dhcp-3.0.5_rc2.ebuild 7269 RMD160 32d85e51abef192e0ebf80ef4223dbe14b2ecd26 SHA1 ac7a4403f45843d84008c37f54ac613e459a2f96 SHA256 2a123b3bfb83e7e16ff7f97e32f648b832c3fed289aa7027d211338e8990e4bc
-MD5 a924defc46cce8c648de99e56a4b18fb dhcp-3.0.5_rc2.ebuild 7269
-RMD160 32d85e51abef192e0ebf80ef4223dbe14b2ecd26 dhcp-3.0.5_rc2.ebuild 7269
-SHA256 2a123b3bfb83e7e16ff7f97e32f648b832c3fed289aa7027d211338e8990e4bc dhcp-3.0.5_rc2.ebuild 7269
+EBUILD dhcp-3.0.5_rc2.ebuild 7322 RMD160 7fa6ea36dd2c7def9e12468204a9e20788dff9b4 SHA1 2cf4050a8c8870868f9c9c94eba7fffbb6d59fcd SHA256 fd7f7e53c8a715f5fd66aec312bfaefcb2320ff28b26c26502c5d26365290573
+MD5 645fd1f734173dee400daf6e37586614 dhcp-3.0.5_rc2.ebuild 7322
+RMD160 7fa6ea36dd2c7def9e12468204a9e20788dff9b4 dhcp-3.0.5_rc2.ebuild 7322
+SHA256 fd7f7e53c8a715f5fd66aec312bfaefcb2320ff28b26c26502c5d26365290573 dhcp-3.0.5_rc2.ebuild 7322
 EBUILD dhcp-3.1.0_alpha1.ebuild 7303 RMD160 e5613b6f1378e1eb66ecec565025244cd2d0677f SHA1 dfe6b31e949b783680eadaca60567c9857f6b88b SHA256 7d87a9ff4590deb2f0a58279188976b6fedce802b8c0d018a2b67f59196b0cb7
 MD5 0dfe1283416cb133be9f39206747a91a dhcp-3.1.0_alpha1.ebuild 7303
 RMD160 e5613b6f1378e1eb66ecec565025244cd2d0677f dhcp-3.1.0_alpha1.ebuild 7303
diff --git a/net-misc/dhcp/dhcp-3.0.5_rc2.ebuild b/net-misc/dhcp/dhcp-3.0.5_rc2.ebuild
index c21905059f85..03dde2e9271d 100644
--- a/net-misc/dhcp/dhcp-3.0.5_rc2.ebuild
+++ b/net-misc/dhcp/dhcp-3.0.5_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0.5_rc2.ebuild,v 1.4 2006/09/13 09:21:30 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0.5_rc2.ebuild,v 1.5 2006/09/20 12:23:29 uberlord Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
 LICENSE="isc-dhcp"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc minimal static selinux"
+IUSE="doc minimal static selinux kernel_linux"
 
 DEPEND="selinux? ( sec-policy/selinux-dhcp )
 	kernel_linux? ( sys-apps/net-tools )"
@@ -49,6 +49,9 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}"-3.0.3-no_isc_blurb.patch
 	# Enable dhclient to get extra configuration from stdin
 	epatch "${FILESDIR}/${PN}"-3.0.4-dhclient-stdin-conf.patch
+	# Disable fallback interfaces when using BPF
+	# This allows more than one dhclient instance on the BSD's
+	epatch "${FILESDIR}/${PN}"-3.0.5-bpf-nofallback.patch
 
 	# General fixes which will probably be accepted upstream eventually
 	# Install libdst, #75544
@@ -173,12 +176,6 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	if use kernel_linux ; then
-		ewarn
-		ewarn "${PN} requires kernel support for Packet Socket (CONFIG_PACKET)."
-		ewarn
-	fi
-
 	use minimal && return
 
 	chown dhcp:dhcp "${ROOT}"/var/{lib,run}/dhcp
diff --git a/net-misc/dhcp/dhcp-3.1.0_alpha1.ebuild b/net-misc/dhcp/dhcp-3.1.0_alpha1.ebuild
index d1eb4b32ba88..1b4b0c169bce 100644
--- a/net-misc/dhcp/dhcp-3.1.0_alpha1.ebuild
+++ b/net-misc/dhcp/dhcp-3.1.0_alpha1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.1.0_alpha1.ebuild,v 1.2 2006/09/13 09:21:30 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.1.0_alpha1.ebuild,v 1.3 2006/09/20 12:23:29 uberlord Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
 LICENSE="isc-dhcp"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc minimal static selinux"
+IUSE="doc minimal static selinux kernel_linux"
 
 DEPEND="selinux? ( sec-policy/selinux-dhcp )
 	kernel_linux? ( sys-apps/net-tools )"
@@ -50,6 +50,9 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}"-3.0.3-no_isc_blurb.patch
 	# Enable dhclient to get extra configuration from stdin
 	epatch "${FILESDIR}/${PN}"-3.0.4-dhclient-stdin-conf.patch
+	# Disable fallback interfaces when using BPF
+	# This allows more than one dhclient instance on the BSD's
+	epatch "${FILESDIR}/${PN}"-3.0.5-bpf-nofallback.patch
 
 	# General fixes which will probably be accepted upstream eventually
 	# Install libdst, #75544
@@ -174,12 +177,6 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	if use kernel_linux ; then
-		ewarn
-		ewarn "${PN} requires kernel support for Packet Socket (CONFIG_PACKET)."
-		ewarn
-	fi
-
 	use minimal && return
 
 	chown dhcp:dhcp "${ROOT}"/var/{lib,run}/dhcp
diff --git a/net-misc/dhcp/files/dhcp-3.0.5-bpf-nofallback.patch b/net-misc/dhcp/files/dhcp-3.0.5-bpf-nofallback.patch
new file mode 100644
index 000000000000..2fae6f2204af
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0.5-bpf-nofallback.patch
@@ -0,0 +1,44 @@
+diff -ur common.orig/bpf.c common/bpf.c
+--- common.orig/bpf.c	2006-09-20 12:52:47 +0100
++++ common/bpf.c	2006-09-20 12:53:22 +0100
+@@ -354,10 +354,6 @@
+ 	int result;
+ 	int fudge;
+ 
+-	if (!strcmp (interface -> name, "fallback"))
+-		return send_fallback (interface, packet, raw,
+-				      len, from, to, hto);
+-
+ 	/* Assemble the headers... */
+ 	assemble_hw_header (interface, (unsigned char *)hw, &hbufp, hto);
+ 	assemble_udp_ip_header (interface,
+@@ -531,17 +527,5 @@
+ 
+ void maybe_setup_fallback ()
+ {
+-	isc_result_t status;
+-	struct interface_info *fbi = (struct interface_info *)0;
+-	if (setup_fallback (&fbi, MDL)) {
+-		if_register_fallback (fbi);
+-		status = omapi_register_io_object ((omapi_object_t *)fbi,
+-						   if_readsocket, 0,
+-						   fallback_discard, 0, 0);
+-		if (status != ISC_R_SUCCESS)
+-			log_fatal ("Can't register I/O handle for %s: %s",
+-				   fbi -> name, isc_result_totext (status));
+-		interface_dereference (&fbi, MDL);
+-	}
+ }
+ #endif
+diff -ur includes.orig/osdep.h includes/osdep.h
+--- includes.orig/osdep.h	2006-09-20 12:54:52 +0100
++++ includes/osdep.h	2006-09-20 12:56:40 +0100
+@@ -190,7 +190,7 @@
+    Currently, all low-level packet interfaces use BSD sockets as a
+    fallback. */
+ 
+-#if defined (USE_BPF_SEND) || defined (USE_NIT_SEND) || \
++#if defined (USE_NIT_SEND) || \
+     defined (USE_DLPI_SEND) || defined (USE_UPF_SEND) || \
+     defined (USE_LPF_SEND) || \
+     (defined (USE_SOCKET_SEND) && defined (HAVE_SO_BINDTODEVICE))