gentoo resync : 06.12.2017

11 files changed, 12 insertions, 93 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 72251d795d3d..bd43758677ed 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/c-ares/Manifest b/net-dns/c-ares/Manifest
index 99c7732cc06d..e9c8a86fad6b 100644
--- a/net-dns/c-ares/Manifest
+++ b/net-dns/c-ares/Manifest
@@ -1,4 +1,4 @@
 AUX c-ares-1.12.0-remove-tests.patch 422 BLAKE2B 37b7a7a85f053d6a2231b46ca244ffb449bb011fb3567bfdd601dd7e598e72bf70ffb209ddaf23cb3a2b06f2bc38ff34e1a6bec7cbfafd2d25516f1a24780ace SHA512 53a9c126183c811b1f68c12014e4123d250447925ded472ff1fb6b57d254730206becd4182692ad5958b14ba0b929a2713df6988c0306872b046aa49bd70e743
 DIST c-ares-1.13.0.tar.gz 1446797 SHA256 03f708f1b14a26ab26c38abd51137640cb444d3ec72380b21b20f1a8d2861da7 SHA512 4a7942e754673f5b8d55a7471e31b0f390e8324b14c12077580c956147fad4d165c7fe8a3190199b1add95c710ceeb1a7957706d4f0d6299d39c5dddc719bd9d WHIRLPOOL 02a398db6a1256aabb77e445be6131319f2f1f15327146fb3293033f7b6a15e499bead3d8ded022eb38f6509c76dc0981a3ce139e16132373540c21e7a313d89
-EBUILD c-ares-1.13.0.ebuild 988 BLAKE2B 3598224ccad560bb1b12176640b127f9f7a51d2023068403d41f622d43d3dafeabf39eaa46e20eaabebccfa44b130e366cb14ae6585877f1e364f7294f955200 SHA512 7d38abfe0a9aa4ae7c98d1a39ad1141680f1ca30793fb2d760dd80072f6ad805122b78917a5a7a12a0dfaa22338bbc7f6715ae56688d3f18dd05ab2a4cef48cf
+EBUILD c-ares-1.13.0.ebuild 987 BLAKE2B f2318a4cddb334cbe8bed5b29a0e4fb83b332599ebaafda7089b194834783a70d28fb826249b9d94f29f56f1708447c5ff9822555ce45a2df8340418854a6131 SHA512 b868aa2ef56a1e9826994fc18ee3191c80a30133fa2cf81b90ce67809551c7d341c1b9c99016df4412c33229af08358e0550c466ad327b3edde4d3a23d7d0132
 MISC metadata.xml 339 BLAKE2B e32a823a5af6c260cfb7ebc58dfa81bcb97ff1792aca66662e8206ad3bfb5304784e2f9ec800fe1230472510f864edcacec07df97493e1b481c157e3e5fc971b SHA512 fb726c9af8f3b9b104f13f5d7f8c1d38659848afdd619fe8c9242e8d2dea24c21a2654baca4bac96a94cadf68a0f649c87346f296e6b5d2aa5d88a4276c41755
diff --git a/net-dns/c-ares/c-ares-1.13.0.ebuild b/net-dns/c-ares/c-ares-1.13.0.ebuild
index 0b181ed60e36..c897118fcb57 100644
--- a/net-dns/c-ares/c-ares-1.13.0.ebuild
+++ b/net-dns/c-ares/c-ares-1.13.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://c-ares.haxx.se/"
 SRC_URI="http://${PN}.haxx.se/download/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
 IUSE="static-libs"
 
 # Subslot = SONAME of libcares.so.2
