1 |
commit: dff4d31f17860f1ac30f7e5c849d9a2a9e364941 |
2 |
Author: Andreas Schuerch <nativemad <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 2 13:24:19 2020 +0000 |
4 |
Commit: Andreas Schuerch <nativemad <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 2 13:24:19 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dff4d31f |
7 |
|
8 |
net-dns/dnsdist: version bump and remove old |
9 |
|
10 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
11 |
Signed-off-by: Andreas Schuerch <nativemad <AT> gentoo.org> |
12 |
|
13 |
net-dns/dnsdist/Manifest | 3 +- |
14 |
net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild | 104 --------------------- |
15 |
.../{dnsdist-1.4.0.ebuild => dnsdist-1.5.1.ebuild} | 10 +- |
16 |
net-dns/dnsdist/metadata.xml | 1 - |
17 |
4 files changed, 4 insertions(+), 114 deletions(-) |
18 |
|
19 |
diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest |
20 |
index 6d2a06fbff8..773ff1f17b9 100644 |
21 |
--- a/net-dns/dnsdist/Manifest |
22 |
+++ b/net-dns/dnsdist/Manifest |
23 |
@@ -1,3 +1,2 @@ |
24 |
-DIST dnsdist-1.3.3.tar.bz2 971253 BLAKE2B e9c36969fc1e4b95b71a3f6885503aea2d527b4d9abce9cb137c290a21aee994a441c0e17c0bf985396fda51020b5ef910753554990259abb16641d93d2d1010 SHA512 c0e3435eafc1f7bcdf41346cecf7b089cc142716f94058f9ec262d0c6ad16467e0b8bed5abc648829c597120c94f998602849ded574e75bfc1a1fb70c1b719ad |
25 |
-DIST dnsdist-1.4.0.tar.bz2 1044479 BLAKE2B 79aef57ed2b1036f222e8bcfdf615c3221c9dfdbc8fd3f80d778fb050f74bc200958b4d605dcadd5c23ac6c4b5b1a36048108cd85394920e99d6037177b81342 SHA512 c9450e97325d8ad8c8c3a395412c46ea8053cbe1ebe73329a1618212ba29bdf2f8da908ae2b90c314b5aab613387f42363e3a5322b1a36f60190fb48e1c425c5 |
26 |
DIST dnsdist-1.5.0.tar.bz2 1067645 BLAKE2B de07de8f862a633d8eb11ccf632e01c2ce779a35ef61ba2fcf932894d692f2f3edfd638ce77f178bbfbfc1115d8e76f5522e10061fcf61650170a5b59d5cc9ca SHA512 df6f8caae001f152f0d264176c570778842979484d16e4199afe0e2591006392444245dd8ce23287cdcf9613e2c40a9e3564f5236e5f5a6fd67b89d6ea0d9ed4 |
27 |
+DIST dnsdist-1.5.1.tar.bz2 1068061 BLAKE2B 1c0fdd181b62b96fcd433581715cea9dc204fcdd2f65efd26a5293cc9c17d904e0937b51ba33d2dc01ecc8044f491ba2c6c8720c0816587fa5082da73108783e SHA512 68fe5f55fd081ed80a620933af9f8310be0e21c86ba449a9c557975b5c83f4b64e3002e6032dc002582d081e70e1ec2ff080c5d8389fd46a9896bdafd5a41f9f |
28 |
|
29 |
diff --git a/net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild b/net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild |
30 |
deleted file mode 100644 |
31 |
index 493fd0f5e4c..00000000000 |
32 |
--- a/net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,104 +0,0 @@ |
35 |
-# Copyright 1999-2019 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=7 |
39 |
- |
40 |
-EGIT_REPO_URI="https://github.com/PowerDNS/pdns.git" |
41 |
- |
42 |
-if [[ ${PV} = 9999 ]]; then |
43 |
- ADDITIONAL_ECLASSES="autotools git-r3" |
44 |
-fi |
45 |
- |
46 |
-inherit eutils flag-o-matic user ${ADDITIONAL_ECLASSES} |
47 |
- |
48 |
-DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer" |
49 |
-HOMEPAGE="https://dnsdist.org" |
50 |
- |
51 |
-if [[ ${PV} == 9999 ]]; then |
52 |
- SRC_URI="" |
53 |
- S="${WORKDIR}/${P}/pdns/dnsdistdist" |
54 |
-else |
55 |
- SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2" |
56 |
- KEYWORDS="~amd64 ~x86" |
57 |
-fi |
58 |
- |
59 |
-LICENSE="GPL-2" |
60 |
-SLOT="0" |
61 |
-IUSE="dnscrypt gnutls fstrm luajit regex remote-logging snmp +ssl systemd test" |
62 |
-RESTRICT="!test? ( test )" |
63 |
-REQUIRED_USE="dnscrypt? ( ssl ) |
64 |
- gnutls? ( ssl )" |
65 |
- |
66 |
-RDEPEND=" |
67 |
- >=dev-libs/boost-1.35:= |
68 |
- dev-libs/libedit:= |
69 |
- fstrm? ( dev-libs/fstrm:= ) |
70 |
- luajit? ( dev-lang/luajit:= ) |
71 |
- !luajit? ( >=dev-lang/lua-5.1:= ) |
72 |
- remote-logging? ( >=dev-libs/protobuf-3:= ) |
73 |
- regex? ( dev-libs/re2:= ) |
74 |
- snmp? ( net-analyzer/net-snmp:= ) |
75 |
- ssl? ( |
76 |
- dev-libs/libsodium:= |
77 |
- gnutls? ( net-libs/gnutls:= ) |
78 |
- !gnutls? ( dev-libs/openssl:= ) |
79 |
- ) |
80 |
- systemd? ( sys-apps/systemd:0= ) |
81 |
-" |
82 |
- |
83 |
-DEPEND="${RDEPEND} |
84 |
- virtual/pkgconfig |
85 |
-" |
86 |
- |
87 |
-[[ ${PV} == 9999 ]] && DEPEND+=" |
88 |
- app-text/pandoc |
89 |
- dev-util/ragel |
90 |
- dev-python/virtualenv |
91 |
-" |
92 |
- |
93 |
-src_prepare() { |
94 |
- default |
95 |
- [[ ${PV} == 9999 ]] && eautoreconf |
96 |
-} |
97 |
- |
98 |
-src_configure() { |
99 |
- econf \ |
100 |
- --sysconfdir=/etc/dnsdist \ |
101 |
- $(use_enable dnscrypt) \ |
102 |
- $(use_enable fstrm) \ |
103 |
- $(use luajit && echo "--with-lua=luajit" || echo "--with-lua=lua" ) \ |
104 |
- $(use_enable regex re2) \ |
105 |
- $(use_with remote-logging protobuf) \ |
106 |
- $(use_with snmp net-snmp) \ |
107 |
- $(use_enable ssl libsodium) \ |
108 |
- $(use ssl && { echo "--enable-dns-over-tls" && use_enable gnutls && use_enable !gnutls libssl;} || echo "--disable-gnutls --disable-libssl") \ |
109 |
- $(use_enable systemd) \ |
110 |
- $(use_enable test unit-tests) |
111 |
- if [ ${PV} == "1.3.3" ]; then |
112 |
- sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \ |
113 |
- -i "${S}/configure" |
114 |
- fi |
115 |
-} |
116 |
- |
117 |
-src_install() { |
118 |
- default |
119 |
- |
120 |
- insinto /etc/dnsdist |
121 |
- doins "${FILESDIR}"/dnsdist.conf.example |
122 |
- |
123 |
- newconfd "${FILESDIR}"/dnsdist.confd ${PN} |
124 |
- newinitd "${FILESDIR}"/dnsdist.initd ${PN} |
125 |
-} |
126 |
- |
127 |
-pkg_preinst() { |
128 |
- enewgroup dnsdist |
129 |
- enewuser dnsdist -1 -1 -1 dnsdist |
130 |
-} |
131 |
- |
132 |
-pkg_postinst() { |
133 |
- elog "dnsdist provides multiple instances support. You can create more instances" |
134 |
- elog "by symlinking the dnsdist init script to another name." |
135 |
- elog |
136 |
- elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the" |
137 |
- elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default." |
138 |
-} |
139 |
|
140 |
diff --git a/net-dns/dnsdist/dnsdist-1.4.0.ebuild b/net-dns/dnsdist/dnsdist-1.5.1.ebuild |
141 |
similarity index 95% |
142 |
rename from net-dns/dnsdist/dnsdist-1.4.0.ebuild |
143 |
rename to net-dns/dnsdist/dnsdist-1.5.1.ebuild |
144 |
index dae9b523e36..b36be988dc3 100644 |
145 |
--- a/net-dns/dnsdist/dnsdist-1.4.0.ebuild |
146 |
+++ b/net-dns/dnsdist/dnsdist-1.5.1.ebuild |
147 |
@@ -3,7 +3,7 @@ |
148 |
|
149 |
EAPI=7 |
150 |
|
151 |
-inherit eutils flag-o-matic user |
152 |
+inherit eutils flag-o-matic |
153 |
|
154 |
DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer" |
155 |
HOMEPAGE="https://dnsdist.org" |
156 |
@@ -19,7 +19,8 @@ REQUIRED_USE="dnscrypt? ( ssl ) |
157 |
gnutls? ( ssl ) |
158 |
doh? ( ssl !gnutls )" |
159 |
|
160 |
-RDEPEND=" |
161 |
+RDEPEND="acct-group/dnsdist |
162 |
+ acct-user/dnsdist |
163 |
>=dev-libs/boost-1.35:= |
164 |
dev-libs/libedit:= |
165 |
dnscrypt? ( dev-libs/libsodium:= ) |
166 |
@@ -74,11 +75,6 @@ src_install() { |
167 |
newinitd "${FILESDIR}"/dnsdist.initd ${PN} |
168 |
} |
169 |
|
170 |
-pkg_preinst() { |
171 |
- enewgroup dnsdist |
172 |
- enewuser dnsdist -1 -1 -1 dnsdist |
173 |
-} |
174 |
- |
175 |
pkg_postinst() { |
176 |
elog "dnsdist provides multiple instances support. You can create more instances" |
177 |
elog "by symlinking the dnsdist init script to another name." |
178 |
|
179 |
diff --git a/net-dns/dnsdist/metadata.xml b/net-dns/dnsdist/metadata.xml |
180 |
index d42d77d511d..52ecd48eab0 100644 |
181 |
--- a/net-dns/dnsdist/metadata.xml |
182 |
+++ b/net-dns/dnsdist/metadata.xml |
183 |
@@ -10,7 +10,6 @@ |
184 |
</longdescription> |
185 |
<use> |
186 |
<flag name="dnscrypt">Enable the ability to act as a DNSCrypt server</flag> |
187 |
- <flag name="fstrm">Enable support for fstrm via <pkg>dev-libs/fstrm</pkg></flag> |
188 |
<flag name="regex">Enable support for regular expression matching via <pkg>dev-libs/re2</pkg></flag> |
189 |
<flag name="remote-logging">Enable support for remote logging via <pkg>dev-libs/protobuf</pkg></flag> |
190 |
<flag name="ssl">Enable support for and encrypted client-server communication via <pkg>dev-libs/libsodium</pkg></flag> |