gentoo resync : 25.01.2019

4 files changed, 3 insertions, 120 deletions

diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 1a1a765eb3c3..aaceb44b19bc 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,7 +1,4 @@
-AUX pdns-recursor-4.1.9-protobuf-fix.patch 1218 BLAKE2B 73917cb5fcb5d47da0f7798c46d7dc994c3da23f3d1daffe5e09e4833e8eb7e3bc897d0f0723a9c0d8e22ea897c3a557306124cabdd4103763c26c4a7752468e SHA512 2a983ded40af1a6c29e14b80a6bdff53b1270301820e8733cbbcb7ded2bf7c5a73f777ff8bf8c65b6f040028e8e2e8b8c0f3bc0756cdc160c610d0baba7c56de
 AUX pdns-recursor-r1 1135 BLAKE2B 90f28d33c126882e5b5e29209ec12f336797720832f7750262329cc5d47fefdf8bcb5208807e47638037a704abbbebd0ee2b1380a3d1d54feab6d4900c250176 SHA512 9dce3cd454ed6b61af8d70c90a8464c60d16eb8342ffc46558f5dcc5089c77aff4581f208684ddb25c4512ce6f39c54afaf267dcade667d812511ae3fa3a1f48
-DIST pdns-recursor-4.1.8.tar.bz2 1237750 BLAKE2B 1170198ea2ed9f1d16f7d8fa76e4c9f8bc56e3c72a391d094e7380d84657b55daa6f45acf4737a9d9b144f2deae64103c40dc3b95550a853ee6f41f0f8a92c78 SHA512 5c09b8ce3f2f3ed6bb350cbd20e6cad4b66f9db85677605d57eca67187c05ddde5071af246a7398e2821c9ed2e5ff101d2b4928366b3ddf12013020fa9b74e61
-DIST pdns-recursor-4.1.9.tar.bz2 1237727 BLAKE2B e060120edbbccd6688f614e0c00f0ecb9954b2d1f96194f7fff53d7111ec8c843348c25e206e998e1d0eb920b68b4a4631fb0806810e14956bd04957ece0c960 SHA512 2deaf1cdc8c32087f744efe0d142421cfd2d89dc9b31edcdea55c1efc2637987e8557891716498e3703c4b1af4b0d301e2a53316c5a97c7a18ec85016ccfa8f1
-EBUILD pdns-recursor-4.1.8.ebuild 1756 BLAKE2B 1a3c13fc02d5b8a7a42ca513155ba244497ec3f667dcff34a51e9e7cf3b67534d66aacfb6498bb895edf952e96aaf247e8b67f321d0cbfe1d47b193b60e77e74 SHA512 a740b4dee0291128f4e58655975bbf32752906bdc0b75392026a7baef90adc8bd14c500df7b123c56bc883c38687ac64e936a8deb0f9bedccb02a3ee371ebcac
-EBUILD pdns-recursor-4.1.9.ebuild 1810 BLAKE2B e9bdc8b17e8c992121e1709ad5fc0a51d5af3b814e2c4aee2301894e6ee0c53ee86a25a9c72b1d03d2703beab9a7252f2748b3376521f275f02b0066a63cda58 SHA512 01f3200888f5db6a382c96a9a40dba39473edbaace746393ce328036655824699d5469e2a528393ba60950e7a27aca3fa9ba555572af5b05a70354267fc2b428
+DIST pdns-recursor-4.1.10.tar.bz2 1238148 BLAKE2B b68e33b40d5f1a680cbbd76c9864439a84416071dc75d658a3988e891da7f6a5d0c197d8dda7ff014a30b7f762bfbe5db4a616a6cad4415fd46db119b51ba70a SHA512 204ea40f5c14d1e589935af4fbd24c102090390d741dbc5ad28f4c20044011f4b2b1c7926d8caaf144a7b2b1680f793e66199c5e9238e926da9fba60c5573dcd
+EBUILD pdns-recursor-4.1.10.ebuild 1756 BLAKE2B e2fbacc7c51b9979ec9b1a034cac79d3f0960b70614aacb69362577e047383d03b35e2baefd0e5ceea666baa913e4bf2c068b2ab9d28567f8bd0458b2c63506e SHA512 acd802ca6e50382bbe08992ee77791d08ad9aeae143d889423bfe5cd08818fe83e0ec091ab1e65020883d838779bc344b0969a6f90dbb241fb66666fb0b434d8
 MISC metadata.xml 954 BLAKE2B 91824dd5b63f8533d2f0a9df87df133ba87f54d6ede9dfd1b1e920251081372fa659dbeb75e2252d91804a2fe269508693ef507c7e070a3cca5ba18711ea8d70 SHA512 1ade9c243b0bdaf70146c344bc318f8c042f846bd91c8e42706d803638c2132bc9ecc9f83db5b862e6e6aff65be9c7437250ac831264a640367d1308c8e3fcfe
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.1.9-protobuf-fix.patch b/net-dns/pdns-recursor/files/pdns-recursor-4.1.9-protobuf-fix.patch
deleted file mode 100644
index b0e3f4f5cef4..000000000000
--- a/net-dns/pdns-recursor/files/pdns-recursor-4.1.9-protobuf-fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 6b34c39dce4483f97d48201929ff6acd4abbef84 Mon Sep 17 00:00:00 2001
-From: Remi Gacogne <remi.gacogne@powerdns.com>
-Date: Mon, 21 Jan 2019 16:07:29 +0100
-Subject: [PATCH] rec: Fix compilation in handleRunningTCPQuestion without
- protobuf support
-
----
- pdns/pdns_recursor.cc | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/pdns_recursor.cc b/pdns_recursor.cc
-index d92b1ffae..98232dca2 100644
---- a/pdns_recursor.cc
-+++ b/pdns_recursor.cc
-@@ -1535,6 +1535,9 @@ static void handleRunningTCPQuestion(int fd, FDMultiplexer::funcparam_t& var)
-             L<<Logger::Warning<<"Error parsing a query packet for tag determination, setting tag=0: "<<e.what()<<endl;
-         }
-       }
-+
-+      const struct dnsheader* dh = (const struct dnsheader*) conn->data;
-+
- #ifdef HAVE_PROTOBUF
-       if(luaconfsLocal->protobufServer || luaconfsLocal->outgoingProtobufServer) {
-         dc->d_requestorId = requestorId;
-@@ -1542,7 +1545,6 @@ static void handleRunningTCPQuestion(int fd, FDMultiplexer::funcparam_t& var)
-         dc->d_uuid = (*t_uuidGenerator)();
-       }
- 
--      const struct dnsheader* dh = (const struct dnsheader*) conn->data;
-       if(luaconfsLocal->protobufServer) {
-         try {
- 
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.1.8.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.1.10.ebuild
index 2e627d8108a4..45a74d2b9434 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.1.8.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.1.9.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.1.9.ebuild
deleted file mode 100644
index 2bf5e320d812..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-4.1.9.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic
-
-DESCRIPTION="The PowerDNS Recursor"
-HOMEPAGE="https://www.powerdns.com/"
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="libressl luajit protobuf snmp sodium systemd"
-
-DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
-	luajit? ( dev-lang/luajit:= )
-	protobuf? (
-		dev-libs/protobuf
-		>=dev-libs/boost-1.42:=
-	)
-	systemd? ( sys-apps/systemd:0= )
-	snmp? ( net-analyzer/net-snmp )
-	sodium? ( dev-libs/libsodium:= )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
-	>=dev-libs/boost-1.35:="
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_/-}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-protobuf-fix.patch
-)
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/powerdns \
-		$(use_enable systemd) \
-		$(use_enable sodium libsodium) \
-		$(use_with !luajit lua) \
-		$(use_with luajit luajit) \
-		$(use_with protobuf) \
-		$(use_with snmp net-snmp)
-}
-
-src_install() {
-	default
-
-	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
-
-	# set defaults: setuid=nobody, setgid=nobody
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=nobody/' \
-		-e 's/^# quiet=$/quiet=on/' \
-		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
-		"${D}"/etc/powerdns/recursor.conf
-
-	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
-
-	keepdir /var/lib/powerdns
-}
-
-pkg_postinst() {
-	local old
-
-	for old in ${REPLACING_VERSIONS}; do
-		ver_test ${old} -lt 4.0.0-r1 || continue
-
-		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
-		ewarn "to pdns-recursor, please update your runlevels accordingly."
-
-		break
-	done
-}