public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-dns/dnsdist/files/, net-dns/dnsdist/
@ 2017-05-23 22:17 Michał Górny
  0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2017-05-23 22:17 UTC (permalink / raw
  To: gentoo-commits

commit:     0e7456587ffeff7a2922737205caaf3da0a2ee2c
Author:     bgo <bgo <AT> 9dt <DOT> de>
AuthorDate: Tue May 23 21:44:31 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 23 22:16:54 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e745658

net-dns/dnsdist: New package, #611892

Closes: https://github.com/gentoo/gentoo/pull/4606

 net-dns/dnsdist/Manifest                     |   1 +
 net-dns/dnsdist/dnsdist-1.1.0.ebuild         |  99 ++++++++++++++++++++++++++
 net-dns/dnsdist/dnsdist-9999.ebuild          | 101 +++++++++++++++++++++++++++
 net-dns/dnsdist/files/dnsdist-readline.patch |  25 +++++++
 net-dns/dnsdist/files/dnsdist.conf.example   |  19 +++++
 net-dns/dnsdist/files/dnsdist.confd          |  13 ++++
 net-dns/dnsdist/files/dnsdist.initd          |  55 +++++++++++++++
 net-dns/dnsdist/metadata.xml                 |  22 ++++++
 8 files changed, 335 insertions(+)

diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
new file mode 100644
index 00000000000..83b82a38f36
--- /dev/null
+++ b/net-dns/dnsdist/Manifest
@@ -0,0 +1 @@
+DIST dnsdist-1.1.0.tar.bz2 874837 SHA256 b4a1e8931b6d05a24494f54224211c0de0eeb1f5ff170f6b9f5665219bfeafc2 SHA512 91da716997c2440e153944f510a39dd86c9cf8ba8093a7f51a9a5d58ab0a1c230bd99ec57fe8ff0721279c8c4429ad576fe797c1fbe4cde2b9fb8f0405025320 WHIRLPOOL 6d88f4159b8155c9600af94e6e8401c426f183102a18b3f35fc066b8a19d781f5800a2aa64d306ab4ee0daadbaaab1d29b2df05c10058a9b99b9d9cf1abf071e

diff --git a/net-dns/dnsdist/dnsdist-1.1.0.ebuild b/net-dns/dnsdist/dnsdist-1.1.0.ebuild
new file mode 100644
index 00000000000..4b025151e37
--- /dev/null
+++ b/net-dns/dnsdist/dnsdist-1.1.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://github.com/PowerDNS/pdns.git"
+
+if [[ ${PV} = 9999 ]]; then
+	ADDITIONAL_ECLASSES="autotools git-r3"
+fi
+
+inherit eutils flag-o-matic user ${ADDITIONAL_ECLASSES}
+
+DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
+HOMEPAGE="http://dnsdist.org"
+
+if [[ ${PV} == 9999 ]]; then
+	SRC_URI=""
+	S="${WORKDIR}/${P}/pdns/dnsdistdist"
+else
+	SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dnscrypt luajit readline regex remote-logging +ssl test"
+RESTRICT="readline? ( bindist )"
+REQUIRED_USE="dnscrypt? ( ssl )"
+
+DEPEND="
+	>=dev-libs/boost-1.35:=
+	luajit? ( dev-lang/luajit:= )
+	!luajit? ( >=dev-lang/lua-5.1:= )
+	remote-logging? ( dev-libs/protobuf:= )
+	readline? ( sys-libs/readline:0= )
+	!readline? ( dev-libs/libedit:= )
+	regex? ( dev-libs/re2:= )
+	ssl? ( dev-libs/libsodium:= )
+"
+
+RDEPEND="${DEPEND}"
+
+[[ ${PV} == 9999 ]] && DEPEND+="
+	app-text/pandoc
+	dev-util/ragel
+"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-readline.patch"
+	eapply_user
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	if use readline ; then
+		local -x LIBEDIT_CFLAGS="-I/usr/include/readline"
+		local -x LIBEDIT_LIBS="-lreadline -lcurses"
+		append-cxxflags -DREADLINE
+	fi
+
+	econf \
+		--sysconfdir=/etc/dnsdist \
+		$(use_enable ssl libsodium) \
+		$(use_with remote-logging protobuf) \
+		$(use_enable regex re2) \
+		$(use_enable dnscrypt) \
+		$(use_with luajit) \
+		$(use_enable test unit-tests)
+}
+
+src_install() {
+	default
+
+	insinto /etc/dnsdist
+	doins "${FILESDIR}"/dnsdist.conf.example
+
+	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
+	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
+}
+
+pkg_preinst() {
+	enewgroup dnsdist
+	enewuser dnsdist -1 -1 -1 dnsdist
+}
+
+pkg_postinst() {
+	elog "dnsdist provides multiple instances support. You can create more instances"
+	elog "by symlinking the dnsdist init script to another name."
+	elog
+	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
+	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
+
+	if use readline ; then
+		ewarn "dnsdist (GPLv2) was linked against readline (GPLv3)."
+		ewarn "A binary distribution should therefore not happen."
+	fi
+}

diff --git a/net-dns/dnsdist/dnsdist-9999.ebuild b/net-dns/dnsdist/dnsdist-9999.ebuild
new file mode 100644
index 00000000000..a0571422096
--- /dev/null
+++ b/net-dns/dnsdist/dnsdist-9999.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://github.com/PowerDNS/pdns.git"
+
+if [[ ${PV} = 9999 ]]; then
+	ADDITIONAL_ECLASSES="autotools git-r3"
+fi
+
+inherit eutils flag-o-matic user ${ADDITIONAL_ECLASSES}
+
+DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
+HOMEPAGE="http://dnsdist.org"
+
+if [[ ${PV} == 9999 ]]; then
+	SRC_URI=""
+	S="${WORKDIR}/${P}/pdns/dnsdistdist"
+else
+	SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dnscrypt luajit readline regex remote-logging snmp +ssl test"
+RESTRICT="readline? ( bindist )"
+REQUIRED_USE="dnscrypt? ( ssl )"
+
+DEPEND="
+	>=dev-libs/boost-1.35:=
+	luajit? ( dev-lang/luajit:= )
+	!luajit? ( >=dev-lang/lua-5.1:= )
+	remote-logging? ( dev-libs/protobuf:= )
+	readline? ( sys-libs/readline:0= )
+	!readline? ( dev-libs/libedit:= )
+	regex? ( dev-libs/re2:= )
+	snmp? ( net-analyzer/net-snmp:= )
+	ssl? ( dev-libs/libsodium:= )
+"
+
+RDEPEND="${DEPEND}"
+
+[[ ${PV} == 9999 ]] && DEPEND+="
+	app-text/pandoc
+	dev-util/ragel
+"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-readline.patch"
+	eapply_user
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	if use readline ; then
+		local -x LIBEDIT_CFLAGS="-I/usr/include/readline"
+		local -x LIBEDIT_LIBS="-lreadline -lcurses"
+		append-cxxflags -DREADLINE
+	fi
+
+	econf \
+		--sysconfdir=/etc/dnsdist \
+		$(use_enable ssl libsodium) \
+		$(use_with remote-logging protobuf) \
+		$(use_enable regex re2) \
+		$(use_enable dnscrypt) \
+		$(use_with luajit) \
+		$(use_enable test unit-tests) \
+		$(use_with snmp net-snmp)
+}
+
+src_install() {
+	default
+
+	insinto /etc/dnsdist
+	doins "${FILESDIR}"/dnsdist.conf.example
+
+	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
+	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
+}
+
+pkg_preinst() {
+	enewgroup dnsdist
+	enewuser dnsdist -1 -1 -1 dnsdist
+}
+
+pkg_postinst() {
+	elog "dnsdist provides multiple instances support. You can create more instances"
+	elog "by symlinking the dnsdist init script to another name."
+	elog
+	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
+	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
+
+	if use readline ; then
+		ewarn "dnsdist (GPLv2) was linked against readline (GPLv3)."
+		ewarn "A binary distribution should therefore not happen."
+	fi
+}

diff --git a/net-dns/dnsdist/files/dnsdist-readline.patch b/net-dns/dnsdist/files/dnsdist-readline.patch
new file mode 100644
index 00000000000..d6e031feb4f
--- /dev/null
+++ b/net-dns/dnsdist/files/dnsdist-readline.patch
@@ -0,0 +1,25 @@
+diff -Naur dnsdist-1.1.0/dnsdist.cc dnsdist-1.1.0-gentoo/dnsdist.cc
+--- dnsdist-1.1.0/dnsdist.cc	2016-12-29 13:45:46.000000000 +0100
++++ dnsdist-1.1.0-gentoo/dnsdist.cc	2017-05-21 15:09:10.414951426 +0200
+@@ -29,6 +29,8 @@
+ 
+ #if defined (__OpenBSD__)
+ #include <readline/readline.h>
++#elif defined READLINE
++#include <readline/readline.h>
+ #else
+ #include <editline/readline.h>
+ #endif
+diff -Naur dnsdist-1.1.0/dnsdist-console.cc dnsdist-1.1.0-gentoo/dnsdist-console.cc
+--- dnsdist-1.1.0/dnsdist-console.cc	2016-12-29 13:45:46.000000000 +0100
++++ dnsdist-1.1.0-gentoo/dnsdist-console.cc	2017-05-21 15:09:24.758950947 +0200
+@@ -25,6 +25,9 @@
+ #if defined (__OpenBSD__)
+ #include <readline/readline.h>
+ #include <readline/history.h>
++#elif defined READLINE
++#include <readline/readline.h>
++#include <readline/history.h>
+ #else
+ #include <editline/readline.h>
+ #endif

diff --git a/net-dns/dnsdist/files/dnsdist.conf.example b/net-dns/dnsdist/files/dnsdist.conf.example
new file mode 100644
index 00000000000..ffcc6060ef0
--- /dev/null
+++ b/net-dns/dnsdist/files/dnsdist.conf.example
@@ -0,0 +1,19 @@
+--[[
+This is an example dnsdist configuration file.
+Please refer to the dnsdist documentation
+at http://dnsdist.org/README/ for more information.
+]]--
+
+-- Listen on 192.0.2.1 on port 53.
+setLocal("192.0.2.1:53")
+
+-- Add 2001:db8::2:1 to the list of adresses dnsdist should listen on
+addLocal("2001:db8::2:1")
+
+-- Add to the ACL set who can use this server
+addACL("192.0.2.0/24")
+addACL("2001:db8::/32")
+
+-- Instantiate two new downstram server with their default settings
+newServer("198.51.100.1")
+newServer("198.51.100.2")

