Version bump, add dnstap use flag.

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

4 files changed, 137 insertions, 17 deletions

diff --git a/net-dns/unbound/ChangeLog b/net-dns/unbound/ChangeLog
index 1c866e1c3521..f7026c8a437e 100644
--- 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.76 2014/11/02 08:49:46 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/ChangeLog,v 1.77 2014/11/27 18:36:35 radhermit Exp $
+
+*unbound-1.5.0 (27 Nov 2014)
+
+  27 Nov 2014; Tim Harder <radhermit@gentoo.org> +unbound-1.5.0.ebuild,
+  metadata.xml:
+  Version bump, add dnstap use flag.
 
   02 Nov 2014; Sven Vermeulen <swift@gentoo.org> unbound-1.4.22-r1.ebuild:
   Remove sec-policy/selinux-* dependency from DEPEND but keep in RDEPEND (bug
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 9599db53f283..181931d509d2 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -9,25 +9,21 @@ AUX unbound.service 247 SHA256 6c12373b61f136edd95bea3dc6b7f56499de83aae7c925aee
 AUX unbound_at.service 304 SHA256 6d8dfaf740f47af87bf521e871d824aefa10c702f724ae57998656b443fb8675 SHA512 71bd8c422ffe57e448b66f97775075a407671757266d40294a670b41cd1a59f16b65488d30aa74b79b7536f0c4c50adb56e32377e8029fd6c327b85c022c5fe3 WHIRLPOOL c304eec4a9293b92499b6895c57b7553a3d0247a00eed7f8299f4d0b2b7d24a33ca383125270b0616d826f71fa5e800e1a0b32c38316f03d806a2399dfb3cbcd
 DIST unbound-1.4.21.tar.gz 3624553 SHA256 502f817a72721f78243923eb1d6187029639f7a8bdcc33a6ce0819bbb2a80970 SHA512 a0b6f9d0d1905a72aa62e2a7a8d15450ccd68c81bf987f53931c0bbb888d86544253d85ca467eeaf3573db443ec11020f3517dc3de84816f28a2f4dabab0ed17 WHIRLPOOL 37bdc64ba370e8f985668527bf84d745c9acac91f4f67046b329bc2edf7281726dc14db2ae14ba79e1f073e961141a9cf6206adaaf6e1bc6cda48e7822239645
 DIST unbound-1.4.22.tar.gz 4735801 SHA256 1caf5081b2190ecdb23fc4d998b7999e28640c941f53baff7aee03c092a7d29f SHA512 0593cad3966f24f76b93bbc9c906c096c645e9360a57034c5ed4f04baeaa021eb9169a8e9cd0a98651c7a564d9feda8b9490e3b87ad469f6ce1dd1fcb05d9974 WHIRLPOOL 4de27d6c4548c46c83b95a7f21efd8d75898ddb92e3af84fbd1d07a39e29a121e593ddbf13676f914d4ee428942bf345c9b93937165725ece5031fc67ab9eacc
+DIST unbound-1.5.0.tar.gz 4811349 SHA256 9fde4aeb8258bc864cd5e5d6d9b8bcf8fa12a57059424fece1c6adcc6387b876 SHA512 698c56d10c15e952a590cfead23ef20222c21469de2c74a94dbb7238db2d9acdce146fcdd581e504501e5315c359a7adb4128b6acb844bad74e80c3a71d3a1b6 WHIRLPOOL 1ffcbbf08b97425841bcc82075aabbd47a1f33360a5453bf544599fb3caa85fa26295401768a2e8cf9ad54c2c7f3a6f9546a41d6f84b692577b31a5fa36fd66a
 EBUILD unbound-1.4.21-r1.ebuild 2890 SHA256 4ceace8b234786324206c5f5f6c9c66206bf0b04170385b217e12e9e4a3c681f SHA512 5b5b8a40915cb4ea6c647c2e79af432da41f9f23acfc3cc8b414125bc0ded3aeabb58cd3280ec01f101f0f29dc2550e05686e7bcd61bc32fcd17e7bec9a91791 WHIRLPOOL b027cb65e973f8fe559752681df69ca2d5c9f1462e714192b98b47000b96fb9f372b4c66f380fab1908ba9f71d64323536395381a8215ba67c641ac002630fe1
 EBUILD unbound-1.4.21-r2.ebuild 3240 SHA256 d7b2168d7b931aca365d5fe52ee589737951777a1f1262fb032f8c02fff2a288 SHA512 ee11da39fa4ae7bb190020499f4af80d29ef5ba524ac374db7df4faba6d384272f623f9c33e331ca1712f40080a718d2ebdb6f4031379ad2189a92dd3d27b5a2 WHIRLPOOL 0ad751472ad8759290fb7c2e5354a4e87157cb2e14d73eb452b838a745c79c6e044c1417c8c28416a8222c90e021639a98ad41a714da4745651a997e633d6f73
 EBUILD unbound-1.4.22-r1.ebuild 3262 SHA256 4bca7316fa732dd7e24b8c641145aa2bf7098cc41ae6a12e49c09e9970cf0421 SHA512 cd1ff23d64dfcf2b45b64689d6ee54e910ca535e9d4ab3e3d010fa7afa138f76e583314288e586ee173cbf0d9f36fe49c488cc6d4c4f40b478ffcbfcbe97a6cf WHIRLPOOL 29c425bd6b03f7f7d1f6fe52634b72be10e11052c9011283ffae4505261793b1f28644ecb2045cb14be455ccb81d5fd6ced3a10c37e0358f06ab6778e795dcb9
-MISC ChangeLog 11300 SHA256 a9a2b4fc7ec92589604a6754f0a14aace7cf5e746784602b389bab3e68409472 SHA512 eed20cfb85007e3cfa465959464c59a0362507433e7af69ffef12ebfac4bef7a36c8c008fba7515db9e8c9c3b6f12a84bfbe790bc91766763ef3a74b01cd1df6 WHIRLPOOL 224b6c713d7d609563666fd06c5aac3c2b50332cc588f7d1693369bc8c91f75efaafdaba004705eb7c27e92f3d99f48f719a1c01336d570e760c690ad225ad5b
-MISC metadata.xml 1037 SHA256 c510014e7928b8c5a5cadf237c985c2cbea9b7e3101ae555e19393febf022788 SHA512 64ab9119a1d82cf9fd1d8b8ea99a11174003b62576307c4d2f9af091a6710d23102d9465c816e815a6409b76eaba577a8ad12200a8bee565d99ab2884a9c4c50 WHIRLPOOL e23196ec459f0afa4d52339f2eccac65affc80dea467b219f43b9394ce600bd208616da75915bfd84c0c036949d70f0d33775ae13cf216f3af118a6f384281fb
+EBUILD unbound-1.5.0.ebuild 3318 SHA256 4fccbce9f61804a52e2d3d0f8bb4429fac9e1d007a6ffdc03dd2f9aacfa6d2c5 SHA512 33c732adf0f8315e1c321a87f3e07dc145ed317cf56940a85e42482494b846c88855836ef62427eb0b0402d167c61ba0543946ac30d4436287e9a1c0b0c19739 WHIRLPOOL 4e53d738b562f4d4dc9d4e3c8241d6c13349ce4feeea68377ffd66d345c131d1ab2e6c4167cd7c7d2e48e819c764ada77d55ca86ca6d0fd785abb5a1c4aac942
+MISC ChangeLog 11460 SHA256 1371ea79a1a360e0f1f4ecec9f1e30f899739e2abcec22d89f664799a4e15742 SHA512 2cac8ac0460930f9c8015cf7215adf843bf25ea8d3e42c7099fae91ae9c00a7fb80be95e2c0595390878f9b9281f1391ca74efa64e9b5975c39fb24162e27806 WHIRLPOOL 25d9310416929ee84ad6e08623f008c95c91ae9c9cf3c96aaab0969088d7d01cad50c1f42b5e141c6e1d437e66ea7cb205ad2b0f532c527a1854ee2c5f378363
+MISC metadata.xml 1090 SHA256 129c0a4aaaf997b326bd478f7a0faf59a6befb7ff24fb3526cd269500e0d694c SHA512 2e3f44bc0f14487a81f2ee42bdd4c51f5d9e98bfb57c4e01b2ad5733ce1bf1eb59715fcaa0215eef65e8bbd7a42e59199d3e3b80fdebd6a848381999db83742d WHIRLPOOL b01b04d5298f95facdb666cc504ba3ec0e2692fdf75e9d545ec5deabd62e2cc31af496c4c5b1729a504c8b3b9c4b21b40909872fd174d20592c69217eefca729
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUVe+iAAoJEC7dUkA7aK9HbzQQAJW5ZziZh6ejlaUS7TZovjvI
-eq3C2AgOOLz0M6pQ51QHu9XA6OkhaBv7xAPXEfPk+5z1POHkVkKUCAdK/wyLFKW9
-tJZElv6IJwq+Dr0Gt8/U1bb5n6yNEOME9L2XLmziiWfDcsPR5p0nRcbpg99lasRg
-TF6seqs6s2T5CZtIbNtPMYuHkG+psD1t7Rh2Sjzie5RFbOSzXHlrqS8IYpea70ir
-xxf84snv9ZNMKfpCB4f5RIxqmRM+CQswOWtFYPszhaCEPfcnDmMrjYJzgrzN8m11
-6lxEqOzNjmZos9agK/18UcGyOlUeFWZpxUutsXAJIHVVjH4mlUtW36k3mvqA6utl
-sHHdQzYSZJGhk1LO8kHeS9h44RsiZXHImhzTuQLTbRGECuM+MtbHeTn3zcuQjuoH
-VYtI0a1w4129Hcc5i5lETVAbEN+HoDqe4YVV/dbMWoPN+fkXXtYbAjyzjxP08oI0
-D6WU66Gmaaa7jnooYKGRco7k8kYiZiA/wpIZiT6uHumNUPiW+p7cz1P2Dm8AuI8e
-pL8WfDo0szrPnsLFd2bbnOs4Lj6GFjJw+lZJEhj92gMD3LA+oYxpPBzBN1FJQ4Yt
-rDR+xVl6O5av2HY+TH9/jIyLnO/M4MKUcDXoeQtiENFoFiWoNJH48fsA3pIqxs+f
-Epvu0mQv66HyaSFrrYRX
-=BtVI
+iQEcBAEBCAAGBQJUd287AAoJEEqz6FtPBkyjYzkH/R0UtjW0702D6jxCQSP8Aoi0
+OPHemfnT64cttUQS+UTNlAkTTzaTA8jv2wvE5gr1ixBvFc4SnWlksvMXgTWpeY2j
+6ebYuaWdFtGlELoc9fKnUEIDVGvivVCgrwM6PKuNg4RIKV5Ywr65WXpMCfEj/OML
+8jmr5nKefRQDOF3yEreqjfEZ8yLY2mVd4Zd4zhcKpu5I63g/xW5DI5uf6HZRWad9
+LhMyyLO0IxpHOtAvVMdgRwya7Juaqv3P5OBPTI2PIhG8b3zuIp8Hzz5QA2eNVRIK
+PoYhgLpSMC+N6SjiQifxeRljnwRhJTdBcZ4c5id5vFVXR6FnU35VbMO0AVKDlPQ=
+=uNcQ
 -----END PGP SIGNATURE-----
diff --git a/net-dns/unbound/metadata.xml b/net-dns/unbound/metadata.xml
index f8c3a5fe1c2f..027a847ba2ff 100644
--- a/net-dns/unbound/metadata.xml
+++ b/net-dns/unbound/metadata.xml
@@ -23,6 +23,7 @@
   as a server, but are linked into an application) are easily possible.
   </longdescription>
   <use>
+    <flag name='dnstap'>Enable dnstap support</flag>
     <flag name='gost'>Enable GOST support</flag>
   </use>
 </pkgmetadata>
diff --git a/net-dns/unbound/unbound-1.5.0.ebuild b/net-dns/unbound/unbound-1.5.0.ebuild
new file mode 100644
index 000000000000..0864cb07f64e
--- /dev/null
+++ b/net-dns/unbound/unbound-1.5.0.ebuild
@@ -0,0 +1,117 @@
+# 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.0.ebuild,v 1.1 2014/11/27 18:36:35 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic multilib-minimal python-single-r1 systemd user
+
+DESCRIPTION="A validating, recursive and caching DNS resolver"
+HOMEPAGE="http://unbound.net/"
+SRC_URI="http://unbound.net/downloads/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug dnstap 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[${MULTILIB_USEDEP}]
+	dnstap? (
+		dev-libs/fstrm[${MULTILIB_USEDEP}]
+		>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
+	)
+	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"
+
+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
+
+	# 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 static-libs static) \
+		$(multilib_native_use_with python pythonmodule) \
+		$(multilib_native_use_with python pyunbound) \
+		$(use_with threads pthreads) \
+		--disable-rpath \
+		--enable-ecdsa \
+		--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
+}