* [gentoo-commits] repo/gentoo:master commit in: net-dns/getdns/, net-dns/getdns/files/
@ 2018-04-15 15:28 Anthony G. Basile
0 siblings, 0 replies; 8+ messages in thread
From: Anthony G. Basile @ 2018-04-15 15:28 UTC (permalink / raw
To: gentoo-commits
commit: 1d28661efeeff81e034c735131efbe4a1077820f
Author: CaseOf <caseoffr <AT> outlook <DOT> com>
AuthorDate: Thu Apr 12 18:37:01 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 15:15:09 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d28661e
net-dns/getdns: new package
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
net-dns/getdns/Manifest | 1 +
net-dns/getdns/files/stubby.confd | 4 +++
net-dns/getdns/files/stubby.initd | 21 ++++++++++++
net-dns/getdns/getdns-1.4.1.ebuild | 66 ++++++++++++++++++++++++++++++++++++++
net-dns/getdns/metadata.xml | 17 ++++++++++
5 files changed, 109 insertions(+)
diff --git a/net-dns/getdns/Manifest b/net-dns/getdns/Manifest
new file mode 100644
index 00000000000..2df8dc169a7
--- /dev/null
+++ b/net-dns/getdns/Manifest
@@ -0,0 +1 @@
+DIST getdns-1.4.1.tar.gz 1055348 BLAKE2B 3b664e669327f5d866e6b40defb3ee4b62a09be228cac726478dbc6843b64aaf49faa328e1013700daf554c4df1144a8d56cca9d9405057d35b89b8ab7ae1f43 SHA512 b15da1c898d4bb4e5dcd93b47f481696dd456d8a841b02122c46035f3da27ca13b5513e7b6a00e943d1a5f5cec8c5ce1f13729d3ce0c887d8faa31d201864b27
diff --git a/net-dns/getdns/files/stubby.confd b/net-dns/getdns/files/stubby.confd
new file mode 100644
index 00000000000..b862ea4a40d
--- /dev/null
+++ b/net-dns/getdns/files/stubby.confd
@@ -0,0 +1,4 @@
+# /etc/conf.d/stubby: config file for /etc/init.d/stubby
+
+# See stubby -h for possible options to put here.
+STUBBY_OPTS=""
diff --git a/net-dns/getdns/files/stubby.initd b/net-dns/getdns/files/stubby.initd
new file mode 100755
index 00000000000..170db9be07f
--- /dev/null
+++ b/net-dns/getdns/files/stubby.initd
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+command="capsh"
+command_args="--inh=cap_net_bind_service --user=stubby -- -c '/usr/bin/stubby -g ${STUBBY_OPTS}'"
+pidfile="/var/run/stubby/stubby.pid"
+name="DNS Privacy Daemon"
+
+depend()
+{
+ provide dns
+ need localmount net
+ after bootmisc
+ use logger
+}
+
+start_pre()
+{
+ checkpath -d -m 1755 -o stubby:stubby /var/run/stubby
+}
diff --git a/net-dns/getdns/getdns-1.4.1.ebuild b/net-dns/getdns/getdns-1.4.1.ebuild
new file mode 100644
index 00000000000..13ab6bc3b15
--- /dev/null
+++ b/net-dns/getdns/getdns-1.4.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user fcaps
+
+DESCRIPTION="Modern asynchronous DNS API"
+HOMEPAGE="https://getdnsapi.net/"
+SRC_URI="https://getdnsapi.net/releases/${P//./-}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="stubby +getdns_query +getdns_server_mon libressl +idn +unbound libevent libev libuv +threads"
+
+DEPEND="
+ dev-libs/libyaml:=
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ idn? ( net-dns/libidn2:= )
+ unbound? ( >=net-dns/unbound-1.4.16:= )
+ libevent? ( dev-libs/libevent:= )
+ libev? ( dev-libs/libev:= )
+ libuv? ( dev-libs/libuv:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ econf \
+ --runstatedir=/var/run \
+ --with-piddir=/var/run/stubby \
+ $(use_with stubby) \
+ $(use_with getdns_query) \
+ $(use_with getdns_server_mon) \
+ $(use_with idn libidn2) \
+ --without-libidn \
+ $(use_with unbound libunbound) \
+ $(use_with libevent) \
+ $(use_with libev) \
+ $(use_with libuv) \
+ $(use_with threads libpthread)
+}
+
+src_install() {
+ default
+ if use stubby; then
+ newinitd "${FILESDIR}"/stubby.initd stubby
+ newconfd "${FILESDIR}"/stubby.confd stubby
+ fi
+}
+
+pkg_postinst() {
+ if use stubby; then
+ enewgroup stubby
+ enewuser stubby -1 -1 -1 stubby
+ fcaps cap_net_bind_service=ei /usr/bin/stubby
+ fi
+
+ if has_version <dev-libs/libressl-2.7.0; then
+ ewarn "BEWARE: dev-libs/libressl prior to 2.7 does NOT check TLS certificates."
+ if use stubby; then
+ ewarn "You will NOT be able to use strict profile in Stubby."
+ fi
+ fi
+}
diff --git a/net-dns/getdns/metadata.xml b/net-dns/getdns/metadata.xml
new file mode 100644
index 00000000000..16e6ffa9c9c
--- /dev/null
+++ b/net-dns/getdns/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>gentoo@retornaz.com</email>
+ <name>Quentin Retornaz</name>
+ </maintainer>
+ <use>
+ <flag name="stubby">Add Stubby DNS Privacy Deamon</flag>
+ <flag name="getdns_query">Add getdns_query tool</flag>
+ <flag name="getdns_server_mon">Add getdns_server_mon tool</flag>
+ <flag name="unbound">Enable <pkg>net-dns/unbound</pkg> libraries support</flag>
+ <flag name="libevent">Enable <pkg>dev-libs/libevent</pkg> support</flag>
+ <flag name="libev">Enable <pkg>dev-libs/libev</pkg> support</flag>
+ <flag name="libuv">Enable <pkg>dev-libs/libuv</pkg> support</flag>
+ </use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/getdns/, net-dns/getdns/files/
@ 2018-07-12 22:31 Anthony G. Basile
0 siblings, 0 replies; 8+ messages in thread
From: Anthony G. Basile @ 2018-07-12 22:31 UTC (permalink / raw
To: gentoo-commits
commit: cecd6be7b3c948d81dd4c97cfba092acfbd0a366
Author: Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
AuthorDate: Wed Jun 20 15:00:34 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Jul 12 22:31:43 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cecd6be7
net-dns/getdns: fix upstream systemd unit to match ebuild configuration #656988
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
net-dns/getdns/files/getdns-1.4.2-stubby.service.patch | 16 ++++++++++++++++
.../{getdns-1.4.2.ebuild => getdns-1.4.2-r1.ebuild} | 2 ++
2 files changed, 18 insertions(+)
diff --git a/net-dns/getdns/files/getdns-1.4.2-stubby.service.patch b/net-dns/getdns/files/getdns-1.4.2-stubby.service.patch
new file mode 100644
index 00000000000..2bb7546fcfa
--- /dev/null
+++ b/net-dns/getdns/files/getdns-1.4.2-stubby.service.patch
@@ -0,0 +1,16 @@
+diff -ur a/stubby/systemd/stubby.service b/stubby/systemd/stubby.service
+--- a/stubby/systemd/stubby.service 2018-05-11 13:25:22.000000000 +0200
++++ b/stubby/systemd/stubby.service 2018-06-20 15:40:23.650164668 +0200
+@@ -3,9 +3,11 @@
+
+ [Service]
+ User=stubby
+-DynamicUser=yes
++DynamicUser=no
+ CacheDirectory=stubby
+ WorkingDirectory=/var/cache/stubby
++ExecStartPre=/bin/mkdir -p /var/cache/stubby
++ExecStartPre=/bin/chown stubby:stubby /var/cache/stubby
+ ExecStart=/usr/bin/stubby
+ AmbientCapabilities=CAP_NET_BIND_SERVICE
+ CapabilityBoundingSet=CAP_NET_BIND_SERVICE
diff --git a/net-dns/getdns/getdns-1.4.2.ebuild b/net-dns/getdns/getdns-1.4.2-r1.ebuild
similarity index 96%
rename from net-dns/getdns/getdns-1.4.2.ebuild
rename to net-dns/getdns/getdns-1.4.2-r1.ebuild
index de86ca0dce7..28d7a6c9c3c 100644
--- a/net-dns/getdns/getdns-1.4.2.ebuild
+++ b/net-dns/getdns/getdns-1.4.2-r1.ebuild
@@ -30,6 +30,8 @@ RDEPEND="
stubby? ( sys-libs/libcap:= )
"
+PATCHES=( "${FILESDIR}/${PN}-1.4.2-stubby.service.patch" )
+
src_configure() {
econf \
--runstatedir=/var/run \
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/getdns/, net-dns/getdns/files/
@ 2019-12-23 21:42 Anthony G. Basile
0 siblings, 0 replies; 8+ messages in thread
From: Anthony G. Basile @ 2019-12-23 21:42 UTC (permalink / raw
To: gentoo-commits
commit: 5b644cb1a2c287eee592935fcc005ae5b1cf25fa
Author: Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
AuthorDate: Sun Dec 22 01:44:37 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Dec 23 21:42:14 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b644cb1
net-dns/getdns: bump version to 1.6.0_beta1
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
net-dns/getdns/Manifest | 1 +
net-dns/getdns/files/stubby.initd-r2 | 28 ++++++++++
net-dns/getdns/getdns-1.6.0_beta1.ebuild | 87 ++++++++++++++++++++++++++++++++
3 files changed, 116 insertions(+)
diff --git a/net-dns/getdns/Manifest b/net-dns/getdns/Manifest
index 6c5178376c6..144eeeba9b3 100644
--- a/net-dns/getdns/Manifest
+++ b/net-dns/getdns/Manifest
@@ -1,2 +1,3 @@
DIST getdns-1.5.1.tar.gz 1075728 BLAKE2B fd6ac52a302ecf22cc913d8de6f93f9ab125429d0eb9d6e233f23b84bb2e242573cd93997f88b4d1a2493273691dab897efc8509a0e3f03f6fddcb9d3b53ecb6 SHA512 4013cb4f00cc87164380c22dc6f82a4fd54702769c28eeb7cfcb13fb35ef41e32916c36a1aa2f6ef05f008da97bea5c7ed849aedc6ae7050c285f9589a9817b0
DIST getdns-1.5.2.tar.gz 1091088 BLAKE2B c5f32af794f3c710c0f84027d38ca393c72a438905c5e2fe49f2d20477e3f90f855d280f43d0ef7d204fa67d95ebdb960ce86d934e26c1ef3030f263f98ec7f4 SHA512 42e56264578f59e94d0a7315cd9cb1720f24c7a9abbaa09e1b42c274d15d1082ad4a036fa3c10573cf4d0ee6d868b6fcedf3a7cd64b53bdabd9d45542e479ca4
+DIST getdns-1.6.0-beta.1.tar.gz 669637 BLAKE2B cab019c38a0e7268a3ffef7ffd6b52ab3565bbf0b4ea4e897d60cfc0885ee7d32d8bd22e58f24b554e03d4297945d4eaa915aff254f43d4e82455f1070923d46 SHA512 b36d05b09b5ab7c384fdb93820bc6ad253e9a44da9c7ea38c735882e56e03eaba1793ea22068d03867ed2ade71682686a359b1b0a821eed4a5f3bebeeaeeb7e2
diff --git a/net-dns/getdns/files/stubby.initd-r2 b/net-dns/getdns/files/stubby.initd-r2
new file mode 100755
index 00000000000..69e76c0acfd
--- /dev/null
+++ b/net-dns/getdns/files/stubby.initd-r2
@@ -0,0 +1,28 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+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"
+name="DNS Privacy Daemon"
+
+depend()
+{
+ provide dns
+ need localmount net
+ after bootmisc
+ use logger
+}
+
+start_pre()
+{
+ checkpath -f -m 0644 -o stubby:stubby /run/stubby.pid
+ 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.6.0_beta1.ebuild b/net-dns/getdns/getdns-1.6.0_beta1.ebuild
new file mode 100644
index 00000000000..7b782226afc
--- /dev/null
+++ b/net-dns/getdns/getdns-1.6.0_beta1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+_SRCURI_P="${P/%_beta1/-beta.1}"
+
+inherit cmake-utils fcaps systemd
+
+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 +unbound"
+
+S="${WORKDIR}/${_SRCURI_P}"
+
+# https://bugs.gentoo.org/661760
+# https://github.com/getdnsapi/getdns/issues/407
+RESTRICT="test"
+
+DEPEND="
+ dev-libs/libbsd:=
+ dev-libs/libyaml:=
+ dev-libs/openssl:0=
+ 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:= )
+ unbound? ( >=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" )
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_RUNSTATEDIR=/var/run
+ -DENABLE_STATIC=$(usex static-libs)
+ -DBUILD_GETDNS_QUERY=$(usex getdns-query)
+ -DBUILD_GETDNS_SERVER_MON=$(usex getdns-server-mon)
+ -DUSE_GNUTLS=$(usex gnutls)
+ -DUSE_LIBIDN2=$(usex idn)
+ -DUSE_LIBEV=$(usex libev)
+ -DUSE_LIBEVENT2=$(usex libevent)
+ -DUSE_LIBUV=$(use_with libuv)
+ -DBUILD_STUBBY=$(usex stubby)
+ -DENABLE_UNBOUND_EVENT_API=$(usex unbound)
+ -DBUILD_DOXYGEN=$(usex doc)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_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
+ systemd_dotmpfilesd "${S}"/stubby/systemd/stubby.conf
+ fi
+}
+
+pkg_postinst() {
+ if use stubby; then
+ fcaps cap_net_bind_service=ei /usr/bin/stubby
+ fi
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/getdns/, net-dns/getdns/files/
@ 2021-06-09 23:56 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2021-06-09 23:56 UTC (permalink / raw
To: gentoo-commits
commit: 45217c6fa29dd8414c2561772df7d76b6abedca8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 9 23:02:52 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 9 23:55:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45217c6f
net-dns/getdns: add 1.7.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-dns/getdns/Manifest | 1 +
net-dns/getdns/files/getdns-1.7.0-docdir.patch | 16 +++++
net-dns/getdns/files/stubby.initd-r1 | 0
net-dns/getdns/files/stubby.initd-r2 | 0
net-dns/getdns/getdns-1.7.0.ebuild | 94 ++++++++++++++++++++++++++
5 files changed, 111 insertions(+)
diff --git a/net-dns/getdns/Manifest b/net-dns/getdns/Manifest
index 144eeeba9b3..688c16cdad6 100644
--- a/net-dns/getdns/Manifest
+++ b/net-dns/getdns/Manifest
@@ -1,3 +1,4 @@
DIST getdns-1.5.1.tar.gz 1075728 BLAKE2B fd6ac52a302ecf22cc913d8de6f93f9ab125429d0eb9d6e233f23b84bb2e242573cd93997f88b4d1a2493273691dab897efc8509a0e3f03f6fddcb9d3b53ecb6 SHA512 4013cb4f00cc87164380c22dc6f82a4fd54702769c28eeb7cfcb13fb35ef41e32916c36a1aa2f6ef05f008da97bea5c7ed849aedc6ae7050c285f9589a9817b0
DIST getdns-1.5.2.tar.gz 1091088 BLAKE2B c5f32af794f3c710c0f84027d38ca393c72a438905c5e2fe49f2d20477e3f90f855d280f43d0ef7d204fa67d95ebdb960ce86d934e26c1ef3030f263f98ec7f4 SHA512 42e56264578f59e94d0a7315cd9cb1720f24c7a9abbaa09e1b42c274d15d1082ad4a036fa3c10573cf4d0ee6d868b6fcedf3a7cd64b53bdabd9d45542e479ca4
DIST getdns-1.6.0-beta.1.tar.gz 669637 BLAKE2B cab019c38a0e7268a3ffef7ffd6b52ab3565bbf0b4ea4e897d60cfc0885ee7d32d8bd22e58f24b554e03d4297945d4eaa915aff254f43d4e82455f1070923d46 SHA512 b36d05b09b5ab7c384fdb93820bc6ad253e9a44da9c7ea38c735882e56e03eaba1793ea22068d03867ed2ade71682686a359b1b0a821eed4a5f3bebeeaeeb7e2
+DIST getdns-1.7.0.tar.gz 690885 BLAKE2B 25e81c01c5da0a5494dc25077257f8f98210b442b7ca65c895aa2a40af180e840aa53205ae84ed242cbd6c55f8830caf255db9d7f607dde39f118ab7494a7072 SHA512 d09b8bdd0b4a3df2d25b9689166226da83a5a7eb2c7436487dc637539ac6077624a4d66cf684c4e6c4911561872c6bd191af3afd90d275b1662e4c6c47773ef6
diff --git a/net-dns/getdns/files/getdns-1.7.0-docdir.patch b/net-dns/getdns/files/getdns-1.7.0-docdir.patch
new file mode 100644
index 00000000000..1c955fdd4b3
--- /dev/null
+++ b/net-dns/getdns/files/getdns-1.7.0-docdir.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6928a02..e8a0cbb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1101,9 +1101,8 @@ endif ()
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/getdns DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION share/man)
+
+-set(docdir share/doc/getdns)
+-install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${docdir})
+-install(FILES spec/index.html DESTINATION ${docdir}/spec)
++install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
++install(FILES spec/index.html DESTINATION ${CMAKE_INSTALL_DOCDIR}/spec)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/getdns.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+
+ install(CODE "message(\"\
diff --git a/net-dns/getdns/files/stubby.initd-r1 b/net-dns/getdns/files/stubby.initd-r1
old mode 100755
new mode 100644
diff --git a/net-dns/getdns/files/stubby.initd-r2 b/net-dns/getdns/files/stubby.initd-r2
old mode 100755
new mode 100644
diff --git a/net-dns/getdns/getdns-1.7.0.ebuild b/net-dns/getdns/getdns-1.7.0.ebuild
new file mode 100644
index 00000000000..39b9a79e186
--- /dev/null
+++ b/net-dns/getdns/getdns-1.7.0.ebuild
@@ -0,0 +1,94 @@
+# 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
+ fi
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/getdns/, net-dns/getdns/files/
@ 2021-07-15 22:12 Conrad Kostecki
0 siblings, 0 replies; 8+ messages in thread
From: Conrad Kostecki @ 2021-07-15 22:12 UTC (permalink / raw
To: gentoo-commits
commit: fcfb6cddf587f5c80d0a2cbd14c3838a8556bc51
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 15 22:08:42 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Jul 15 22:11:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcfb6cdd
net-dns/getdns: drop old version
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
net-dns/getdns/Manifest | 3 -
net-dns/getdns/files/stubby.initd-r1 | 23 --------
net-dns/getdns/getdns-1.5.1.ebuild | 76 -------------------------
net-dns/getdns/getdns-1.5.2-r2.ebuild | 82 ---------------------------
net-dns/getdns/getdns-1.6.0_beta1-r2.ebuild | 87 -----------------------------
net-dns/getdns/metadata.xml | 1 -
6 files changed, 272 deletions(-)
diff --git a/net-dns/getdns/Manifest b/net-dns/getdns/Manifest
index 688c16cdad6..43f673dd12e 100644
--- a/net-dns/getdns/Manifest
+++ b/net-dns/getdns/Manifest
@@ -1,4 +1 @@
-DIST getdns-1.5.1.tar.gz 1075728 BLAKE2B fd6ac52a302ecf22cc913d8de6f93f9ab125429d0eb9d6e233f23b84bb2e242573cd93997f88b4d1a2493273691dab897efc8509a0e3f03f6fddcb9d3b53ecb6 SHA512 4013cb4f00cc87164380c22dc6f82a4fd54702769c28eeb7cfcb13fb35ef41e32916c36a1aa2f6ef05f008da97bea5c7ed849aedc6ae7050c285f9589a9817b0
-DIST getdns-1.5.2.tar.gz 1091088 BLAKE2B c5f32af794f3c710c0f84027d38ca393c72a438905c5e2fe49f2d20477e3f90f855d280f43d0ef7d204fa67d95ebdb960ce86d934e26c1ef3030f263f98ec7f4 SHA512 42e56264578f59e94d0a7315cd9cb1720f24c7a9abbaa09e1b42c274d15d1082ad4a036fa3c10573cf4d0ee6d868b6fcedf3a7cd64b53bdabd9d45542e479ca4
-DIST getdns-1.6.0-beta.1.tar.gz 669637 BLAKE2B cab019c38a0e7268a3ffef7ffd6b52ab3565bbf0b4ea4e897d60cfc0885ee7d32d8bd22e58f24b554e03d4297945d4eaa915aff254f43d4e82455f1070923d46 SHA512 b36d05b09b5ab7c384fdb93820bc6ad253e9a44da9c7ea38c735882e56e03eaba1793ea22068d03867ed2ade71682686a359b1b0a821eed4a5f3bebeeaeeb7e2
DIST getdns-1.7.0.tar.gz 690885 BLAKE2B 25e81c01c5da0a5494dc25077257f8f98210b442b7ca65c895aa2a40af180e840aa53205ae84ed242cbd6c55f8830caf255db9d7f607dde39f118ab7494a7072 SHA512 d09b8bdd0b4a3df2d25b9689166226da83a5a7eb2c7436487dc637539ac6077624a4d66cf684c4e6c4911561872c6bd191af3afd90d275b1662e4c6c47773ef6
diff --git a/net-dns/getdns/files/stubby.initd-r1 b/net-dns/getdns/files/stubby.initd-r1
deleted file mode 100644
index e6b799919e2..00000000000
--- a/net-dns/getdns/files/stubby.initd-r1
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-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="/var/run/stubby/stubby.pid"
-name="DNS Privacy Daemon"
-
-depend()
-{
- provide dns
- need localmount net
- after bootmisc
- use logger
-}
-
-start_pre()
-{
- checkpath -d -m 1755 -o stubby:stubby /var/run/stubby
- checkpath -f -m 0644 -o stubby:stubby /var/log/stubby.log
-}
diff --git a/net-dns/getdns/getdns-1.5.1.ebuild b/net-dns/getdns/getdns-1.5.1.ebuild
deleted file mode 100644
index 9333b5ff65f..00000000000
--- a/net-dns/getdns/getdns-1.5.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps systemd user tmpfiles
-
-DESCRIPTION="Modern asynchronous DNS API"
-HOMEPAGE="https://getdnsapi.net/"
-SRC_URI="https://getdnsapi.net/releases/${P//./-}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +getdns-query +getdns-server-mon +idn libev libevent libuv static-libs stubby +threads +unbound"
-
-# https://bugs.gentoo.org/661760
-# https://github.com/getdnsapi/getdns/issues/407
-RESTRICT="test"
-
-DEPEND="
- dev-libs/libbsd:=
- dev-libs/libyaml:=
- idn? ( net-dns/libidn2:= )
- dev-libs/openssl:0=
- libev? ( dev-libs/libev:= )
- libevent? ( dev-libs/libevent:= )
- libuv? ( dev-libs/libuv:= )
- unbound? ( >=net-dns/unbound-1.4.16:= )
-"
-RDEPEND="
- ${DEPEND}
- stubby? ( sys-libs/libcap:= )
-"
-BDEPEND="
- doc? ( app-doc/doxygen )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.4.2-stubby.service.patch" )
-
-src_configure() {
- econf \
- --runstatedir=/var/run \
- $(use_enable static-libs static) \
- $(use_with getdns-query getdns_query) \
- $(use_with getdns-server-mon getdns_server_mon) \
- $(use_with idn libidn2) \
- $(use_with libev) \
- $(use_with libevent) \
- $(use_with libuv) \
- $(use_with stubby) \
- $(use_with threads libpthread) \
- $(use_with unbound libunbound) \
- --without-libidn \
- --with-piddir=/var/run/stubby
-}
-
-src_install() {
- default
- if use stubby; then
- newinitd "${FILESDIR}"/stubby.initd-r1 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
- enewgroup stubby
- enewuser stubby -1 -1 -1 stubby
- fcaps cap_net_bind_service=ei /usr/bin/stubby
- fi
-}
diff --git a/net-dns/getdns/getdns-1.5.2-r2.ebuild b/net-dns/getdns/getdns-1.5.2-r2.ebuild
deleted file mode 100644
index 805ea4a5e29..00000000000
--- a/net-dns/getdns/getdns-1.5.2-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps systemd user tmpfiles
-
-DESCRIPTION="Modern asynchronous DNS API"
-HOMEPAGE="https://getdnsapi.net/"
-SRC_URI="https://getdnsapi.net/releases/${P//./-}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="doc +getdns-query +getdns-server-mon gnutls +idn libev libevent libuv nettle static-libs stubby +threads +unbound"
-
-REQUIRED_USE="gnutls? ( nettle )"
-
-# https://bugs.gentoo.org/661760
-# https://github.com/getdnsapi/getdns/issues/407
-RESTRICT="test"
-
-DEPEND="
- dev-libs/libbsd:=
- dev-libs/libyaml:=
- idn? ( net-dns/libidn2:= )
- !gnutls? ( dev-libs/openssl:0= )
- gnutls? ( net-libs/gnutls:0=[dane] )
- libev? ( dev-libs/libev:= )
- libevent? ( dev-libs/libevent:= )
- libuv? ( dev-libs/libuv:= )
- nettle? ( dev-libs/nettle:0= )
- unbound? ( >=net-dns/unbound-1.4.16:= )
-"
-RDEPEND="
- ${DEPEND}
- stubby? ( sys-libs/libcap:= )
-"
-BDEPEND="
- doc? ( app-doc/doxygen )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.4.2-stubby.service.patch" )
-
-src_configure() {
- econf \
- --runstatedir=/var/run \
- $(use_enable static-libs static) \
- $(use_with getdns-query getdns_query) \
- $(use_with getdns-server-mon getdns_server_mon) \
- $(usex gnutls '--with-gnutls' '' '' '') \
- $(use_with idn libidn2) \
- $(use_with libev) \
- $(use_with libevent) \
- $(use_with libuv) \
- $(use_with nettle) \
- $(use_with stubby) \
- $(use_with threads libpthread) \
- $(use_with unbound libunbound) \
- --without-libidn \
- --with-piddir=/var/run/stubby
-}
-
-src_install() {
- default
- if use stubby; then
- newinitd "${FILESDIR}"/stubby.initd-r1 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
- enewgroup stubby
- enewuser stubby -1 -1 -1 stubby
- fcaps cap_net_bind_service=ei /usr/bin/stubby
- fi
-}
diff --git a/net-dns/getdns/getdns-1.6.0_beta1-r2.ebuild b/net-dns/getdns/getdns-1.6.0_beta1-r2.ebuild
deleted file mode 100644
index ab3972e67e6..00000000000
--- a/net-dns/getdns/getdns-1.6.0_beta1-r2.ebuild
+++ /dev/null
@@ -1,87 +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 +unbound"
-
-S="${WORKDIR}/${_SRCURI_P}"
-
-# https://bugs.gentoo.org/661760
-# https://github.com/getdnsapi/getdns/issues/407
-RESTRICT="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:= )
- >=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" )
-
-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)
- -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
- fi
-}
diff --git a/net-dns/getdns/metadata.xml b/net-dns/getdns/metadata.xml
index eef66059a1e..9c8f002f154 100644
--- a/net-dns/getdns/metadata.xml
+++ b/net-dns/getdns/metadata.xml
@@ -13,6 +13,5 @@
<flag name="libevent">Enable <pkg>dev-libs/libevent</pkg> support</flag>
<flag name="libev">Enable <pkg>dev-libs/libev</pkg> support</flag>
<flag name="libuv">Enable <pkg>dev-libs/libuv</pkg> support</flag>
- <flag name="nettle">Use <pkg>dev-libs/nettle</pkg> as crypto backend</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/getdns/, net-dns/getdns/files/
@ 2021-07-31 2:04 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2021-07-31 2:04 UTC (permalink / raw
To: gentoo-commits
commit: f07fbf4f25958dbe59deacaca26e0ecfa426d979
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 31 02:02:30 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 31 02:03:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f07fbf4f
net-dns/getdns: fix stubby init script
Closes: https://bugs.gentoo.org/716492
Thanks-to: Maciej S. Szmigiero <mail <AT> maciej.szmigiero.name>
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-dns/getdns/files/stubby.initd-r2 | 9 ++-------
net-dns/getdns/{getdns-1.7.0.ebuild => getdns-1.7.0-r1.ebuild} | 2 +-
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/net-dns/getdns/files/stubby.initd-r2 b/net-dns/getdns/files/stubby.initd-r2
index 69e76c0acfd..6af818c2db8 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.ebuild b/net-dns/getdns/getdns-1.7.0-r1.ebuild
similarity index 97%
rename from net-dns/getdns/getdns-1.7.0.ebuild
rename to net-dns/getdns/getdns-1.7.0-r1.ebuild
index ebf797b77be..98248f10308 100644
--- a/net-dns/getdns/getdns-1.7.0.ebuild
+++ b/net-dns/getdns/getdns-1.7.0-r1.ebuild
@@ -58,7 +58,7 @@ PATCHES=(
src_configure() {
local mycmakeargs=(
- -DCMAKE_INSTALL_RUNSTATEDIR=/var/run
+ -DCMAKE_INSTALL_RUNSTATEDIR=/var/run/stubby
-DBUILD_DOXYGEN=$(usex doc)
-DBUILD_GETDNS_QUERY=$(usex getdns-query)
-DBUILD_GETDNS_SERVER_MON=$(usex getdns-server-mon)
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/getdns/, net-dns/getdns/files/
@ 2022-12-24 19:13 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2022-12-24 19:13 UTC (permalink / raw
To: gentoo-commits
commit: dd0edee1d55e62453029e425f973d19e9c030e35
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 24 18:57:40 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 18:57:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd0edee1
net-dns/getdns: drop 1.7.0-r1
Closes: https://bugs.gentoo.org/886893
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-dns/getdns/Manifest | 1 -
net-dns/getdns/files/getdns-1.7.0-docdir.patch | 15 ----
net-dns/getdns/getdns-1.7.0-r1.ebuild | 95 --------------------------
3 files changed, 111 deletions(-)
diff --git a/net-dns/getdns/Manifest b/net-dns/getdns/Manifest
index b8a9569bbd04..77ae018e7a78 100644
--- a/net-dns/getdns/Manifest
+++ b/net-dns/getdns/Manifest
@@ -1,2 +1 @@
-DIST getdns-1.7.0.tar.gz 690885 BLAKE2B 25e81c01c5da0a5494dc25077257f8f98210b442b7ca65c895aa2a40af180e840aa53205ae84ed242cbd6c55f8830caf255db9d7f607dde39f118ab7494a7072 SHA512 d09b8bdd0b4a3df2d25b9689166226da83a5a7eb2c7436487dc637539ac6077624a4d66cf684c4e6c4911561872c6bd191af3afd90d275b1662e4c6c47773ef6
DIST getdns-1.7.2.tar.gz 702969 BLAKE2B 668a754200b816790f39a772d89c28e14bc5dbd041e07d9e53605ad44d63d6637078b66881c35dda62ed61622142797cc8f0041522e076cf551651fca688053a SHA512 6c4a75a4696c46ec8bd9e9659a93fd81f3490b43da28a4c95f99a766027c7588fc493a8ac51563afb8f975c0e5b77d5ea67014d80e78ee2bb17fba1d1073d19f
diff --git a/net-dns/getdns/files/getdns-1.7.0-docdir.patch b/net-dns/getdns/files/getdns-1.7.0-docdir.patch
deleted file mode 100644
index e674a3b2b81d..000000000000
--- a/net-dns/getdns/files/getdns-1.7.0-docdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://github.com/getdnsapi/getdns/pull/509
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1101,9 +1101,8 @@ endif ()
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/getdns DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION share/man)
-
--set(docdir share/doc/getdns)
--install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${docdir})
--install(FILES spec/index.html DESTINATION ${docdir}/spec)
-+install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
-+install(FILES spec/index.html DESTINATION ${CMAKE_INSTALL_DOCDIR}/spec)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/getdns.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-
- install(CODE "message(\"\
diff --git a/net-dns/getdns/getdns-1.7.0-r1.ebuild b/net-dns/getdns/getdns-1.7.0-r1.ebuild
deleted file mode 100644
index 85df2006a4a2..000000000000
--- a/net-dns/getdns/getdns-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2022 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
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/getdns/, net-dns/getdns/files/
@ 2024-12-01 12:12 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2024-12-01 12:12 UTC (permalink / raw
To: gentoo-commits
commit: df7eb9bcfa9ef003b6145b781a759cfad4739fcd
Author: Han Mertens <hanmertens <AT> outlook <DOT> com>
AuthorDate: Thu Oct 17 19:09:28 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 1 12:09:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df7eb9bc
net-dns/getdns: add 1.7.3
Apart from the version bump, this
- introduces the `minimal` USE flag to build in stub resolution mode
only, removing the dependency on `net-dns/unbound` (bug 803497)
- fixes installation paths of stubby (bugs 828724 and 857582)
- fixes linking to `dev-libs/gmp` when linking to `net-libs/gnutls`; see
https://github.com/gentoo/gentoo/pull/29459#pullrequestreview-1314483307
Bug: https://bugs.gentoo.org/803497
Closes: https://bugs.gentoo.org/828724
Closes: https://bugs.gentoo.org/857582
Signed-off-by: Han Mertens <hanmertens <AT> outlook.com>
Closes: https://github.com/gentoo/gentoo/pull/39022
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-dns/getdns/Manifest | 1 +
.../getdns/files/getdns-1.7.3-cmake-linking.patch | 40 +++++++++
.../getdns/files/stubby-0.4.3-install-dir.patch | 28 +++++++
net-dns/getdns/getdns-1.7.3.ebuild | 97 ++++++++++++++++++++++
net-dns/getdns/metadata.xml | 1 +
5 files changed, 167 insertions(+)
diff --git a/net-dns/getdns/Manifest b/net-dns/getdns/Manifest
index 77ae018e7a78..3f17d16169e1 100644
--- a/net-dns/getdns/Manifest
+++ b/net-dns/getdns/Manifest
@@ -1 +1,2 @@
DIST getdns-1.7.2.tar.gz 702969 BLAKE2B 668a754200b816790f39a772d89c28e14bc5dbd041e07d9e53605ad44d63d6637078b66881c35dda62ed61622142797cc8f0041522e076cf551651fca688053a SHA512 6c4a75a4696c46ec8bd9e9659a93fd81f3490b43da28a4c95f99a766027c7588fc493a8ac51563afb8f975c0e5b77d5ea67014d80e78ee2bb17fba1d1073d19f
+DIST getdns-1.7.3.tar.gz 703262 BLAKE2B 830063fc6f882a624fb7a6bb36fcb4f049a83ddd4515a906152a76d0247f4397b1e12ace7ce07053e7a42432c4f3683fe999ff36d8ede13a005ebecd14a78326 SHA512 d5725a24378b6fe0018daefdaba5565d2d4d51109ef66609fc34270a0a69accb95f5f895d0cdfc5caca51d2ec586db126f367439f05aed12507395af26739e2f
diff --git a/net-dns/getdns/files/getdns-1.7.3-cmake-linking.patch b/net-dns/getdns/files/getdns-1.7.3-cmake-linking.patch
new file mode 100644
index 000000000000..18e9e51d3285
--- /dev/null
+++ b/net-dns/getdns/files/getdns-1.7.3-cmake-linking.patch
@@ -0,0 +1,40 @@
+diff -ur a/cmake/modules/FindGnuTLS.cmake b/cmake/modules/FindGnuTLS.cmake
+--- a/cmake/modules/FindGnuTLS.cmake 2024-10-16 21:33:11.113665484 +0200
++++ b/cmake/modules/FindGnuTLS.cmake 2024-10-16 21:33:40.923835214 +0200
+@@ -38,8 +38,8 @@
+
+ if (PkgGnuTLS_FOUND AND PkgGnuTLSDane_FOUND)
+ set(GNUTLS_INCLUDE_DIR ${PkgGnuTLS_INCLUDE_DIRS} $PkgGnuTLSDane_INCLUDE_DIRS} CACHE FILEPATH "GnuTLS include path")
+- set(NETTLE_LIBRARIES ${PkgGnuTLS_LIBRARIES} ${PkgGnuTLSDane_LIBRARIES} CACHE STRING "GnuTLS libraries")
+- set(NETTLE_VERSION ${PkgGnuTLS_VERSION})
++ set(GNUTLS_LIBRARIES ${PkgGnuTLS_LIBRARIES} ${PkgGnuTLSDane_LIBRARIES} CACHE STRING "GnuTLS libraries")
++ set(GNUTLS_VERSION ${PkgGnuTLS_VERSION})
+ add_library(GnuTLS::GnuTLS ALIAS PkgConfig::PkgGnuTLS)
+ add_library(GnuTLS::Dane ALIAS PkgConfig::PkgGnuTLSDane)
+ set(GnuTLS_FOUND ON)
+diff -ur a/cmake/modules/FindNettle.cmake b/cmake/modules/FindNettle.cmake
+--- a/cmake/modules/FindNettle.cmake 2024-10-16 21:05:17.521591723 +0200
++++ b/cmake/modules/FindNettle.cmake 2024-10-16 21:50:42.414650647 +0200
+@@ -34,12 +34,20 @@
+ if(PKG_CONFIG_FOUND)
+ pkg_check_modules(PkgNettle IMPORTED_TARGET GLOBAL nettle)
+ pkg_check_modules(PkgHogweed IMPORTED_TARGET GLOBAL QUIET hogweed)
++ if (UNIX)
++ pkg_check_modules(PkgGmp IMPORTED_TARGET GLOBAL QUIET gmp)
++ endif ()
+ endif()
+
+-if(PkgNettle_FOUND AND PkHogweed_FOUND)
++if(PkgNettle_FOUND AND PkgHogweed_FOUND)
+ set(NETTLE_INCLUDE_DIR ${PkgNettle_INCLUDE_DIRS} ${PkgHogweed_INCLUDE_DIRS} CACHE FILEPATH "Nettle include path")
+- set(NETTLE_LIBRARIES ${PkgNettle_LIBRARIES} ${PkgHogweed_LIBRARIES} CACHE STRING "Nettle libraries")
++ if (PkgGmp_FOUND)
++ set(NETTLE_LIBRARIES ${PkgNettle_LIBRARIES} ${PkgHogweed_LIBRARIES} ${PkgGmp_LIBRARIES} CACHE STRING "Nettle libraries")
++ else ()
++ set(NETTLE_LIBRARIES ${PkgNettle_LIBRARIES} ${PkgHogweed_LIBRARIES} CACHE STRING "Nettle libraries")
++ endif ()
+ set(NETTLE_VERSION ${PkgNettle_VERSION})
++ set_target_properties(PkgConfig::PkgNettle PROPERTIES INTERFACE_LINK_LIBRARIES "${NETTLE_LIBRARIES}")
+ add_library(Nettle::Nettle ALIAS PkgConfig::PkgNettle)
+ add_library(Nettle::Hogweed ALIAS PkgConfig::PkgHogweed)
+ set(Nettle_FOUND ON)
diff --git a/net-dns/getdns/files/stubby-0.4.3-install-dir.patch b/net-dns/getdns/files/stubby-0.4.3-install-dir.patch
new file mode 100644
index 000000000000..51f846e3aa95
--- /dev/null
+++ b/net-dns/getdns/files/stubby-0.4.3-install-dir.patch
@@ -0,0 +1,28 @@
+diff -ur a/stubby/CMakeLists.txt b/stubby/CMakeLists.txt
+--- a/stubby/CMakeLists.txt 2024-10-14 20:08:06.950985143 +0200
++++ b/stubby/CMakeLists.txt 2024-10-14 20:09:29.408454887 +0200
+@@ -58,13 +58,6 @@
+ else ()
+ set(RUNSTATEDIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/run")
+ endif ()
+-install(DIRECTORY
+- DESTINATION ${RUNSTATEDIR}
+- DIRECTORY_PERMISSIONS
+- OWNER_READ OWNER_WRITE OWNER_EXECUTE
+- GROUP_READ GROUP_EXECUTE
+- WORLD_READ WORLD_EXECUTE
+- )
+ set(STUBBYCONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/stubby")
+
+ find_package(Libyaml REQUIRED)
+@@ -187,8 +180,8 @@
+ if (ENABLE_WINDOWS_SERVICE)
+ install(TARGETS stubres LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif ()
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/stubby.1 DESTINATION share/man/man1)
+-install(FILES AUTHORS COPYING ChangeLog NEWS README.md DESTINATION share/doc/stubby)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/stubby.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
++install(FILES AUTHORS COPYING ChangeLog NEWS README.md DESTINATION ${CMAKE_INSTALL_DOCDIR}/stubby)
+
+ # Ensure the file gets CRLF line endings on Windows.
+ file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/stubby.yml INPUT ${CMAKE_CURRENT_SOURCE_DIR}/stubby.yml.example)
diff --git a/net-dns/getdns/getdns-1.7.3.ebuild b/net-dns/getdns/getdns-1.7.3.ebuild
new file mode 100644
index 000000000000..e86d32e2ef54
--- /dev/null
+++ b/net-dns/getdns/getdns-1.7.3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+_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 minimal 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 )
+ !minimal? ( >=net-dns/unbound-1.5.9:= )
+"
+RDEPEND="
+ ${DEPEND}
+ stubby? (
+ acct-group/stubby
+ acct-user/stubby
+ sys-libs/libcap
+ )
+"
+BDEPEND="
+ doc? ( app-text/doxygen )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.4.2-stubby.service.patch"
+ "${FILESDIR}/${PN}-1.7.3-cmake-linking.patch"
+ "${FILESDIR}/stubby-0.4.3-install-dir.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)
+ -DENABLE_STUB_ONLY=$(usex minimal)
+ -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/metadata.xml b/net-dns/getdns/metadata.xml
index 115e5fa205a5..9e9856efb041 100644
--- a/net-dns/getdns/metadata.xml
+++ b/net-dns/getdns/metadata.xml
@@ -10,5 +10,6 @@
<flag name="libevent">Enable <pkg>dev-libs/libevent</pkg> support</flag>
<flag name="libev">Enable <pkg>dev-libs/libev</pkg> support</flag>
<flag name="libuv">Enable <pkg>dev-libs/libuv</pkg> support</flag>
+ <flag name="minimal">Only build stub resolution mode</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-12-01 12:12 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-15 22:12 [gentoo-commits] repo/gentoo:master commit in: net-dns/getdns/, net-dns/getdns/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2024-12-01 12:12 Sam James
2022-12-24 19:13 Andreas Sturmlechner
2021-07-31 2:04 Sam James
2021-06-09 23:56 Sam James
2019-12-23 21:42 Anthony G. Basile
2018-07-12 22:31 Anthony G. Basile
2018-04-15 15:28 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox