From bf4c3059da8c7cdf703e980534b89beb05e40a31 Mon Sep 17 00:00:00 2001 From: Tomáš Chvátal Date: Mon, 8 Feb 2016 11:16:04 +0100 Subject: [net-dns/knot] Version update to 1.6.6 bug#553782 and version update to 2.1.0 with nettle patch bug#573866. --- net-dns/knot/files/knot-2.1.0-nettle.patch | 26 ++++++++ net-dns/knot/knot-1.5.3.ebuild | 61 ------------------- net-dns/knot/knot-1.6.3.ebuild | 95 ----------------------------- net-dns/knot/knot-1.6.6.ebuild | 95 +++++++++++++++++++++++++++++ net-dns/knot/knot-2.0.2.ebuild | 97 ----------------------------- net-dns/knot/knot-2.1.0.ebuild | 98 ++++++++++++++++++++++++++++++ 6 files changed, 219 insertions(+), 253 deletions(-) create mode 100644 net-dns/knot/files/knot-2.1.0-nettle.patch delete mode 100644 net-dns/knot/knot-1.5.3.ebuild delete mode 100644 net-dns/knot/knot-1.6.3.ebuild create mode 100644 net-dns/knot/knot-1.6.6.ebuild delete mode 100644 net-dns/knot/knot-2.0.2.ebuild create mode 100644 net-dns/knot/knot-2.1.0.ebuild (limited to 'net-dns/knot') diff --git a/net-dns/knot/files/knot-2.1.0-nettle.patch b/net-dns/knot/files/knot-2.1.0-nettle.patch new file mode 100644 index 000000000000..8f89ae85067f --- /dev/null +++ b/net-dns/knot/files/knot-2.1.0-nettle.patch @@ -0,0 +1,26 @@ +diff --git a/src/dnssec/lib/binary.c b/src/dnssec/lib/binary.c +index 454dc5a..8d642be 100644 +--- a/src/dnssec/lib/binary.c ++++ b/src/dnssec/lib/binary.c +@@ -15,16 +15,18 @@ + */ + + #include +-#include + #include ++#include ++#ifdef HAVE_NETTLE_VERSION_H ++#include ++#endif + + #include "binary.h" + #include "error.h" + #include "shared.h" + + typedef +-#ifdef HAVE_NETTLE_VERSION_H +- #include ++#ifdef NETTLE_VERSION_MAJOR + #if NETTLE_VERSION_MAJOR >= 3 + size_t + #else diff --git a/net-dns/knot/knot-1.5.3.ebuild b/net-dns/knot/knot-1.5.3.ebuild deleted file mode 100644 index 77b523f63892..000000000000 --- a/net-dns/knot/knot-1.5.3.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -EGIT_REPO_URI="https://gitlab.labs.nic.cz/labs/${PN}.git" -[[ ${PV} == 9999 ]] && inherit autotools git-r3 -inherit eutils user - -DESCRIPTION="High-performance authoritative-only DNS server" -HOMEPAGE="http://www.knot-dns.cz/" -[[ ${PV} == 9999 ]] || SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -[[ ${PV} == 9999 ]] || \ -KEYWORDS="~amd64 ~x86" -IUSE="debug caps +fastparser idn" - -RDEPEND=" - dev-libs/openssl - dev-libs/userspace-rcu - caps? ( sys-libs/libcap-ng ) - idn? ( net-dns/libidn ) -" -# sys-libs/glibc -DEPEND="${RDEPEND} - virtual/pkgconfig - sys-devel/flex - virtual/yacc - fastparser? ( dev-util/ragel ) -" - -S="${WORKDIR}/${P/_/-}" - -src_prepare() { - [[ ${PV} == 9999 ]] && eautoreconf -} - -src_configure() { - econf \ - --with-storage="${EPREFIX}/var/lib/${PN}" \ - --with-rundir="${EPREFIX}/var/run/${PN}" \ - --disable-lto \ - --enable-recvmmsg \ - $(use_enable fastparser) \ - $(use_enable debug debug server,zones,xfr,packet,dname,rr,ns,hash,compiler) \ - $(use_enable debug debuglevel details) \ - $(use_with idn libidn) -} - -src_install() { - default - newinitd "${FILESDIR}/knot.init" knot -} - -pkg_postinst() { - enewgroup knot 53 - enewuser knot 53 -1 /var/lib/knot knot -} diff --git a/net-dns/knot/knot-1.6.3.ebuild b/net-dns/knot/knot-1.6.3.ebuild deleted file mode 100644 index 9b45a0ef6952..000000000000 --- a/net-dns/knot/knot-1.6.3.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils user - -DESCRIPTION="High-performance authoritative-only DNS server" -HOMEPAGE="http://www.knot-dns.cz/" -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 lmdb systemd" - -RDEPEND=" - >=dev-libs/openssl-1.0.1 - >=dev-libs/userspace-rcu-0.5.4 - caps? ( >=sys-libs/libcap-ng-0.6.4 ) - dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) - idn? ( net-dns/libidn ) - lmdb? ( dev-db/lmdb ) - systemd? ( sys-apps/systemd ) -" - -DEPEND="${RDEPEND} - virtual/pkgconfig - sys-devel/flex - sys-devel/bison - doc? ( dev-python/sphinx app-text/texlive-core sys-apps/texinfo ) -" - -S="${WORKDIR}/${P/_/-}" - -src_prepare() { - epatch "${FILESDIR}/${PV}-dont-create-extra-directories.patch" -} - -src_configure() { - econf \ - --with-storage="${EPREFIX}/var/lib/${PN}" \ - --with-rundir="${EPREFIX}/var/run/${PN}" \ - $(use_enable fastparser) \ - $(use_enable debug debug server,zones,xfr,packet,rr,ns,loader,dnssec) \ - $(use_enable debug debuglevel details) \ - $(use_enable dnstap) \ - $(use_enable lmdb) \ - $(use_with idn libidn) \ - $(usex systemd --enable-systemd=yes --enable-systemd=no) -} - -src_compile() { - default - use doc && emake -C doc html-local singlehtml pdf-local info-local -} - -# Portage's automatic test code runs "make -n check" to see if there -# is a "check" target, but that fails here because the test -# infrastructure hasn't been built yet. Just run "make check", which -# will build it and then run the tests. -src_test() { - emake -j1 check -} - -src_install() { - default - keepdir /var/lib/${PN} - - if use doc; then - dodoc doc/_build/latex/KnotDNS.pdf - - docinto html - dodoc doc/_build/html/*.html doc/_build/html/*.js - docinto html/_sources - dodoc doc/_build/html/_sources/* - docinto html/_static - dodoc doc/_build/html/_static/* - - docinto singlehtml - dodoc doc/_build/singlehtml/index.html - docinto singlehtml/_static/ - dodoc doc/_build/singlehtml/_static/* - - doinfo doc/_build/texinfo/KnotDNS.info - fi - - newinitd "${FILESDIR}/knot.init" knot -} - -pkg_postinst() { - enewgroup knot 53 - enewuser knot 53 -1 /var/lib/knot knot -} diff --git a/net-dns/knot/knot-1.6.6.ebuild b/net-dns/knot/knot-1.6.6.ebuild new file mode 100644 index 000000000000..44bb39fbe737 --- /dev/null +++ b/net-dns/knot/knot-1.6.6.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils user + +DESCRIPTION="High-performance authoritative-only DNS server" +HOMEPAGE="http://www.knot-dns.cz/" +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 lmdb systemd" + +RDEPEND=" + >=dev-libs/openssl-1.0.1 + >=dev-libs/userspace-rcu-0.5.4 + caps? ( >=sys-libs/libcap-ng-0.6.4 ) + dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) + idn? ( net-dns/libidn ) + lmdb? ( dev-db/lmdb ) + systemd? ( sys-apps/systemd ) +" + +DEPEND="${RDEPEND} + virtual/pkgconfig + sys-devel/flex + sys-devel/bison + doc? ( dev-python/sphinx app-text/texlive-core sys-apps/texinfo ) +" + +S="${WORKDIR}/${P/_/-}" + +src_prepare() { + epatch "${FILESDIR}/1.6.3-dont-create-extra-directories.patch" +} + +src_configure() { + econf \ + --with-storage="${EPREFIX}/var/lib/${PN}" \ + --with-rundir="${EPREFIX}/var/run/${PN}" \ + $(use_enable fastparser) \ + $(use_enable debug debug server,zones,xfr,packet,rr,ns,loader,dnssec) \ + $(use_enable debug debuglevel details) \ + $(use_enable dnstap) \ + $(use_enable lmdb) \ + $(use_with idn libidn) \ + $(usex systemd --enable-systemd=yes --enable-systemd=no) +} + +src_compile() { + default + use doc && emake -C doc html-local singlehtml pdf-local info-local +} + +# Portage's automatic test code runs "make -n check" to see if there +# is a "check" target, but that fails here because the test +# infrastructure hasn't been built yet. Just run "make check", which +# will build it and then run the tests. +src_test() { + emake -j1 check +} + +src_install() { + default + keepdir /var/lib/${PN} + + if use doc; then + dodoc doc/_build/latex/KnotDNS.pdf + + docinto html + dodoc doc/_build/html/*.html doc/_build/html/*.js + docinto html/_sources + dodoc doc/_build/html/_sources/* + docinto html/_static + dodoc doc/_build/html/_static/* + + docinto singlehtml + dodoc doc/_build/singlehtml/index.html + docinto singlehtml/_static/ + dodoc doc/_build/singlehtml/_static/* + + doinfo doc/_build/texinfo/KnotDNS.info + fi + + newinitd "${FILESDIR}/knot.init" knot +} + +pkg_postinst() { + enewgroup knot 53 + enewuser knot 53 -1 /var/lib/knot knot +} diff --git a/net-dns/knot/knot-2.0.2.ebuild b/net-dns/knot/knot-2.0.2.ebuild deleted file mode 100644 index deb9f031be80..000000000000 --- a/net-dns/knot/knot-2.0.2.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit bash-completion-r1 eutils systemd user - -DESCRIPTION="High-performance authoritative-only DNS server" -HOMEPAGE="http://www.knot-dns.cz/" -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" - -RDEPEND=" - >=net-libs/gnutls-3.0 - >=dev-libs/jansson-2.3 - dev-db/lmdb - >=dev-libs/userspace-rcu-0.5.4 - caps? ( >=sys-libs/libcap-ng-0.6.4 ) - dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) - idn? ( net-dns/libidn ) - systemd? ( sys-apps/systemd ) -" - -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( dev-python/sphinx app-text/texlive-core sys-apps/texinfo ) -" - -S="${WORKDIR}/${P/_/-}" - -src_prepare() { - epatch "${FILESDIR}/2.0.2-dont-create-extra-directories.patch" -} - -src_configure() { - econf \ - --with-storage="${EPREFIX}/var/lib/${PN}" \ - --with-rundir="${EPREFIX}/var/run/${PN}" \ - --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) \ - $(usex systemd --enable-systemd=yes --enable-systemd=no) -} - -src_compile() { - default - use doc && emake -C doc html-local singlehtml pdf-local info-local -} - -# Portage's automatic test code runs "make -n check" to see if there -# is a "check" target, but that fails here because the test -# infrastructure hasn't been built yet. Just run "make check", which -# will build it and then run the tests. -src_test() { - emake -j1 check -} - -src_install() { - default - keepdir /var/lib/${PN} - - if use doc; then - dodoc doc/_build/latex/KnotDNS.pdf - - docinto html - dodoc doc/_build/html/*.html doc/_build/html/*.js - docinto html/_sources - dodoc doc/_build/html/_sources/* - docinto html/_static - dodoc doc/_build/html/_static/* - - docinto singlehtml - dodoc doc/_build/singlehtml/index.html - docinto singlehtml/_static/ - dodoc doc/_build/singlehtml/_static/* - - doinfo doc/_build/texinfo/KnotDNS.info - fi - - newinitd "${FILESDIR}/knot.init" knot - systemd_dounit "${FILESDIR}/knot.service" -} - -pkg_postinst() { - enewgroup knot 53 - enewuser knot 53 -1 /var/lib/knot knot -} diff --git a/net-dns/knot/knot-2.1.0.ebuild b/net-dns/knot/knot-2.1.0.ebuild new file mode 100644 index 000000000000..5e244eae6b31 --- /dev/null +++ b/net-dns/knot/knot-2.1.0.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit bash-completion-r1 eutils systemd user + +DESCRIPTION="High-performance authoritative-only DNS server" +HOMEPAGE="http://www.knot-dns.cz/" +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" + +RDEPEND=" + >=net-libs/gnutls-3.0 + >=dev-libs/jansson-2.3 + dev-db/lmdb + >=dev-libs/userspace-rcu-0.5.4 + caps? ( >=sys-libs/libcap-ng-0.6.4 ) + dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) + idn? ( net-dns/libidn ) + systemd? ( sys-apps/systemd ) +" + +DEPEND="${RDEPEND} + virtual/pkgconfig + doc? ( dev-python/sphinx app-text/texlive-core sys-apps/texinfo ) +" + +S="${WORKDIR}/${P/_/-}" + +src_prepare() { + epatch "${FILESDIR}/2.0.2-dont-create-extra-directories.patch" + epatch "${FILESDIR}/knot-2.1.0-nettle.patch" +} + +src_configure() { + econf \ + --with-storage="${EPREFIX}/var/lib/${PN}" \ + --with-rundir="${EPREFIX}/var/run/${PN}" \ + --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) \ + $(usex systemd --enable-systemd=yes --enable-systemd=no) +} + +src_compile() { + default + use doc && emake -C doc html-local singlehtml pdf-local info-local +} + +# Portage's automatic test code runs "make -n check" to see if there +# is a "check" target, but that fails here because the test +# infrastructure hasn't been built yet. Just run "make check", which +# will build it and then run the tests. +src_test() { + emake -j1 check +} + +src_install() { + default + keepdir /var/lib/${PN} + + if use doc; then + dodoc doc/_build/latex/KnotDNS.pdf + + docinto html + dodoc doc/_build/html/*.html doc/_build/html/*.js + docinto html/_sources + dodoc doc/_build/html/_sources/* + docinto html/_static + dodoc doc/_build/html/_static/* + + docinto singlehtml + dodoc doc/_build/singlehtml/index.html + docinto singlehtml/_static/ + dodoc doc/_build/singlehtml/_static/* + + doinfo doc/_build/texinfo/KnotDNS.info + fi + + newinitd "${FILESDIR}/knot.init" knot + systemd_dounit "${FILESDIR}/knot.service" +} + +pkg_postinst() { + enewgroup knot 53 + enewuser knot 53 -1 /var/lib/knot knot +} -- cgit v1.2.3-65-gdbad