diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2013-09-28 11:50:42 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2013-09-28 11:50:42 +0000 |
| commit | 40d0d5eb028d0ef317fb28956564a0c2397e8029 (patch) | |
| tree | 93cc72b9fcc647283a2b62a97ed6f678b94fcba9 /net-misc/dhcp/files | |
| parent | Add unit file (#485442 by Peter Volkov) (diff) | |
| download | gentoo-2-40d0d5eb028d0ef317fb28956564a0c2397e8029.tar.gz gentoo-2-40d0d5eb028d0ef317fb28956564a0c2397e8029.tar.bz2 gentoo-2-40d0d5eb028d0ef317fb28956564a0c2397e8029.zip | |
Import patch from Fedora for IPv6 interface binding #471142 by Jaak Ristioja. Fix path to iproute2 ip program #480636 by cyberbat.
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'net-misc/dhcp/files')
| -rw-r--r-- | net-misc/dhcp/files/dhcp-4.2.5-bindtodevice-inet6.patch | 19 | ||||
| -rw-r--r-- | net-misc/dhcp/files/dhcp-4.2.5-iproute2-path.patch | 15 |
2 files changed, 34 insertions, 0 deletions
diff --git a/net-misc/dhcp/files/dhcp-4.2.5-bindtodevice-inet6.patch b/net-misc/dhcp/files/dhcp-4.2.5-bindtodevice-inet6.patch new file mode 100644 index 000000000000..77254c32e2b0 --- /dev/null +++ b/net-misc/dhcp/files/dhcp-4.2.5-bindtodevice-inet6.patch @@ -0,0 +1,19 @@ +https://bugs.gentoo.org/471142 + +snipped from fedora + +# dhclient -6: bind socket to interface (#1001742) +# (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #34784]) + +diff -up dhcp-4.2.5/common/socket.c.bindtodevice_inet6 dhcp-4.2.5/common/socket.c +--- dhcp-4.2.5/common/socket.c.bindtodevice_inet6 2013-09-17 16:47:05.000000000 +0200 ++++ dhcp-4.2.5/common/socket.c 2013-09-17 16:48:18.975997842 +0200 +@@ -245,7 +245,7 @@ if_register_socket(struct interface_info + + #if defined(SO_BINDTODEVICE) + /* Bind this socket to this interface. */ +- if ((local_family != AF_INET6) && (info->ifp != NULL) && ++ if (((do_multicast == 0)||(*do_multicast == 0)) && (info->ifp != NULL) && + setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, + (char *)(info -> ifp), sizeof(*(info -> ifp))) < 0) { + log_fatal("setsockopt: SO_BINDTODEVICE: %m"); diff --git a/net-misc/dhcp/files/dhcp-4.2.5-iproute2-path.patch b/net-misc/dhcp/files/dhcp-4.2.5-iproute2-path.patch new file mode 100644 index 000000000000..f97f38dc9bff --- /dev/null +++ b/net-misc/dhcp/files/dhcp-4.2.5-iproute2-path.patch @@ -0,0 +1,15 @@ +find `ip` via $PATH and not hardcoded path + +https://bugs.gentoo.org/480636 + +--- a/client/scripts/linux ++++ b/client/scripts/linux +@@ -23,7 +23,7 @@ + # of the $1 in its args. + + # 'ip' just looks too weird. /sbin/ip looks less weird. +-ip=/sbin/ip ++ip=ip + + make_resolv_conf() { + if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then |