Fix syntax error in PEER_DNS patches #489980 by Aleksandr Karagodov.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

5 files changed, 38 insertions, 32 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/Manifest b/net-misc/dhcp/Manifest
index 90325f5e40b3..ef5bc470259c 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -21,18 +21,18 @@ AUX dhcp-4.0-dhclient-ntp.patch 7966 SHA256 e93bda7f2baae9163f96ab0408bfbe885caa
 AUX dhcp-4.0.1-dhclient-stdin-conf.patch 2965 SHA256 0b25bc74ae258656dd1f0e6f4ffd6b4ef8b4ad56956624c0b6070941a180e57c SHA512 a65ad75be87f71d7e4021b0d875b9c1d123e9bb691ca9b555a0455ac12addfb4fd0c1e42ab9d5ec78ed0c3ffac40754b997b8729ca3e9a7907d989357ad83763 WHIRLPOOL 100e3dfff5ea75eaad636fb7c4519c08ca004ad6580b5dcf6cc73f041e0c96c0905b4157c1a72aae8d4e4f7031b853a8d348ed8334034a186971f57bdde8fd09
 AUX dhcp-4.2.0-errwarn-message.patch 1508 SHA256 e2baa7b6097a6ca20b66afcd7b0e399840a8b0f251b3750a49a03f0d5b714231 SHA512 6471e4b73fd817740118a5db9ac801914f418360c3322e98c4c2417cb9f563729bb88885e12735ad35a9ec404ac345367300b47be0ca6c2a42673f3c6528ce8d WHIRLPOOL 3262c1433aaec67ce0fbd7cb83eaf47a4d2b264b67c082e0db704c47b918bfc8b6284de54ae205220e6ffa3d34cab360e7a94fcdf0aa6160ac9b0b4e5d8e1cf3
 AUX dhcp-4.2.1-dhclient-parse_option_param-Bad-format-a.patch 1440 SHA256 d54d013d5947f8e501b9cce43a04c611e420eec5cbf29ff67f151db6cee6e9c8 SHA512 e897de809d78e2e924ae15dfcfebf94c5ea8e72445f575259305c149f6e6255b820f39d495c7e3457d129cf955ea016282c4fa6b0a6cab57656a8590a889d6d8 WHIRLPOOL b61598aa7cb2885cade07622d63f800bdb69fd6747bd06b607b15c844e4d53db5e4ff7544347e26de59e0feb7f95287433282744f76a70a817455f06239790e7
-AUX dhcp-4.2.1-dhclient-resolvconf.patch 13742 SHA256 ddc284623b421098702d3e0cc1849b37c015e78dc510aa7efdd2e5fc9b6a849c SHA512 edd0b70196650216a669de5cb5661a2b5225e2bbecdf15f8862173cfa821f27448eb30d4ba6b4244e26e1aa898e624a8e3ad3c95c8a192ba12eb9a436fe2e61f WHIRLPOOL dfd18488ff027bfb688877d7634217ddd43ffdbfa8a9230efd82c545aceb514a88def6d7a3a0dbc308c4b21934ab292bb75680e8c243afbb63bf2ad70ab8b5de
+AUX dhcp-4.2.1-dhclient-resolvconf.patch 13742 SHA256 c2957b00432d7ffcf172a33e5c9dab43897ba58b8efdbd484f8ed1256150fcc1 SHA512 3f349ea2941bcd7c74e3d819e1cb76ea999735393fa7ab6f0f55ea2690fab14dfe7d789dd94f37c493399663a3966a2badd0bd2eee5d45fc375d9249c75d8530 WHIRLPOOL 544aafc4d572fac09cd8e17c843250a38092c196116d600e99dd407db5797ccd52b3153d7927872a6d850e50b3d757a0805b62dc6e1dea56c6f23ce168c86b21
 AUX dhcp-4.2.1-nogateway.patch 1648 SHA256 694caca5fbcf900cef2223307a43fb21a66fd672728cebfd873313730029acc4 SHA512 4b2fce7cb99d490f16382c80fb5615a402a3a655c960151ef49b1d7757caedb471445f3333c50707053b6438cc83297def87142824a4e17d4a43ce85b66c2141 WHIRLPOOL 9282d13538ad2f0cbec74bdc073e61c1707515bd6c6a98299ad7d929ac86a2c6755e482fde48a75368bb01cec036e0abc9fd62378c83a636810d0caa0604cc24
 AUX dhcp-4.2.2-bind-build-flags.patch 476 SHA256 a16d9da5fc29c95c46cf7e2401744292b898f692d49dea4753991505e03c1ca8 SHA512 f552f2b8b1e13e22636f8e4548557801273b0ab38f076a141adb72584ad55b4da156401d94abd12e9364b8632a6e75ecbf3cd90af3b6dbad88627ad3f9658059 WHIRLPOOL 3202f614747eaa9b533e36495bfa862eb96b3e884cb4939a8406fdbded56061aabea20e9249d647e6aa8ed5ed5547d5c8f14c46af193c248239a2734dc79411a
 AUX dhcp-4.2.2-bind-disable.patch 390 SHA256 0871e10198af86414f85c72d21beec640cb0b7c7c4ccea2550d4886bade1417e SHA512 4f852b3fe9dbc18ffa4013fc54aa81ec1009289569c504de10bd01f42798ea21b08567c84e77fbac09ec43038c4da1f0c5579c34ab19e0a038dcb2f61f078df1 WHIRLPOOL 039e71725dbf05e8e74916be490dca13459614038eaf0bfea6a5a5cfd0a72604db4bbdaf02cd8126c4649e7033cbbf39da11d46fee1b83424f41952534230342
 AUX dhcp-4.2.2-bind-parallel-build.patch 304 SHA256 cff322da581742ef1a8019641ee9689c588c3f9fef883b55e28af52823f08838 SHA512 3dee3b0ae5bd512bd7be6d5be7b8cfca8077065f6a3463089bf9ff5fcb556b3333fb8d3aeadf25ea7125fb6eff2ef6967b2878c9312046fa378c8acf0c9cf9d2 WHIRLPOOL 4dbc45c32b7da7cb6f591356290f598308083af3df309cd8e6908b586cbec3dfa6d7d582a3f3675112ff46a15db9c0e1abe727b8b8b4c2168c21a97905f9fb13
-AUX dhcp-4.2.2-dhclient-resolvconf.patch 14535 SHA256 a87f33e33fc3f3a103264909cc85c477036949f2c00c428d562c12b560f09877 SHA512 2e5343c3401c61c8d33e0b16832dd3daec308b4c17f67f5ffa86b13e194f2cb96db6c3696134df1114b839261b03bc890becf925465f312ab67855db33738abf WHIRLPOOL 203bb55c61b7018efdfb9c8083bc70c8a23693da90943ae7720c8968b3d7dcb0d2f27699e3a417efe8bde69347d762d9c0433093da03599cd6a0a67fd603a5fb
+AUX dhcp-4.2.2-dhclient-resolvconf.patch 14535 SHA256 e1142264522fa868f5d86bf2776f5ec3e683783471a39672395e22d417081082 SHA512 8acc93a393979870b2b00908c696d1ab971167e8eb447d9d97d4f861ec727aa18b8d74e79f9d87ee5c569d47cab6e8b7521187cbe2b9aea596d18f0167776d67 WHIRLPOOL e1b616de2aac75b56157abfb6add22274b17e3f8845150bb910cadffd911f32fa294f8bedd3500979d2d31a146178720b322c6fe4013f5cca3439c369ecb957b
 AUX dhcp-4.2.2-dhclient-stdin-conf.patch 3017 SHA256 701da4d022490bf9e1cfd946c752a00a2d2ab9a1fd5030281c1608f367cc68fe SHA512 1adfa938e5531040008981dd4dcba37219bce0794524d3c3530eff527528ef7b22aa6fd540f9ac175339372e98347c0a91b86b4bb5f2aa93f04217b9902c3388 WHIRLPOOL c42b3880b5cf710613021c192fc5bc1290bd04db9d79b991bac9e361f58fd84514044a19a5eff82695845e017c996cd46b29b697bfe718e51fba413caf925096
 AUX dhcp-4.2.2-nogateway.patch 1671 SHA256 3fed5823812c134e1819c8ac10c5fc718df86f4013ffc7505efbbe692319480e SHA512 fefbb402020dfdc3eff75da50bfaed0f30c5b90facd4b4ca25ac38d62f14bb85b18028261b32ac3f4654afc8e6915fcdd6f5e580444f2efe882f6f75ea10be0c WHIRLPOOL 91d38301aaecc4a2199ffd0be19d5c2b36531446524aeb65e743adb82220d20b18f53f3e740b5286bdf578f8fd35b2511f52747406b914d1c4d2841d1677e1bd
 AUX dhcp-4.2.4-always-accept-4.patch 907 SHA256 2a876b92ff385e97955279eab8d7658b9a323cdf16c4a162ba649166cae10194 SHA512 682583d3a68b9609b16ba5029fb14a068c5e4ba1134b91e3c5c91f8cfa0d97d68e7b0fec2aa3d4e224bef9e97765971ca423e54f853a74ff6a2e24715ce17a2c WHIRLPOOL 27516c02bcece28eac935f2a6fbfbf64e3b31b75206151ec618daa906b21a40b62497cefe2e793c1ae74b0b4ee5decde363c9908a632bb38513e14cbb64347e5
 AUX dhcp-4.2.4-quieter-ping.patch 2771 SHA256 8acf6266190a76f13c942da5c0a52c38421259f3fd63426134ad245e65081db0 SHA512 1a17a7ca52aa2a56e483e5f70e9878d7472f8eb3982b4f04c6cb3c32f839fa3972f79f632f99f47196a7e7b9fd8826392b94daaa074691d26636b793fcd40e73 WHIRLPOOL aa0b2bc3f3c539eaa6de27f9ce98525c5342af9a257cf36b8889b40455b3264f7b824a615146539ab012bcf4e5a55a7f1992cfc6222ce77976709c1a88dc907b
 AUX dhcp-4.2.5-bindtodevice-inet6.patch 826 SHA256 482dea1517e3d7a22c0469908c41c0595455b654968e24a31e2053af8b11aa30 SHA512 74d9d30b4803d10a63843d474dda92f019e4b7b9d7a9f4e32a49a1c261c1bb7238cd13f9b91c2bf8cf7f3ce5a5c665ef1d32998b06ca1439b30785d33827fe67 WHIRLPOOL 78b09180b95a4629c383d4347dd6ae55c83987f3c8946eb71a7643a442d59bfb63b3decbdc3fa3bc4e608c6d8ab59c3904eb027e97dcdbba169ca51ff0ced6c2
