Use upstream patch for 3.14 LTS issue.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

5 files changed, 93 insertions, 55 deletions

diff --git a/net-dns/unbound/ChangeLog b/net-dns/unbound/ChangeLog
index 18b1d3311b0f..8cea540e5706 100644
--- a/net-dns/unbound/ChangeLog
+++ b/net-dns/unbound/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/unbound
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/ChangeLog,v 1.85 2015/01/15 08:39:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/ChangeLog,v 1.86 2015/01/19 14:08:32 radhermit Exp $
+
+*unbound-1.5.1-r2 (19 Jan 2015)
+
+  19 Jan 2015; Tim Harder <radhermit@gentoo.org> -unbound-1.5.1-r1.ebuild,
+  +unbound-1.5.1-r2.ebuild, -files/unbound-1.5.1-pmtudisc.patch,
+  +files/0001-fix-fail-to-start-on-Linux-LTS-3.14.X-ignore.patch:
+  Use upstream patch for 3.14 LTS issue.
 
   15 Jan 2015; Agostino Sarubbo <ago@gentoo.org> unbound-1.4.22-r1.ebuild:
   Stable for ppc, wrt bug #536226
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 5b4ee7376eed..dd72c3fc7953 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 0001-fix-fail-to-start-on-Linux-LTS-3.14.X-ignore.patch 2032 SHA256 b5312b80a37501198345214a7eeaf589340ab698dc3390e3addb146c35f2e9b6 SHA512 1a28fca9fa39cf4c07e2f9b75058ca1d00a176ab4f0b96130fbe4773f503f39f7f16518e82f58d289001dd468e53e54f1e208e99eec713fda0efd35517c4bcb3 WHIRLPOOL 7f630f1c7b0be788a4a288501fb47065b31a8afb9b4d462122e01c01f7be9f8575aa141502fc83d57c6f330a0d8a3f8423489452f878fb6314868c6e2586204c
 AUX unbound-1.4.12-gentoo.patch 639 SHA256 8223261764f067355a5c013b2c8b13384480c91782fc42ae339dcc8bed843448 SHA512 81292d898284c27e0b30a90816d283d2fffd5810afb38b5a79ff4acc94d82c91bd5414d177f11745c5ee7e56d1600a67bdc4d7395504ff6266103b4e018baf6c WHIRLPOOL 29fb59e16d8f3f4e4d6029f2b3ec6dfd3665c366f3842b318a80b5721a9770b7fd47ad5e0169ab9539f87ed49d03a282f47507754c09cf17ea0d99705f1860c0
-AUX unbound-1.5.1-pmtudisc.patch 1099 SHA256 7d1073872898000299148f86f564c2a5eaa0ae0868dfff64d281a3d2f9a4c8a8 SHA512 5ff77f00d5eee410869868fa9e2730f8c5380baa25384c52f52999d4660310b0b67c7a94e40ae89201165ddb52b60c50cda14513e53e2023ec3b29aa8e72ba3b WHIRLPOOL a6a7a6edeba3130ef80620bdbea2403156f65be1b6db20bd96fd6555314a854f616b9f7ecd7aeefc99fa69f0a50ee9e5eccae0579ed2401290155ce9cfe6061e
 AUX unbound-anchor.service 263 SHA256 cbb233e37b5136ab089a909472bfb0b58185f138df974a8abc9121d86cf2ba17 SHA512 c0f8ff2df106d1f05786cf5d69b48cdf69ba2fd42645bf6b7fa2d34d6c3fdd1608fb470c4fb0216164386e8b22977292ae8932c784a6967774e3daae1b8aeb95 WHIRLPOOL 0fa95e2d8113f9940b89c3c26194b37ab99a85f7ffb699240e6bad32213565c614a4f41d88e08d4b0a15e5a8b0b6a81a029d0f8dac9f7b36763ed3c5b18b0b05
 AUX unbound.confd 171 SHA256 7da812ef83f8f8b9351363525ab6bebd5348faed76d0ae424dcbd7cb6a830dfd SHA512 e3e4c7f97c13d133724417a70e4f20dac6f1f4b5a4e2e573c410148059d9f722589249b3dd4668069d4e324abef60f5981f20b1797623f37db9c9422410dc13f WHIRLPOOL d88c7542891ea7420253598c1fb94982a01d378aacf26a75c28650acc6f0093f526e0fab51f8e1b60681809bd253f765f8f73aa205bef5c4949766861f410ca5
 AUX unbound.initd 1479 SHA256 62cac1d151351d1e843cd0d8cc502ef92a3b47d818f620d2995601e0c6e7eadc SHA512 96f9646d6b15091a9d3c241dac1fa71fea19ccd1e921201799c3fc904faa474672a76d87e97f209ec7d48b11f7c6e266e94ae746e1cfaf8edf21a13ee66ed74d WHIRLPOOL 33f7abee3a210af4976c323a65b8a7bb618406ef59dbe265946f894555e4878e03dbbd4907f1dc7941ab606d0972af894c326125c4f6038dfc420bdfc5c69b44