diff --git a/net-dns/dnsdist/files/dnsdist.confd b/net-dns/dnsdist/files/dnsdist.confd
new file mode 100644
index 00000000000..7151fd0ad7b
--- /dev/null
+++ b/net-dns/dnsdist/files/dnsdist.confd
@@ -0,0 +1,13 @@
+# /etc/conf.d/dnsdist
+
+# Options to pass on to dnsdist during the start
+DNSDIST_OPTIONS=""
+
+# Run dnsdist as this user
+DNSDIST_USER="dnsdist"
+
+# Run dnsdist in this group
+DNSDIST_GROUP="dnsdist"
+
+# Set the maximum number of open file descriptors
+rc_ulimit="-n 2048"

diff --git a/net-dns/dnsdist/files/dnsdist.initd b/net-dns/dnsdist/files/dnsdist.initd
new file mode 100644
index 00000000000..bfeef82d46f
--- /dev/null
+++ b/net-dns/dnsdist/files/dnsdist.initd
@@ -0,0 +1,55 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="configcheck"
+#extra_started_commands=""
+
+DNSDIST_INSTANCE="${SVCNAME#dnsdist[.-]}"
+DNSDIST_CONFFILE="/etc/dnsdist/${SVCNAME#dnsdist[.-]}.conf"
+DNSDIST="/usr/bin/dnsdist"
+PIDDIR=/run/dnsdist
+PIDFILE=$PIDDIR/$SVCNAME.pid
+
+
+if [ -n "${DNSDIST_INSTANCE}" ] && [ "${DNSDIST_INSTANCE}" != "dnsdist" ]
+then
+	DNSDIST_INSTANCE="dnsdist-${SVCNAME#dnsdist[.-]}"
+	DNSDIST_CONFFILE="/etc/dnsdist/${DNSDIST_INSTANCE}.conf"
+else
+	DNSDIST_INSTANCE="default"
+fi
+
+depend() {
+	need net
+}
+
+start() {
+	checkpath -q -d ${PIDDIR} -o ${DNSDIST_USER}:${DNSDIST_GROUP} 
+
+	configcheck || return 1
+
+	ebegin "Starting dnsdist (${DNSDIST_INSTANCE})"
+	start-stop-daemon --start --exec $DNSDIST --pidfile ${PIDFILE} \
+		-- -d -p ${PIDFILE} -u ${DNSDIST_USER} -g ${DNSDIST_GROUP} \
+		-C $DNSDIST_CONFFILE ${DNSDIST_OPTIONS} 
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping dnsdist (${DNSDIST_INSTANCE})"
+	start-stop-daemon --stop --exec $DNSDIST --pidfile ${PIDFILE}
+	eend $?
+}
+
+configcheck() {
+	ebegin "Checking configuration file (${DNSDIST_CONFFILE})"
+	$DNSDIST --check-config -C $DNSDIST_CONFFILE > /dev/null
+
+	if [ $? -ne 0 ]; then
+		$DNSDIST --check-config -C $DNSDIST_CONFFILE
+	fi
+
+	eend $? "failed, please correct errors above"
+}
+

