From f07fbf4f25958dbe59deacaca26e0ecfa426d979 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 31 Jul 2021 03:02:30 +0100 Subject: net-dns/getdns: fix stubby init script Closes: https://bugs.gentoo.org/716492 Thanks-to: Maciej S. Szmigiero Signed-off-by: Sam James --- net-dns/getdns/files/stubby.initd-r2 | 9 +--- net-dns/getdns/getdns-1.7.0-r1.ebuild | 95 +++++++++++++++++++++++++++++++++++ net-dns/getdns/getdns-1.7.0.ebuild | 95 ----------------------------------- 3 files changed, 97 insertions(+), 102 deletions(-) create mode 100644 net-dns/getdns/getdns-1.7.0-r1.ebuild delete mode 100644 net-dns/getdns/getdns-1.7.0.ebuild diff --git a/net-dns/getdns/files/stubby.initd-r2 b/net-dns/getdns/files/stubby.initd-r2 index 69e76c0acfdf..6af818c2db8a 100644 --- a/net-dns/getdns/files/stubby.initd-r2 +++ b/net-dns/getdns/files/stubby.initd-r2 @@ -5,7 +5,7 @@ stubby_opts="-C ${STUBBY_CONFIG_FILE:-/etc/stubby/stubby.yml} -v ${STUBBY_LOGLEVEL:-5}" command="capsh" command_args="--inh=cap_net_bind_service --user=stubby -- -c '/usr/bin/stubby -g ${stubby_opts} >>/var/log/stubby.log 2>&1'" -pidfile="/run/stubby.pid" +pidfile="/run/stubby/stubby.pid" name="DNS Privacy Daemon" depend() @@ -18,11 +18,6 @@ depend() start_pre() { - checkpath -f -m 0644 -o stubby:stubby /run/stubby.pid + checkpath -d -m 0755 -o stubby:stubby /run/stubby checkpath -f -m 0644 -o stubby:stubby /var/log/stubby.log } - -stop_post() -{ - [ -f /run/stubby.pid ] && rm /run/stubby.pid -} diff --git a/net-dns/getdns/getdns-1.7.0-r1.ebuild b/net-dns/getdns/getdns-1.7.0-r1.ebuild new file mode 100644 index 000000000000..98248f10308a --- /dev/null +++ b/net-dns/getdns/getdns-1.7.0-r1.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +_SRCURI_P="${P/%_beta1/-beta.1}" + +inherit cmake fcaps systemd tmpfiles + +DESCRIPTION="Modern asynchronous DNS API" +HOMEPAGE="https://getdnsapi.net/" +SRC_URI="https://getdnsapi.net/releases/${_SRCURI_P//./-}/${_SRCURI_P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~x86" +IUSE="doc examples +getdns-query +getdns-server-mon gnutls +idn libev libevent libuv static-libs stubby test +unbound" + +S="${WORKDIR}/${_SRCURI_P}" + +# https://bugs.gentoo.org/661760 +# https://github.com/getdnsapi/getdns/issues/407 +# (As of 1.7.0, seems to need network) +RESTRICT="test" +#RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/libbsd + dev-libs/libyaml + dev-libs/openssl:= + idn? ( net-dns/libidn2:= ) + gnutls? ( + net-libs/gnutls:0=[dane,openssl] + dev-libs/nettle:0= + ) + libev? ( dev-libs/libev:= ) + libevent? ( dev-libs/libevent:= ) + libuv? ( dev-libs/libuv:= ) + test? ( dev-libs/check ) + >=net-dns/unbound-1.5.9:= +" +RDEPEND=" + ${DEPEND} + stubby? ( + acct-group/stubby + acct-user/stubby + sys-libs/libcap + ) +" +BDEPEND=" + doc? ( app-doc/doxygen ) +" + +PATCHES=( + "${FILESDIR}/${PN}-1.4.2-stubby.service.patch" + "${FILESDIR}/${PN}-1.7.0-docdir.patch" +) + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_RUNSTATEDIR=/var/run/stubby + -DBUILD_DOXYGEN=$(usex doc) + -DBUILD_GETDNS_QUERY=$(usex getdns-query) + -DBUILD_GETDNS_SERVER_MON=$(usex getdns-server-mon) + -DBUILD_STUBBY=$(usex stubby) + -DENABLE_STATIC=$(usex static-libs) + -DBUILD_TESTING:BOOL=$(usex test) + -DENABLE_UNBOUND_EVENT_API=$(usex unbound) + -DUSE_GNUTLS=$(usex gnutls) + -DUSE_LIBEV=$(usex libev) + -DUSE_LIBEVENT2=$(usex libevent) + -DUSE_LIBIDN2=$(usex idn) + -DUSE_LIBUV=$(usex libuv) + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + if use stubby; then + newinitd "${FILESDIR}"/stubby.initd-r2 stubby + newconfd "${FILESDIR}"/stubby.confd-r1 stubby + insinto /etc/logrotate.d + newins "${FILESDIR}"/stubby.logrotate stubby + systemd_dounit "${S}"/stubby/systemd/stubby.service + dotmpfiles "${S}"/stubby/systemd/stubby.conf + fi +} + +pkg_postinst() { + if use stubby; then + fcaps cap_net_bind_service=ei /usr/bin/stubby + tmpfiles_process stubby.conf + fi +} diff --git a/net-dns/getdns/getdns-1.7.0.ebuild b/net-dns/getdns/getdns-1.7.0.ebuild deleted file mode 100644 index ebf797b77bec..000000000000 --- a/net-dns/getdns/getdns-1.7.0.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -_SRCURI_P="${P/%_beta1/-beta.1}" - -inherit cmake fcaps systemd tmpfiles - -DESCRIPTION="Modern asynchronous DNS API" -HOMEPAGE="https://getdnsapi.net/" -SRC_URI="https://getdnsapi.net/releases/${_SRCURI_P//./-}/${_SRCURI_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="doc examples +getdns-query +getdns-server-mon gnutls +idn libev libevent libuv static-libs stubby test +unbound" - -S="${WORKDIR}/${_SRCURI_P}" - -# https://bugs.gentoo.org/661760 -# https://github.com/getdnsapi/getdns/issues/407 -# (As of 1.7.0, seems to need network) -RESTRICT="test" -#RESTRICT="!test? ( test )" - -DEPEND=" - dev-libs/libbsd - dev-libs/libyaml - dev-libs/openssl:= - idn? ( net-dns/libidn2:= ) - gnutls? ( - net-libs/gnutls:0=[dane,openssl] - dev-libs/nettle:0= - ) - libev? ( dev-libs/libev:= ) - libevent? ( dev-libs/libevent:= ) - libuv? ( dev-libs/libuv:= ) - test? ( dev-libs/check ) - >=net-dns/unbound-1.5.9:= -" -RDEPEND=" - ${DEPEND} - stubby? ( - acct-group/stubby - acct-user/stubby - sys-libs/libcap - ) -" -BDEPEND=" - doc? ( app-doc/doxygen ) -" - -PATCHES=( - "${FILESDIR}/${PN}-1.4.2-stubby.service.patch" - "${FILESDIR}/${PN}-1.7.0-docdir.patch" -) - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_RUNSTATEDIR=/var/run - -DBUILD_DOXYGEN=$(usex doc) - -DBUILD_GETDNS_QUERY=$(usex getdns-query) - -DBUILD_GETDNS_SERVER_MON=$(usex getdns-server-mon) - -DBUILD_STUBBY=$(usex stubby) - -DENABLE_STATIC=$(usex static-libs) - -DBUILD_TESTING:BOOL=$(usex test) - -DENABLE_UNBOUND_EVENT_API=$(usex unbound) - -DUSE_GNUTLS=$(usex gnutls) - -DUSE_LIBEV=$(usex libev) - -DUSE_LIBEVENT2=$(usex libevent) - -DUSE_LIBIDN2=$(usex idn) - -DUSE_LIBUV=$(usex libuv) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - if use stubby; then - newinitd "${FILESDIR}"/stubby.initd-r2 stubby - newconfd "${FILESDIR}"/stubby.confd-r1 stubby - insinto /etc/logrotate.d - newins "${FILESDIR}"/stubby.logrotate stubby - systemd_dounit "${S}"/stubby/systemd/stubby.service - dotmpfiles "${S}"/stubby/systemd/stubby.conf - fi -} - -pkg_postinst() { - if use stubby; then - fcaps cap_net_bind_service=ei /usr/bin/stubby - tmpfiles_process stubby.conf - fi -} -- cgit v1.2.3-65-gdbad