diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2013-11-28 20:03:51 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2013-11-28 20:03:51 +0000 |
| commit | 786f3f201dd3609c91292fae503b0376dbd2d807 (patch) | |
| tree | 13af58e35b38cda81267785566e9d69977b6f3d1 /net-misc | |
| parent | Add USE=nls support #491202 by Seemant Kulleen. (diff) | |
| download | gentoo-2-786f3f201dd3609c91292fae503b0376dbd2d807.tar.gz gentoo-2-786f3f201dd3609c91292fae503b0376dbd2d807.tar.bz2 gentoo-2-786f3f201dd3609c91292fae503b0376dbd2d807.zip | |
Fix syntax error in PEER_DNS patches #489980 by Aleksandr Karagodov.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/dhcp/ChangeLog | 8 | ||||
| -rw-r--r-- | net-misc/dhcp/files/dhcp-4.2.1-dhclient-resolvconf.patch | 12 | ||||
| -rw-r--r-- | net-misc/dhcp/files/dhcp-4.2.2-dhclient-resolvconf.patch | 12 | ||||
| -rw-r--r-- | net-misc/dhcp/files/dhcp-4.2.5-iproute2-path.patch | 2 |
4 files changed, 20 insertions, 14 deletions
diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog index 041806b27611..44956b9ac682 100644 --- a/net-misc/dhcp/ChangeLog +++ b/net-misc/dhcp/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/dhcp # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.244 2013/09/28 11:50:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.245 2013/11/28 20:03:51 vapier Exp $ + + 28 Nov 2013; Mike Frysinger <vapier@gentoo.org> + files/dhcp-4.2.1-dhclient-resolvconf.patch, + files/dhcp-4.2.2-dhclient-resolvconf.patch, + files/dhcp-4.2.5-iproute2-path.patch: + Fix syntax error in PEER_DNS patches #489980 by Aleksandr Karagodov. *dhcp-4.2.5_p1-r1 (28 Sep 2013) diff --git a/net-misc/dhcp/files/dhcp-4.2.1-dhclient-resolvconf.patch b/net-misc/dhcp/files/dhcp-4.2.1-dhclient-resolvconf.patch index 6d8caecdf938..fbbe65ad2061 100644 --- a/net-misc/dhcp/files/dhcp-4.2.1-dhclient-resolvconf.patch +++ b/net-misc/dhcp/files/dhcp-4.2.1-dhclient-resolvconf.patch @@ -4,7 +4,7 @@ #!/bin/sh make_resolv_conf() { -+ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then ++ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then + return 0 + fi + local conf= @@ -60,7 +60,7 @@ fi make_resolv_conf() { -+ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then ++ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then + return 0 + fi + local conf= @@ -160,7 +160,7 @@ ip=/sbin/ip make_resolv_conf() { -+ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then ++ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then + return 0 + fi + local conf= @@ -224,7 +224,7 @@ - if [ "x$new_domain_search" != x ]; then - echo search $new_domain_search >> /etc/resolv.conf.dhclient - elif [ "x$new_domain_name" != x ]; then -+ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then ++ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then + return 0 + fi + local conf= @@ -283,7 +283,7 @@ - if [ x"$new_domain_search" != x ]; then - echo search $new_domain_search >> /etc/resolv.conf.dhclient - elif [ x"$new_domain_name" != x ]; then -+ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then ++ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then + return 0 + fi + local conf= @@ -337,7 +337,7 @@ #!/bin/sh make_resolv_conf() { -+ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then ++ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then + return 0 + fi + local conf= diff --git a/net-misc/dhcp/files/dhcp-4.2.2-dhclient-resolvconf.patch b/net-misc/dhcp/files/dhcp-4.2.2-dhclient-resolvconf.patch index 95a0d6564889..28080a848d71 100644 --- a/net-misc/dhcp/files/dhcp-4.2.2-dhclient-resolvconf.patch +++ b/net-misc/dhcp/files/dhcp-4.2.2-dhclient-resolvconf.patch @@ -4,7 +4,7 @@ #!/bin/sh make_resolv_conf() { -+ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then ++ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then + return 0 + fi + local conf= @@ -65,7 +65,7 @@ fi make_resolv_conf() { -+ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then ++ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then + return 0 + fi + local conf= @@ -169,7 +169,7 @@ ip=/sbin/ip make_resolv_conf() { -+ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then ++ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then + return 0 + fi + local conf= @@ -241,7 +241,7 @@ - if [ "x$new_domain_search" != x ]; then - echo search $new_domain_search >> /etc/resolv.conf.dhclient - elif [ "x$new_domain_name" != x ]; then -+ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then ++ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then + return 0 + fi + local conf= @@ -305,7 +305,7 @@ - if [ x"$new_domain_search" != x ]; then - echo search $new_domain_search >> /etc/resolv.conf.dhclient - elif [ x"$new_domain_name" != x ]; then -+ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then ++ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then + return 0 + fi + local conf= @@ -364,7 +364,7 @@ #!/bin/sh make_resolv_conf() { -+ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then ++ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then + return 0 + fi + local conf= 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 index f97f38dc9bff..ea223ed38b6e 100644 --- a/net-misc/dhcp/files/dhcp-4.2.5-iproute2-path.patch +++ b/net-misc/dhcp/files/dhcp-4.2.5-iproute2-path.patch @@ -12,4 +12,4 @@ https://bugs.gentoo.org/480636 +ip=ip make_resolv_conf() { - if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then + if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then |