diff --git a/net-dns/dnsdist/metadata.xml b/net-dns/dnsdist/metadata.xml
new file mode 100644
index 00000000000..a9231ab0333
--- /dev/null
+++ b/net-dns/dnsdist/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bgo@9dt.de</email>
+		<name>Vladimir Datsevich</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		dnsdist is a highly DNS-, DoS- and abuse-aware loadbalancer. Its goal in life is to route traffic to the best server, delivering top performance to legitimate users while shunting or blocking abusive traffic.
+	</longdescription>
+	<use>
+		<flag name="dnscrypt">Enable the ability to act as a DNSCrypt server</flag>
+		<flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
+		<flag name="regex">Enable support for regular expression matching via <pkg>dev-libs/re2</pkg></flag>
+		<flag name="remote-logging">Enable support for remote logging via <pkg>dev-libs/protobuf</pkg></flag>
+		<flag name="ssl">Enable support for and encrypted client-server communication via <pkg>dev-libs/libsodium</pkg></flag>
+	</use>	
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/dnsdist/files/, net-dns/dnsdist/
@ 2019-03-30 10:02 Andreas Schuerch
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Schuerch @ 2019-03-30 10:02 UTC (permalink / raw
  To: gentoo-commits

commit:     198b4ec0e6d0d24464a31896012aa358c8beb941
Author:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 10:00:21 2019 +0000
Commit:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 10:02:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=198b4ec0

net-dns/dnsdist: added useflags bug 672516 and initscript changes

Signed-off-by: Andreas Schuerch <nativemad <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 net-dns/dnsdist/{dnsdist-1.3.3.ebuild => dnsdist-1.3.3-r1.ebuild} | 7 +++++--
 net-dns/dnsdist/dnsdist-9999.ebuild                               | 7 +++++--
 net-dns/dnsdist/files/dnsdist.initd                               | 8 ++++----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/net-dns/dnsdist/dnsdist-1.3.3.ebuild b/net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild
similarity index 97%
rename from net-dns/dnsdist/dnsdist-1.3.3.ebuild
rename to net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild
index b13e2bdae49..ed3b96e1ed6 100644
--- a/net-dns/dnsdist/dnsdist-1.3.3.ebuild
+++ b/net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild
@@ -28,7 +28,7 @@ IUSE="dnscrypt gnutls fstrm luajit regex remote-logging snmp +ssl systemd test"
 REQUIRED_USE="dnscrypt? ( ssl )
 		gnutls? ( ssl )"
 
-DEPEND="
+RDEPEND="
 	>=dev-libs/boost-1.35:=
 	dev-libs/libedit:=
 	fstrm? ( dev-libs/fstrm:= )
@@ -45,11 +45,14 @@ DEPEND="
 	systemd? ( sys-apps/systemd:0= )
 "
 
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
 
 [[ ${PV} == 9999 ]] && DEPEND+="
 	app-text/pandoc
 	dev-util/ragel
+	dev-python/virtualenv
 "
 
 src_prepare() {

diff --git a/net-dns/dnsdist/dnsdist-9999.ebuild b/net-dns/dnsdist/dnsdist-9999.ebuild
index b13e2bdae49..ed3b96e1ed6 100644
--- a/net-dns/dnsdist/dnsdist-9999.ebuild
+++ b/net-dns/dnsdist/dnsdist-9999.ebuild
@@ -28,7 +28,7 @@ IUSE="dnscrypt gnutls fstrm luajit regex remote-logging snmp +ssl systemd test"
 REQUIRED_USE="dnscrypt? ( ssl )
 		gnutls? ( ssl )"
 
-DEPEND="
+RDEPEND="
 	>=dev-libs/boost-1.35:=
 	dev-libs/libedit:=
 	fstrm? ( dev-libs/fstrm:= )
@@ -45,11 +45,14 @@ DEPEND="
 	systemd? ( sys-apps/systemd:0= )
 "
 
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
 
 [[ ${PV} == 9999 ]] && DEPEND+="
 	app-text/pandoc
 	dev-util/ragel
+	dev-python/virtualenv
 "
 
 src_prepare() {

diff --git a/net-dns/dnsdist/files/dnsdist.initd b/net-dns/dnsdist/files/dnsdist.initd
index bfeef82d46f..17c86ca431d 100644
--- a/net-dns/dnsdist/files/dnsdist.initd
+++ b/net-dns/dnsdist/files/dnsdist.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 extra_commands="configcheck"
@@ -25,14 +25,14 @@ depend() {
 }
 
 start() {
-	checkpath -q -d ${PIDDIR} -o ${DNSDIST_USER}:${DNSDIST_GROUP} 
+	checkpath -q -d ${PIDDIR} -o ${DNSDIST_USER}:${DNSDIST_GROUP}
 
 	configcheck || return 1
 
 	ebegin "Starting dnsdist (${DNSDIST_INSTANCE})"
 	start-stop-daemon --start --exec $DNSDIST --pidfile ${PIDFILE} \
-		-- -d -p ${PIDFILE} -u ${DNSDIST_USER} -g ${DNSDIST_GROUP} \
-		-C $DNSDIST_CONFFILE ${DNSDIST_OPTIONS} 
+		-b -- -u ${DNSDIST_USER} -g ${DNSDIST_GROUP} \
+		-C $DNSDIST_CONFFILE ${DNSDIST_OPTIONS}
 	eend $?
 }
 


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/dnsdist/files/, net-dns/dnsdist/
@ 2020-07-31  8:13 Andreas Schuerch
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Schuerch @ 2020-07-31  8:13 UTC (permalink / raw
  To: gentoo-commits

commit:     b7fb560859a6a7f42ec0517ec2ee19e5f1f99172
Author:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 31 08:12:13 2020 +0000
Commit:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Fri Jul 31 08:13:21 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7fb5608

net-dns/dnsdist: version bump to 1.5.0 and bug 711454

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Schuerch <nativemad <AT> gentoo.org>

 net-dns/dnsdist/Manifest             |  1 +
 net-dns/dnsdist/dnsdist-1.5.0.ebuild | 84 ++++++++++++++++++++++++++++++++++++
 net-dns/dnsdist/files/dnsdist.initd  |  5 ++-
 3 files changed, 88 insertions(+), 2 deletions(-)

diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index c3750fa2697..6d2a06fbff8 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -1,2 +1,3 @@
 DIST dnsdist-1.3.3.tar.bz2 971253 BLAKE2B e9c36969fc1e4b95b71a3f6885503aea2d527b4d9abce9cb137c290a21aee994a441c0e17c0bf985396fda51020b5ef910753554990259abb16641d93d2d1010 SHA512 c0e3435eafc1f7bcdf41346cecf7b089cc142716f94058f9ec262d0c6ad16467e0b8bed5abc648829c597120c94f998602849ded574e75bfc1a1fb70c1b719ad
 DIST dnsdist-1.4.0.tar.bz2 1044479 BLAKE2B 79aef57ed2b1036f222e8bcfdf615c3221c9dfdbc8fd3f80d778fb050f74bc200958b4d605dcadd5c23ac6c4b5b1a36048108cd85394920e99d6037177b81342 SHA512 c9450e97325d8ad8c8c3a395412c46ea8053cbe1ebe73329a1618212ba29bdf2f8da908ae2b90c314b5aab613387f42363e3a5322b1a36f60190fb48e1c425c5
+DIST dnsdist-1.5.0.tar.bz2 1067645 BLAKE2B de07de8f862a633d8eb11ccf632e01c2ce779a35ef61ba2fcf932894d692f2f3edfd638ce77f178bbfbfc1115d8e76f5522e10061fcf61650170a5b59d5cc9ca SHA512 df6f8caae001f152f0d264176c570778842979484d16e4199afe0e2591006392444245dd8ce23287cdcf9613e2c40a9e3564f5236e5f5a6fd67b89d6ea0d9ed4

diff --git a/net-dns/dnsdist/dnsdist-1.5.0.ebuild b/net-dns/dnsdist/dnsdist-1.5.0.ebuild
new file mode 100644
index 00000000000..b36be988dc3
--- /dev/null
+++ b/net-dns/dnsdist/dnsdist-1.5.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
+HOMEPAGE="https://dnsdist.org"
+
+SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dnscrypt dnstap doh gnutls +lmdb luajit regex remote-logging snmp +ssl systemd test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="dnscrypt? ( ssl )
+		gnutls? ( ssl )
+		doh? ( ssl !gnutls )"
+
+RDEPEND="acct-group/dnsdist
+	acct-user/dnsdist
+	>=dev-libs/boost-1.35:=
+	dev-libs/libedit:=
+	dnscrypt? ( dev-libs/libsodium:= )
+	dnstap? ( dev-libs/fstrm:= )
+	doh? ( www-servers/h2o:=[libh2o] )
+	lmdb? ( dev-db/lmdb:= )
+	luajit? ( dev-lang/luajit:= )
+	!luajit? ( >=dev-lang/lua-5.1:= )
+	regex? ( dev-libs/re2:= )
+	remote-logging? ( >=dev-libs/protobuf-3:= )
+	snmp? ( net-analyzer/net-snmp:= )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? ( dev-libs/openssl:= )
+	)
+	systemd? ( sys-apps/systemd:0= )
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/dnsdist \
+		$(use_enable doh dns-over-https) \
+		$(use_enable dnscrypt) \
+		$(use_enable dnstap) \
+		$(use_with lmdb ) \
+		$(use luajit && echo "--with-lua=luajit" || echo "--with-lua=lua" ) \
+		$(use_with regex re2) \
+		$(use_with remote-logging protobuf) \
+		$(use_with snmp net-snmp) \
+		$(use ssl && { echo "--enable-dns-over-tls" && use_with gnutls && use_with !gnutls libssl;} || echo "--without-gnutls --without-libssl") \
+		$(use_enable systemd) \
+		$(use_enable test unit-tests)
+		sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
+			-i "${S}/configure"
+}
+
+src_install() {
+	default
+
+	insinto /etc/dnsdist
+	doins "${FILESDIR}"/dnsdist.conf.example
+
+	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
+	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
+}
+
+pkg_postinst() {
+	elog "dnsdist provides multiple instances support. You can create more instances"
+	elog "by symlinking the dnsdist init script to another name."
+	elog
+	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
+	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
+}

diff --git a/net-dns/dnsdist/files/dnsdist.initd b/net-dns/dnsdist/files/dnsdist.initd
index f15a6d9e6a4..554c43b0150 100644
--- a/net-dns/dnsdist/files/dnsdist.initd
+++ b/net-dns/dnsdist/files/dnsdist.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 extra_commands="configcheck"
@@ -31,7 +31,8 @@ start() {
 
 	ebegin "Starting dnsdist (${DNSDIST_INSTANCE})"
 	start-stop-daemon --start --exec $DNSDIST --pidfile ${PIDFILE} \
-		-b -- --supervised -u ${DNSDIST_USER} -g ${DNSDIST_GROUP} \
+		-b -m -- --supervised -u ${DNSDIST_USER} -g 
+${DNSDIST_GROUP} \
 		-C $DNSDIST_CONFFILE ${DNSDIST_OPTIONS}
 	eend $?
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/dnsdist/files/, net-dns/dnsdist/
@ 2021-06-15  3:48 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2021-06-15  3:48 UTC (permalink / raw
  To: gentoo-commits

commit:     6f4c9bd084526bce777418dc7a1d269046413bea
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 15 03:45:51 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 15 03:45:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f4c9bd0

net-dns/dnsdist: fix build with GCC 11, protobuf no longer optional

* Fix build with GCC 11
* Upstream made protobuf mandatory

Closes: https://bugs.gentoo.org/790719
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-dns/dnsdist/dnsdist-1.6.0.ebuild               |  9 ++++----
 .../dnsdist-1.6.0-gcc11-missing-include.patch      | 24 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/net-dns/dnsdist/dnsdist-1.6.0.ebuild b/net-dns/dnsdist/dnsdist-1.6.0.ebuild
index 3340f22db78..84866fb8314 100644
--- a/net-dns/dnsdist/dnsdist-1.6.0.ebuild
+++ b/net-dns/dnsdist/dnsdist-1.6.0.ebuild
@@ -26,12 +26,12 @@ RDEPEND="acct-group/dnsdist
 	acct-user/dnsdist
 	>=dev-libs/boost-1.35:=
 	dev-libs/libedit:=
+	>=dev-libs/protobuf-3:=
 	dnscrypt? ( dev-libs/libsodium:= )
 	dnstap? ( dev-libs/fstrm:= )
 	doh? ( www-servers/h2o:=[libh2o] )
 	lmdb? ( dev-db/lmdb:= )
 	regex? ( dev-libs/re2:= )
-	remote-logging? ( >=dev-libs/protobuf-3:= )
 	snmp? ( net-analyzer/net-snmp:= )
 	ssl? (
 		gnutls? ( net-libs/gnutls:= )
@@ -44,9 +44,9 @@ RDEPEND="acct-group/dnsdist
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-src_prepare() {
-	default
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-gcc11-missing-include.patch
+)
 
 src_configure() {
 	econf \
@@ -57,7 +57,6 @@ src_configure() {
 		$(use_enable dnstap) \
 		$(use_with lmdb ) \
 		$(use_with regex re2) \
-		$(use_with remote-logging protobuf) \
 		$(use_with snmp net-snmp) \
 		$(use ssl && { echo "--enable-dns-over-tls" && use_with gnutls && use_with !gnutls libssl;} || echo "--without-gnutls --without-libssl") \
 		$(use_enable systemd) \

diff --git a/net-dns/dnsdist/files/dnsdist-1.6.0-gcc11-missing-include.patch b/net-dns/dnsdist/files/dnsdist-1.6.0-gcc11-missing-include.patch
new file mode 100644
index 00000000000..6e549b2450e
--- /dev/null
+++ b/net-dns/dnsdist/files/dnsdist-1.6.0-gcc11-missing-include.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/790719
+https://github.com/hhoffstaette/portage/blob/master/net-dns/dnsdist/files/dnsdist-1.6.0-add-missing-include.patch
+
+From: Kees Monshouwer <mind04@monshouwer.org>
+Date: Tue, 11 May 2021 10:27:01 +0200
+Subject: [PATCH] add missing includes (Fedora 34, gcc 11.1 / clang 12)
+
+[HH: reduced to necessary patch for dnsdist]
+---
+ lock.hh      | 1 +
+ 1 file changed, 1 insertions(+)
+
+diff --git a/lock.hh b/lock.hh
+index 09299d7979d..0644502f871 100644
+--- a/lock.hh
++++ b/lock.hh
+@@ -20,6 +20,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ #pragma once
++#include <mutex>
+ #include <shared_mutex>
+ 
+ class ReadWriteLock


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/dnsdist/files/, net-dns/dnsdist/
@ 2023-01-27  8:35 Joonas Niilola
  0 siblings, 0 replies; 7+ messages in thread
From: Joonas Niilola @ 2023-01-27  8:35 UTC (permalink / raw
  To: gentoo-commits

commit:     8f8d4de81f6f3e78b9f34beb5f4a6f5dd39a9e9e
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 27 08:34:23 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jan 27 08:35:51 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f8d4de8

net-dns/dnsdist: drop versions

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-dns/dnsdist/Manifest                           |  4 -
 net-dns/dnsdist/dnsdist-1.5.1-r100.ebuild          | 85 ----------------------
 net-dns/dnsdist/dnsdist-1.6.0.ebuild               | 84 ---------------------
 net-dns/dnsdist/dnsdist-1.6.1.ebuild               | 80 --------------------
 net-dns/dnsdist/dnsdist-1.7.0.ebuild               | 81 ---------------------
 net-dns/dnsdist/dnsdist-1.7.1.ebuild               | 84 ---------------------
 net-dns/dnsdist/dnsdist-1.7.2.ebuild               | 84 ---------------------
 net-dns/dnsdist/dnsdist-1.7.3.ebuild               | 84 ---------------------
 .../dnsdist-1.6.0-gcc11-missing-include.patch      | 24 ------
 9 files changed, 610 deletions(-)

diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index 4f7a541a9b21..b7764a5a1b3a 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -1,7 +1,3 @@
 DIST dnsdist-1.5.1.tar.bz2 1068061 BLAKE2B 1c0fdd181b62b96fcd433581715cea9dc204fcdd2f65efd26a5293cc9c17d904e0937b51ba33d2dc01ecc8044f491ba2c6c8720c0816587fa5082da73108783e SHA512 68fe5f55fd081ed80a620933af9f8310be0e21c86ba449a9c557975b5c83f4b64e3002e6032dc002582d081e70e1ec2ff080c5d8389fd46a9896bdafd5a41f9f
-DIST dnsdist-1.6.0.tar.bz2 1328707 BLAKE2B d093142875882cacaa456d76d42e703e45577c32a0e5d5024fb372180d2bdd4ff0c82546142f6c2c01904bdd15407f0a39dc1d658e04e171cffe386cfc1e943d SHA512 f6a1676c431d5622af075bc184c9f82b4ea0bb40ec84797a8fe835804f91bc0a93a745495f193bb52f3a5204ec0e98ed41bc206c997d1f5b13e872bb31747b0f
 DIST dnsdist-1.6.1.tar.bz2 1328069 BLAKE2B a9e9c0cb35ebc2ecd93d7fa0d6d3961b02d711da2df56240335786a5d2e529d4a7e8716f578b6e935edd3bc79dfed767d358b9feaff32dd9cd65993ef0b97b71 SHA512 68e114eeb1a7ae8a4ce52a7de31095c46d0ba8f572676a8ef1e858b97da199c04ec88656c7642160ba07b7db325cc2a49cd91794da8dd2e81a5301d089c34f90
-DIST dnsdist-1.7.0.tar.bz2 1392585 BLAKE2B 3766da5f63df6390f555307d665efcbb2ad1462abae3af44503479d4c6ae6453e43527d2bcac718fabeb8b60ec989f264860532b480c465afc440405f9efac74 SHA512 abaed7aaa18f4acaf220dc938da6896e521373b1da3b6b9c4114467dd5d8b0e6cd9809534edbc6ba5b789ed8387fb47317c47bd4e00e66a6ccb035f6dd6068af
-DIST dnsdist-1.7.1.tar.bz2 1392179 BLAKE2B 48189da6bceb1723b19bab7c42ec8cd834f3ef6d822b5da23fe2f4e02ec825d1566bce472f522fa9ac0b027d36f3089ce7c0c7eb1c7e1161c050dc50305dfdb6 SHA512 eee44a9994c6cab84977cad58539ca59882149d6898dfeed9e4190f06ddbc280b836bf426d22e6980d8acae1437290bddcc5166af165b6eb48c77c669281a310
-DIST dnsdist-1.7.2.tar.bz2 1391588 BLAKE2B cf2a9853be4c896b3909f871fad771d4298eb2586702a8a85eff2c612d275214cdad82e93961f4cfd58300f5629f06569c51a2c4f15de58188a69116bd5275de SHA512 2048ac0f861547fb103da1a128fd39a35ed689ccbf3c080232a3bd0550c9e7c7e01c95864d61e065e341a9f4111c974d2db2aba73eb8f7cba9bf8273da39b8a6
 DIST dnsdist-1.7.3.tar.bz2 1379011 BLAKE2B e7d1cb9dba3d3ad1dd696d324697ffac60863112eae83307237639bea339f7ed1c3f320002d3467a44ab38a9ea60ade95fff43645c889d29465760f7f467b996 SHA512 2a39096709db5b41cf3bd21170689bc85ad2cd550896d02ddd85eff7410780ea59d6cf8e08b0a08962ee93b49b7f3228dfa649275453215e23c25098aca40e1a

diff --git a/net-dns/dnsdist/dnsdist-1.5.1-r100.ebuild b/net-dns/dnsdist/dnsdist-1.5.1-r100.ebuild
deleted file mode 100644
index 2b055db7ffc6..000000000000
--- a/net-dns/dnsdist/dnsdist-1.5.1-r100.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit flag-o-matic lua-single
-
-DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
-HOMEPAGE="https://dnsdist.org"
-
-SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-		dnscrypt? ( ssl )
-		gnutls? ( ssl )
-		doh? ( ssl !gnutls )"
-
-RDEPEND="acct-group/dnsdist
-	acct-user/dnsdist
-	dev-libs/boost:=
-	dev-libs/libedit:=
-	dnscrypt? ( dev-libs/libsodium:= )
-	dnstap? ( dev-libs/fstrm:= )
-	doh? ( www-servers/h2o:=[libh2o] )
-	lmdb? ( dev-db/lmdb:= )
-	regex? ( dev-libs/re2:= )
-	remote-logging? ( >=dev-libs/protobuf-3:= )
-	snmp? ( net-analyzer/net-snmp:= )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? ( dev-libs/openssl:= )
-	)
-	systemd? ( sys-apps/systemd:0= )
-	${LUA_DEPS}
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/dnsdist \
-		--with-lua="${ELUA}" \
-		$(use_enable doh dns-over-https) \
-		$(use_enable dnscrypt) \
-		$(use_enable dnstap) \
-		$(use_with lmdb ) \
-		$(use_with regex re2) \
-		$(use_with remote-logging protobuf) \
-		$(use_with snmp net-snmp) \
-		$(use ssl && { echo "--enable-dns-over-tls" && use_with gnutls && use_with !gnutls libssl;} || echo "--without-gnutls --without-libssl") \
-		$(use_enable systemd) \
-		$(use_enable test unit-tests)
-		sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
-			-i "${S}/configure"
-}
-
-src_install() {
-	default
-
-	insinto /etc/dnsdist
-	doins "${FILESDIR}"/dnsdist.conf.example
-
-	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
-	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
-}
-
-pkg_postinst() {
-	elog "dnsdist provides multiple instances support. You can create more instances"
-	elog "by symlinking the dnsdist init script to another name."
-	elog
-	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
-	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
-}

diff --git a/net-dns/dnsdist/dnsdist-1.6.0.ebuild b/net-dns/dnsdist/dnsdist-1.6.0.ebuild
deleted file mode 100644
index f323eee2a756..000000000000
--- a/net-dns/dnsdist/dnsdist-1.6.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit flag-o-matic lua-single
-
-DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
-HOMEPAGE="https://dnsdist.org"
-
-SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
-KEYWORDS="~amd64"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-		dnscrypt? ( ssl )
-		gnutls? ( ssl )
-		doh? ( ssl !gnutls )"
-
-RDEPEND="acct-group/dnsdist
-	acct-user/dnsdist
-	dev-libs/boost:=
-	dev-libs/libedit:=
-	>=dev-libs/protobuf-3:=
-	dnscrypt? ( dev-libs/libsodium:= )
-	dnstap? ( dev-libs/fstrm:= )
-	doh? ( www-servers/h2o:=[libh2o] )
-	lmdb? ( dev-db/lmdb:= )
-	regex? ( dev-libs/re2:= )
-	snmp? ( net-analyzer/net-snmp:= )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? ( dev-libs/openssl:= )
-	)
-	systemd? ( sys-apps/systemd:0= )
-	${LUA_DEPS}
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-gcc11-missing-include.patch
-)
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/dnsdist \
-		--with-lua="${ELUA}" \
-		$(use_enable doh dns-over-https) \
-		$(use_enable dnscrypt) \
-		$(use_enable dnstap) \
-		$(use_with lmdb ) \
-		$(use_with regex re2) \
-		$(use_with snmp net-snmp) \
-		$(use ssl && { echo "--enable-dns-over-tls" && use_with gnutls && use_with !gnutls libssl;} || echo "--without-gnutls --without-libssl") \
-		$(use_enable systemd) \
-		$(use_enable test unit-tests)
-		sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
-			-i "${S}/configure"
-}
-
-src_install() {
-	default
-
-	insinto /etc/dnsdist
-	doins "${FILESDIR}"/dnsdist.conf.example
-
-	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
-	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
-}
-
-pkg_postinst() {
-	elog "dnsdist provides multiple instances support. You can create more instances"
-	elog "by symlinking the dnsdist init script to another name."
-	elog
-	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
-	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
-}

diff --git a/net-dns/dnsdist/dnsdist-1.6.1.ebuild b/net-dns/dnsdist/dnsdist-1.6.1.ebuild
deleted file mode 100644
index 450026f8becd..000000000000
--- a/net-dns/dnsdist/dnsdist-1.6.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit flag-o-matic lua-single
-
-DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
-HOMEPAGE="https://dnsdist.org"
-
-SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
-KEYWORDS="~amd64"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-		dnscrypt? ( ssl )
-		gnutls? ( ssl )
-		doh? ( ssl !gnutls )"
-
-RDEPEND="acct-group/dnsdist
-	acct-user/dnsdist
-	dev-libs/boost:=
-	dev-libs/libedit:=
-	>=dev-libs/protobuf-3:=
-	dnscrypt? ( dev-libs/libsodium:= )
-	dnstap? ( dev-libs/fstrm:= )
-	doh? ( www-servers/h2o:=[libh2o] )
-	lmdb? ( dev-db/lmdb:= )
-	regex? ( dev-libs/re2:= )
-	snmp? ( net-analyzer/net-snmp:= )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? ( dev-libs/openssl:= )
-	)
-	systemd? ( sys-apps/systemd:0= )
-	${LUA_DEPS}
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/dnsdist \
-		--with-lua="${ELUA}" \
-		$(use_enable doh dns-over-https) \
-		$(use_enable dnscrypt) \
-		$(use_enable dnstap) \
-		$(use_with lmdb ) \
-		$(use_with regex re2) \
-		$(use_with snmp net-snmp) \
-		$(use ssl && { echo "--enable-dns-over-tls" && use_with gnutls && use_with !gnutls libssl;} || echo "--without-gnutls --without-libssl") \
-		$(use_enable systemd) \
-		$(use_enable test unit-tests)
-		sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
-			-i "${S}/configure"
-}
-
-src_install() {
-	default
-
-	insinto /etc/dnsdist
-	doins "${FILESDIR}"/dnsdist.conf.example
-
-	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
-	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
-}
-
-pkg_postinst() {
-	elog "dnsdist provides multiple instances support. You can create more instances"
-	elog "by symlinking the dnsdist init script to another name."
-	elog
-	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
-	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
-}

diff --git a/net-dns/dnsdist/dnsdist-1.7.0.ebuild b/net-dns/dnsdist/dnsdist-1.7.0.ebuild
deleted file mode 100644
index f3402a4021cb..000000000000
--- a/net-dns/dnsdist/dnsdist-1.7.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit flag-o-matic lua-single
-
-DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
-HOMEPAGE="https://dnsdist.org"
-
-SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
-KEYWORDS="~amd64"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-		dnscrypt? ( ssl )
-		gnutls? ( ssl )
-		doh? ( ssl !gnutls )"
-
-RDEPEND="acct-group/dnsdist
-	acct-user/dnsdist
-	dev-libs/boost:=
-	dev-libs/libedit:=
-	>=dev-libs/protobuf-3:=
-	dnscrypt? ( dev-libs/libsodium:= )
-	dnstap? ( dev-libs/fstrm:= )
-	doh? ( www-servers/h2o:=[libh2o] )
-	lmdb? ( dev-db/lmdb:= )
-	regex? ( dev-libs/re2:= )
-	snmp? ( net-analyzer/net-snmp:= )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? ( dev-libs/openssl:= )
-	)
-	systemd? ( sys-apps/systemd:0= )
-	${LUA_DEPS}
-	net-libs/nghttp2
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/dnsdist \
-		--with-lua="${ELUA}" \
-		$(use_enable doh dns-over-https) \
-		$(use_enable dnscrypt) \
-		$(use_enable dnstap) \
-		$(use_with lmdb ) \
-		$(use_with regex re2) \
-		$(use_with snmp net-snmp) \
-		$(use ssl && { echo "--enable-dns-over-tls" && use_with gnutls && use_with !gnutls libssl;} || echo "--without-gnutls --without-libssl") \
-		$(use_enable systemd) \
-		$(use_enable test unit-tests)
-		sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
-			-i "${S}/configure"
-}
-
-src_install() {
-	default
-
-	insinto /etc/dnsdist
-	doins "${FILESDIR}"/dnsdist.conf.example
-
-	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
-	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
-}
-
-pkg_postinst() {
-	elog "dnsdist provides multiple instances support. You can create more instances"
-	elog "by symlinking the dnsdist init script to another name."
-	elog
-	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
-	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
-}

