[gentoo-commits] repo/gentoo:master commit in: net-dns/pdns-recursor/files/, net-dns/pdns-recursor/

["Sven Wegener" <swegener@gentoo.org>]

commit:     9cc6c29be1d45345e3259e4c04f6673f0d4e711a
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 24 16:34:18 2019 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Fri Jan 25 06:31:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cc6c29b

net-dns/pdns-recursor: Version bump

This release just incorporates the protobuf fix, which is why I'm
committing it directly to stable.

Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 net-dns/pdns-recursor/Manifest                     |  2 +-
 .../files/pdns-recursor-4.1.9-protobuf-fix.patch   | 32 ----------------------
 ...or-4.1.9.ebuild => pdns-recursor-4.1.10.ebuild} |  4 ---
 3 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index b28e2a3f4a1..62cf394f365 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1 +1 @@
-DIST pdns-recursor-4.1.9.tar.bz2 1237727 BLAKE2B e060120edbbccd6688f614e0c00f0ecb9954b2d1f96194f7fff53d7111ec8c843348c25e206e998e1d0eb920b68b4a4631fb0806810e14956bd04957ece0c960 SHA512 2deaf1cdc8c32087f744efe0d142421cfd2d89dc9b31edcdea55c1efc2637987e8557891716498e3703c4b1af4b0d301e2a53316c5a97c7a18ec85016ccfa8f1
+DIST pdns-recursor-4.1.10.tar.bz2 1238148 BLAKE2B b68e33b40d5f1a680cbbd76c9864439a84416071dc75d658a3988e891da7f6a5d0c197d8dda7ff014a30b7f762bfbe5db4a616a6cad4415fd46db119b51ba70a SHA512 204ea40f5c14d1e589935af4fbd24c102090390d741dbc5ad28f4c20044011f4b2b1c7926d8caaf144a7b2b1680f793e66199c5e9238e926da9fba60c5573dcd

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 b0e3f4f5cef..00000000000
--- 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.9.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.1.10.ebuild
similarity index 97%
rename from net-dns/pdns-recursor/pdns-recursor-4.1.9.ebuild
rename to net-dns/pdns-recursor/pdns-recursor-4.1.10.ebuild
index 57436494bb1..45a74d2b943 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.1.9.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.1.10.ebuild
@@ -32,10 +32,6 @@ BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}"/${P/_/-}
 
-PATCHES=(
-	"${FILESDIR}"/${P}-protobuf-fix.patch
-)
-
 pkg_setup() {
 	filter-flags -ftree-vectorize
 }