Archives
Archives
| From: | "Mike Frysinger (vapier)" <vapier@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in net-misc/dhcp/files: dhcp-4.2.5-iproute2-path.patch dhcp-4.2.5-bindtodevice-inet6.patch |
| Date: | Sat, 28 Sep 2013 11:50:50 |
| Message-Id: | 20130928115042.26DCD2004E@flycatcher.gentoo.org |
| 1 | vapier 13/09/28 11:50:42 |
| 2 | |
| 3 | Added: dhcp-4.2.5-iproute2-path.patch |
| 4 | dhcp-4.2.5-bindtodevice-inet6.patch |
| 5 | Log: |
| 6 | Import patch from Fedora for IPv6 interface binding #471142 by Jaak Ristioja. Fix path to iproute2 ip program #480636 by cyberbat. |
| 7 | |
| 8 | (Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key FB7C4156) |
| 9 | |
| 10 | Revision Changes Path |
| 11 | 1.1 net-misc/dhcp/files/dhcp-4.2.5-iproute2-path.patch |
| 12 | |
| 13 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/files/dhcp-4.2.5-iproute2-path.patch?rev=1.1&view=markup |
| 14 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/files/dhcp-4.2.5-iproute2-path.patch?rev=1.1&content-type=text/plain |
| 15 | |
| 16 | Index: dhcp-4.2.5-iproute2-path.patch |
| 17 | =================================================================== |
| 18 | find `ip` via $PATH and not hardcoded path |
| 19 | |
| 20 | https://bugs.gentoo.org/480636 |
| 21 | |
| 22 | --- a/client/scripts/linux |
| 23 | +++ b/client/scripts/linux |
| 24 | @@ -23,7 +23,7 @@ |
| 25 | # of the $1 in its args. |
| 26 | |
| 27 | # 'ip' just looks too weird. /sbin/ip looks less weird. |
| 28 | -ip=/sbin/ip |
| 29 | +ip=ip |
| 30 | |
| 31 | make_resolv_conf() { |
| 32 | if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then |
| 33 | |
| 34 | |
| 35 | |
| 36 | 1.1 net-misc/dhcp/files/dhcp-4.2.5-bindtodevice-inet6.patch |
| 37 | |
| 38 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/files/dhcp-4.2.5-bindtodevice-inet6.patch?rev=1.1&view=markup |
| 39 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/files/dhcp-4.2.5-bindtodevice-inet6.patch?rev=1.1&content-type=text/plain |
| 40 | |
| 41 | Index: dhcp-4.2.5-bindtodevice-inet6.patch |
| 42 | =================================================================== |
| 43 | https://bugs.gentoo.org/471142 |
| 44 | |
| 45 | snipped from fedora |
| 46 | |
| 47 | # dhclient -6: bind socket to interface (#1001742) |
| 48 | # (Submitted to dhcp-bugs@×××.org - [ISC-Bugs #34784]) |
| 49 | |
| 50 | diff -up dhcp-4.2.5/common/socket.c.bindtodevice_inet6 dhcp-4.2.5/common/socket.c |
| 51 | --- dhcp-4.2.5/common/socket.c.bindtodevice_inet6 2013-09-17 16:47:05.000000000 +0200 |
| 52 | +++ dhcp-4.2.5/common/socket.c 2013-09-17 16:48:18.975997842 +0200 |
| 53 | @@ -245,7 +245,7 @@ if_register_socket(struct interface_info |
| 54 | |
| 55 | #if defined(SO_BINDTODEVICE) |
| 56 | /* Bind this socket to this interface. */ |
| 57 | - if ((local_family != AF_INET6) && (info->ifp != NULL) && |
| 58 | + if (((do_multicast == 0)||(*do_multicast == 0)) && (info->ifp != NULL) && |
| 59 | setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, |
| 60 | (char *)(info -> ifp), sizeof(*(info -> ifp))) < 0) { |
| 61 | log_fatal("setsockopt: SO_BINDTODEVICE: %m"); |