diff --git a/net-dns/dnsdist/dnsdist-1.7.1.ebuild b/net-dns/dnsdist/dnsdist-1.7.1.ebuild
deleted file mode 100644
index e68e3726babb..000000000000
--- a/net-dns/dnsdist/dnsdist-1.7.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit flag-o-matic lua-single
-
-DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
-HOMEPAGE="https://dnsdist.org"
-
-SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-		dnscrypt? ( ssl )
-		gnutls? ( ssl )
-		doh? ( ssl !gnutls )"
-
-RDEPEND="acct-group/dnsdist
-	acct-user/dnsdist
-	dev-libs/boost:=
-	dev-libs/libedit:=
-	>=dev-libs/protobuf-3:=
-	dnscrypt? ( dev-libs/libsodium:= )
-	dnstap? ( dev-libs/fstrm:= )
-	doh? ( www-servers/h2o:=[libh2o] )
-	lmdb? ( dev-db/lmdb:= )
-	regex? ( dev-libs/re2:= )
-	snmp? ( net-analyzer/net-snmp:= )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? ( dev-libs/openssl:= )
-	)
-	systemd? ( sys-apps/systemd:0= )
-	${LUA_DEPS}
-	net-libs/nghttp2
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	# bug #822855
-	append-lfs-flags
-
-	econf \
-		--sysconfdir=/etc/dnsdist \
-		--with-lua="${ELUA}" \
-		$(use_enable doh dns-over-https) \
-		$(use_enable dnscrypt) \
-		$(use_enable dnstap) \
-		$(use_with lmdb ) \
-		$(use_with regex re2) \
-		$(use_with snmp net-snmp) \
-		$(use ssl && { echo "--enable-dns-over-tls" && use_with gnutls && use_with !gnutls libssl;} || echo "--without-gnutls --without-libssl") \
-		$(use_enable systemd) \
-		$(use_enable test unit-tests)
-		sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
-			-i "${S}/configure"
-}
-
-src_install() {
-	default
-
-	insinto /etc/dnsdist
-	doins "${FILESDIR}"/dnsdist.conf.example
-
-	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
-	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
-}
-
-pkg_postinst() {
-	elog "dnsdist provides multiple instances support. You can create more instances"
-	elog "by symlinking the dnsdist init script to another name."
-	elog
-	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
-	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
-}

