From 2ca277cdc6baf257bf49bc95317fa67c534b2b39 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Wed, 29 Mar 2017 23:22:17 +0200 Subject: [PATCH] net-dns/knot: version bump + fixing some bugs --- net-dns/knot/Manifest | 11 +++++++--- net-dns/knot/files/knot.init | 1 - net-dns/knot/files/knot.service-r1 | 17 ++++++++++++++++ .../{knot-2.3.3.ebuild => knot-2.4.2.ebuild} | 20 +++++++++---------- 4 files changed, 34 insertions(+), 15 deletions(-) create mode 100644 net-dns/knot/files/knot.service-r1 rename net-dns/knot/{knot-2.3.3.ebuild => knot-2.4.2.ebuild} (77%) diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest index b1123e5..18b0a68 100644 --- a/net-dns/knot/Manifest +++ b/net-dns/knot/Manifest @@ -1,9 +1,14 @@ AUX 1.6.3-dont-create-extra-directories.patch 499 SHA256 9c8a18a56117830b9b9c50d95503928a08450cb8864d93cb72be98f532711a82 SHA512 69def6e4c5282dfaa070c41275ec6cdeccccf90c96ccb6c570e410ac3fba6cdf569468c9bdbcb3604de0c1c128d51d28846f5daa0f411a0c62d1fd2e5093795f WHIRLPOOL ccfdb194a1c0622939acf206ecd3e1dc0b33b03fb0a899364f15f1b920b08bdfab918f20f812da08c504fc9c98d132080272c7e249abf44c75a0d2da13d25cbb AUX 2.0.2-dont-create-extra-directories.patch 595 SHA256 27e9e307dfca4a534efca368689d5bf8738d7019991a064f3d9e4f32ca6331c6 SHA512 942a063102fe0d5273b1727432111798375a0cc3f9131e85184226a7de194c5bcfa96c64f3440dfcee3949ac8ecd9afd67ac75b5b47a677e09ad6e50db8bb083 WHIRLPOOL 1bf8403474b7e950b2a519d3f0122166dd290627a45e728afd9439f2a6bcc181df81b65a390a61a7a69b523d4a2294fcad834608f4cbe7a72499e620686076ec -AUX knot.init 868 SHA256 de555f2361a96e31ca908bba442c83b641f15bcfc54866d822128ba122cdddaa SHA512 f926af80a41e172ac97fe6c7684c80d64625f26af4a9148a1ccf13b8731428aa1fd88997e0b0f9ea4260442380fef3deea9848f765e29bb9fa5dea42e4c9a93f WHIRLPOOL 2e5841989772eb646b4376fae8c160868c4616e20462e66100ab00686c60dedd0089773a2f1e213a2f020f94fdb4a17ebf09850079a144ddbf2f34af58a67eb8 +AUX knot.init 861 SHA256 ec5c5aef42aaf7b0e47be6ea7dd94abdb38605f6e64b251184e381e2d490daf3 SHA512 e5faa96cbee618e9042bdfd0628f06c4bc4d23c7295521771e16f6eae715835a240799e8425317b03b1ea162966defb5d6b6592139cb1d9d61b47a24961ec9b9 WHIRLPOOL 5c102cf9ca93757a98be1e41f04027b6072b27e3e5e55d24c26040c94bcf6ac96cf5684ba639d3c65f9f46745a50981ac28a40bd50d432f04f83c5f84217ab60 AUX knot.service 275 SHA256 3b091f61652f7d91189659e1d297e5ead76c79f4b0515c9eb4c7f054894e6810 SHA512 37c4700320a2781aa93ca92bc2634c3e080c87337b7d632d0e2fa23f6e2e8fa1985d1d8e2516fed02b612da4d340472d5f8d0ae37c5b323ac17bbd61ca243a86 WHIRLPOOL 39623f669bf141e785b630cd5caa71f47e67d6aa923cbfda074a4644faf83f05214484d133618a2c3731342f5bb44ef942d7559f36e7e2cade3c2318e8461dcb +AUX knot.service-r1 337 SHA256 5140fd96b54c3ecf79e9f386ce27159fa5c9d85c60fea11eb3d46a1b98e17b1d SHA512 58c4186e57ebd00b86dae34d5d208ed8801c0376da40cccb23b3d4542a7ee04a1003a12a4b89347b76a384b50eae4a61f96164bf22ec987ce05b1c65691659e7 WHIRLPOOL 03d9fd28f19d7c4a5a17fce6944560e01a4f95dc67a6a6385900f407c638b13c6f2908c619e652a7cfa08cea823bccc39de7cd939c152811a05240b14751192c DIST knot-1.6.8.tar.xz 806748 SHA256 8d95dfd359fb187289d7d085e217d8fabb6022135d358134ed4165418a269237 SHA512 ee205a0813729bea712b0ac550209538382a2f0a7698607c3baa045a345f08e118e1b927116ad00fa58939051db70a6b21e154259276f3647acc80edf043efc8 WHIRLPOOL ed33ebdf99ba402b18550a880fb10e24f428108e297cb007d48ebbc0eea3f2e803034fe72052989e2eeb22859e3d47a5f93303b363bb50daddec868fd030e1a4 DIST knot-2.3.3.tar.xz 1071160 SHA256 a929bce3b957a81776b1db7b43b0e4473339bf16be8dbba5abb4b0593bf43c94 SHA512 ed7b93c2d0ae15819d09a8bf77c2d12505a035dcd7777e9ac453b58c36d302c3cbaa2766e1f6d2163a71234d005494a7d9b5be436c0e16b443de4da97f7a5d9f WHIRLPOOL 4bdf92d537d90e2ad412bb0619a7b4b8f0752c9dc981b3522beece19514f22d88db083e59c0f833d9492b0a1f8d347e008350d108d4c7337c9ee748d007bbde7 +DIST knot-2.4.1.tar.xz 1104576 SHA256 c064ddf99bf5fc24dd3c6a3a523394760357e204c8b69f0e691e49bc0d9b704c SHA512 2b3e6c1a187538b218e3e915aaa91bc38ad4cdecb0f03f31b29bfa83c620d117c169a580ddcc8a33e6422109b422c72f3cf79f2a8d1e10e613edfe4437b4b29c WHIRLPOOL 538b8433efced9afe57d3d34216d3a4981a4c637e813b1601ca360f9eb8c7c903051ca5dbff3248b138129e80388a673e9177b8340e1e465b737686d4d2528e8 +DIST knot-2.4.2.tar.xz 1109156 SHA256 37da7fcf1f194bd6376c63d8c4fa28a21899b56a3f3b63dba7095740a5752c52 SHA512 8e3f6ea1cf951f090977d26ed555a8e228416e2b7c7f86eae1b5d744099203effb1df6c664076547ef3e820fe8af15b370651edbf8b846b3c0707f4cd2faa4f2 WHIRLPOOL 34358644fa20dbe60ec77ac0fb2915810b03b949a5cfc014b1be1a2d212fcf3f2c5a22ca00a48eed2879a4a2014362501a8261704ce27ae334cb1ff2fd7b0174 EBUILD knot-1.6.8.ebuild 1782 SHA256 c7a47d5c0cf7400007d3827ad7283b82d8db1907c8eb70cd058a61c2faf5a3f3 SHA512 adb625746a03d8e450723c09638b21f7c4d85c294c44ce86a2c11acba08c84516c5c03165ac22ff81eb26368d1899f7310efa4a8d47337a4e2c023e76168678d WHIRLPOOL 74c2ea9bfb10bb195455b4f710f6550e679cc461a4df6a5612aa8c34d6a6ac24324925a6fd493be51e8f57cc712516fefaad06ba9fd64769110c66aa6ea5e43b -EBUILD knot-2.3.3.ebuild 1622 SHA256 5c695e1b72b1b5547a070a1a612421687e1a6584ab7977fae4afcf53f2c49f67 SHA512 2548a5f296b3fc579bb940e6f4599755a53e069d5e6eb8078d20038fad9c05039d50fbbeed5abece651a4d53cc2cdf0fce57727f4a647f74053e60f39d1ba838 WHIRLPOOL 76dc900f72213a7517c223a36093aee7712c429ea72c611cbb49c6d1ddc1b9308e7cfc790978540cc1d6f4036a2d2ef377cfead8b94b84679859b12838ea0ff4 -MISC metadata.xml 860 SHA256 fe726aad8fcb32cf2af9a862edb095dbc78b142124b154bc9e4467af9fdc068c SHA512 6c9094cbfd9ba5dde5a07ec21bfdceb8da8ad008ab34fcc76fe5b8478ab1439e887ae2c1f6ce9143d0f4b9a190fad4df50e6c57cf41c928f7095917557fa33b2 WHIRLPOOL db84dd7cb1c2206e026cb73119c3970256479d34e6548a123bc399a1b55abe02459797763791b9c695c4b42df313b4b17e9b47e26695dd01aa00b463abbfe2b4 +EBUILD knot-2.3.3.ebuild 1618 SHA256 a910f934db21fd2d27b21708bb89d5de6e474911fa8e150e18f4090d3cc80f5a SHA512 f38788b4dacfce82fc1e7b604894dd6d3f2d3e9394f505bc59f193c8314a9922470f621caa9189777d7b99881b98f4243ac563384b5bc5e3eb8efc4c76408d2f WHIRLPOOL cb7efd00b14c966b09e4d01d6f1fa3622ed2b3a35e2585f82db03adde963c064684103e3e479a276de8a970b6e84f20aa4305ec57d4eaeac31cf274e10977fec +EBUILD knot-2.4.1.ebuild 1618 SHA256 81f2d9681c97388cca53c0057142dacb358954c7255b59bc40fb631ac2d0190b SHA512 5f1eceed172d496201d3e9ca16baaab08cdce64f4cd6869ba2de727fefcafcdabedc0a1abee93335bde77b28c8f29049d9202e5053405a588702c06ee5b25cce WHIRLPOOL 2c8f81a28d5e2d3369e8ebc9ff8fc4c879ce23330d16fe1d5fa2d60c455989a01075b69befd6b413b5f33ee053c83041bc96f23b070ab10b269516c1a273a212 +EBUILD knot-2.4.2.ebuild 1526 SHA256 6eddabf0cd0a65752e9d34284e0efd79b1933ca429f3044b8cf61edaea4b8a59 SHA512 611df211d6cbf85ee1da5f451f6ecad1666dc2939941bd8f689367125c1ca84e39e6cd809373b81043b3969b11b748f0b56d28dd40e48506f0c1f76133008323 WHIRLPOOL 29efd8fa9919c6ed2ce7f9ed65a17dddf5346b3d9d4752b777cf07d3ae53d147d9f7843ec7d6b4e5516f0939a90dd6cda29df97950f8380259683f396914fe7a +MISC metadata.xml 700 SHA256 599e5d85b3f41649b1e19eec905262ba5fe19033f1cd42f57e2eaac7711b12b5 SHA512 1f036b49916a21225d3879dbb57863c2726d6ce06eaf1fabd068341c9666da735a06f8a3664250f4eb2c04ddfb948fa0510cb95e9d249dd0f67ff36ed898bc31 WHIRLPOOL 1c27ccecb4a00bb44eff00be16de2c21be4b7811dccba6a7a674a0ce976f8f2d70ee882dfc016b87f1989c9e432e801e20327bccf1ee592fd59ce4ce974f705a diff --git a/net-dns/knot/files/knot.init b/net-dns/knot/files/knot.init index 2ca0b8e..8dc460c 100644 --- a/net-dns/knot/files/knot.init +++ b/net-dns/knot/files/knot.init @@ -1,7 +1,6 @@ #!/sbin/openrc-run # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ command=/usr/sbin/knotd command_args="-d" diff --git a/net-dns/knot/files/knot.service-r1 b/net-dns/knot/files/knot.service-r1 new file mode 100644 index 0000000..14a34a2 --- /dev/null +++ b/net-dns/knot/files/knot.service-r1 @@ -0,0 +1,17 @@ +[Unit] +Description=Knot high-performance DNS Server +After=network.target + +[Service] +ExecStart=/usr/sbin/knotd +ExecReload=/usr/sbin/knotc reload +ExecStop=/usr/sbin/knotc stop +PrivateTmp=true +User=knot +Group=knot +RuntimeDirectory=knot +RuntimeDirectoryMode=750 +AmbientCapabilities=CAP_NET_BIND_SERVICE + +[Install] +WantedBy=multi-user.target diff --git a/net-dns/knot/knot-2.3.3.ebuild b/net-dns/knot/knot-2.4.2.ebuild similarity index 77% rename from net-dns/knot/knot-2.3.3.ebuild rename to net-dns/knot/knot-2.4.2.ebuild index 67019dc..06a2b7d 100644 --- a/net-dns/knot/knot-2.3.3.ebuild +++ b/net-dns/knot/knot-2.4.2.ebuild @@ -1,6 +1,5 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI=6 @@ -13,10 +12,10 @@ SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="debug dnstap doc caps +fastparser idn systemd" +IUSE="dnstap doc caps +fastparser idn systemd" RDEPEND=" - >=net-libs/gnutls-3.3 + >=net-libs/gnutls-3.3:= >=dev-libs/jansson-2.3 >=dev-db/lmdb-0.9.15 >=dev-libs/userspace-rcu-0.5.4 @@ -29,7 +28,6 @@ RDEPEND=" dev-libs/libedit systemd? ( sys-apps/systemd ) " - DEPEND="${RDEPEND} virtual/pkgconfig doc? ( dev-python/sphinx ) @@ -44,8 +42,6 @@ src_configure() { --with-lmdb \ --with-bash-completions="$(get_bashcompdir)" \ $(use_enable fastparser) \ - $(use_enable debug debug server,zones,ns,loader,dnssec) \ - $(use_enable debug debuglevel details) \ $(use_enable dnstap) \ $(use_enable doc documentation) \ $(use_with idn libidn) \ @@ -54,7 +50,11 @@ src_configure() { src_compile() { default - use doc && emake -C doc html + + if use doc; then + emake -C doc html + HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} ) + fi } src_test() { @@ -62,14 +62,12 @@ src_test() { } src_install() { - use doc && HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} ) - default keepdir /var/lib/${PN} newinitd "${FILESDIR}/knot.init" knot - systemd_dounit "${FILESDIR}/knot.service" + systemd_newunit "${FILESDIR}/knot.service-r1" knot.service } pkg_postinst() {