diff --git a/net-dns/ldns-utils/Manifest b/net-dns/ldns-utils/Manifest
index abf684f6c9e4..a44a56ed2b15 100644
--- a/net-dns/ldns-utils/Manifest
+++ b/net-dns/ldns-utils/Manifest
@@ -1,8 +1,8 @@
 AUX 1.6.12-cflags.patch 938 BLAKE2B 9dbcc10a21d0fade4422098c325be04a13d46d17021288501801c5e80233ea3695ddaae4a5a8ac1a8d4d818e94ec7995836b03af374b2e1ab3a7cad809b3ad88 SHA512 bd03ef07cdc407d2ad3714027c91339ada3d79bc3302884b05c4e0ada18d93d232cd718b67a35234b98c29a35f26730df631e0854b8a64399498a7e9f83e6216
 DIST ldns-1.6.12.tar.gz 1057607 SHA256 b966787510a169ca0ed78f9a8a5de01fb309909575e721ead92095d4677aa51c SHA512 f928be35a5c0bc2b918f005dd592cc531451f373ed9d77a54d5207a2a80b9d525faabf75bba75483d3476cfeff75a66ad4d9527a84a983216dae4fac30213773 WHIRLPOOL 0e8cf513991850b065144568ec1ea3188ddb6bbf6b3cf08490186552884b2b2dd42ae8ab8995f54c183a989976ab292772411f2582a5bd595d4d54d25e2b4096
-DIST ldns-1.6.17.tar.gz 1315403 SHA256 8b88e059452118e8949a2752a55ce59bc71fa5bc414103e17f5b6b06f9bcc8cd SHA512 5de42b4b8622591db51efb0956735deee9cd5e0bee12249a03b65c5b45d7c51bf9c2edb310ef9d7431af49aef77d968bfa2455a7dedfa80cde3d433436c83785 WHIRLPOOL 08c8a13df3dbeccd5dc5ceeb52730a61ab231e70a85524e826f9275bbcde6e09d6e2fc5234303a6bceb431d2b91f510140ce61a2b59d77afbb2759a0627c7cb7
-DIST ldns-1.7.0.tar.gz 1304424 SHA256 c19f5b1b4fb374cfe34f4845ea11b1e0551ddc67803bd6ddd5d2a20f0997a6cc SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8 WHIRLPOOL 4450b94dd3e2586230f1691b626947cad7ac2031e343d1e522343570d5b713cfd4bacd52e91713139a88c2fe2406f5f42594d2da0a0474c807f47fd2e98726b1
+DIST ldns-1.6.17.tar.gz 1315403 BLAKE2B 67cf163c0fc529730f6de6a7ed3c581a2fdc3be7eb3f1d2cdc4ff51c98e6b78f93fab96d19d665f2dc8592f80d92ec5d3dd16da9760124f0604eb48c09ffd201 SHA512 5de42b4b8622591db51efb0956735deee9cd5e0bee12249a03b65c5b45d7c51bf9c2edb310ef9d7431af49aef77d968bfa2455a7dedfa80cde3d433436c83785
+DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06 SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8
 EBUILD ldns-utils-1.6.12.ebuild 1351 BLAKE2B c2d36cf2b3924821904af1632d3df395d92ec0835030cce8f03d150478ccae743be26e795ab9e6e7a104771bd7119832efcfe05f1b9f9790472d25a91a457d57 SHA512 74b2120348484901b4736f10cc4fc4f36b4ae728fb3173623c8e5274205c1bbe5b6d535ddf62c20e367fedbcdc0591a870fae871ac99679325267a67721b3829
 EBUILD ldns-utils-1.6.17.ebuild 1138 BLAKE2B 0731e3377961d21b35e5a4237d72079a24b22ed76a24efd8deb0d275f9c54ca40968901802b7a25d1033a4fbc6e0f8322775ff23f81263766a6e65e8c9ef6f7d SHA512 3ae6b8549ed43e1957127129094ece798f1e7f64dae5521f83eeb59a37bc72ae7e97963b68fadf3c5446c8c019d3800ce06f7e29acaf2c6e748750aed6db03d0
