1 |
commit: 6fad89dca5912b9f36ea41977987b8e8ef6cc53f |
2 |
Author: Sven Wegener <swegener <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 21 15:21:45 2019 +0000 |
4 |
Commit: Sven Wegener <swegener <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 21 15:22:20 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fad89dc |
7 |
|
8 |
net-dns/pdns-recursor: Version bump, security bug #675968 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/675968 |
11 |
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org> |
12 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
13 |
|
14 |
net-dns/pdns-recursor/Manifest | 1 + |
15 |
.../files/pdns-recursor-4.1.9-protobuf-fix.patch | 32 +++++++++ |
16 |
net-dns/pdns-recursor/pdns-recursor-4.1.9.ebuild | 82 ++++++++++++++++++++++ |
17 |
3 files changed, 115 insertions(+) |
18 |
|
19 |
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest |
20 |
index e3bcab62e0c..63a87021f03 100644 |
21 |
--- a/net-dns/pdns-recursor/Manifest |
22 |
+++ b/net-dns/pdns-recursor/Manifest |
23 |
@@ -1 +1,2 @@ |
24 |
DIST pdns-recursor-4.1.8.tar.bz2 1237750 BLAKE2B 1170198ea2ed9f1d16f7d8fa76e4c9f8bc56e3c72a391d094e7380d84657b55daa6f45acf4737a9d9b144f2deae64103c40dc3b95550a853ee6f41f0f8a92c78 SHA512 5c09b8ce3f2f3ed6bb350cbd20e6cad4b66f9db85677605d57eca67187c05ddde5071af246a7398e2821c9ed2e5ff101d2b4928366b3ddf12013020fa9b74e61 |
25 |
+DIST pdns-recursor-4.1.9.tar.bz2 1237727 BLAKE2B e060120edbbccd6688f614e0c00f0ecb9954b2d1f96194f7fff53d7111ec8c843348c25e206e998e1d0eb920b68b4a4631fb0806810e14956bd04957ece0c960 SHA512 2deaf1cdc8c32087f744efe0d142421cfd2d89dc9b31edcdea55c1efc2637987e8557891716498e3703c4b1af4b0d301e2a53316c5a97c7a18ec85016ccfa8f1 |
26 |
|
27 |
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 |
28 |
new file mode 100644 |
29 |
index 00000000000..b0e3f4f5cef |
30 |
--- /dev/null |
31 |
+++ b/net-dns/pdns-recursor/files/pdns-recursor-4.1.9-protobuf-fix.patch |
32 |
@@ -0,0 +1,32 @@ |
33 |
+From 6b34c39dce4483f97d48201929ff6acd4abbef84 Mon Sep 17 00:00:00 2001 |
34 |
+From: Remi Gacogne <remi.gacogne@××××××××.com> |
35 |
+Date: Mon, 21 Jan 2019 16:07:29 +0100 |
36 |
+Subject: [PATCH] rec: Fix compilation in handleRunningTCPQuestion without |
37 |
+ protobuf support |
38 |
+ |
39 |
+--- |
40 |
+ pdns/pdns_recursor.cc | 4 +++- |
41 |
+ 1 file changed, 3 insertions(+), 1 deletion(-) |
42 |
+ |
43 |
+diff --git a/pdns_recursor.cc b/pdns_recursor.cc |
44 |
+index d92b1ffae..98232dca2 100644 |
45 |
+--- a/pdns_recursor.cc |
46 |
++++ b/pdns_recursor.cc |
47 |
+@@ -1535,6 +1535,9 @@ static void handleRunningTCPQuestion(int fd, FDMultiplexer::funcparam_t& var) |
48 |
+ L<<Logger::Warning<<"Error parsing a query packet for tag determination, setting tag=0: "<<e.what()<<endl; |
49 |
+ } |
50 |
+ } |
51 |
++ |
52 |
++ const struct dnsheader* dh = (const struct dnsheader*) conn->data; |
53 |
++ |
54 |
+ #ifdef HAVE_PROTOBUF |
55 |
+ if(luaconfsLocal->protobufServer || luaconfsLocal->outgoingProtobufServer) { |
56 |
+ dc->d_requestorId = requestorId; |
57 |
+@@ -1542,7 +1545,6 @@ static void handleRunningTCPQuestion(int fd, FDMultiplexer::funcparam_t& var) |
58 |
+ dc->d_uuid = (*t_uuidGenerator)(); |
59 |
+ } |
60 |
+ |
61 |
+- const struct dnsheader* dh = (const struct dnsheader*) conn->data; |
62 |
+ if(luaconfsLocal->protobufServer) { |
63 |
+ try { |
64 |
+ |
65 |
|
66 |
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.1.9.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.1.9.ebuild |
67 |
new file mode 100644 |
68 |
index 00000000000..2bf5e320d81 |
69 |
--- /dev/null |
70 |
+++ b/net-dns/pdns-recursor/pdns-recursor-4.1.9.ebuild |
71 |
@@ -0,0 +1,82 @@ |
72 |
+# Copyright 1999-2019 Gentoo Authors |
73 |
+# Distributed under the terms of the GNU General Public License v2 |
74 |
+ |
75 |
+EAPI="7" |
76 |
+ |
77 |
+inherit flag-o-matic |
78 |
+ |
79 |
+DESCRIPTION="The PowerDNS Recursor" |
80 |
+HOMEPAGE="https://www.powerdns.com/" |
81 |
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2" |
82 |
+ |
83 |
+LICENSE="GPL-2" |
84 |
+SLOT="0" |
85 |
+KEYWORDS="~amd64 ~arm ~x86" |
86 |
+IUSE="libressl luajit protobuf snmp sodium systemd" |
87 |
+ |
88 |
+DEPEND="!luajit? ( >=dev-lang/lua-5.1:= ) |
89 |
+ luajit? ( dev-lang/luajit:= ) |
90 |
+ protobuf? ( |
91 |
+ dev-libs/protobuf |
92 |
+ >=dev-libs/boost-1.42:= |
93 |
+ ) |
94 |
+ systemd? ( sys-apps/systemd:0= ) |
95 |
+ snmp? ( net-analyzer/net-snmp ) |
96 |
+ sodium? ( dev-libs/libsodium:= ) |
97 |
+ libressl? ( dev-libs/libressl:= ) |
98 |
+ !libressl? ( dev-libs/openssl:= ) |
99 |
+ >=dev-libs/boost-1.35:=" |
100 |
+RDEPEND="${DEPEND} |
101 |
+ !<net-dns/pdns-2.9.20-r1" |
102 |
+BDEPEND="virtual/pkgconfig" |
103 |
+ |
104 |
+S="${WORKDIR}"/${P/_/-} |
105 |
+ |
106 |
+PATCHES=( |
107 |
+ "${FILESDIR}"/${P}-protobuf-fix.patch |
108 |
+) |
109 |
+ |
110 |
+pkg_setup() { |
111 |
+ filter-flags -ftree-vectorize |
112 |
+} |
113 |
+ |
114 |
+src_configure() { |
115 |
+ econf \ |
116 |
+ --sysconfdir=/etc/powerdns \ |
117 |
+ $(use_enable systemd) \ |
118 |
+ $(use_enable sodium libsodium) \ |
119 |
+ $(use_with !luajit lua) \ |
120 |
+ $(use_with luajit luajit) \ |
121 |
+ $(use_with protobuf) \ |
122 |
+ $(use_with snmp net-snmp) |
123 |
+} |
124 |
+ |
125 |
+src_install() { |
126 |
+ default |
127 |
+ |
128 |
+ mv "${D}"/etc/powerdns/recursor.conf{-dist,} |
129 |
+ |
130 |
+ # set defaults: setuid=nobody, setgid=nobody |
131 |
+ sed -i \ |
132 |
+ -e 's/^# set\([ug]\)id=$/set\1id=nobody/' \ |
133 |
+ -e 's/^# quiet=$/quiet=on/' \ |
134 |
+ -e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \ |
135 |
+ "${D}"/etc/powerdns/recursor.conf |
136 |
+ |
137 |
+ newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor |
138 |
+ |
139 |
+ keepdir /var/lib/powerdns |
140 |
+} |
141 |
+ |
142 |
+pkg_postinst() { |
143 |
+ local old |
144 |
+ |
145 |
+ for old in ${REPLACING_VERSIONS}; do |
146 |
+ ver_test ${old} -lt 4.0.0-r1 || continue |
147 |
+ |
148 |
+ ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor" |
149 |
+ ewarn "to pdns-recursor, please update your runlevels accordingly." |
150 |
+ |
151 |
+ break |
152 |
+ done |
153 |
+} |