@@ -17,24 +17,18 @@ EBUILD unbound-1.4.21-r2.ebuild 3240 SHA256 d7b2168d7b931aca365d5fe52ee589737951
 EBUILD unbound-1.4.22-r1.ebuild 3259 SHA256 bcf3d21ce99569b98d5254fd66984c4dc80ef61e4c31ddf339807708745bee33 SHA512 7a023e46e961a5f5a731788a8d344ea54ba8e75cc6bbc1f50a15d9538b2543371db991ade78640fbab3d467ab66e486778df54be53c720c791dc6699b2a36261 WHIRLPOOL d0bc88a402d356495ea0fa610471a8733103d80c207ac4916848a6b6f359f981b0d33b483970a1387402746fe85d4e9860978ca7267236f939797fb5e109f627
 EBUILD unbound-1.5.0-r1.ebuild 3380 SHA256 99840c6ee479218deab00f520a4b3bc8834e5ab74795f726be935e24b520cc0d SHA512 1e3ebd20780169cd1a00ce5ca74ef33627816209583cb03f2ca747ab9c04e2b33f7eef68218b83acaf6ce91bbb9831ff7d8b1cee9dddef211fdcaf2ad464ccb0 WHIRLPOOL b6610e338fed590127c75f63de0bc89548978ea2608ef836fd3c69288cae43f05dce79afd80a711487779dc011bfffce3b69a9e279b2b68b64303e2097ce6a3a
 EBUILD unbound-1.5.0.ebuild 3318 SHA256 2edec28c3d2e801853f2caca53d11a917bae3ee724e9d61535d44179bbf9e0fc SHA512 f20052ea7b91887b6c6c232c995e9243ada0f136b8b742ac3079ca991c219825aeb9a915669a9f9279dbbb4039232c043393a569609c8d13a9a5aff656f31b2e WHIRLPOOL 92fa289de1fcacea65965d0a58a51cdb4fdb04386097d012528e160a4eaa02b2cdc3d33410d175f73f2ca572b691cb2bb6e2356457f04df66a832a9027fd67aa
-EBUILD unbound-1.5.1-r1.ebuild 3472 SHA256 6b80ac2541fee25c603f10a8c313ead53574cdf17def910aa5c373589f055aac SHA512 6727599cc88a08f77a2cf6691a7ae37e960c8411fbe812f6c6eb54dbd843d007d14b3eceff033a72c6209c8febb89371fd3048bc93476eededdec7fa86c43d2e WHIRLPOOL a7d79c866fa9dbf71f7fbab9fbe008ad5f460d7fe4433dc8f181e49e8e951d41a9afc439a6c27835ac3c0878af45966d90db3c44efe7b557622ecc93649ed500
+EBUILD unbound-1.5.1-r2.ebuild 3505 SHA256 e13906a64bb27d299e0d24f43183245d15ff18132f47c0d0f3deb97dcce37cf2 SHA512 1359a77b21ac449d58147b8dac034164c19dbc57756decd2a3fd036b7d51a7de805def05f501a5cbf83f3e7db507d5f40fa7d74a1c9b809db8cb223c6d623cb8 WHIRLPOOL ecfb37568b6aadd23519d844e71c641735d83e88f939259c9605f641104e20c28a19968695776276b07faf958370a8373906d8b1400a6b2bf517e6aece791d33
 EBUILD unbound-1.5.1.ebuild 3424 SHA256 2496d95cbdb1deee2fa735ba6cbae28eb539ceb3b5e59f13d5e960d002d7267b SHA512 8ed32aab219b34f458b0a3a90378769821c3bc6dc921bd0c4e68a787dc5bd8640af326a0bfb7de30e77763fed6b8f60dab85b2679fb9cf09f63f086a76198876 WHIRLPOOL 4b01d49ae500b231eed27f756d1e99d972d873af1bfee38ed74bb6ce33a2a7f260885db86a79ea08a10fc9de2ae0be31186a54b35a795b75662dc9a55dc5e009
