Fix breakage on 3.14 LTS kernels.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xA5DE03AE

diff --git a/net-dns/unbound/ChangeLog b/net-dns/unbound/ChangeLog
index 96db5df30130ace3af6490673da1c03dcdf195c9..c1bd6a401acb25b383fe7b15071a5f6e9e0dafec 100644 (file)
--- a/net-dns/unbound/ChangeLog
+++ b/net-dns/unbound/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/unbound
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/ChangeLog,v 1.83 2014/12/08 18:39:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/ChangeLog,v 1.84 2014/12/21 07:17:57 zx2c4 Exp $
+
+*unbound-1.5.1-r1 (21 Dec 2014)
+
+  21 Dec 2014; Jason A. Donenfeld <zx2c4@gentoo.org>
+  +files/unbound-1.5.1-pmtudisc.patch, +unbound-1.5.1-r1.ebuild:
+  Fix breakage on 3.14 LTS kernels.
 
 *unbound-1.5.1 (08 Dec 2014)
 

diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index b36143e7331fe6ecf4fc31c34e8bdf27f70a7b84..38227b1df20442360e7b9dcf528e925c794b7cc2 100644 (file)
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 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
@@ -16,17 +17,24 @@ EBUILD unbound-1.4.21-r2.ebuild 3240 SHA256 d7b2168d7b931aca365d5fe52ee589737951
 EBUILD unbound-1.4.22-r1.ebuild 3262 SHA256 4bca7316fa732dd7e24b8c641145aa2bf7098cc41ae6a12e49c09e9970cf0421 SHA512 cd1ff23d64dfcf2b45b64689d6ee54e910ca535e9d4ab3e3d010fa7afa138f76e583314288e586ee173cbf0d9f36fe49c488cc6d4c4f40b478ffcbfcbe97a6cf WHIRLPOOL 29c425bd6b03f7f7d1f6fe52634b72be10e11052c9011283ffae4505261793b1f28644ecb2045cb14be455ccb81d5fd6ced3a10c37e0358f06ab6778e795dcb9
 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.ebuild 3424 SHA256 2496d95cbdb1deee2fa735ba6cbae28eb539ceb3b5e59f13d5e960d002d7267b SHA512 8ed32aab219b34f458b0a3a90378769821c3bc6dc921bd0c4e68a787dc5bd8640af326a0bfb7de30e77763fed6b8f60dab85b2679fb9cf09f63f086a76198876 WHIRLPOOL 4b01d49ae500b231eed27f756d1e99d972d873af1bfee38ed74bb6ce33a2a7f260885db86a79ea08a10fc9de2ae0be31186a54b35a795b75662dc9a55dc5e009
-MISC ChangeLog 12314 SHA256 47b78003e944752e0472f6b6a05f60bd207ebcb746c9e74b95dd933afc628c92 SHA512 7cf05176255b1e9c94004797d21a9e4bd7882acf4c1959682fea2235fdca750220f0fd055027d40acf7d4112ae321dce5d02521193fcee4248f8417e6878ec3e WHIRLPOOL f46bf32712c6e82050f4ff666b0f2c44a124a4457b5ec5edbf5166479fe9ac7fc5eb9b3b6780c3fe36e95c2080cc8ff46ff6406640b759b5a4cd911cb1f3c04e
+MISC ChangeLog 12498 SHA256 cafda5d70c3c7f443bdd9030a7f6dfc2a0c2efeb44e14e1732c0e4052f83a823 SHA512 9c2167145b46540bdd1db8bb51527ffaa4cdf1b4247a33a327031fc04015470ecd067b76c871316be05c105748c19209279d09ca3a21448635b9ab5384967c28 WHIRLPOOL 990cf662e03514405a738ad94c3dae956992c14b12875d4ed7c8932b90a0959eaa36dc97c3f6d744f7979e3e8dfe2b22bc515b572938ad5c20f3030298d9ff24
 MISC metadata.xml 1138 SHA256 0673eac45500ed668c7dc6e0876eb4b59bf41cc1a051e656a57dc94f25b8acdf SHA512 9867ed53f0c77346379104457c1c1e99cccb4b203d8cd3120a9e07a5bd9ba13659982eae71d6aa9f13ae545ed0356639be3f294320f7cc8ca355881e65772e98 WHIRLPOOL 5b0728f47c66353a2367c87023f12eb4cb0d4a7798ab7e1feab841eb52fc4c28f039e14d48eee58c13509abf0d90087cc0e7568a7bf1ab25eddf8f27f8c1e924
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUhfBYAAoJEEqz6FtPBkyjA00H/jmAsihHJTjHp7GqLBZv8T86
-pVr0OsHR7HaSpO6WfXWZmb6Fyo6D4KM5FNSqtE8LgXjAdJU/szLtgITCGUiNXoiG
-xOIAHcosjBKUHxQmxTIp4mRBbOgacSSA5VoU47W8dAiQeGRgCL8AgZsYKzAPXSSc
-c3CfaatSKvkZbrJKo2N0FTW9fha1LwvxHPSr1SsJaNaHv2bXw6Giz4BFOjgB5Apf
-c/2azfVYaiwjR0Fy/FBgC+KP7hbCFg30dNa0gja1jLgkMmONka9filghOUfR27Hf
-TrbF1EVDcHQgGSslwesWg3d6galFvjdUoDCU9LGZ8V0x7Glg/HB002jfbxHZ6ig=
-=JGq8
+iQIcBAEBCAAGBQJUlnQnAAoJEEn8cBKl3gOuYPEQAIOV1BbD8y/GQqaFcNsIok7b
+m9ld9ho+zAUqB/lmfdPw8+QqLwdaJUoc9rzvag/0uK9DVb5NXkdXvvmhVZjJ1vgy
+3guFvBbwiOEhZ8AjpLqp8cUwBlu7V2O68ULtL13So/sTZzuRweKoO8oZ1sdXYGLG
+Tm3E619csZOFO/iM7LIZktG/LcU3a/SwwwJWGI/j10fyawYGS/TcrE0LDVKUD388
+qPTW3KWfb99ggPvbY1vGibx77wCXQhftGzzOteco32nSXpu9mO8wJ+6447ksLRxh
+SDjNesWqvOThAY+l7UmcXXFtn2z3K06ssSyK7YwvHCzR9z9ca55LALeqlEqNx2mZ
+qFpsllqRzZUqGkhFb7xqB3VGUBmeyw5RddP9ycK7N7s2atkAfYWLC5YZs3ytTRCd
+c9quumiFyUpncXxgEEBn0TqsX1MLeJS4ryEoEyvcC/7HJIhWchmI3SqQ4zfy/84M
+Cgw9Rbb5T3CaMc+S2ONyUFW/mIx8q7jIGMV/QqZbExqWZjQzz6OfHnbBmF0ZAQzb
+Rms8KRWBd9rbCyoHH/gJy9lwBbFPQZmAUmx1rQ7n50nxcGEmzkjz05xUDFzTMLXS
+BZ7EE2kEluJCi23HiDn6gjNSabvWzz6WNfsh0FxuD7X2xv+ewWy2RJt5B3DbUumY
+XWiACoIBO3ilkjgRrpB6
+=AWwA
 -----END PGP SIGNATURE-----

diff --git a/net-dns/unbound/files/unbound-1.5.1-pmtudisc.patch b/net-dns/unbound/files/unbound-1.5.1-pmtudisc.patch
new file mode 100644 (file)
index 0000000..fb24734
--- /dev/null
+++ b/net-dns/unbound/files/unbound-1.5.1-pmtudisc.patch
@@ -0,0 +1,35 @@
+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-r1.ebuild
new file mode 100644 (file)
index 0000000..f2c7510
--- /dev/null
+++ b/net-dns/unbound/unbound-1.5.1-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2014 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 $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic multilib-minimal python-single-r1 systemd user
+
+MY_P=${PN}-${PV/_/}
+DESCRIPTION="A validating, recursive and caching DNS resolver"
+HOMEPAGE="http://unbound.net/"
+SRC_URI="http://unbound.net/downloads/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="debug dnstap +ecdsa gost python selinux static-libs test threads"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Note: expat is needed by executable only but the Makefile is custom
+# and doesn't make it possible to easily install the library without
+# the executables. MULTILIB_USEDEP may be dropped once build system
+# is fixed.
+
+CDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+       >=dev-libs/libevent-2.0.21[${MULTILIB_USEDEP}]
+       >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}]
+       dnstap? (
+               dev-libs/fstrm[${MULTILIB_USEDEP}]
+               >=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
+       )
+       ecdsa? ( dev-libs/openssl:0[-bindist] )
+       python? ( ${PYTHON_DEPS} )"
+
+DEPEND="${CDEPEND}
+       python? ( dev-lang/swig )
+       test? (
+               net-dns/ldns-utils[examples]
+               dev-util/splint
+               app-text/wdiff
+       )"
+
+RDEPEND="${CDEPEND}
+       selinux? ( sec-policy/selinux-bind )"
+
+# bug #347415
+RDEPEND="${RDEPEND}
+       net-dns/dnssec-root"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+       enewgroup unbound
+       enewuser unbound -1 -1 /etc/unbound unbound
+
+       use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+       # To avoid below error messages, set 'trust-anchor-file' to same value in
+       # 'auto-trust-anchor-file'.
+       # [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
+
+       # required for the python part
+       multilib_copy_sources
+}
+
+src_configure() {
+       [[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack
+       multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+       econf \
+               $(use_enable debug) \
+               $(use_enable gost) \
+               $(use_enable dnstap) \
+               $(use_enable ecdsa) \
+               $(use_enable static-libs static) \
+               $(multilib_native_use_with python pythonmodule) \
+               $(multilib_native_use_with python pyunbound) \
+               $(use_with threads pthreads) \
+               --disable-rpath \
+               --with-libevent="${EPREFIX}"/usr \
+               --with-pidfile="${EPREFIX}"/var/run/unbound.pid \
+               --with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \
+               --with-ssl="${EPREFIX}"/usr \
+               --with-libexpat="${EPREFIX}"/usr
+
+               # http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
+               # $(use_enable debug lock-checks) \
+               # $(use_enable debug alloc-checks) \
+               # $(use_enable debug alloc-lite) \
+               # $(use_enable debug alloc-nonregional) \
+}
+
+multilib_src_install_all() {
+       prune_libtool_files --modules
+       use python && python_optimize
+
+       newinitd "${FILESDIR}"/unbound.initd unbound
+       newconfd "${FILESDIR}"/unbound.confd unbound
+
+       systemd_dounit "${FILESDIR}"/unbound.service
+       systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service"
+       systemd_dounit "${FILESDIR}"/unbound-anchor.service
+
+       dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES}
+
+       # bug #315519
+       dodoc contrib/unbound_munin_
+
+       docinto selinux
+       dodoc contrib/selinux/*
+
+       exeinto /usr/share/${PN}
+       doexe contrib/update-anchor.sh
+}