Add unit file (#491712 by Emery Hemingway)

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

6 files changed, 161 insertions, 9 deletions

diff --git a/net-dns/unbound/ChangeLog b/net-dns/unbound/ChangeLog
index a8cc73ba0c24..54ee99bfa0e5 100644
--- a/net-dns/unbound/ChangeLog
+++ b/net-dns/unbound/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/unbound
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/ChangeLog,v 1.62 2013/11/19 21:31:15 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/ChangeLog,v 1.63 2013/11/23 08:49:28 pacho Exp $
+
+*unbound-1.4.21-r1 (23 Nov 2013)
+
+  23 Nov 2013; Pacho Ramos <pacho@gentoo.org> +files/unbound-anchor.service,
+  +files/unbound.service, +files/unbound_at.service, +unbound-1.4.21-r1.ebuild:
+  Add unit file (#491712 by Emery Hemingway)
 
   19 Nov 2013; Tom Wijsman <TomWij@gentoo.org> metadata.xml:
   Added proxy-maintainers herd.
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 29cd7808fbfa..ea96ae1ce65e 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -3,8 +3,11 @@ Hash: SHA256
 
 AUX unbound-1.4.12-gentoo.patch 639 SHA256 8223261764f067355a5c013b2c8b13384480c91782fc42ae339dcc8bed843448 SHA512 81292d898284c27e0b30a90816d283d2fffd5810afb38b5a79ff4acc94d82c91bd5414d177f11745c5ee7e56d1600a67bdc4d7395504ff6266103b4e018baf6c WHIRLPOOL 29fb59e16d8f3f4e4d6029f2b3ec6dfd3665c366f3842b318a80b5721a9770b7fd47ad5e0169ab9539f87ed49d03a282f47507754c09cf17ea0d99705f1860c0
 AUX unbound-1.4.17-gentoo.patch 309 SHA256 413761947931133744475d446689a812fbace3f8f121b7c8e00345f6c23ac547 SHA512 e7256af29ab07deca3a5ed3313ee5bb1e55bdc4bb50ab59a8d09f7a06703db97b6f8f45b8d685138f9566bb112525fa27dd4cd33b7516e758faadac170377880 WHIRLPOOL f34e0dc227cc29ca2a352aa3b950389e7eba134d867266f549a15d8e4c4abc49f03904b48b9dc166091f51a05d100c3bdd3406c6d62446fec82236954eb86008
+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
+AUX unbound.service 247 SHA256 6c12373b61f136edd95bea3dc6b7f56499de83aae7c925aee30e6db99051d72d SHA512 7904225d0e9fb3ea5b97521ed24f24fcc4db650cfff8523b896ddd9edfccbd61e817775ad0449acf30d02dba5f714d633b60cace6010d472f438df7c22381dfc WHIRLPOOL c156a2b96e1c1a6d787ee7c143b8c5cd8bf00b9e8cb00f90a5113ecd502f4d5fa2f0249debd10ef7f15d38d33f5d1c9ac4c15c61485f227fa70cd42af696ee3d
+AUX unbound_at.service 304 SHA256 6d8dfaf740f47af87bf521e871d824aefa10c702f724ae57998656b443fb8675 SHA512 71bd8c422ffe57e448b66f97775075a407671757266d40294a670b41cd1a59f16b65488d30aa74b79b7536f0c4c50adb56e32377e8029fd6c327b85c022c5fe3 WHIRLPOOL c304eec4a9293b92499b6895c57b7553a3d0247a00eed7f8299f4d0b2b7d24a33ca383125270b0616d826f71fa5e800e1a0b32c38316f03d806a2399dfb3cbcd
 DIST unbound-1.4.16.tar.gz 3562989 SHA256 fb71665851eb11d3b1ad5dd5f9d7b167e0902628c06db3d6fc14afd95cc970fa SHA512 694f79336d2340b2850a83ab8639a4754bf39eff8fea3d0a99c100e3cb2c0281cfc14087ed4de36c543c6f84322fdb0da07ccdb14e3d599988dc9dbb5231d84f WHIRLPOOL cf1aebf3012e4604a04a78791baaff453a618b85d6edaa2fa3efb5f2fd5c42ae21706954a18dea50124e9b9ecb3913060a314820c8cdb1b6ec2c76b9d63aad67
 DIST unbound-1.4.17.tar.gz 3585122 SHA256 2637d6bda4065d7abf1cd11ee25bfc8e916241153c2d331de99ab6c63df5e3d3 SHA512 187c2f51373a8b9dcb43c4f3d71dfce6239a3d675e8d305a620c8ccab71295f5bb732c90341e6c97b3388cbeaeca432a9d4ca4b965a27bb7782ad6b3d2714cb7 WHIRLPOOL 446a89db8dc6ca3331ce00f1ada8c2bb4af179f2f20f815deab1cd2f50ca2a97d44484699dbab67b465f2445ff28107aaf63317bbce74769cf7296e637b5c940
 DIST unbound-1.4.18.tar.gz 3592485 SHA256 b20f45ff90b944f306fc1875084af8ecba68ca0db16895148288d43cec225b8d SHA512 2e5f77a7d7210cda27d439c7d78d742a81a636855b50a08c9ae4fdfa44f7d0f6a9d193441248dab6aff0b4466456b5b77cb068c40a1c52ae77fed75bb4961c27 WHIRLPOOL ff43bb882a6c4549817bdeea56f7986c3e5db170d3facdbc5566612f8d37c48ea8ec738a3c1f9fed4321c9daea558d70c5942862debd0e9b27dd7e278d72a795
@@ -16,17 +19,14 @@ EBUILD unbound-1.4.17-r1.ebuild 2873 SHA256 a963378864f3c4b3694d5cd01d1e09673fc2
 EBUILD unbound-1.4.18.ebuild 2828 SHA256 cc00c3b28d449416ac28dd696a5a5b9af2f0c811378556e7f1f8c89e1e1cb6ae SHA512 d337df850d56fd666ef8e02139d537653db92ab95d712c6b5600aa4d2df713f2338618a484d4ddb10e1e8c341d79f28b0f6c32e9b8b6c5e1b6e004bac348e08c WHIRLPOOL 9d241e63629424a83026c90a4505b12a93e1045174c476f26ec74a6b8c6b753394cd60e9f8a1aa3a8f20a191f2019a8dfc7aef302e801972c888d8a97cee962c
 EBUILD unbound-1.4.19.ebuild 2828 SHA256 37c243b8a8a4262e2f67553357f4f9df6614fc6ff02bccbb65495ee321155942 SHA512 699486127e124cb91bad6444a664f4bcdab57b52f9bb41e1ca61566e5d266287fb8c7a5e948100ecf53a853da1fb5db79deef85aa3fd45fb9a6bdc7bf76d3fc1 WHIRLPOOL 3e271998af677cf1ec93de8ecd9fb6aaa4792f2d92d12bd3ead88b275ea8e4bb0c68a21d02af877c5b3eeced73730f9117c0c8cdfefdf7617ba90a453f93d940
 EBUILD unbound-1.4.20.ebuild 2679 SHA256 3678e6092bc5528ccd8ab022eb8001488e51e73cf7b593e25404c3a3fb79e551 SHA512 34cd70bf8051b9fb2a693f2a06c373be8fbf6627229e2db4250aaae47203a6dd6617ef1da2587edf396680e9541926991f615532b031a4429ff40353dfd7b8fe WHIRLPOOL 709689cc8d32189a1eba7781d3c36694d6ac7db7edfb25aa58d6749ae33051215fef2b8f97438f5f14c44f194cbee0348209ab4a3e051759812c5c4c9e4fbd73
+EBUILD unbound-1.4.21-r1.ebuild 2860 SHA256 7c91bd09c7e002077fbbdf75263c2ecdfad950a930eee1100f6f182017492a83 SHA512 4d6012f76f97f831e38be0834508b91d92acaae4eb23e22cec31f3359281d4632cbe12f70e12be3ea53500420e223f8d171e52af2aef884e4cde2e0459516c4b WHIRLPOOL 0681025e53af72aaa479eb5fad7481661e89b4045882ab5724e5a1956e4e36b2d6fc72c182f940a74ae0a86c5b6a7a6596dd4a5195b7796eb02ed30a98f22923
 EBUILD unbound-1.4.21.ebuild 2684 SHA256 db67ecbafc4ccbe5849cbbfde6449bc901a821f9c243d2aca5b1189bd13f9224 SHA512 c3b7e141970abb02b51bd0bae2185cf52d6d0af689dcf30e19964ec6336be819517e227c1fdd97ecfaaf1222c1f3d3167d777729b097bb9f2c25c1831bfbfc26 WHIRLPOOL ce01a40a8f8c6f7e22992f766c761e4329bd16304d05c02f1ae2afc4fccf5ea1fd5bb5fa5b0152954690cf7f46ccd8743bc58a06417e798e1cf7ae4b2443902e
-MISC ChangeLog 9182 SHA256 d65c7ca7879d8856b9f6f646bc02f66579e772cc4505fc56458f3861571a98ed SHA512 14c2f29ea2b6a223c768b37705ba6781559db65452d00322ccd730fd93ac7cb42508318f1b9b1c083adf34ae7a09a45a82ffdd8633b9cde2e92e1e1845e1dfc3 WHIRLPOOL b49b67d55266ef6cdfc10c253607d2e91bdc0f32f0f3fcd7d4199ae13e1ae68e05f70a5c2bff9bc35f5083f812543ad74ea96fb17280d19260a72185f02c119f
+MISC ChangeLog 9418 SHA256 a5f710ae86bdef5303292c492e5348525acb13e23813da8708da495b9c23a7e8 SHA512 74fb91f22c5dadba5283c32075a998934e998316f5b1b76c75fa99d5eb8d1c3a61078b7dd35bfeb45a41df4b2d577474804ebf45e199efa1b17af4905c4f644e WHIRLPOOL f7560de114bab2cf1bd8d2ef92fb33903d4cd01fb2da3859be9194bee0dbf7047e6b6c69982556c85940af6928c1e7ca3202e1b2d10fd572ebf0aa61b0ddaf2f
 MISC metadata.xml 1037 SHA256 c510014e7928b8c5a5cadf237c985c2cbea9b7e3101ae555e19393febf022788 SHA512 64ab9119a1d82cf9fd1d8b8ea99a11174003b62576307c4d2f9af091a6710d23102d9465c816e815a6409b76eaba577a8ad12200a8bee565d99ab2884a9c4c50 WHIRLPOOL e23196ec459f0afa4d52339f2eccac65affc80dea467b219f43b9394ce600bd208616da75915bfd84c0c036949d70f0d33775ae13cf216f3af118a6f384281fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSi9hpAAoJEJWyH81tNOV9FCMIAKu119e7IUeIeTDGmjUx6PGh
-VfVhKX1SAwjpE8ycMOCA7++0OtRioAByS5N570f1coC6/SGXpg28nXLUIzfirZJ/
-MHcAGsZVd2UD585BuvyteZGEVpILDiksNf8+2xfscDkGU9W9Djzy+5hoH8lVLCFg
-HpTQH9RM+0UCvSMrKhBSZl7Le9hXi/kYkg1a/ZKPqh6iXcVipQUb6WyFKP/9Lq3r
-h2LdnlvIO19RkJlKAOWAgNeenICcI9k21U+WIeh9IASTPSs894m7vka2SAArWB7J
-N9l9cvfFBe6zbGsulM7l0IsKaJ2/1ShusSfvqFDj66E7JE9e2LmwDADZh9CN7v4=
-=ubet
+iEYEAREIAAYFAlKQbBkACgkQCaWpQKGI+9Sg7ACfWqCySiPN0t55iCQdFVCOAaQf
++GMAn2/Kum8fUPN6EPTI5AUgBk+HUyKn
+=d3A7
 -----END PGP SIGNATURE-----
diff --git a/net-dns/unbound/files/unbound-anchor.service b/net-dns/unbound/files/unbound-anchor.service
new file mode 100644
index 000000000000..f55cf9db5d1e
--- /dev/null
+++ b/net-dns/unbound/files/unbound-anchor.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Update of the root trust anchor for DNSSEC validation
+After=network.target
+Before=nss-lookup.target
+Wants=nss-lookup.target
+Before=unbound.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/sbin/unbound-anchor
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-dns/unbound/files/unbound.service b/net-dns/unbound/files/unbound.service
new file mode 100644
index 000000000000..41dd6fabd290
--- /dev/null
+++ b/net-dns/unbound/files/unbound.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Unbound recursive Domain Name Server
+After=network.target
+Before=nss-lookup.target
+Wants=nss-lookup.target
+
+[Service]
+ExecStartPre=/usr/sbin/unbound-checkconf
+ExecStart=/usr/sbin/unbound -d
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-dns/unbound/files/unbound_at.service b/net-dns/unbound/files/unbound_at.service
new file mode 100644
index 000000000000..84b34af45446
--- /dev/null
+++ b/net-dns/unbound/files/unbound_at.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Unbound recursive Domain Name Server
+After=network.target
+Before=nss-lookup.target
+Wants=nss-lookup.target
+
+[Service]
+Type=simple
+ExecStartPre=/usr/sbin/unbound-checkconf /etc/unbound/%i.conf
+ExecStart=/usr/sbin/unbound -d -c /etc/unbound/%i.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-dns/unbound/unbound-1.4.21-r1.ebuild b/net-dns/unbound/unbound-1.4.21-r1.ebuild
new file mode 100644
index 000000000000..fe58f00cff39
--- /dev/null
+++ b/net-dns/unbound/unbound-1.4.21-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/unbound-1.4.21-r1.ebuild,v 1.1 2013/11/23 08:49:28 pacho Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils flag-o-matic 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 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x64-macos"
+IUSE="debug gost python selinux static-libs test threads"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="dev-libs/expat
+	dev-libs/libevent
+	>=dev-libs/openssl-0.9.8
+	>=net-libs/ldns-1.6.13[ecdsa,ssl,gost?]
+	selinux? ( sec-policy/selinux-bind )"
+
+DEPEND="${RDEPEND}
+	python? (
+		${PYTHON_DEPS}
+		dev-lang/swig
+	)
+	test? (
+		net-dns/ldns-utils[examples]
+		dev-util/splint
+		app-text/wdiff
+	)"
+
+# 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
+}
+
+src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+	econf \
+		$(use_enable debug) \
+		$(use_enable gost) \
+		$(use_enable static-libs static) \
+		$(use_with python pythonmodule) \
+		$(use_with python pyunbound) \
+		$(use_with threads pthreads) \
+		--disable-rpath \
+		--enable-ecdsa \
+		--with-ldns="${EPREFIX}"/usr \
+		--with-libevent="${EPREFIX}"/usr \
+		--with-pidfile="${EPREFIX}"/var/run/unbound.pid \
+		--with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt
+
+		# 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) \
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# bug #299016
+	if use python ; then
+		find "${ED}" -name '_unbound.{la,a}' -delete || die
+		python_optimize
+	fi
+	if ! use static-libs ; then
+		find "${ED}" -name "*.la" -type f -delete || die
+	fi
+
+	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
+}