diff options
author | 2011-09-13 15:14:49 +0000 | |
---|---|---|
committer | 2011-09-13 15:14:49 +0000 | |
commit | a8a0310acefd98b146df05d4887f7ce1ab27f580 (patch) | |
tree | cda6f882112cae2301a2c09eb985285529a9e96f /net-dns | |
parent | Mask the latest nvidia-drivers package (diff) | |
download | historical-a8a0310acefd98b146df05d4887f7ce1ab27f580.tar.gz historical-a8a0310acefd98b146df05d4887f7ce1ab27f580.tar.bz2 historical-a8a0310acefd98b146df05d4887f7ce1ab27f580.zip |
Fixed python modules handling. The patch was submitted by Tom Hendrikx, bug #378395. Removed oknodo from unbound.initd, bug #379947.
Package-Manager: portage-2.1.10.15/cvs/Linux x86_64
Diffstat (limited to 'net-dns')
-rw-r--r-- | net-dns/unbound/ChangeLog | 9 | ||||
-rw-r--r-- | net-dns/unbound/Manifest | 33 | ||||
-rw-r--r-- | net-dns/unbound/files/unbound.initd | 33 | ||||
-rw-r--r-- | net-dns/unbound/unbound-1.4.12-r1.ebuild | 108 |
4 files changed, 152 insertions, 31 deletions
diff --git a/net-dns/unbound/ChangeLog b/net-dns/unbound/ChangeLog index f2a75b084a6f..c94c154bb958 100644 --- a/net-dns/unbound/ChangeLog +++ b/net-dns/unbound/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-dns/unbound # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/ChangeLog,v 1.28 2011/07/16 03:52:59 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/ChangeLog,v 1.29 2011/09/13 15:14:49 matsuu Exp $ + +*unbound-1.4.12-r1 (13 Sep 2011) + + 13 Sep 2011; MATSUU Takuto <matsuu@gentoo.org> +unbound-1.4.12-r1.ebuild, + files/unbound.initd: + Fixed python modules handling. The patch was submitted by Tom Hendrikx, bug + #378395. Removed oknodo from unbound.initd, bug #379947. 16 Jul 2011; MATSUU Takuto <matsuu@gentoo.org> +files/unbound-1.4.12-gentoo.patch: diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest index f238d6d86784..802981df859e 100644 --- a/net-dns/unbound/Manifest +++ b/net-dns/unbound/Manifest @@ -3,29 +3,30 @@ Hash: SHA1 AUX unbound-1.4.12-gentoo.patch 639 RMD160 f3092ab9149ff47d0948aa650ba923e9e059b168 SHA1 6c753f0bc2dce7679a19d69d4ac4321c5c3270c5 SHA256 8223261764f067355a5c013b2c8b13384480c91782fc42ae339dcc8bed843448 AUX unbound.confd 171 RMD160 090f4e941ed9469ea2b444c9862fff3a490e992e SHA1 cafbec0f4b23849bbc4288c8bc4d81cd867e4f6e SHA256 7da812ef83f8f8b9351363525ab6bebd5348faed76d0ae424dcbd7cb6a830dfd -AUX unbound.initd 1174 RMD160 76161ab351f85b1e80895f01cc74269ee020dad7 SHA1 a453e1ad4c1e0ea9c4eacab3f2d185e0e764f538 SHA256 7465e1035f3cfbbc1e356ba6d0fff3a5c74fb8b9f2cc1d092a91fae27f23b582 +AUX unbound.initd 1479 RMD160 9c0b945bc2bd2497c023d4d77f15a7656695d4da SHA1 37fcde8b17c8e2339e47c0298dfd8f3488dd7f3c SHA256 62cac1d151351d1e843cd0d8cc502ef92a3b47d818f620d2995601e0c6e7eadc DIST unbound-1.4.10.tar.gz 4476504 RMD160 7102613a43e566d542ca6b571094a8fef3b901e0 SHA1 ac9ab61a51e147ade69ca8b043fee2ed76336a62 SHA256 dace571f8906e858cebaa347824e3e0be711c830cc6eb747eb6c2246e2e5ecea DIST unbound-1.4.11.tar.gz 4503148 RMD160 988b8090a3ef39c690443a6e099a83711d7983d0 SHA1 3dbd7854b05b1e48fcc088be50e4c7aafc8d7306 SHA256 19e44dd7a737de678456885483002c6cd84147d334c7323cb3674d2012c82b4b DIST unbound-1.4.12.tar.gz 3506466 RMD160 2e3a35f1e72046c9701cd3f51a8a2f58881a03d3 SHA1 c46c05d1fa2402a59c10f51864fd4c62d10a472f SHA256 d7f0ee340b8a62e3fe02e505fdf6f2e4742ae7eaf8fd1da200fb38c4947e2d66 EBUILD unbound-1.4.10.ebuild 2419 RMD160 c55fae766d013a86192a00fbd38bd77a235dae6c SHA1 d69824ec01a94e76ba938772f099fd9e14adea4d SHA256 1fefffefc77469f7c11e27226a9ef793b007e29f8f98aef1260d1803d7c19341 EBUILD unbound-1.4.11.ebuild 2454 RMD160 78d8bf060a5a0c579088daf69461278d48ccc6ea SHA1 8e72f4afec697d86fca225eb10a8b6bea90700fe SHA256 cb16826f59b4454b279c459edac2ac765a0dadf0fee0a499d421a421ac17f379 +EBUILD unbound-1.4.12-r1.ebuild 2929 RMD160 123a389cde7a20e1a9932a8a3c1fd37f34e6c7ef SHA1 ef795532f2537d1d5b82ee6b79a49739bb771fd3 SHA256 68654743d0383f7dc2018f79b8d9e6fe83e96db99f9f1fc6167bf9e4f0f56434 EBUILD unbound-1.4.12.ebuild 2730 RMD160 b90573be6e59d9b2f2b5586753e6065083007de8 SHA1 d84a175d9ca360114e302e6e655d02c709b080ca SHA256 ff6877b72012021bdf1962e0457b1985dd5786d1494910bc90ee32f00750fba6 -MISC ChangeLog 4311 RMD160 571ea783dec833d7dbe8864a80a7b0accb2f6b90 SHA1 2b8258be69762b7d0bc75c256faaa0926e7c6962 SHA256 cbf07d6c0667811b3f651ccb407b3eb3ec4edc4d7faac0fb2fc17683a76ef6ad +MISC ChangeLog 4582 RMD160 6ace12ab839a71b39936a8d34640ea1c0af9d6b1 SHA1 5f099a88a8389781c4fdfb9a405c0263359ca23a SHA256 35d8bf86a8ecd1160af375dda693c93fd1578bdb3c5df58159f005f45876e4d5 MISC metadata.xml 1031 RMD160 0bd78b9a39982efbd2fcb3f95a97ab7765b98154 SHA1 94fd9c91b82a6a747c51d8d4bef073be7f3a58ee SHA256 d13d3e25ea0b34e78b692a6c7045903841d4ed7b0551589febe4fe36a9f25a7d -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBAgAGBQJOIQvlAAoJECaGw+YFKA1pOxcQAKbB+8cJ1GYC3eTL5f913nQg -o6+6vuD81lTWeM0YKBHfUNcZrwxvyeb3R1f9o2rAv2U3GGgwIXpcMM8/ZqQU4g/w -lEhk32L7N8djEWpsLTRnFltis3YO8a86knitfg8OoUcSBU6/hTyMJeCp52ETydAZ -GCOquRzXv1ffhFsoYHi9R3JqwDLcGk/0gILIcg53m6slc7whfNPL1zPZfPUJBXNW -mPXX0Ka9dW7dbuOL8A9hc7sMHgP1kfqVUrDBXQ0DBtvAdh0BdxlXSsyFhCpvpGS4 -844jOZAAfipvYFOqEJMLFHINJDXfZrSy6DwrdNCz+20+Vlrk0Jo4teXvz3tvCB6F -M5objed/OsdrbqHDLnznJexdLbrFYeCcIWRPPiz+5RxW+uX8x0hOv8G+w1E4Xywv -mbyeRGJwRlHj/CdfmGB6w/cAXzex0uSmTIyvM+U48DqRtL8ZxFvDFdvcXSUyurFs -lyMbsDQ5DqiC4jjiBIzZM7HkqaAofkr+sToRe0Mi+4Jm6eaueSiPdXazitnIOhig -fgFDeWstngnMELM1ZnrRZ9oP1zzX8bvFz3j5Ccuarkc2w1emmZqRnG8tdf3mRcnk -Z3X97giKbYrXihW0KWyrvdNIz1pL9ffPvzGDujoeyxeJZdELz1uCl1Ks3+5xiDzK -gbfoYE53tmFMFU0oJfoJ -=tNCd +iQIcBAEBAgAGBQJOb3NyAAoJECaGw+YFKA1pTIQP+wUyNXroXHbx8Yqz/zEcULrO +VO/EjYhZb6x7cO8psA/v4wEcceTR0NQqgA+dlwU5cr/CFI4LZvw2DyKBxtvPZi/9 +yVZt03ip6qgVqYru6xeEWGqe7MiEB9DS83TBpR7z0L2wXoSxOWitDrla+2uD4iC0 +x7YjPXJjMs08XGRGw4m70a41M7NCQozGhV8aovl4HMfdpKL2AAwXR/tlcaFkm7ON +EZkgL5m2QvN0HUQudXnO2qi2H5uSmGLsBm+q1GorO/E/nmotPtIGCzK1euqiDO6N +p+nS3ezN/y7tjjr+yUHZwxOVG3HShwNB42Nf8vOJpNwdl1Kd+9GOJOfAmHyPxXyO +XR8GvgdNjkk0dHyAF/CdMZ+voy3sAG+5wX3k4/euFKQubbWYRWHJanx6Kf6EYPj7 +YVxLoVPGkJm3J8iJAv3rT3zlCVefaPAGO61fWEgr1HtiyQGHXRbL/7nuvM26TNc6 +fpH143mPB7F1oBxMcuAm+tA3Bzk6ptbQWvp9DKZzIfabk82EoMLkMxdmOUPn/iB8 +4OSs6Q+W5kvclNwldrdoFcvhrgMnXOJ0q90UI2mnBLe4dOu9NjBLTywbIlh2BtUl +o0SIgO0AfHPilz6zDhOmnfGIouc4CGnPKzRvcy87jE/4WiTn+g9i9DRr/6I+AYRB +Kif7UpjLtEhaMa+86dJA +=XVYu -----END PGP SIGNATURE----- diff --git a/net-dns/unbound/files/unbound.initd b/net-dns/unbound/files/unbound.initd index e9e902c9b9cb..90deb23e4ac8 100644 --- a/net-dns/unbound/files/unbound.initd +++ b/net-dns/unbound/files/unbound.initd @@ -1,9 +1,15 @@ #!/sbin/runscript -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/files/unbound.initd,v 1.1 2009/11/22 16:57:33 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/files/unbound.initd,v 1.2 2011/09/13 15:14:49 matsuu Exp $ + +name="unbound daemon" +extra_commands="configtest" +extra_started_commands="reload" +description="unbound is a Domain Name Server (DNS) that is used to resolve host names to IP address." +description_configtest="Run syntax tests for configuration files only." +description_reload="Kills all children and reloads the configuration." -opts="${opts} checkconfig reload" UNBOUND_BINARY=${UNBOUND_BINARY:-/usr/sbin/unbound} UNBOUND_CHECKCONF=${UNBOUND_CHECKCONF:-/usr/sbin/unbound-checkconf} @@ -21,9 +27,15 @@ checkconfig() { return $? } +configtest() { + ebegin "Checking ${SVCNAME} configuration" + checkconfig + eend $? +} + start() { checkconfig || return $? - ebegin "Starting unbound" + ebegin "Starting ${SVCNAME}" start-stop-daemon --start --pidfile "${UNBOUND_PIDFILE}" \ --exec "${UNBOUND_BINARY}" -- -c "${UNBOUND_CONFFILE}" eend $? @@ -31,21 +43,14 @@ start() { stop() { checkconfig || return $? - ebegin "Stopping unbound" + ebegin "Stopping ${SVCNAME}" start-stop-daemon --stop --pidfile "${UNBOUND_PIDFILE}" eend $? } -restart() { - checkconfig || return $? - svc_stop - svc_start -} - reload() { checkconfig || return $? - ebegin "Reloading unbound" - start-stop-daemon --stop --pidfile "${UNBOUND_PIDFILE}" \ - --signal HUP --oknodo + ebegin "Reloading ${SVCNAME}" + start-stop-daemon --signal HUP --pidfile "${UNBOUND_PIDFILE}" eend $? } diff --git a/net-dns/unbound/unbound-1.4.12-r1.ebuild b/net-dns/unbound/unbound-1.4.12-r1.ebuild new file mode 100644 index 000000000000..5c26ec60257e --- /dev/null +++ b/net-dns/unbound/unbound-1.4.12-r1.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/unbound-1.4.12-r1.ebuild,v 1.1 2011/09/13 15:14:49 matsuu Exp $ + +EAPI="3" +PYTHON_DEPEND="python? 2" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="3.*" + +inherit eutils flag-o-matic python + +DESCRIPTION="A validating, recursive and caching DNS resolver" +HOMEPAGE="http://unbound.net/" +SRC_URI="http://unbound.net/downloads/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~x64-macos" +IUSE="debug gost python static-libs test threads" + +RDEPEND="dev-libs/expat + dev-libs/libevent + >=dev-libs/openssl-0.9.8 + >=net-libs/ldns-1.6.5[ssl,gost?]" + +DEPEND="${RDEPEND} + python? ( 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_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}/${P}-gentoo.patch" +} + +src_configure() { + append-ldflags -Wl,-z,noexecstack || die + econf \ + --with-pidfile="${EPREFIX}"/var/run/unbound.pid \ + --with-ldns="${EPREFIX}"/usr \ + --with-libevent="${EPREFIX}"/usr \ + --with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \ + $(use_enable debug) \ + $(use_enable gost) \ + $(use_enable static-libs static) \ + $(use_with threads pthreads) \ + $(use_with python pyunbound) \ + $(use_with python pythonmodule) \ + --disable-rpath || die + + # 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 || die "emake install failed" + + # bug #299016 + if use python ; then + find "${ED}" -name '_unbound.{la,a}' -delete || die + fi + if ! use static-libs ; then + find "${ED}" -name "*.la" -type f -delete || die + fi + + newinitd "${FILESDIR}/unbound.initd" unbound || die "newinitd failed" + newconfd "${FILESDIR}/unbound.confd" unbound || die "newconfd failed" + + dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES} || die "dodoc failed" + + # bug #315519 + #exeinto /usr/libexec/munin/plugins + #doexe contrib/unbound_munin_ || die "doexe failed" + dodoc contrib/unbound_munin_ || die "dodoc failed" + + docinto selinux + dodoc contrib/selinux/* || die "dodoc failed" + + exeinto /usr/share/${PN} + doexe contrib/update-anchor.sh || die "doexe failed" +} + +pkg_postinst() { + use python && python_mod_optimize unbound.py unboundmodule.py +} + +pkg_postrm() { + use python && python_mod_cleanup unbound.py unboundmodule.py +} |