-MISC ChangeLog 12606 SHA256 589da3c41eabd6436bc2558095500bb224c6ae36dc2c486f86bbe6c7ffd37391 SHA512 3df91b87e3ad529667e129f531c2ec71044fbf351bad12b550b5ecd075e0bc321ce1dc65e83529ab5016d41c0af612ea2a727a48a4c85cc7852684b739c39611 WHIRLPOOL 9d6a8f67e38ecb7f42678d836a909d0b6a66c3e3c433d925e32218301cd82ac9775e4ec65c1564f4bb93220177b73f5f3159e56df731f16cc81b1599ff03dac3
+MISC ChangeLog 12893 SHA256 91c677456f910c44cee036c8e1155344307971846eff14cfd78fe01f63a65ffe SHA512 e71e0503e6cb7fe3252dd4276fba58ef6439f661e112eb5810f982f3a630a351710dd17d2efca156189690cc44f1b5fa06e6c26d7690d19f0f38add8f78c26bc WHIRLPOOL 57ac0093e9bfb0706dea986568d1adecad63076c6c3178ef934de7e06bd73cdfb09df34e48f8c8212342f05215b5ac901c2be0d80aaff0bcde5bea31ca25bd85
 MISC metadata.xml 1138 SHA256 0673eac45500ed668c7dc6e0876eb4b59bf41cc1a051e656a57dc94f25b8acdf SHA512 9867ed53f0c77346379104457c1c1e99cccb4b203d8cd3120a9e07a5bd9ba13659982eae71d6aa9f13ae545ed0356639be3f294320f7cc8ca355881e65772e98 WHIRLPOOL 5b0728f47c66353a2367c87023f12eb4cb0d4a7798ab7e1feab841eb52fc4c28f039e14d48eee58c13509abf0d90087cc0e7568a7bf1ab25eddf8f27f8c1e924
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUt3zTAAoJELp701BxlEWfBHUQALkSO1aeEg4C5Bi5A5Izj120
-ts21RkXInTJYw7hnAeLYeiB9ZQNKmY3lpm82JGePX8JRH8YQFpXyTxu9r9HUzTMo
-16nBHLgNhXsM0ycEIvw5q5TQwyvfFCyYgSpVK8oMllrS/E92zq4uxNg3DpyY4xwf
-okXWikwN4z9/ur3A72llU+ZnZWauuI96myTMXB2wNd6NWUS5VUpNoIkLR7/xiZIS
-ZMzcHwBlrTzo0+2Mdq26hDlfQN7H3ui9zh2bI/+3W7YnrzKLbkQt6XtsiC2eo3+H
-IFro25xw3uNZ1Ge4Tcyz89JGpvNYGlh+u+aXK4QyaVTLai1soc+gy22ZAURKfIEp
-QJAmsmgKjJbi4u9DjxtoQpln2h+Q63pINM1sXJ6cDSPQAeoILxbRyRn68fbmIbU5
-D3SZoFYksCgUUI4XuE0Q+Ql4Gz0Ok5AAkxnclugJJgif+0TSQU/l/bnJxjaiYZ/n
-Zt1Vxvr35rkVoCOhFnj4NTJS9mV3OSd5pGaai37R2Tf0qLHE1cO//lsoKUK1JfRX
-BwWOwZFtWdcaOyE0h90wsPhb8KbcoAD5W3t/wj+jPVB3vAFYhl4F6jzZtT3n7IvR
-Beg15trrHvZJ8w2ttvRQJKUXcMhUTtBOMG3CyhXD8uehlT9FI6V2+eowl6G1FJDa
-JprHlBj5roiJevgveaN3
-=OL1Y
+iQEcBAEBCAAGBQJUvQ/mAAoJEEqz6FtPBkyjRY4H/j4z2r33DusCeqyzJbO+M8sh
+dOSwW4Y1RsKLUh7h5ohebY8hTd8wkPDaEd8yUdd2SWmWdrmwd0gx/gqRggHpdK8X
+dAxGD/6938Tn05bmgYW6MzjCWmtcqF8nAQCClEkm6TZs3j9YyHZ9hYcPm3ItxRLO
+b0nFB0wpEeiQNWbEKcXqZfBSN31vvdVsqeUVUkpwes1CjEhb3wEFvR1I/+4iTOWK
+gRSknebZ3Um4SXKWNfsoZdoWOwIAblPpnVz2nwEWsKBlnCCirT+C9zktEHLCJtbr
+5mW0Dd3ApsgNmhNX1ztw7rq65syopchW4w5ZQfK0kCKvZVfiGsv6Mz9NvxUm8pA=
+=cDZq
 -----END PGP SIGNATURE-----
diff --git a/net-dns/unbound/files/0001-fix-fail-to-start-on-Linux-LTS-3.14.X-ignore.patch b/net-dns/unbound/files/0001-fix-fail-to-start-on-Linux-LTS-3.14.X-ignore.patch
new file mode 100644
index 000000000000..c1be28cbc0db
--- /dev/null
+++ b/net-dns/unbound/files/0001-fix-fail-to-start-on-Linux-LTS-3.14.X-ignore.patch
@@ -0,0 +1,72 @@
+From 858da540f70a4411ad8fbe7144cef6ce9da18f89 Mon Sep 17 00:00:00 2001
+From: wouter <wouter@be551aaa-1e26-0410-a405-d3ace91eadb9>
+Date: Mon, 5 Jan 2015 13:51:22 +0000
+Subject: [PATCH] - Fix #634: fix fail to start on Linux LTS 3.14.X, ignores
+ missing   IP_MTU_DISCOVER OMIT option.
+
+--- a/services/listen_dnsport.c
++++ b/services/listen_dnsport.c
+@@ -368,29 +368,47 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr,
+  * (and also uses the interface mtu to determine the size of the packets).
+  * So there won't be any EMSGSIZE error.  Against DNS fragmentation attacks.
+  * FreeBSD already has same semantics without setting the option. */
+-#    if defined(IP_PMTUDISC_OMIT)
+-		int action = IP_PMTUDISC_OMIT;
+-#    else
+-		int action = IP_PMTUDISC_DONT;
+-#    endif
++		int omit_set = 0;
++		int action;
++#   if defined(IP_PMTUDISC_OMIT)
++		action = IP_PMTUDISC_OMIT;
+ 		if (setsockopt(s, IPPROTO_IP, IP_MTU_DISCOVER, 
+ 			&action, (socklen_t)sizeof(action)) < 0) {
+-			log_err("setsockopt(..., IP_MTU_DISCOVER, "
+-#    if defined(IP_PMTUDISC_OMIT)
+-				"IP_PMTUDISC_OMIT"
++
++			if (errno != EINVAL) {
++				log_err("setsockopt(..., IP_MTU_DISCOVER, IP_PMTUDISC_OMIT...) failed: %s",
++					strerror(errno));
++
++#    ifndef USE_WINSOCK
++				close(s);
+ #    else
+-				"IP_PMTUDISC_DONT"
++				closesocket(s);
+ #    endif
+-				"...) failed: %s",
+-				strerror(errno));
++				*noproto = 0;
++				*inuse = 0;
++				return -1;
++			}
++		}
++		else
++		{
++		    omit_set = 1;
++		}
++#   endif
++		if (omit_set == 0) {
++   			action = IP_PMTUDISC_DONT;
++			if (setsockopt(s, IPPROTO_IP, IP_MTU_DISCOVER,
++				&action, (socklen_t)sizeof(action)) < 0) {
++				log_err("setsockopt(..., IP_MTU_DISCOVER, IP_PMTUDISC_DONT...) failed: %s",
++					strerror(errno));
+ #    ifndef USE_WINSOCK
+-			close(s);
++				close(s);
+ #    else
+-			closesocket(s);
++				closesocket(s);
+ #    endif
+-			*noproto = 0;
+-			*inuse = 0;
+-			return -1;
++				*noproto = 0;
++				*inuse = 0;
++				return -1;
++			}
+ 		}
+ #  elif defined(IP_DONTFRAG)
+ 		int off = 0;
diff --git a/net-dns/unbound/files/unbound-1.5.1-pmtudisc.patch b/net-dns/unbound/files/unbound-1.5.1-pmtudisc.patch
deleted file mode 100644
index fb24734d0f2b..000000000000
--- a/net-dns/unbound/files/unbound-1.5.1-pmtudisc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ru unbound-1.5.1-orig/services/listen_dnsport.c unbound-1.5.1/services/listen_dnsport.c
---- unbound-1.5.1-orig/services/listen_dnsport.c	2014-09-16 15:49:21.000000000 +0200
-+++ unbound-1.5.1/services/listen_dnsport.c	2014-12-21 08:15:39.126734451 +0100
-@@ -361,6 +361,7 @@
- 		}
- # endif /* IPv6 MTU */
- 	} else if(family == AF_INET) {
-+		int omit = 0;
- #  if defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DONT)
- /* linux 3.15 has IP_PMTUDISC_OMIT, Hannes Frederic Sowa made it so that
-  * PMTU information is not accepted, but fragmentation is allowed
-@@ -373,8 +374,11 @@
- #    else
- 		int action = IP_PMTUDISC_DONT;
- #    endif
-+blahblah:
- 		if (setsockopt(s, IPPROTO_IP, IP_MTU_DISCOVER, 
- 			&action, (socklen_t)sizeof(action)) < 0) {
-+			omit++;
-+			if (errno != EINVAL) {
- 			log_err("setsockopt(..., IP_MTU_DISCOVER, "
- #    if defined(IP_PMTUDISC_OMIT)
- 				"IP_PMTUDISC_OMIT"
-@@ -391,6 +395,11 @@
- 			*noproto = 0;
- 			*inuse = 0;
- 			return -1;
-+		}}
-+		if (omit == 1) {
-+		omit++;
-+		action = IP_PMTUDISC_DONT;
-+		goto blahblah;
- 		}
- #  elif defined(IP_DONTFRAG)
- 		int off = 0;
diff --git a/net-dns/unbound/unbound-1.5.1-r1.ebuild b/net-dns/unbound/unbound-1.5.1-r2.ebuild
index f2c751084214..66a0c0ef7705 100644
--- a/net-dns/unbound/unbound-1.5.1-r1.ebuild
+++ b/net-dns/unbound/unbound-1.5.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/unbound-1.5.1-r1.ebuild,v 1.1 2014/12/21 07:17:57 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/unbound-1.5.1-r2.ebuild,v 1.1 2015/01/19 14:08:32 radhermit Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -63,7 +63,7 @@ src_prepare() {
 	# [23109:0] error: Could not open autotrust file for writing,
 	# /etc/dnssec/root-anchors.txt: Permission denied
 	epatch "${FILESDIR}"/${PN}-1.4.12-gentoo.patch
-	epatch "${FILESDIR}"/${PN}-1.5.1-pmtudisc.patch
+	epatch "${FILESDIR}"/0001-fix-fail-to-start-on-Linux-LTS-3.14.X-ignore.patch
 
 	# required for the python part
 	multilib_copy_sources