Add ecdsa use flag to support openssl compiled with bindist enabled (bug #531256).

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

4 files changed, 137 insertions, 6 deletions

diff --git a/net-dns/unbound/ChangeLog b/net-dns/unbound/ChangeLog
index 1a6f64be12b7..0f54f726a00e 100644
--- a/net-dns/unbound/ChangeLog
+++ b/net-dns/unbound/ChangeLog
@@ -1,6 +1,13 @@
 # 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.78 2014/11/29 12:47:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/ChangeLog,v 1.79 2014/11/30 23:25:53 radhermit Exp $
+
+*unbound-1.5.0-r1 (30 Nov 2014)
+
+  30 Nov 2014; Tim Harder <radhermit@gentoo.org> +unbound-1.5.0-r1.ebuild,
+  metadata.xml:
+  Add ecdsa use flag to support openssl compiled with bindist enabled (bug
+  #531256).
 
   29 Nov 2014; Jeroen Roovers <jer@gentoo.org> unbound-1.5.0.ebuild:
   Marked ~hppa (bug #531068).
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 59fb1b000a8e..ac264228ed8e 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -13,13 +13,18 @@ DIST unbound-1.5.0.tar.gz 4811349 SHA256 9fde4aeb8258bc864cd5e5d6d9b8bcf8fa12a57
 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
+EBUILD unbound-1.5.0-r1.ebuild 3409 SHA256 4a2b5759d79d1b217c26cc09890be94f632c6c5a0d7433f2244b2f82ef5fad50 SHA512 b7596bb56fe3d990f46c7e93169e3c77fb46db70c016622bae91c6290fa0e3da830a75d1d664ccf5dbe32fac8f101814c1a0e611e67e916545934e969c355ea2 WHIRLPOOL 30634f130f3f2661a19f0fcf57446d9026af86a06794ed6d493b1b6a171da9c45b7de4bdf60a128c2ea7f360364d3b04365d0ee924f28a61d320d6e4deb5e026
 EBUILD unbound-1.5.0.ebuild 3318 SHA256 2edec28c3d2e801853f2caca53d11a917bae3ee724e9d61535d44179bbf9e0fc SHA512 f20052ea7b91887b6c6c232c995e9243ada0f136b8b742ac3079ca991c219825aeb9a915669a9f9279dbbb4039232c043393a569609c8d13a9a5aff656f31b2e WHIRLPOOL 92fa289de1fcacea65965d0a58a51cdb4fdb04386097d012528e160a4eaa02b2cdc3d33410d175f73f2ca572b691cb2bb6e2356457f04df66a832a9027fd67aa
-MISC ChangeLog 11554 SHA256 c43eed6ec826c9213cf45d37815d995b4b7e949e8590d32d04c77cd40425ef6b SHA512 0e90774c0c331d495790b21ada45b7bebe8bf8469c15bb8c443332f5f622936ea7bdccd05c8a9daf25259e637db77f869382b617e3fa7ec13b9896f3f1eb4425 WHIRLPOOL aeb87ab526e3e10edfbb6ac370afc10caa729dd16f3ba03da3d65710b2ec44e0434adc494aba474145280f852ea7a49d7a90cd0122d701b087816ff391c15b28
-MISC metadata.xml 1090 SHA256 129c0a4aaaf997b326bd478f7a0faf59a6befb7ff24fb3526cd269500e0d694c SHA512 2e3f44bc0f14487a81f2ee42bdd4c51f5d9e98bfb57c4e01b2ad5733ce1bf1eb59715fcaa0215eef65e8bbd7a42e59199d3e3b80fdebd6a848381999db83742d WHIRLPOOL b01b04d5298f95facdb666cc504ba3ec0e2692fdf75e9d545ec5deabd62e2cc31af496c4c5b1729a504c8b3b9c4b21b40909872fd174d20592c69217eefca729
+MISC ChangeLog 11772 SHA256 71f7b2915342ce331aca176b01799c0d07b686cb05c7ce29149a1e5960a38552 SHA512 f974170648178bc9f7150296b80e0b7fa6cc73d4fd1aefa7b43ba46f0af788c33397ad5d8bb65fd39d5f6d681a294a084a86c70c71dc4bbc4def4f222ff78da6 WHIRLPOOL 8d93c3ffda82b2977a246c207a9240cd933dbcca7807b6790e34db4e9c4b9b32e667db358ca3ba214f4b52be4585e13adcf0163bac6a368ce37ec0a288750a52
+MISC metadata.xml 1138 SHA256 0673eac45500ed668c7dc6e0876eb4b59bf41cc1a051e656a57dc94f25b8acdf SHA512 9867ed53f0c77346379104457c1c1e99cccb4b203d8cd3120a9e07a5bd9ba13659982eae71d6aa9f13ae545ed0356639be3f294320f7cc8ca355881e65772e98 WHIRLPOOL 5b0728f47c66353a2367c87023f12eb4cb0d4a7798ab7e1feab841eb52fc4c28f039e14d48eee58c13509abf0d90087cc0e7568a7bf1ab25eddf8f27f8c1e924
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlR5wFkACgkQVWmRsqeSphPGyACfYwWaRGHn4plqrZud8MNGCMcq
-+K4AnjrKdqcR3ZyK9QLclp1b4rjtq0bK
-=/1In
+iQEcBAEBCAAGBQJUe6eLAAoJEEqz6FtPBkyj7QgH/1XqS3yI5nkh4VKJsrN1Skea
+a/oky9V5s9l7Epht1IkXoWUEySmGxcftC0Ag6w/G3nDzG23RYAZ9y9ZF4F5GJcVP
+kOn/5Bi3y/bh7fF01o4pIcDREFSonjLOfRCZr39irkcmHwLbpDye2Pezq68UUCg5
+pWTfktzUwyYrogTSPJ+KWDzo0ExEE1l/WSAkP2El/SpYT1g/KpRTc8CXzmbv3yje
+63PTsGvCdxpZpDubB3s5Z59ARSEjylnwr5eW01Pki20mogpIJ1fXnqBKgGwr9lDH
+S6lYkM6I8v/lSjgs6Hldg56y1TMnVzovx9kuTKwS11p37Cv3nMjlh+G3Ji9MJ7w=
+=KU2r
 -----END PGP SIGNATURE-----
diff --git a/net-dns/unbound/metadata.xml b/net-dns/unbound/metadata.xml
index 027a847ba2ff..a241999b7667 100644
--- a/net-dns/unbound/metadata.xml
+++ b/net-dns/unbound/metadata.xml
@@ -24,6 +24,7 @@
   </longdescription>
   <use>
     <flag name='dnstap'>Enable dnstap support</flag>
+	<flag name='ecdsa'>Enable ECDSA support</flag>
     <flag name='gost'>Enable GOST support</flag>
   </use>
 </pkgmetadata>
diff --git a/net-dns/unbound/unbound-1.5.0-r1.ebuild b/net-dns/unbound/unbound-1.5.0-r1.ebuild
new file mode 100644
index 000000000000..b81e3a394b4a
--- /dev/null
+++ b/net-dns/unbound/unbound-1.5.0-r1.ebuild
@@ -0,0 +1,118 @@
+# 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-r1.ebuild,v 1.1 2014/11/30 23:25:53 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 ~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[${MULTILIB_USEDEP}]
+	dnstap? (
+		dev-libs/fstrm[${MULTILIB_USEDEP}]
+		>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
+	)
+	ecdsa? ( >=dev-libs/openssl-1.0.1h-r2[-bindist,${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 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
+}