diff --git a/net-dns/dnsdist/dnsdist-1.7.2.ebuild b/net-dns/dnsdist/dnsdist-1.7.2.ebuild
deleted file mode 100644
index e68e3726babb..000000000000
--- a/net-dns/dnsdist/dnsdist-1.7.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit flag-o-matic lua-single
-
-DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
-HOMEPAGE="https://dnsdist.org"
-
-SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-		dnscrypt? ( ssl )
-		gnutls? ( ssl )
-		doh? ( ssl !gnutls )"
-
-RDEPEND="acct-group/dnsdist
-	acct-user/dnsdist
-	dev-libs/boost:=
-	dev-libs/libedit:=
-	>=dev-libs/protobuf-3:=
-	dnscrypt? ( dev-libs/libsodium:= )
-	dnstap? ( dev-libs/fstrm:= )
-	doh? ( www-servers/h2o:=[libh2o] )
-	lmdb? ( dev-db/lmdb:= )
-	regex? ( dev-libs/re2:= )
-	snmp? ( net-analyzer/net-snmp:= )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? ( dev-libs/openssl:= )
-	)
-	systemd? ( sys-apps/systemd:0= )
-	${LUA_DEPS}
-	net-libs/nghttp2
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	# bug #822855
-	append-lfs-flags
-
-	econf \
-		--sysconfdir=/etc/dnsdist \
-		--with-lua="${ELUA}" \
-		$(use_enable doh dns-over-https) \
-		$(use_enable dnscrypt) \
-		$(use_enable dnstap) \
-		$(use_with lmdb ) \
-		$(use_with regex re2) \
-		$(use_with snmp net-snmp) \
-		$(use ssl && { echo "--enable-dns-over-tls" && use_with gnutls && use_with !gnutls libssl;} || echo "--without-gnutls --without-libssl") \
-		$(use_enable systemd) \
-		$(use_enable test unit-tests)
-		sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
-			-i "${S}/configure"
-}
-
-src_install() {
-	default
-
-	insinto /etc/dnsdist
-	doins "${FILESDIR}"/dnsdist.conf.example
-
-	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
-	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
-}
-
-pkg_postinst() {
-	elog "dnsdist provides multiple instances support. You can create more instances"
-	elog "by symlinking the dnsdist init script to another name."
-	elog
-	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
-	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
-}

diff --git a/net-dns/dnsdist/dnsdist-1.7.3.ebuild b/net-dns/dnsdist/dnsdist-1.7.3.ebuild
deleted file mode 100644
index e68e3726babb..000000000000
--- a/net-dns/dnsdist/dnsdist-1.7.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit flag-o-matic lua-single
-
-DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
-HOMEPAGE="https://dnsdist.org"
-
-SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-		dnscrypt? ( ssl )
-		gnutls? ( ssl )
-		doh? ( ssl !gnutls )"
-
-RDEPEND="acct-group/dnsdist
-	acct-user/dnsdist
-	dev-libs/boost:=
-	dev-libs/libedit:=
-	>=dev-libs/protobuf-3:=
-	dnscrypt? ( dev-libs/libsodium:= )
-	dnstap? ( dev-libs/fstrm:= )
-	doh? ( www-servers/h2o:=[libh2o] )
-	lmdb? ( dev-db/lmdb:= )
-	regex? ( dev-libs/re2:= )
-	snmp? ( net-analyzer/net-snmp:= )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? ( dev-libs/openssl:= )
-	)
-	systemd? ( sys-apps/systemd:0= )
-	${LUA_DEPS}
-	net-libs/nghttp2
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	# bug #822855
-	append-lfs-flags
-
-	econf \
-		--sysconfdir=/etc/dnsdist \
-		--with-lua="${ELUA}" \
-		$(use_enable doh dns-over-https) \
-		$(use_enable dnscrypt) \
-		$(use_enable dnstap) \
-		$(use_with lmdb ) \
-		$(use_with regex re2) \
-		$(use_with snmp net-snmp) \
-		$(use ssl && { echo "--enable-dns-over-tls" && use_with gnutls && use_with !gnutls libssl;} || echo "--without-gnutls --without-libssl") \
-		$(use_enable systemd) \
-		$(use_enable test unit-tests)
-		sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
-			-i "${S}/configure"
-}
-
-src_install() {
-	default
-
-	insinto /etc/dnsdist
-	doins "${FILESDIR}"/dnsdist.conf.example
-
-	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
-	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
-}
-
-pkg_postinst() {
-	elog "dnsdist provides multiple instances support. You can create more instances"
-	elog "by symlinking the dnsdist init script to another name."
-	elog
-	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
-	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
-}

