1 |
commit: b22e01fdbd14ba264f89dd1cfd7630ca6a8bcd29 |
2 |
Author: Andreas Schuerch <nativemad <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 28 20:17:47 2019 +0000 |
4 |
Commit: Andreas Schuerch <nativemad <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 28 20:40:02 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b22e01fd |
7 |
|
8 |
net-dns/dnsdist: new maintainer, bump, remove old, new useflags |
9 |
|
10 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
11 |
Signed-off-by: Andreas Schuerch <nativemad <AT> gentoo.org> |
12 |
|
13 |
net-dns/dnsdist/Manifest | 2 +- |
14 |
.../{dnsdist-1.2.0.ebuild => dnsdist-1.3.3.ebuild} | 38 +++++++++++++++------- |
15 |
net-dns/dnsdist/dnsdist-9999.ebuild | 38 +++++++++++++++------- |
16 |
net-dns/dnsdist/metadata.xml | 9 ++--- |
17 |
4 files changed, 56 insertions(+), 31 deletions(-) |
18 |
|
19 |
diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest |
20 |
index d67dcea2a2d..52184b556f1 100644 |
21 |
--- a/net-dns/dnsdist/Manifest |
22 |
+++ b/net-dns/dnsdist/Manifest |
23 |
@@ -1 +1 @@ |
24 |
-DIST dnsdist-1.2.0.tar.bz2 876104 BLAKE2B 6e9d0f871c63a0aae539ae074648edcd6b9d626434c343b28c45cf16ffb6b088300d5327e04c45dbb1c9a0b9ad6077d539dc36ae0424d1ec0a240932e8b34223 SHA512 93f8c5f18462d3291c973a690f6ac2b3c5791d9947bee83d9250b503b7526de365bdcb530f3b082e51ae168a9129e77d5558af7cc3b9d2e98a585af53783c237 |
25 |
+DIST dnsdist-1.3.3.tar.bz2 971253 BLAKE2B e9c36969fc1e4b95b71a3f6885503aea2d527b4d9abce9cb137c290a21aee994a441c0e17c0bf985396fda51020b5ef910753554990259abb16641d93d2d1010 SHA512 c0e3435eafc1f7bcdf41346cecf7b089cc142716f94058f9ec262d0c6ad16467e0b8bed5abc648829c597120c94f998602849ded574e75bfc1a1fb70c1b719ad |
26 |
|
27 |
diff --git a/net-dns/dnsdist/dnsdist-1.2.0.ebuild b/net-dns/dnsdist/dnsdist-1.3.3.ebuild |
28 |
similarity index 64% |
29 |
rename from net-dns/dnsdist/dnsdist-1.2.0.ebuild |
30 |
rename to net-dns/dnsdist/dnsdist-1.3.3.ebuild |
31 |
index 81f8dbfc0f8..b13e2bdae49 100644 |
32 |
--- a/net-dns/dnsdist/dnsdist-1.2.0.ebuild |
33 |
+++ b/net-dns/dnsdist/dnsdist-1.3.3.ebuild |
34 |
@@ -1,7 +1,7 @@ |
35 |
-# Copyright 1999-2018 Gentoo Foundation |
36 |
+# Copyright 1999-2019 Gentoo Authors |
37 |
# Distributed under the terms of the GNU General Public License v2 |
38 |
|
39 |
-EAPI=6 |
40 |
+EAPI=7 |
41 |
|
42 |
EGIT_REPO_URI="https://github.com/PowerDNS/pdns.git" |
43 |
|
44 |
@@ -24,18 +24,25 @@ fi |
45 |
|
46 |
LICENSE="GPL-2" |
47 |
SLOT="0" |
48 |
-IUSE="dnscrypt luajit regex remote-logging snmp +ssl test" |
49 |
-REQUIRED_USE="dnscrypt? ( ssl )" |
50 |
+IUSE="dnscrypt gnutls fstrm luajit regex remote-logging snmp +ssl systemd test" |
51 |
+REQUIRED_USE="dnscrypt? ( ssl ) |
52 |
+ gnutls? ( ssl )" |
53 |
|
54 |
DEPEND=" |
55 |
>=dev-libs/boost-1.35:= |
56 |
dev-libs/libedit:= |
57 |
+ fstrm? ( dev-libs/fstrm:= ) |
58 |
luajit? ( dev-lang/luajit:= ) |
59 |
!luajit? ( >=dev-lang/lua-5.1:= ) |
60 |
- remote-logging? ( dev-libs/protobuf:= ) |
61 |
+ remote-logging? ( >=dev-libs/protobuf-3:= ) |
62 |
regex? ( dev-libs/re2:= ) |
63 |
snmp? ( net-analyzer/net-snmp:= ) |
64 |
- ssl? ( dev-libs/libsodium:= ) |
65 |
+ ssl? ( |
66 |
+ dev-libs/libsodium:= |
67 |
+ gnutls? ( net-libs/gnutls:= ) |
68 |
+ !gnutls? ( dev-libs/openssl:= ) |
69 |
+ ) |
70 |
+ systemd? ( sys-apps/systemd:0= ) |
71 |
" |
72 |
|
73 |
RDEPEND="${DEPEND}" |
74 |
@@ -53,13 +60,20 @@ src_prepare() { |
75 |
src_configure() { |
76 |
econf \ |
77 |
--sysconfdir=/etc/dnsdist \ |
78 |
- $(use_enable ssl libsodium) \ |
79 |
- $(use_with remote-logging protobuf) \ |
80 |
- $(use_enable regex re2) \ |
81 |
$(use_enable dnscrypt) \ |
82 |
- $(use_with luajit) \ |
83 |
- $(use_enable test unit-tests) \ |
84 |
- $(use_with snmp net-snmp) |
85 |
+ $(use_enable fstrm) \ |
86 |
+ $(use luajit && echo "--with-lua=luajit" || echo "--with-lua=lua" ) \ |
87 |
+ $(use_enable regex re2) \ |
88 |
+ $(use_with remote-logging protobuf) \ |
89 |
+ $(use_with snmp net-snmp) \ |
90 |
+ $(use_enable ssl libsodium) \ |
91 |
+ $(use ssl && { echo "--enable-dns-over-tls" && use_enable gnutls && use_enable !gnutls libssl;} || echo "--disable-gnutls --disable-libssl") \ |
92 |
+ $(use_enable systemd) \ |
93 |
+ $(use_enable test unit-tests) |
94 |
+ if [ ${PV} == "1.3.3" ]; then |
95 |
+ sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \ |
96 |
+ -i "${S}/configure" |
97 |
+ fi |
98 |
} |
99 |
|
100 |
src_install() { |
101 |
|
102 |
diff --git a/net-dns/dnsdist/dnsdist-9999.ebuild b/net-dns/dnsdist/dnsdist-9999.ebuild |
103 |
index 81f8dbfc0f8..b13e2bdae49 100644 |
104 |
--- a/net-dns/dnsdist/dnsdist-9999.ebuild |
105 |
+++ b/net-dns/dnsdist/dnsdist-9999.ebuild |
106 |
@@ -1,7 +1,7 @@ |
107 |
-# Copyright 1999-2018 Gentoo Foundation |
108 |
+# Copyright 1999-2019 Gentoo Authors |
109 |
# Distributed under the terms of the GNU General Public License v2 |
110 |
|
111 |
-EAPI=6 |
112 |
+EAPI=7 |
113 |
|
114 |
EGIT_REPO_URI="https://github.com/PowerDNS/pdns.git" |
115 |
|
116 |
@@ -24,18 +24,25 @@ fi |
117 |
|
118 |
LICENSE="GPL-2" |
119 |
SLOT="0" |
120 |
-IUSE="dnscrypt luajit regex remote-logging snmp +ssl test" |
121 |
-REQUIRED_USE="dnscrypt? ( ssl )" |
122 |
+IUSE="dnscrypt gnutls fstrm luajit regex remote-logging snmp +ssl systemd test" |
123 |
+REQUIRED_USE="dnscrypt? ( ssl ) |
124 |
+ gnutls? ( ssl )" |
125 |
|
126 |
DEPEND=" |
127 |
>=dev-libs/boost-1.35:= |
128 |
dev-libs/libedit:= |
129 |
+ fstrm? ( dev-libs/fstrm:= ) |
130 |
luajit? ( dev-lang/luajit:= ) |
131 |
!luajit? ( >=dev-lang/lua-5.1:= ) |
132 |
- remote-logging? ( dev-libs/protobuf:= ) |
133 |
+ remote-logging? ( >=dev-libs/protobuf-3:= ) |
134 |
regex? ( dev-libs/re2:= ) |
135 |
snmp? ( net-analyzer/net-snmp:= ) |
136 |
- ssl? ( dev-libs/libsodium:= ) |
137 |
+ ssl? ( |
138 |
+ dev-libs/libsodium:= |
139 |
+ gnutls? ( net-libs/gnutls:= ) |
140 |
+ !gnutls? ( dev-libs/openssl:= ) |
141 |
+ ) |
142 |
+ systemd? ( sys-apps/systemd:0= ) |
143 |
" |
144 |
|
145 |
RDEPEND="${DEPEND}" |
146 |
@@ -53,13 +60,20 @@ src_prepare() { |
147 |
src_configure() { |
148 |
econf \ |
149 |
--sysconfdir=/etc/dnsdist \ |
150 |
- $(use_enable ssl libsodium) \ |
151 |
- $(use_with remote-logging protobuf) \ |
152 |
- $(use_enable regex re2) \ |
153 |
$(use_enable dnscrypt) \ |
154 |
- $(use_with luajit) \ |
155 |
- $(use_enable test unit-tests) \ |
156 |
- $(use_with snmp net-snmp) |
157 |
+ $(use_enable fstrm) \ |
158 |
+ $(use luajit && echo "--with-lua=luajit" || echo "--with-lua=lua" ) \ |
159 |
+ $(use_enable regex re2) \ |
160 |
+ $(use_with remote-logging protobuf) \ |
161 |
+ $(use_with snmp net-snmp) \ |
162 |
+ $(use_enable ssl libsodium) \ |
163 |
+ $(use ssl && { echo "--enable-dns-over-tls" && use_enable gnutls && use_enable !gnutls libssl;} || echo "--disable-gnutls --disable-libssl") \ |
164 |
+ $(use_enable systemd) \ |
165 |
+ $(use_enable test unit-tests) |
166 |
+ if [ ${PV} == "1.3.3" ]; then |
167 |
+ sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \ |
168 |
+ -i "${S}/configure" |
169 |
+ fi |
170 |
} |
171 |
|
172 |
src_install() { |
173 |
|
174 |
diff --git a/net-dns/dnsdist/metadata.xml b/net-dns/dnsdist/metadata.xml |
175 |
index 3f6dc8527a3..e4d52294acd 100644 |
176 |
--- a/net-dns/dnsdist/metadata.xml |
177 |
+++ b/net-dns/dnsdist/metadata.xml |
178 |
@@ -2,18 +2,15 @@ |
179 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
180 |
<pkgmetadata> |
181 |
<maintainer type="person"> |
182 |
- <email>bgo@×××.de</email> |
183 |
- <name>Vladimir Datsevich</name> |
184 |
- </maintainer> |
185 |
- <maintainer type="project"> |
186 |
- <email>proxy-maint@g.o</email> |
187 |
- <name>Proxy Maintainers</name> |
188 |
+ <email>nativemad@g.o</email> |
189 |
+ <name>Andreas Schuerch</name> |
190 |
</maintainer> |
191 |
<longdescription lang="en"> |
192 |
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. |
193 |
</longdescription> |
194 |
<use> |
195 |
<flag name="dnscrypt">Enable the ability to act as a DNSCrypt server</flag> |
196 |
+ <flag name="fstrm">Enable support for fstrm via <pkg>dev-libs/fstrm</pkg></flag> |
197 |
<flag name="regex">Enable support for regular expression matching via <pkg>dev-libs/re2</pkg></flag> |
198 |
<flag name="remote-logging">Enable support for remote logging via <pkg>dev-libs/protobuf</pkg></flag> |
199 |
<flag name="ssl">Enable support for and encrypted client-server communication via <pkg>dev-libs/libsodium</pkg></flag> |