-AUX dhcp-4.2.5-iproute2-path.patch 340 SHA256 ef7b3268b052903d7d198f992a07ba95b43d0c454f3e83f321fa19423fb8c841 SHA512 08308b0142719bde1037260cb95370e64e0b9fcccd6df39153c62353511b8102c49bb785e6de660be7319f53302b35c18d61b2416b778c02bdd41b39c969a3a5 WHIRLPOOL bee8e2eeba7be8f99eadfc91102e304ac98fa94d80661c5ca04a08b14bde240343341d5ccc932c93a13c43dc6a407cc7dc06823c1de42680166445b24bff0f90
+AUX dhcp-4.2.5-iproute2-path.patch 340 SHA256 a6c25d408ca1bac5180151ff2955807017c386c06fc162395dcd71040900f59b SHA512 4a5c4f3b1af93fa137d94fd860689919b83de5885198e48eb89678379a59a7c9d90f8a3f558ddf9d442130abb127a460928a85c0646c4ad0984827ccd9e08852 WHIRLPOOL d54ba0f4c3da34375ab0f1fa98368ad4ec4f6ff79a131638a3d6540a4c2fa62e83cb45f946518b114793ad8e868b6cef9ec9338a4930080623439e7692386d77
 AUX dhcpd.conf 1092 SHA256 b86d27e0560689057b01a352474582fceb3a398eaf3b17f901378ec56284c4d5 SHA512 21467475571e914b60084a20eacba794806631c84c33e5977db0c5f3b572752c2518c807daac107ec9cbfe4d4ef0cdf54e9797d7ab064e7386b586b00619e035 WHIRLPOOL 0c9a81b3b19f6b91687db7a7ede9107afc0e50fe1ee9d86e848fa444d0da9c55798b545cb8215ec1149d48163a944d6f86969430570b26012f0a19413cff278a
 AUX dhcpd.conf2 1068 SHA256 e8a413e9102948b336f60041fc3cade33125faf56d8319ee65d9f3c63199a8e7 SHA512 7b7a77b7826b475a4113ebeee54501ce417cc56e85754301a82a185d88b4713d198f615a366e63e0e2b0aef988c8137dcd1e18c4036d993378257079da17693d WHIRLPOOL eef0331ee019b561de2f3e46860d2c470f6de05be9104f46316d61b09bad9687d916af94eb4b399612bfd05340cda5f68f87886200801de485bd3665cc0886b9
 AUX dhcpd.init2 2421 SHA256 fef93e5a7264780044a977ade27e9cc70de824063791bcd07d3db81c11c16df5 SHA512 ab7f9c310ad7d6342aa996ae4a94f71e7df71ecaea569cec721637f75ba1a26681769181ef6f2eef1b11cb6bbf5827ab7503ba6012a689d82ac1b96eb918c444 WHIRLPOOL bfc0a4e31521c8b527c5c47ee449d2f2c9e84c4316fa869ba019fb31c9cc9db884d65d016a537c53874556fdc95165039705943dae32b30a8853900685cbfc2e