diff --git a/net-dns/dnsdist/files/dnsdist-1.6.0-gcc11-missing-include.patch b/net-dns/dnsdist/files/dnsdist-1.6.0-gcc11-missing-include.patch
deleted file mode 100644
index 6e549b2450ee..000000000000
--- a/net-dns/dnsdist/files/dnsdist-1.6.0-gcc11-missing-include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/790719
-https://github.com/hhoffstaette/portage/blob/master/net-dns/dnsdist/files/dnsdist-1.6.0-add-missing-include.patch
-
-From: Kees Monshouwer <mind04@monshouwer.org>
-Date: Tue, 11 May 2021 10:27:01 +0200
-Subject: [PATCH] add missing includes (Fedora 34, gcc 11.1 / clang 12)
-
-[HH: reduced to necessary patch for dnsdist]
----
- lock.hh      | 1 +
- 1 file changed, 1 insertions(+)
-
-diff --git a/lock.hh b/lock.hh
-index 09299d7979d..0644502f871 100644
---- a/lock.hh
-+++ b/lock.hh
-@@ -20,6 +20,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- #pragma once
-+#include <mutex>
- #include <shared_mutex>
- 
- class ReadWriteLock


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/dnsdist/files/, net-dns/dnsdist/
@ 2024-09-08  8:53 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2024-09-08  8:53 UTC (permalink / raw
  To: gentoo-commits

commit:     73369745e0a35f1b78af0e13c8db78866fae3eca
Author:     Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com>
AuthorDate: Sun Sep  8 07:36:18 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep  8 08:52:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73369745

net-dns/dnsdist: build fixes for gcc-15 & boost-1.86.0

Also reported & fixed upstream.

Closes: https://bugs.gentoo.org/937628
Closes: https://bugs.gentoo.org/938947
Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-dns/dnsdist/dnsdist-1.9.6-r1.ebuild        | 117 +++++++++++++++++++++++++
 net-dns/dnsdist/files/1.9.6-boost-1.86.0.patch |  35 ++++++++
 net-dns/dnsdist/files/1.9.6-json11-gcc15.patch |  19 ++++
 3 files changed, 171 insertions(+)

diff --git a/net-dns/dnsdist/dnsdist-1.9.6-r1.ebuild b/net-dns/dnsdist/dnsdist-1.9.6-r1.ebuild
new file mode 100644
index 000000000000..dc311688bbfd
--- /dev/null
+++ b/net-dns/dnsdist/dnsdist-1.9.6-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit flag-o-matic lua-single
+
+DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
+HOMEPAGE="https://dnsdist.org"
+
+SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="bpf cdb dnscrypt dnstap doh doh3 ipcipher lmdb quic regex snmp +ssl systemd test web xdp"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+		dnscrypt? ( ssl )
+		doh? ( ssl )
+		doh3? ( ssl quic )
+		ipcipher? ( ssl )
+		quic? ( ssl )"
+
+RDEPEND="acct-group/dnsdist
+	acct-user/dnsdist
+	bpf? ( dev-libs/libbpf:= )
+	cdb? ( dev-db/tinycdb:= )
+	dev-libs/boost:=
+	sys-libs/libcap
+	dev-libs/libedit
+	dev-libs/libsodium:=
+	dnstap? ( dev-libs/fstrm )
+	doh? ( net-libs/nghttp2:= )
+	doh3? ( net-libs/quiche:= )
+	lmdb? ( dev-db/lmdb:= )
+	quic? ( net-libs/quiche )
+	regex? ( dev-libs/re2:= )
+	snmp? ( net-analyzer/net-snmp:= )
+	ssl? ( dev-libs/openssl:= )
+	systemd? ( sys-apps/systemd:0= )
+	xdp? ( net-libs/xdp-tools )
+	${LUA_DEPS}
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/1.9.6-boost-1.86.0.patch"
+	"${FILESDIR}/1.9.6-json11-gcc15.patch"
+)
+
+src_prepare() {
+	default
+
+	# clean up duplicate file
+	rm -f README.md
+}
+
+src_configure() {
+	# bug #822855
+	append-lfs-flags
+
+	# some things can only be enabled/disabled by defines
+	! use dnstap && append-cppflags -DDISABLE_PROTOBUF
+	! use web && append-cppflags -DDISABLE_BUILTIN_HTML
+
+	sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
+		-i "${S}/configure"
+
+	local myeconfargs=(
+		--sysconfdir=/etc/dnsdist
+		--with-lua="${ELUA}"
+		--without-h2o
+		--enable-tls-providers
+		--without-gnutls
+		$(use_with bpf ebpf)
+		$(use_with cdb cdb)
+		$(use_enable doh dns-over-https)
+		$(use_enable doh3 dns-over-http3)
+		$(use_enable dnscrypt)
+		$(use_enable dnstap)
+		$(use_enable ipcipher)
+		$(use_with lmdb )
+		$(use_enable quic dns-over-quic)
+		$(use_with regex re2)
+		$(use_with snmp net-snmp)
+		$(use_enable ssl dns-over-tls)
+		$(use_enable systemd) \
+		$(use_enable test unit-tests)
+		$(use_with xdp xsk)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	insinto /etc/dnsdist
+	doins "${FILESDIR}"/dnsdist.conf.example
+
+	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
+	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
+}
+
+pkg_postinst() {
+	elog "dnsdist provides multiple instances support. You can create more instances"
+	elog "by symlinking the dnsdist init script to another name."
+	elog
+	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
+	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
+}

diff --git a/net-dns/dnsdist/files/1.9.6-boost-1.86.0.patch b/net-dns/dnsdist/files/1.9.6-boost-1.86.0.patch
new file mode 100644
index 000000000000..bf9d23984bba
--- /dev/null
+++ b/net-dns/dnsdist/files/1.9.6-boost-1.86.0.patch
@@ -0,0 +1,35 @@
+
+Fix compilation with boost-1.86.
+Patch path prefix adapted for dnsdist.
+
+From: https://github.com/PowerDNS/pdns/commit/eed56000b1d68ac083b8e8bea4ff0ea30a1579c4
+
+From eed56000b1d68ac083b8e8bea4ff0ea30a1579c4 Mon Sep 17 00:00:00 2001
+From: Michael Cho <michael@michaelcho.dev>
+Date: Thu, 15 Aug 2024 22:49:17 -0400
+Subject: [PATCH] Fix build with boost 1.86.0
+
+Boost 1.86.0 changes seem to no longer indirectly include header which
+causes build to fail with:
+```
+uuid-utils.cc:38:58:
+error: 'random' is not a class, namespace, or enumeration
+```
+
+boost/random/mersenne_twister.hpp has been available since Boost 1.21.2
+---
+ pdns/uuid-utils.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/pdns/uuid-utils.cc b/pdns/uuid-utils.cc
+index c59e0a0d0daa..301daff0bb1e 100644
+--- a/uuid-utils.cc
++++ b/uuid-utils.cc
+@@ -30,6 +30,7 @@
+ #endif /* BOOST_PENDING_INTEGER_LOG2_HPP */
+ #endif /* BOOST_VERSION */
+ 
++#include <boost/random/mersenne_twister.hpp>
+ #include <boost/uuid/uuid_generators.hpp>
+ 
+ // The default of:

diff --git a/net-dns/dnsdist/files/1.9.6-json11-gcc15.patch b/net-dns/dnsdist/files/1.9.6-json11-gcc15.patch
new file mode 100644
index 000000000000..9aac470625f6
--- /dev/null
+++ b/net-dns/dnsdist/files/1.9.6-json11-gcc15.patch
@@ -0,0 +1,19 @@
+
+Fix compilation with gcc-15
+
+Bug: https://bugs.gentoo.org/937628
+Bug: https://github.com/PowerDNS/pdns/issues/14549
+
+Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
+
+diff -rup dnsdist-1.9.6/ext/json11/json11.cpp dnsdist-1.9.6-gcc15/ext/json11/json11.cpp
+--- dnsdist-1.9.6/ext/json11/json11.cpp	2024-07-15 11:46:15.000000000 +0200
++++ dnsdist-1.9.6-gcc15/ext/json11/json11.cpp	2024-08-09 18:03:51.090140981 +0200
+@@ -22,6 +22,7 @@
+ #include "json11.hpp"
+ #include <cassert>
+ #include <cmath>
++#include <cstdint>
+ #include <cstdlib>
+ #include <cstdio>
+ #include <limits>


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/dnsdist/files/, net-dns/dnsdist/
@ 2025-03-27 12:05 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2025-03-27 12:05 UTC (permalink / raw
  To: gentoo-commits

commit:     7b09ab21eb47d3bf889e96f4546d87b6ed7285fa
Author:     Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com>
AuthorDate: Tue Feb 18 10:04:50 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 27 12:04:44 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b09ab21

net-dns/dnsdist: clean up old versions

Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-dns/dnsdist/Manifest                       |   5 --
 net-dns/dnsdist/dnsdist-1.8.0.ebuild           |  84 ------------------
 net-dns/dnsdist/dnsdist-1.8.1.ebuild           |  84 ------------------
 net-dns/dnsdist/dnsdist-1.9.4.ebuild           | 112 -----------------------
 net-dns/dnsdist/dnsdist-1.9.5.ebuild           | 112 -----------------------
 net-dns/dnsdist/dnsdist-1.9.6-r1.ebuild        | 117 -------------------------
 net-dns/dnsdist/dnsdist-1.9.7.ebuild           | 112 -----------------------
 net-dns/dnsdist/dnsdist-1.9.8.ebuild           | 112 -----------------------
 net-dns/dnsdist/files/1.9.6-boost-1.86.0.patch |  35 --------
 net-dns/dnsdist/files/1.9.6-json11-gcc15.patch |  19 ----
 10 files changed, 792 deletions(-)

diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index 616a9d4abf3d..4af84f8b67f3 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -1,7 +1,2 @@
-DIST dnsdist-1.8.0.tar.bz2 1480500 BLAKE2B 47cfcfe3756cdc4520c1ba1e11b7d60191125ef900ba829ff7437ac2041352b845ab5f7183f53fea9b3aa6f44c5745de3878c2b72f2be048fa57d2c2e9325c0c SHA512 426db3e83729bd2f8a8c8b1c02d719c6618acc0aec09d1f2670c159d441c1cad2fdc85c5ffe919e76d1b1e8e24198bf29133802cb857dfacde2dfed2532001f1
-DIST dnsdist-1.8.1.tar.bz2 1492793 BLAKE2B 84fdf2f360c41ea235f3989d2bc14ad05e98d7b51dd20d983e7ad53ce5a6c00c7075b673e8a15fe3fd710a4e15c80db4d7431256bfb4291bd5785482d3f7f7e5 SHA512 db50c56587084ebdea3eb7f8e5b79178aea67b608cf6afce1453932b5225b3474a459cdc3dc8e4618a36a9edb405403dfefaed7fadd5848b5612de6bfb356f3a
-DIST dnsdist-1.9.4.tar.bz2 1591994 BLAKE2B a8cfc5c2da135ed96b857f9f1b6c3caa796b27f66ff7ead6e976b871a5e5db208ef3ce275c23085318bd7ff2f0fa2ec19e28ad36234991d84b8d13e74acb2f34 SHA512 e013fa3e582cc30d104a66ee44eec50dd1d04cb2bd0dc5b3c9dfec95f3e0e5f3da5f2a1bb9a713b50e5659908669957fe4deb5b1ca10f728e6ceaf550a3223ef
-DIST dnsdist-1.9.5.tar.bz2 1607962 BLAKE2B 2723abd3ba9ab2824c232f65901601c558054ae70dc668632514c4f9bd60f1e3dd7d67d6a58a974a054d33b6869b72dc888024a8f23256c078d7779dbb1b1836 SHA512 1c38f346b6199063e3862dcc5ff8283b3fe17473ef88660a122793b07c806e47fd1c47602d0edf66fd060f2170fb2f678d94e6cc6cc4800e70912b80a4c26c7d
 DIST dnsdist-1.9.6.tar.bz2 1598874 BLAKE2B adb56707bb768ceae974cd9b725d2bf1f4beaa6e3edc6ede22a7d93920214614f10c82d71dbb773741f56dff04e0f0aa26dc0a0e2d5d405bee89d8ada1130303 SHA512 8d0c88336864b788df320298678e2a8556d7c4ff468ec1b4165b87c2fe5c6c167a2c75cdd2df433346fac12694d8e39d30910b8d1d4be7f35d9e0d85edd5ef5a
-DIST dnsdist-1.9.7.tar.bz2 1594532 BLAKE2B 895a581caf00e8274787d7280e790372868354cceebe5c34fc9bd960778758c6e39b1e47e11038b3f85277a9ea0231ee9951cd01febbf1c8edb0c5ae1059c644 SHA512 7d49136efd811d10e86e5df2e4972fdd31245686294efe618107ebb80e13762a0f9a5677af59277484a7b69a05c84bbc6b26f8fabbdcc34acdfcdd7e7b155aac
 DIST dnsdist-1.9.8.tar.bz2 1593902 BLAKE2B 854344eb6b82f98001171830715fe5cf564628405b4c79c07b43fccdbca0a4c9da7e527a748bc2972261a32ed9c51582eac2e6fdbef5c25bd71b161318a62155 SHA512 b89bc1ba62a2cf009a305a71eaa2553810d6d5f25f71098cb34acd86bfe5632e5f9f4b5ce057ea93665f1f5dd65e6a3d67fa364e8cecf0b648559c73061baddd

diff --git a/net-dns/dnsdist/dnsdist-1.8.0.ebuild b/net-dns/dnsdist/dnsdist-1.8.0.ebuild
deleted file mode 100644
index c0ec5088ac0e..000000000000
--- a/net-dns/dnsdist/dnsdist-1.8.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit flag-o-matic lua-single
-
-DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
-HOMEPAGE="https://dnsdist.org"
-
-SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-		dnscrypt? ( ssl )
-		gnutls? ( ssl )
-		doh? ( ssl !gnutls )"
-
-RDEPEND="acct-group/dnsdist
-	acct-user/dnsdist
-	dev-libs/boost:=
-	dev-libs/libedit:=
-	dev-libs/libsodium:=
-	>=dev-libs/protobuf-3:=
-	dnstap? ( dev-libs/fstrm:= )
-	doh? ( www-servers/h2o:=[libh2o] )
-	lmdb? ( dev-db/lmdb:= )
-	regex? ( dev-libs/re2:= )
-	snmp? ( net-analyzer/net-snmp:= )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? ( dev-libs/openssl:= )
-	)
-	systemd? ( sys-apps/systemd:0= )
-	${LUA_DEPS}
-	net-libs/nghttp2
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	# bug #822855
-	append-lfs-flags
-
-	econf \
-		--sysconfdir=/etc/dnsdist \
-		--with-lua="${ELUA}" \
-		$(use_enable doh dns-over-https) \
-		$(use_enable dnscrypt) \
-		$(use_enable dnstap) \
-		$(use_with lmdb ) \
-		$(use_with regex re2) \
-		$(use_with snmp net-snmp) \
-		$(use ssl && { echo "--enable-dns-over-tls" && use_with gnutls && use_with !gnutls libssl;} || echo "--without-gnutls --without-libssl") \
-		$(use_enable systemd) \
-		$(use_enable test unit-tests)
-		sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
-			-i "${S}/configure"
-}
-
-src_install() {
-	default
-
-	insinto /etc/dnsdist
-	doins "${FILESDIR}"/dnsdist.conf.example
-
-	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
-	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
-}
-
-pkg_postinst() {
-	elog "dnsdist provides multiple instances support. You can create more instances"
-	elog "by symlinking the dnsdist init script to another name."
-	elog
-	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
-	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
-}