-EBUILD ldns-utils-1.7.0.ebuild 1141 BLAKE2B 5938f2ca325891402df628c7894c20c23c837dd40809b54d9d345ed0ee5f5c7f424fdb5cba1db5ded4aea4f689fb9d77d96fd96e056776b707f0ef37ad41a531 SHA512 3273c75d7b8ae67b746083afe6c5c682adf689950363539323e3a42acb6ce7324236e01dff68a8f8c6d8735a6e5d5ee952401c82bd7d0a50c1f7bed14c5d36d6
+EBUILD ldns-utils-1.7.0.ebuild 1140 BLAKE2B 85009c95cddddd10178468af8eccbc18ef85db6f23630411d379e2bf4aeec2f1dfe3f72d2230a222c2fe88b87bf007abaee6a14de508941d48e65846b4f506f4 SHA512 f614b21bd387e88be9d15b18c3aaf31820f97fb3c1ca92de60c464f67fb9ea3d0293dfacca4fa5e0fad92dfd4fec9929469b67872124b25b7ca7df95b3dcb670
 MISC metadata.xml 742 BLAKE2B 78bcba18e70bea755bab35347639a1a529961e91b709b789c045db918525939e9fdb4a7adb6dd7801c64bd02090503d5b3edbe444fbf34615ec3ebb5342d2288 SHA512 a0c0fc0a7dd05890fa9b2d6bf99c5b96990d76993d27d18a382ab69e1200aa5f472865c5de928575d773f70ef21314519bc46a1d2a138da34d569bf56a7d8748
diff --git a/net-dns/ldns-utils/ldns-utils-1.7.0.ebuild b/net-dns/ldns-utils/ldns-utils-1.7.0.ebuild
index b2c6d80b3b45..c0049d92534c 100644
--- a/net-dns/ldns-utils/ldns-utils-1.7.0.ebuild
+++ b/net-dns/ldns-utils/ldns-utils-1.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/ldns/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="+dane ecdsa examples gost ssl"
 
 DEPEND=">=net-libs/ldns-${PV}[dane?,ecdsa?,gost?,ssl?]
diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest
index fba2c669cbb6..03cf0178ebe2 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -1,6 +1,6 @@
 AUX 3.8.1-restore-newline.patch 508 BLAKE2B 932f891ed7372ba56058a364d0e8bab41972c82b43f7b4bcc61c68f5204f8121bc79e8641325cd6ffa9407b473d36097eefa81afaeaaa3c415feea17053cbb47 SHA512 ca2c79192f808e16d0aa876fbb35eb28330a86cc4f2bd7ef618bef16f623c127327b1ce16369aadfb73413b103aa5790d7b9e7f44a9c0b26131b17cab22c0552
-DIST openresolv-3.8.1.tar.xz 18396 SHA256 d259d78fd92ac288f1b27959daee11be9a40d70e91af5432046164c260de1d43 SHA512 390bf30bb85b071839104e5c7e276b402f6f485edc038e38da389730d82e614bb11b0dde44a55aa2ca5e790b374671a9c89cc07b053633401a608150eebbf2c8 WHIRLPOOL 34f1c545053c444d950c3a3f9c0775e377c70a2b45af561cec94f96cd171237e2e2de1cd5a45c39c4e996f87aa206b986740557aaf0104f9af9f3c66f1d1a0c1
-DIST openresolv-3.9.0.tar.xz 18844 SHA256 51a04d39232bb797c9efeaad51a525cf50a1deefcb19a1ea5dd3475118634db8 SHA512 4498db60f0b5a762194dd3651b94cc8b01a349a8cfb891e10d040cd6b8e22fa0e9897909517831591787ad22ffad97c78d3281e32296aa1ee67de5dff9bf765e WHIRLPOOL 2f912211c787517baee2e3b5f5b8036fe3a2c78d62f2366c22e256f2e236fd8a748a3816b8f2c09ba3846377a21c1ddca65a9dc96af37104682e7cbcf6aa52ff
+DIST openresolv-3.8.1.tar.xz 18396 BLAKE2B bddfb919728cb49baba6df6226abe2f893d36770643e735b41717dfd98edf17255d8b293f01b335d6ae31c7075884ea65aa150ebac9d34f252be724aa0a695ec SHA512 390bf30bb85b071839104e5c7e276b402f6f485edc038e38da389730d82e614bb11b0dde44a55aa2ca5e790b374671a9c89cc07b053633401a608150eebbf2c8
+DIST openresolv-3.9.0.tar.xz 18844 BLAKE2B 0aa2125d79305aab04a8d052d56328493d51aa6ff5b44fdfe08e96ccc78ae1d84f2115e5d59940e7e1cedf7e4fe7dc36a461839bcef8fc2c5b2e21242e441f36 SHA512 4498db60f0b5a762194dd3651b94cc8b01a349a8cfb891e10d040cd6b8e22fa0e9897909517831591787ad22ffad97c78d3281e32296aa1ee67de5dff9bf765e
 EBUILD openresolv-3.8.1.ebuild 1138 BLAKE2B 5fa12be67ceb812f7cdd4671e392139dbb66f9fd335f9e29c479ba7cfa6e0bf96670680b1af5b186f795fbefc8a43befa7309b2878c01604059daa2b4804b14b SHA512 e372fd7ddbf638112830b475e0f37393d7f3b7834622296adce85ccfdd636073c803810ffd426fbd014cde789ee5572c38f066be3a4f33b1a31eb5967b1ad0e2