@@ -67,22 +67,22 @@ EBUILD dhcp-4.2.4_p2-r1.ebuild 7415 SHA256 3533a94061c37ac5f21c02d8943572cb691b0
 EBUILD dhcp-4.2.4_p2.ebuild 7358 SHA256 05e0483f295935a621837b9800c21991f6f5cf487619ca877f92818ff56270d9 SHA512 811192c12c8fae7db21c951f83daae3af1943556e68575ed9270a5b2bd3d38d6ac4ef010127153bcfa933e33575e7c22caeb1c602c5da123ea36bc1f5e5bebd8 WHIRLPOOL b22485dfc8982f86b1512cf44c7e00a40b41b182c8fabcd247b0a8712fd6a13b949449e5ce9eceb211d8db16e8fb075eccdfb34d9b32e3bfc8ce070381cec4c7
 EBUILD dhcp-4.2.5_p1-r1.ebuild 7589 SHA256 9550000131ba6a3e6fc2e0ad3b4c0beb701a99c6bf4dd2349292be4933e8b8d6 SHA512 02351cbf71804929361a6c5f07a57fa0314620d831a0e387d094c39b8dd5996d2476f433f8be8b37b8c9e3b5d956df2310b2917b92f5fb8d6a47ac774735c3e0 WHIRLPOOL 247b0d5a4c5f4f7793661eaffe3c1f3a81cfc338fe5db67229b8b84688588fbdb85485283e791e41f8a5470d4142d5ad920f13aeffb5b38c41acf93a4ebb1a0e
 EBUILD dhcp-4.2.5_p1.ebuild 7406 SHA256 ddebaf5551445f5e630d6c5223350e1827132b5921b93cef16de7e6b0dde2bdc SHA512 b4e7e6544f46b6711529c7d6dd42f326a1406bae7295fe7d3c74fdeaca62622c448180b7a1400cb3c12f19aae43df4c2bc82fa585daeb20719caf90fae43bb1c WHIRLPOOL 72aba0888b3b3f6ae76684cd3e52240f5c612c205a667fb764ad38dcb08f3925a2572e3dcb49534c5d0002706523aa41f4c0522eadd1fd46faeb73af3b7237cd
-MISC ChangeLog 40464 SHA256 b6a7967c017563321b64277f6bc436f6f526312ab6a9653984d95950a39e9914 SHA512 5f229e8e367eb752a6550be86a420c606f3c89a78cf29af6b3adba8f89b7d00883e0ab1b434662038d6a43a0a3ae93013d16903b363a39a5eff5d08ca3e92ec7 WHIRLPOOL 2b9b9606c2238b17093bbd9a2e3035d08a11c200973ed181e9a6a955cb173d5cfc798dbd5afc2f0a9178d0f04acdeb79fbabfc7b5ae19f271e557271267860b9
+MISC ChangeLog 40718 SHA256 7eeb90f67c89cae1c1d72356f9e8f88f3be239ab5621988b58f6ff1f6bd03e2b SHA512 23361cf0e518e0f85ad671323fa38b2b01ba9f959ced1c65921ee818eaebb4e545f8bd57d70615db8fe7952939e23f6b0734d99f626b1b9fa9de09174b812537 WHIRLPOOL 143de48cfaaa5eb4d70859c28cd7b0b330acdac236bb3452545fa188bee096a42cca62c19cdb4c78e099d14b86d6f9663acf8d56921de0662ba466be91e9a757
 MISC metadata.xml 500 SHA256 e9e4edcf7671391ee2f2af0917a75fc07883f1401aaa22b72dd0133bef81601c SHA512 52b56888b04bd8533e00930fddeccac3f1e6a4e6172b57489f52300dcf60191784fec25e94916dbc9ff007c1493fd8144ec30458b4de3589d31d6f2ddafa78b2 WHIRLPOOL 9631e8fe91b7874d03b4f91ab8ac3064a9c259433a7f27214580ea6643c3784f1988559e9c0336fd3508def32ea0ec7be74be20e8ff7d62f0d47b45b478e8714
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSRsKUAAoJELEHsLL7fEFWgv8P/0M3YLDwKwbn2aqKGGopLj4M
-HPvzLaTk7PDVPW3I+7oQZg1/5A6Bzz+jT1PDGDtxq9UPO0bmbPxRJz78a9rKiU50
-2s4DPoLHW+aLjxK/+uuZomihMErQes+TWJ76DV7fcJlMKEZ5dseuW5H7LhHLGZxq
-idog8xz+5JfoqIpdS/E8bmcWiYslLOEHRFPUwb3L0oVNaoDgrQnL/8mMbTdpaOOa
-Yn7Es3ikNFEtEd2uc9ZnmiTLI2lvaCZyW4QpdsQRUUGRnMTivV9/Op+UfUCFvoQq
-8XlFElun9823hEz+kaLyLLsao625Q8bD9ykoLUp/ssHkZPYkVGW5unsZ3dWiEHjw
-Nbz+Rczzx9oEaPx8ywvNF4ug92R7Ynrbzg8xexNHlW3LLWbqBIREAiyPHqwC40Yj
-7YP+bwj80lf+WqNab04IIkWeuMEvN5ptV9Ar/P9bJyS6CfwkkXP933xZUuHog6y8
-IqMBAjCPdVqDdz3SsazKk8X/WgA6UXhgW34oqONvXXPBU5RrXt7PHDL+MgIegbxN
-wFgPNHkfGHIXXanufE1B0icGfIRmYq3U0tLbG25TNXgHVVl+xNvWmUPvg/2tQz7G
-ZS79B6NyZsN2RR/qlszXjwzbHrML4LcZeJvqAJArn0ApN9JPNSp3mW+NXisTDmQJ
-M6a2aK0vC6ybvLT8NbXC
-=NRGv
+iQIcBAEBCAAGBQJSl6GsAAoJELEHsLL7fEFWtTYQAKNgIU1ARbkRP7iVVeTQqi7B
+wBA/Yd7355W1AaGj6gk94TTE32OpkF4xJ8kzH9UTLr6f7rucLHC/E2uFZU8vUBRG
+A3DrA6PvL/kBBloRWDucwEMJdNLffHOuCBLLWeRYfMOGd38fQXiVo3AfOBtdk2Gw
+Z4NSzs+dlOO/G7FM8637QweUGtIqnRkXuSmu06PZ+qJDKpCTNbXfMokfyipJrdWG
+lIZtF1lI/a0+CEmH+Nxf5zUWRDzksrEY5UUuNTzWZc2wQBdFv+/GsZnE/MAZOiUy
++Fr9LyE0ZzANAXGQqnFttlWCIRyCgpqhbsIWGvQwy3Tb3LgBusgsAWc4+yiw3mK6
+hBgub80HS/+7WyzjDp9aR0/AL+u4YeBh7PVCkm92DE2cNQju46ewWPs0ERQitA9Q
+MTlhPyd/IRsvZBcZr4PUnFYs4l0dTid/z32o4CHvOzbTAm+EonLzIpUGqe//hRY9
+ZqLVyZDe+R2bKs2qzwPjdk8rSkWKtObVrIDUC7rGrsxbX+BFBneMLbSDAI7mW/nc
+uaPcnRzJAodXJUI9UNi3vecI1TtMIA5+lp9v98utIae9kU2H/zWV9Pf16sCjRp/x
+gQJxnsuuNUDkxYMBm8MAOI/7h2g71ZaatGNjDyAm5BL8udwEGcrBPiSRhuGkN4Zg
+7/e5OFzRkIOGUtXJnadP
+=YzX5
 -----END PGP SIGNATURE-----
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