diff --git a/net-dns/dnsdist/dnsdist-1.8.1.ebuild b/net-dns/dnsdist/dnsdist-1.8.1.ebuild
deleted file mode 100644
index c0ec5088ac0e..000000000000
--- a/net-dns/dnsdist/dnsdist-1.8.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit flag-o-matic lua-single
-
-DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
-HOMEPAGE="https://dnsdist.org"
-
-SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-		dnscrypt? ( ssl )
-		gnutls? ( ssl )
-		doh? ( ssl !gnutls )"
-
-RDEPEND="acct-group/dnsdist
-	acct-user/dnsdist
-	dev-libs/boost:=
-	dev-libs/libedit:=
-	dev-libs/libsodium:=
-	>=dev-libs/protobuf-3:=
-	dnstap? ( dev-libs/fstrm:= )
-	doh? ( www-servers/h2o:=[libh2o] )
-	lmdb? ( dev-db/lmdb:= )
-	regex? ( dev-libs/re2:= )
-	snmp? ( net-analyzer/net-snmp:= )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? ( dev-libs/openssl:= )
-	)
-	systemd? ( sys-apps/systemd:0= )
-	${LUA_DEPS}
-	net-libs/nghttp2
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	# bug #822855
-	append-lfs-flags
-
-	econf \
-		--sysconfdir=/etc/dnsdist \
-		--with-lua="${ELUA}" \
-		$(use_enable doh dns-over-https) \
-		$(use_enable dnscrypt) \
-		$(use_enable dnstap) \
-		$(use_with lmdb ) \
-		$(use_with regex re2) \
-		$(use_with snmp net-snmp) \
-		$(use ssl && { echo "--enable-dns-over-tls" && use_with gnutls && use_with !gnutls libssl;} || echo "--without-gnutls --without-libssl") \
-		$(use_enable systemd) \
-		$(use_enable test unit-tests)
-		sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
-			-i "${S}/configure"
-}
-
-src_install() {
-	default
-
-	insinto /etc/dnsdist
-	doins "${FILESDIR}"/dnsdist.conf.example
-
-	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
-	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
-}
-
-pkg_postinst() {
-	elog "dnsdist provides multiple instances support. You can create more instances"
-	elog "by symlinking the dnsdist init script to another name."
-	elog
-	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
-	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
-}

