| 1 |
vapier 13/11/28 20:03:51 |
| 2 |
|
| 3 |
Modified: dhcp-4.2.1-dhclient-resolvconf.patch |
| 4 |
dhcp-4.2.5-iproute2-path.patch |
| 5 |
dhcp-4.2.2-dhclient-resolvconf.patch |
| 6 |
Log: |
| 7 |
Fix syntax error in PEER_DNS patches #489980 by Aleksandr Karagodov. |
| 8 |
|
| 9 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key FB7C4156) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.2 net-misc/dhcp/files/dhcp-4.2.1-dhclient-resolvconf.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/files/dhcp-4.2.1-dhclient-resolvconf.patch?rev=1.2&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/files/dhcp-4.2.1-dhclient-resolvconf.patch?rev=1.2&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/files/dhcp-4.2.1-dhclient-resolvconf.patch?r1=1.1&r2=1.2 |
| 17 |
|
| 18 |
Index: dhcp-4.2.1-dhclient-resolvconf.patch |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcp-4.2.1-dhclient-resolvconf.patch,v |
| 21 |
retrieving revision 1.1 |
| 22 |
retrieving revision 1.2 |
| 23 |
diff -u -r1.1 -r1.2 |
| 24 |
--- dhcp-4.2.1-dhclient-resolvconf.patch 5 Mar 2011 23:59:20 -0000 1.1 |
| 25 |
+++ dhcp-4.2.1-dhclient-resolvconf.patch 28 Nov 2013 20:03:51 -0000 1.2 |
| 26 |
@@ -4,7 +4,7 @@ |
| 27 |
#!/bin/sh |
| 28 |
|
| 29 |
make_resolv_conf() { |
| 30 |
-+ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then |
| 31 |
++ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then |
| 32 |
+ return 0 |
| 33 |
+ fi |
| 34 |
+ local conf= |
| 35 |
@@ -60,7 +60,7 @@ |
| 36 |
fi |
| 37 |
|
| 38 |
make_resolv_conf() { |
| 39 |
-+ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then |
| 40 |
++ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then |
| 41 |
+ return 0 |
| 42 |
+ fi |
| 43 |
+ local conf= |
| 44 |
@@ -160,7 +160,7 @@ |
| 45 |
ip=/sbin/ip |
| 46 |
|
| 47 |
make_resolv_conf() { |
| 48 |
-+ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then |
| 49 |
++ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then |
| 50 |
+ return 0 |
| 51 |
+ fi |
| 52 |
+ local conf= |
| 53 |
@@ -224,7 +224,7 @@ |
| 54 |
- if [ "x$new_domain_search" != x ]; then |
| 55 |
- echo search $new_domain_search >> /etc/resolv.conf.dhclient |
| 56 |
- elif [ "x$new_domain_name" != x ]; then |
| 57 |
-+ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then |
| 58 |
++ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then |
| 59 |
+ return 0 |
| 60 |
+ fi |
| 61 |
+ local conf= |
| 62 |
@@ -283,7 +283,7 @@ |
| 63 |
- if [ x"$new_domain_search" != x ]; then |
| 64 |
- echo search $new_domain_search >> /etc/resolv.conf.dhclient |
| 65 |
- elif [ x"$new_domain_name" != x ]; then |
| 66 |
-+ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then |
| 67 |
++ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then |
| 68 |
+ return 0 |
| 69 |
+ fi |
| 70 |
+ local conf= |
| 71 |
@@ -337,7 +337,7 @@ |
| 72 |
#!/bin/sh |
| 73 |
|
| 74 |
make_resolv_conf() { |
| 75 |
-+ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then |
| 76 |
++ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then |
| 77 |
+ return 0 |
| 78 |
+ fi |
| 79 |
+ local conf= |
| 80 |
|
| 81 |
|
| 82 |
|
| 83 |
1.2 net-misc/dhcp/files/dhcp-4.2.5-iproute2-path.patch |
| 84 |
|
| 85 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/files/dhcp-4.2.5-iproute2-path.patch?rev=1.2&view=markup |
| 86 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/files/dhcp-4.2.5-iproute2-path.patch?rev=1.2&content-type=text/plain |
| 87 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/files/dhcp-4.2.5-iproute2-path.patch?r1=1.1&r2=1.2 |
| 88 |
|
| 89 |
Index: dhcp-4.2.5-iproute2-path.patch |
| 90 |
=================================================================== |
| 91 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcp-4.2.5-iproute2-path.patch,v |
| 92 |
retrieving revision 1.1 |
| 93 |
retrieving revision 1.2 |
| 94 |
diff -u -r1.1 -r1.2 |
| 95 |
--- dhcp-4.2.5-iproute2-path.patch 28 Sep 2013 11:50:42 -0000 1.1 |
| 96 |
+++ dhcp-4.2.5-iproute2-path.patch 28 Nov 2013 20:03:51 -0000 1.2 |
| 97 |
@@ -12,4 +12,4 @@ |
| 98 |
+ip=ip |
| 99 |
|
| 100 |
make_resolv_conf() { |
| 101 |
- if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then |
| 102 |
+ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then |
| 103 |
|
| 104 |
|
| 105 |
|
| 106 |
1.2 net-misc/dhcp/files/dhcp-4.2.2-dhclient-resolvconf.patch |
| 107 |
|
| 108 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/files/dhcp-4.2.2-dhclient-resolvconf.patch?rev=1.2&view=markup |
| 109 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/files/dhcp-4.2.2-dhclient-resolvconf.patch?rev=1.2&content-type=text/plain |
| 110 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcp/files/dhcp-4.2.2-dhclient-resolvconf.patch?r1=1.1&r2=1.2 |
| 111 |
|
| 112 |
Index: dhcp-4.2.2-dhclient-resolvconf.patch |
| 113 |
=================================================================== |
| 114 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcp-4.2.2-dhclient-resolvconf.patch,v |
| 115 |
retrieving revision 1.1 |
| 116 |
retrieving revision 1.2 |
| 117 |
diff -u -r1.1 -r1.2 |
| 118 |
--- dhcp-4.2.2-dhclient-resolvconf.patch 26 Aug 2011 02:39:43 -0000 1.1 |
| 119 |
+++ dhcp-4.2.2-dhclient-resolvconf.patch 28 Nov 2013 20:03:51 -0000 1.2 |
| 120 |
@@ -4,7 +4,7 @@ |
| 121 |
#!/bin/sh |
| 122 |
|
| 123 |
make_resolv_conf() { |
| 124 |
-+ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then |
| 125 |
++ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then |
| 126 |
+ return 0 |
| 127 |
+ fi |
| 128 |
+ local conf= |
| 129 |
@@ -65,7 +65,7 @@ |
| 130 |
fi |
| 131 |
|
| 132 |
make_resolv_conf() { |
| 133 |
-+ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then |
| 134 |
++ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then |
| 135 |
+ return 0 |
| 136 |
+ fi |
| 137 |
+ local conf= |
| 138 |
@@ -169,7 +169,7 @@ |
| 139 |
ip=/sbin/ip |
| 140 |
|
| 141 |
make_resolv_conf() { |
| 142 |
-+ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then |
| 143 |
++ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then |
| 144 |
+ return 0 |
| 145 |
+ fi |
| 146 |
+ local conf= |
| 147 |
@@ -241,7 +241,7 @@ |
| 148 |
- if [ "x$new_domain_search" != x ]; then |
| 149 |
- echo search $new_domain_search >> /etc/resolv.conf.dhclient |
| 150 |
- elif [ "x$new_domain_name" != x ]; then |
| 151 |
-+ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then |
| 152 |
++ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then |
| 153 |
+ return 0 |
| 154 |
+ fi |
| 155 |
+ local conf= |
| 156 |
@@ -305,7 +305,7 @@ |
| 157 |
- if [ x"$new_domain_search" != x ]; then |
| 158 |
- echo search $new_domain_search >> /etc/resolv.conf.dhclient |
| 159 |
- elif [ x"$new_domain_name" != x ]; then |
| 160 |
-+ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then |
| 161 |
++ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then |
| 162 |
+ return 0 |
| 163 |
+ fi |
| 164 |
+ local conf= |
| 165 |
@@ -364,7 +364,7 @@ |
| 166 |
#!/bin/sh |
| 167 |
|
| 168 |
make_resolv_conf() { |
| 169 |
-+ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then |
| 170 |
++ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then |
| 171 |
+ return 0 |
| 172 |
+ fi |
| 173 |
+ local conf= |
Archives