-EBUILD openresolv-3.9.0.ebuild 1092 BLAKE2B 88652816e576234218ae27a258cfbb7a89ae5f435e6e5b63dab6612980c0b91c45fce47e65bf650c18b2da5292d6f02d4907cd337bf54a70e742567ff3ba29de SHA512 34119152a7e56664868c95ccf696c2265ac67e55c332ed6dd07028b7c0061c2eaf140b0aca843f4c3bd49f311ee29e1aaa972662ee073ad6d8fad225c614ccca
+EBUILD openresolv-3.9.0.ebuild 1091 BLAKE2B f32dc9dd4c165e094ce432aa1dbe80e754ab01edcd08bc6244ab37b8cfcde67830af9bda02b7920316173f628dda5bd5c776a8ce71dc33f395b430e9507387ec SHA512 75281841e57d410abd004adfab31333ac5352f5ce3ae25eef8dda7f2ae8f92da71c7785f9a86171ae03c0a7876e4fda0d0a5629854f5945df45ebec9417e3b14
 MISC metadata.xml 309 BLAKE2B 8abae227455bf1e75801e0dcf3b4165beedefc1499e12049e9eb6652302925a11b2b50ea09d417ed523e00103c5f2d7c619669d40bf3c98a7393b939bbb8a05c SHA512 311a9444ac8811bf1ea1a8bb06370b81360c6642921b2932095bd191d8784509bfe46189de8f073a34a831eaf1c8114c3b5bfcf67d0fe042ea2ecd8c1fc7cc0a
diff --git a/net-dns/openresolv/openresolv-3.9.0.ebuild b/net-dns/openresolv/openresolv-3.9.0.ebuild
index b15b0b8c86f9..1d4d055cae34 100644
--- a/net-dns/openresolv/openresolv-3.9.0.ebuild
+++ b/net-dns/openresolv/openresolv-3.9.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="selinux"
 
 DEPEND="!net-dns/resolvconf-gentoo
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 8f3f572b6337..8422aa5035e2 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,8 +1,6 @@
-AUX CVE-2017-15093-4.0.6.patch 1581 BLAKE2B b3604c997b30805bf883879a65e30a96bfeef52eb04fbe7b741c2a41884134c145059359daed0db7d419eadc76909366d19af719a1cb0a978319028c6cbb4614 SHA512 e367895d54c0fe989812195bef0e904c79e16d5bcb1239b074e9587d0e69bab2ae4d675a74c485179c5bb3d4e18fd1f8d505bae0ef1dc72b3a649db596f8c222
-AUX CVE-2017-15094-4.0.6.patch 1031 BLAKE2B 7be45cc770e92fb156b563e32855576ec79f230edd751e14d5bb6b55b859a83acfb9cad30f1e4dace94c316895241a2da2f46e9335b1f3138b4cbd535e62131f SHA512 164370b3667fbe8f19c55068a5d250651ef9873df05d4516f093f98a9bd8f1cd48e95530b2e8cca3b5c54c26bdde8718d7dcd739c922c8d25ac25d2418642393
 AUX pdns-recursor-r1 1135 BLAKE2B 90f28d33c126882e5b5e29209ec12f336797720832f7750262329cc5d47fefdf8bcb5208807e47638037a704abbbebd0ee2b1380a3d1d54feab6d4900c250176 SHA512 9dce3cd454ed6b61af8d70c90a8464c60d16eb8342ffc46558f5dcc5089c77aff4581f208684ddb25c4512ce6f39c54afaf267dcade667d812511ae3fa3a1f48
 DIST pdns-recursor-4.0.7.tar.bz2 1107546 BLAKE2B 3ccda73878599e3ade69e4dc6b0787e588a8403fb7cacfbe574409513b8723cbfd29a3c73d857120def801da60a4bedbc0f0c396e6642adb0287204cde301331 SHA512 0c8873adcce5ed9b41f161bc71635da23496b4ae48dbffff7dcdf9c5181e720f9aa94e18bd64e0dff9fa03eae8410dc93585a74d13f0c16d38b0d1c0f4146bb2
-DIST pdns-recursor-4.1.0-rc3.tar.bz2 1191353 BLAKE2B fcbc6f08f962c9c2f459448770406734eff2caab43b615690e9d910b65327e45182aa2c9bcadadeaa6eb3984a8cb463849d5e001ffb98bb618966da5b8557a8a SHA512 141e3fcbf5e7c81ae0228fb7a15c599ef5ae41e2c2d169e2f7b4f57c6c832ac40d3e20302d219ba565c4a514b1297906684247a1a56cd740e3ea0bff4a7da51d
+DIST pdns-recursor-4.1.0.tar.bz2 1222751 BLAKE2B b2b5a7dee227b28eb3a1451a4d07cb1804e039e6b405c332f30fbb8df39f395906607f3c074b2469b01885b702d12e86e4ffd6114811404134c16956905c744f SHA512 1e4d70f3794005c3f45b2ec0ab580c3697e7de3096f3378b9b9d1cd53f10f95e577522ca9f634eb235b166f007e8a2bfa99f312ddf19f266ad4bb0965167fd7c
 EBUILD pdns-recursor-4.0.7.ebuild 1698 BLAKE2B bf67849d5f47c1f0d148596aea3fbc4268ad6696761f76f7fdb3b3b574708b01a464f12ae2a6c1df8979d60ec0cb877542dbf927af91bb2709e4510ce675a691 SHA512 358312b26fad4c6f2c473b7756f9c6d71c77045d6c7d0e92a10555848bc1643d9fc59454f61f8286d0891d181a1f6b20eeae055598dc7b150ba06faa0af44650
-EBUILD pdns-recursor-4.1.0_rc3-r1.ebuild 1889 BLAKE2B e8a915231e5cdaf6cfcd64d4e78a56b183cb7a37a41262c275d203d00b62de05a8975aa7574ec46ccc089aeeeeafa497b6755a344e718bf9d2db75dd5d09f635 SHA512 216143fbd3c7c869ec09f0bc0fc0785d8f5ca2335c53028d8942cf97e3b25aa0cfc08921130589f97ebea642ba505b908a126921bea60f095d377d4f44453227
+EBUILD pdns-recursor-4.1.0.ebuild 1826 BLAKE2B 07f2d1113ff90503c702e1306f0d9ef87573a04b86f4eeb94dd51be8da29158e4cab390f1a57cc2066760c621e1c87413c0be265c9cd5a94443cce100227c654 SHA512 ab9825a07f4057d8f1a33a5162d0a76f01b55383e62647a9756ea1796405d5f92ad5cc254e2ef3c0ce849cf06a5ffa83519cce8af25ad7874c5c7b510d0929b6
 MISC metadata.xml 1076 BLAKE2B 4f68267d5dfcf3cff38f306f440ed2e9a7f5193c14c1029bcfcbbfca4f8f310c94969001c781e1b78a14cec2a6e313e44d82bebbd9694fe46f97759372e63711 SHA512 374be5aa98c4bab340d8d63c859ab08a392e926fbb4d55e1f5a2967d41c401d13d5e8d5997c0790c3b8f96662b56e4492343248d7c8e0a067dc7eaf3f4b56e95
diff --git a/net-dns/pdns-recursor/files/CVE-2017-15093-4.0.6.patch b/net-dns/pdns-recursor/files/CVE-2017-15093-4.0.6.patch
deleted file mode 100644
index 2695830b4420..000000000000
--- a/net-dns/pdns-recursor/files/CVE-2017-15093-4.0.6.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -ru pdns-recursor-4.0.6.orig/ws-recursor.cc pdns-recursor-4.0.6/ws-recursor.cc
---- pdns-recursor-4.0.6.orig/ws-recursor.cc	2017-07-04 17:43:07.000000000 +0200
-+++ pdns-recursor-4.0.6/ws-recursor.cc	2017-11-02 18:13:55.762458134 +0100
-@@ -76,10 +76,11 @@
-       throw ApiException("'value' must be an array");
-     }
- 
-+    NetmaskGroup nmg;
-     for (auto value : jlist.array_items()) {
-       try {
--        Netmask(value.string_value());
--      } catch (NetmaskException &e) {
-+        nmg.addMask(value.string_value());
-+      } catch (const NetmaskException &e) {
-         throw ApiException(e.reason);
-       }
-     }
-@@ -91,9 +92,7 @@
- 
-     // Clear allow-from, and provide a "parent" value
-     ss << "allow-from=" << endl;
--    for (auto value : jlist.array_items()) {
--      ss << "allow-from+=" << value.string_value() << endl;
--    }
-+    ss << "allow-from+=" << nmg.toString() << endl;
- 
-     apiWriteConfigFile("allow-from", ss.str());
- 
-@@ -201,10 +200,15 @@
-       if (server == "") {
-         throw ApiException("Forwarded-to server must not be an empty string");
-       }
--      if (!serverlist.empty()) {
--        serverlist += ";";
-+      try {
-+        ComboAddress ca = parseIPAndPort(server, 53);
-+        if (!serverlist.empty()) {
-+          serverlist += ";";
-+        }
-+        serverlist += ca.toStringWithPort();
-+      } catch (const PDNSException &e) {
-+        throw ApiException(e.reason);
-       }
--      serverlist += server;
-     }
-     if (serverlist == "")
-       throw ApiException("Need at least one upstream server when forwarding");
diff --git a/net-dns/pdns-recursor/files/CVE-2017-15094-4.0.6.patch b/net-dns/pdns-recursor/files/CVE-2017-15094-4.0.6.patch
deleted file mode 100644
index ee7cf6878d98..000000000000
--- a/net-dns/pdns-recursor/files/CVE-2017-15094-4.0.6.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ru pdns-recursor-4.0.6.orig/opensslsigners.cc pdns-recursor-4.0.6/opensslsigners.cc
---- pdns-recursor-4.0.6.orig/opensslsigners.cc	2017-07-04 17:43:07.000000000 +0200
-+++ pdns-recursor-4.0.6/opensslsigners.cc	2017-11-02 18:18:37.489408103 +0100
-@@ -474,7 +474,7 @@
-   if (iqmp == NULL) {
-     RSA_free(key);
-     BN_clear_free(dmq1);
--    BN_clear_free(iqmp);
-+    BN_clear_free(dmp1);
-     throw runtime_error(getName()+" allocation of BIGNUM iqmp failed");
-   }
-   RSA_set0_crt_params(key, dmp1, dmq1, iqmp);
-@@ -562,6 +562,7 @@
-   BIGNUM *n = BN_bin2bn((unsigned char*)modulus.c_str(), modulus.length(), NULL);
-   if (!n) {
-     RSA_free(key);
-+    BN_clear_free(e);
-     throw runtime_error(getName()+" error loading n value of public key");
-   }
- 
-@@ -866,6 +867,7 @@
- 
-   int ret = EC_POINT_oct2point(d_ecgroup, pub_key, (unsigned char*) ecdsaPoint.c_str(), ecdsaPoint.length(), d_ctx);
-   if (ret != 1) {
-+    EC_POINT_free(pub_key);
-     throw runtime_error(getName()+" reading ECP point from binary failed");
-   }
- 
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.1.0_rc3-r1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.1.0.ebuild
index 224ae2f7537a..346091e0ec16 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.1.0_rc3-r1.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.1.0.ebuild
@@ -33,10 +33,6 @@ DEPEND="${DEPEND}
 
 S="${WORKDIR}"/${P/_/-}
 
-PATCHES=(
-	"${FILESDIR}"/CVE-2017-{15093,15094}-4.0.6.patch
-)
-
 pkg_setup() {
 	filter-flags -ftree-vectorize
 }