diff --git a/net-dns/dnsdist/dnsdist-1.9.4.ebuild b/net-dns/dnsdist/dnsdist-1.9.4.ebuild
deleted file mode 100644
index 33366646a868..000000000000
--- a/net-dns/dnsdist/dnsdist-1.9.4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit flag-o-matic lua-single
-
-DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
-HOMEPAGE="https://dnsdist.org"
-
-SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="bpf cdb dnscrypt dnstap doh doh3 ipcipher lmdb quic regex snmp +ssl systemd test web xdp"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-		dnscrypt? ( ssl )
-		doh? ( ssl )
-		doh3? ( ssl quic )
-		ipcipher? ( ssl )
-		quic? ( ssl )"
-
-RDEPEND="acct-group/dnsdist
-	acct-user/dnsdist
-	bpf? ( dev-libs/libbpf:= )
-	cdb? ( dev-db/tinycdb:= )
-	dev-libs/boost:=
-	sys-libs/libcap
-	dev-libs/libedit
-	dev-libs/libsodium:=
-	dnstap? ( dev-libs/fstrm )
-	doh? ( net-libs/nghttp2:= )
-	doh3? ( net-libs/quiche:= )
-	lmdb? ( dev-db/lmdb:= )
-	quic? ( net-libs/quiche )
-	regex? ( dev-libs/re2:= )
-	snmp? ( net-analyzer/net-snmp:= )
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd:0= )
-	xdp? ( net-libs/xdp-tools )
-	${LUA_DEPS}
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# clean up duplicate file
-	rm -f README.md
-}
-
-src_configure() {
-	# bug #822855
-	append-lfs-flags
-
-	# some things can only be enabled/disabled by defines
-	! use dnstap && append-cppflags -DDISABLE_PROTOBUF
-	! use web && append-cppflags -DDISABLE_BUILTIN_HTML
-
-	sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
-		-i "${S}/configure"
-
-	local myeconfargs=(
-		--sysconfdir=/etc/dnsdist
-		--with-lua="${ELUA}"
-		--without-h2o
-		--enable-tls-providers
-		--without-gnutls
-		$(use_with bpf ebpf)
-		$(use_with cdb cdb)
-		$(use_enable doh dns-over-https)
-		$(use_enable doh3 dns-over-http3)
-		$(use_enable dnscrypt)
-		$(use_enable dnstap)
-		$(use_enable ipcipher)
-		$(use_with lmdb )
-		$(use_enable quic dns-over-quic)
-		$(use_with regex re2)
-		$(use_with snmp net-snmp)
-		$(use_enable ssl dns-over-tls)
-		$(use_enable systemd) \
-		$(use_enable test unit-tests)
-		$(use_with xdp xsk)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	insinto /etc/dnsdist
-	doins "${FILESDIR}"/dnsdist.conf.example
-
-	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
-	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
-}
-
-pkg_postinst() {
-	elog "dnsdist provides multiple instances support. You can create more instances"
-	elog "by symlinking the dnsdist init script to another name."
-	elog
-	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
-	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
-}

diff --git a/net-dns/dnsdist/dnsdist-1.9.5.ebuild b/net-dns/dnsdist/dnsdist-1.9.5.ebuild
deleted file mode 100644
index 33366646a868..000000000000
--- a/net-dns/dnsdist/dnsdist-1.9.5.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit flag-o-matic lua-single
-
-DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
-HOMEPAGE="https://dnsdist.org"
-
-SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="bpf cdb dnscrypt dnstap doh doh3 ipcipher lmdb quic regex snmp +ssl systemd test web xdp"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-		dnscrypt? ( ssl )
-		doh? ( ssl )
-		doh3? ( ssl quic )
-		ipcipher? ( ssl )
-		quic? ( ssl )"
-
-RDEPEND="acct-group/dnsdist
-	acct-user/dnsdist
-	bpf? ( dev-libs/libbpf:= )
-	cdb? ( dev-db/tinycdb:= )
-	dev-libs/boost:=
-	sys-libs/libcap
-	dev-libs/libedit
-	dev-libs/libsodium:=
-	dnstap? ( dev-libs/fstrm )
-	doh? ( net-libs/nghttp2:= )
-	doh3? ( net-libs/quiche:= )
-	lmdb? ( dev-db/lmdb:= )
-	quic? ( net-libs/quiche )
-	regex? ( dev-libs/re2:= )
-	snmp? ( net-analyzer/net-snmp:= )
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd:0= )
-	xdp? ( net-libs/xdp-tools )
-	${LUA_DEPS}
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# clean up duplicate file
-	rm -f README.md
-}
-
-src_configure() {
-	# bug #822855
-	append-lfs-flags
-
-	# some things can only be enabled/disabled by defines
-	! use dnstap && append-cppflags -DDISABLE_PROTOBUF
-	! use web && append-cppflags -DDISABLE_BUILTIN_HTML
-
-	sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
-		-i "${S}/configure"
-
-	local myeconfargs=(
-		--sysconfdir=/etc/dnsdist
-		--with-lua="${ELUA}"
-		--without-h2o
-		--enable-tls-providers
-		--without-gnutls
-		$(use_with bpf ebpf)
-		$(use_with cdb cdb)
-		$(use_enable doh dns-over-https)
-		$(use_enable doh3 dns-over-http3)
-		$(use_enable dnscrypt)
-		$(use_enable dnstap)
-		$(use_enable ipcipher)
-		$(use_with lmdb )
-		$(use_enable quic dns-over-quic)
-		$(use_with regex re2)
-		$(use_with snmp net-snmp)
-		$(use_enable ssl dns-over-tls)
-		$(use_enable systemd) \
-		$(use_enable test unit-tests)
-		$(use_with xdp xsk)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	insinto /etc/dnsdist
-	doins "${FILESDIR}"/dnsdist.conf.example
-
-	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
-	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
-}
-
-pkg_postinst() {
-	elog "dnsdist provides multiple instances support. You can create more instances"
-	elog "by symlinking the dnsdist init script to another name."
-	elog
-	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
-	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
-}

diff --git a/net-dns/dnsdist/dnsdist-1.9.6-r1.ebuild b/net-dns/dnsdist/dnsdist-1.9.6-r1.ebuild
deleted file mode 100644
index dc311688bbfd..000000000000
--- a/net-dns/dnsdist/dnsdist-1.9.6-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit flag-o-matic lua-single
-
-DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
-HOMEPAGE="https://dnsdist.org"
-
-SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="bpf cdb dnscrypt dnstap doh doh3 ipcipher lmdb quic regex snmp +ssl systemd test web xdp"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-		dnscrypt? ( ssl )
-		doh? ( ssl )
-		doh3? ( ssl quic )
-		ipcipher? ( ssl )
-		quic? ( ssl )"
-
-RDEPEND="acct-group/dnsdist
-	acct-user/dnsdist
-	bpf? ( dev-libs/libbpf:= )
-	cdb? ( dev-db/tinycdb:= )
-	dev-libs/boost:=
-	sys-libs/libcap
-	dev-libs/libedit
-	dev-libs/libsodium:=
-	dnstap? ( dev-libs/fstrm )
-	doh? ( net-libs/nghttp2:= )
-	doh3? ( net-libs/quiche:= )
-	lmdb? ( dev-db/lmdb:= )
-	quic? ( net-libs/quiche )
-	regex? ( dev-libs/re2:= )
-	snmp? ( net-analyzer/net-snmp:= )
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd:0= )
-	xdp? ( net-libs/xdp-tools )
-	${LUA_DEPS}
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/1.9.6-boost-1.86.0.patch"
-	"${FILESDIR}/1.9.6-json11-gcc15.patch"
-)
-
-src_prepare() {
-	default
-
-	# clean up duplicate file
-	rm -f README.md
-}
-
-src_configure() {
-	# bug #822855
-	append-lfs-flags
-
-	# some things can only be enabled/disabled by defines
-	! use dnstap && append-cppflags -DDISABLE_PROTOBUF
-	! use web && append-cppflags -DDISABLE_BUILTIN_HTML
-
-	sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
-		-i "${S}/configure"
-
-	local myeconfargs=(
-		--sysconfdir=/etc/dnsdist
-		--with-lua="${ELUA}"
-		--without-h2o
-		--enable-tls-providers
-		--without-gnutls
-		$(use_with bpf ebpf)
-		$(use_with cdb cdb)
-		$(use_enable doh dns-over-https)
-		$(use_enable doh3 dns-over-http3)
-		$(use_enable dnscrypt)
-		$(use_enable dnstap)
-		$(use_enable ipcipher)
-		$(use_with lmdb )
-		$(use_enable quic dns-over-quic)
-		$(use_with regex re2)
-		$(use_with snmp net-snmp)
-		$(use_enable ssl dns-over-tls)
-		$(use_enable systemd) \
-		$(use_enable test unit-tests)
-		$(use_with xdp xsk)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	insinto /etc/dnsdist
-	doins "${FILESDIR}"/dnsdist.conf.example
-
-	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
-	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
-}
-
-pkg_postinst() {
-	elog "dnsdist provides multiple instances support. You can create more instances"
-	elog "by symlinking the dnsdist init script to another name."
-	elog
-	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
-	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
-}

diff --git a/net-dns/dnsdist/dnsdist-1.9.7.ebuild b/net-dns/dnsdist/dnsdist-1.9.7.ebuild
deleted file mode 100644
index 33366646a868..000000000000
--- a/net-dns/dnsdist/dnsdist-1.9.7.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit flag-o-matic lua-single
-
-DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
-HOMEPAGE="https://dnsdist.org"
-
-SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="bpf cdb dnscrypt dnstap doh doh3 ipcipher lmdb quic regex snmp +ssl systemd test web xdp"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-		dnscrypt? ( ssl )
-		doh? ( ssl )
-		doh3? ( ssl quic )
-		ipcipher? ( ssl )
-		quic? ( ssl )"
-
-RDEPEND="acct-group/dnsdist
-	acct-user/dnsdist
-	bpf? ( dev-libs/libbpf:= )
-	cdb? ( dev-db/tinycdb:= )
-	dev-libs/boost:=
-	sys-libs/libcap
-	dev-libs/libedit
-	dev-libs/libsodium:=
-	dnstap? ( dev-libs/fstrm )
-	doh? ( net-libs/nghttp2:= )
-	doh3? ( net-libs/quiche:= )
-	lmdb? ( dev-db/lmdb:= )
-	quic? ( net-libs/quiche )
-	regex? ( dev-libs/re2:= )
-	snmp? ( net-analyzer/net-snmp:= )
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd:0= )
-	xdp? ( net-libs/xdp-tools )
-	${LUA_DEPS}
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# clean up duplicate file
-	rm -f README.md
-}
-
-src_configure() {
-	# bug #822855
-	append-lfs-flags
-
-	# some things can only be enabled/disabled by defines
-	! use dnstap && append-cppflags -DDISABLE_PROTOBUF
-	! use web && append-cppflags -DDISABLE_BUILTIN_HTML
-
-	sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
-		-i "${S}/configure"
-
-	local myeconfargs=(
-		--sysconfdir=/etc/dnsdist
-		--with-lua="${ELUA}"
-		--without-h2o
-		--enable-tls-providers
-		--without-gnutls
-		$(use_with bpf ebpf)
-		$(use_with cdb cdb)
-		$(use_enable doh dns-over-https)
-		$(use_enable doh3 dns-over-http3)
-		$(use_enable dnscrypt)
-		$(use_enable dnstap)
-		$(use_enable ipcipher)
-		$(use_with lmdb )
-		$(use_enable quic dns-over-quic)
-		$(use_with regex re2)
-		$(use_with snmp net-snmp)
-		$(use_enable ssl dns-over-tls)
-		$(use_enable systemd) \
-		$(use_enable test unit-tests)
-		$(use_with xdp xsk)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	insinto /etc/dnsdist
-	doins "${FILESDIR}"/dnsdist.conf.example
-
-	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
-	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
-}
-
-pkg_postinst() {
-	elog "dnsdist provides multiple instances support. You can create more instances"
-	elog "by symlinking the dnsdist init script to another name."
-	elog
-	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
-	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
-}

diff --git a/net-dns/dnsdist/dnsdist-1.9.8.ebuild b/net-dns/dnsdist/dnsdist-1.9.8.ebuild
deleted file mode 100644
index 33366646a868..000000000000
--- a/net-dns/dnsdist/dnsdist-1.9.8.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit flag-o-matic lua-single
-
-DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
-HOMEPAGE="https://dnsdist.org"
-
-SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="bpf cdb dnscrypt dnstap doh doh3 ipcipher lmdb quic regex snmp +ssl systemd test web xdp"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-		dnscrypt? ( ssl )
-		doh? ( ssl )
-		doh3? ( ssl quic )
-		ipcipher? ( ssl )
-		quic? ( ssl )"
-
-RDEPEND="acct-group/dnsdist
-	acct-user/dnsdist
-	bpf? ( dev-libs/libbpf:= )
-	cdb? ( dev-db/tinycdb:= )
-	dev-libs/boost:=
-	sys-libs/libcap
-	dev-libs/libedit
-	dev-libs/libsodium:=
-	dnstap? ( dev-libs/fstrm )
-	doh? ( net-libs/nghttp2:= )
-	doh3? ( net-libs/quiche:= )
-	lmdb? ( dev-db/lmdb:= )
-	quic? ( net-libs/quiche )
-	regex? ( dev-libs/re2:= )
-	snmp? ( net-analyzer/net-snmp:= )
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd:0= )
-	xdp? ( net-libs/xdp-tools )
-	${LUA_DEPS}
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# clean up duplicate file
-	rm -f README.md
-}
-
-src_configure() {
-	# bug #822855
-	append-lfs-flags
-
-	# some things can only be enabled/disabled by defines
-	! use dnstap && append-cppflags -DDISABLE_PROTOBUF
-	! use web && append-cppflags -DDISABLE_BUILTIN_HTML
-
-	sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
-		-i "${S}/configure"
-
-	local myeconfargs=(
-		--sysconfdir=/etc/dnsdist
-		--with-lua="${ELUA}"
-		--without-h2o
-		--enable-tls-providers
-		--without-gnutls
-		$(use_with bpf ebpf)
-		$(use_with cdb cdb)
-		$(use_enable doh dns-over-https)
-		$(use_enable doh3 dns-over-http3)
-		$(use_enable dnscrypt)
-		$(use_enable dnstap)
-		$(use_enable ipcipher)
-		$(use_with lmdb )
-		$(use_enable quic dns-over-quic)
-		$(use_with regex re2)
-		$(use_with snmp net-snmp)
-		$(use_enable ssl dns-over-tls)
-		$(use_enable systemd) \
-		$(use_enable test unit-tests)
-		$(use_with xdp xsk)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	insinto /etc/dnsdist
-	doins "${FILESDIR}"/dnsdist.conf.example
-
-	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
-	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
-}
-
-pkg_postinst() {
-	elog "dnsdist provides multiple instances support. You can create more instances"
-	elog "by symlinking the dnsdist init script to another name."
-	elog
-	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
-	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
-}

diff --git a/net-dns/dnsdist/files/1.9.6-boost-1.86.0.patch b/net-dns/dnsdist/files/1.9.6-boost-1.86.0.patch
deleted file mode 100644
index bf9d23984bba..000000000000
--- a/net-dns/dnsdist/files/1.9.6-boost-1.86.0.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-
-Fix compilation with boost-1.86.
-Patch path prefix adapted for dnsdist.
-
-From: https://github.com/PowerDNS/pdns/commit/eed56000b1d68ac083b8e8bea4ff0ea30a1579c4
-
-From eed56000b1d68ac083b8e8bea4ff0ea30a1579c4 Mon Sep 17 00:00:00 2001
-From: Michael Cho <michael@michaelcho.dev>
-Date: Thu, 15 Aug 2024 22:49:17 -0400
-Subject: [PATCH] Fix build with boost 1.86.0
-
-Boost 1.86.0 changes seem to no longer indirectly include header which
-causes build to fail with:
-```
-uuid-utils.cc:38:58:
-error: 'random' is not a class, namespace, or enumeration
-```
-
-boost/random/mersenne_twister.hpp has been available since Boost 1.21.2
----
- pdns/uuid-utils.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/pdns/uuid-utils.cc b/pdns/uuid-utils.cc
-index c59e0a0d0daa..301daff0bb1e 100644
---- a/uuid-utils.cc
-+++ b/uuid-utils.cc
-@@ -30,6 +30,7 @@
- #endif /* BOOST_PENDING_INTEGER_LOG2_HPP */
- #endif /* BOOST_VERSION */
- 
-+#include <boost/random/mersenne_twister.hpp>
- #include <boost/uuid/uuid_generators.hpp>
- 
- // The default of:

diff --git a/net-dns/dnsdist/files/1.9.6-json11-gcc15.patch b/net-dns/dnsdist/files/1.9.6-json11-gcc15.patch
deleted file mode 100644
index 9aac470625f6..000000000000
--- a/net-dns/dnsdist/files/1.9.6-json11-gcc15.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-
-Fix compilation with gcc-15
-
-Bug: https://bugs.gentoo.org/937628
-Bug: https://github.com/PowerDNS/pdns/issues/14549
-
-Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
-
-diff -rup dnsdist-1.9.6/ext/json11/json11.cpp dnsdist-1.9.6-gcc15/ext/json11/json11.cpp
---- dnsdist-1.9.6/ext/json11/json11.cpp	2024-07-15 11:46:15.000000000 +0200
-+++ dnsdist-1.9.6-gcc15/ext/json11/json11.cpp	2024-08-09 18:03:51.090140981 +0200
-@@ -22,6 +22,7 @@
- #include "json11.hpp"
- #include <cassert>
- #include <cmath>
-+#include <cstdint>
- #include <cstdlib>
- #include <cstdio>
- #include <limits>


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2025-03-27 12:06 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-27  8:35 [gentoo-commits] repo/gentoo:master commit in: net-dns/dnsdist/files/, net-dns/dnsdist/ Joonas Niilola
  -- strict thread matches above, loose matches on Subject: below --
2025-03-27 12:05 Sam James
2024-09-08  8:53 Sam James
2021-06-15  3:48 Sam James
2020-07-31  8:13 Andreas Schuerch
2019-03-30 10:02 Andreas Schuerch
2017-05-23 22:17 Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox