1 |
commit: ccb50fe9480656be84a66d14524b46788bf9319a |
2 |
Author: Sven Wegener <swegener <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 22 18:51:41 2022 +0000 |
4 |
Commit: Sven Wegener <swegener <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 22 18:54:05 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccb50fe9 |
7 |
|
8 |
net-dns/pdns-recursor: Cleanup |
9 |
|
10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
11 |
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org> |
12 |
|
13 |
net-dns/pdns-recursor/Manifest | 2 - |
14 |
.../files/pdns-recursor-4.6.2-parseACL.patch | 24 ------ |
15 |
net-dns/pdns-recursor/pdns-recursor-4.6.2.ebuild | 92 ---------------------- |
16 |
net-dns/pdns-recursor/pdns-recursor-4.7.0.ebuild | 88 --------------------- |
17 |
4 files changed, 206 deletions(-) |
18 |
|
19 |
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest |
20 |
index 8f1f81fe706d..30f5b141869d 100644 |
21 |
--- a/net-dns/pdns-recursor/Manifest |
22 |
+++ b/net-dns/pdns-recursor/Manifest |
23 |
@@ -1,3 +1 @@ |
24 |
-DIST pdns-recursor-4.6.2.tar.bz2 1552587 BLAKE2B 3e7fe59ebe9d776c012304fc1bf6ed723c1c15df0aaedcaa8ac538741e81c5b6ebac2528e763e1395a0ea383904e4a902319509580938caae85b3aef947cfc3d SHA512 20779a065720162f0a6223a4d92deeef7911892bb8aa1929f9c6a8a6ccd2f8756e7bd35c877dbf945bb7627a2a7d40626d02f0008c2e8a602b424d36c110fddc |
25 |
-DIST pdns-recursor-4.7.0.tar.bz2 1596954 BLAKE2B d2fb35caef19ee21ff495deb19939659940f245b44f6ff38977f328af9821862b939c48b5052b42ae83ae09647bab53094816b6dbe784737ef4c53ba02add855 SHA512 095272311623684a5a465ae48bd97b86ffe27d4092dea5dceee915ebb071ffb976eeb4055d560d834a3fafab0b15808137e384f28b7cec24719b78ac024e48c2 |
26 |
DIST pdns-recursor-4.7.1.tar.bz2 1597536 BLAKE2B fc5d7ee80823ad55a986a9317d4be5be7d1ec1d1b993a5bb1bf0c138a901d4f81d4ebcef5e9774cd5de88c9f650053be26dc01dfd31b989dae25d53d12b87bad SHA512 7769c4c082bbf52b0e13adbe9c1c7272a638c0b2b11e1d76794cea66dfe8dc83b07989fa16707a7cc682e8c366ef4c1d37a614ad2841af33ccb9adec6270e07f |
27 |
|
28 |
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.6.2-parseACL.patch b/net-dns/pdns-recursor/files/pdns-recursor-4.6.2-parseACL.patch |
29 |
deleted file mode 100644 |
30 |
index ee58e055f09a..000000000000 |
31 |
--- a/net-dns/pdns-recursor/files/pdns-recursor-4.6.2-parseACL.patch |
32 |
+++ /dev/null |
33 |
@@ -1,24 +0,0 @@ |
34 |
---- a/pdns_recursor.cc |
35 |
-+++ b/pdns_recursor.cc |
36 |
-@@ -4775,8 +4775,6 @@ static std::shared_ptr<NetmaskGroup> parseACL(const std::string& aclFile, const |
37 |
- result->addMask(line); |
38 |
- } |
39 |
- g_log<<Logger::Info<<"Done parsing "<<result->size()<<" "<<aclSetting<<" ranges from file '"<<::arg()[aclFile]<<"' - overriding '"<<aclSetting<<"' setting"<<endl; |
40 |
-- |
41 |
-- return result; |
42 |
- } |
43 |
- else if(!::arg()[aclSetting].empty()) { |
44 |
- vector<string> ips; |
45 |
-@@ -4790,11 +4788,9 @@ static std::shared_ptr<NetmaskGroup> parseACL(const std::string& aclFile, const |
46 |
- g_log<<Logger::Info<<*i; |
47 |
- } |
48 |
- g_log<<Logger::Info<<endl; |
49 |
-- |
50 |
-- return result; |
51 |
- } |
52 |
- |
53 |
-- return nullptr; |
54 |
-+ return result; |
55 |
- } |
56 |
- |
57 |
- void parseACLs() |
58 |
|
59 |
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.6.2.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.6.2.ebuild |
60 |
deleted file mode 100644 |
61 |
index 9de99bbdbbdd..000000000000 |
62 |
--- a/net-dns/pdns-recursor/pdns-recursor-4.6.2.ebuild |
63 |
+++ /dev/null |
64 |
@@ -1,92 +0,0 @@ |
65 |
-# Copyright 1999-2022 Gentoo Authors |
66 |
-# Distributed under the terms of the GNU General Public License v2 |
67 |
- |
68 |
-EAPI=7 |
69 |
- |
70 |
-LUA_COMPAT=( lua5-{1..4} luajit ) |
71 |
- |
72 |
-inherit flag-o-matic lua-single |
73 |
- |
74 |
-DESCRIPTION="The PowerDNS Recursor" |
75 |
-HOMEPAGE="https://www.powerdns.com/" |
76 |
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2" |
77 |
- |
78 |
-LICENSE="GPL-2" |
79 |
-SLOT="0" |
80 |
-KEYWORDS="amd64 ~arm x86" |
81 |
-IUSE="debug dnstap snmp sodium systemd test" |
82 |
-REQUIRED_USE="${LUA_REQUIRED_USE}" |
83 |
-RESTRICT="!test? ( test )" |
84 |
- |
85 |
-DEPEND="${LUA_DEPS} |
86 |
- dnstap? ( dev-libs/fstrm ) |
87 |
- systemd? ( sys-apps/systemd:0= ) |
88 |
- snmp? ( net-analyzer/net-snmp ) |
89 |
- sodium? ( dev-libs/libsodium:= ) |
90 |
- elibc_glibc? ( |
91 |
- arm? ( >=sys-libs/glibc-2.34 ) |
92 |
- x86? ( >=sys-libs/glibc-2.34 ) |
93 |
- ) |
94 |
- dev-libs/openssl:= |
95 |
- >=dev-libs/boost-1.35:=[context]" |
96 |
-RDEPEND="${DEPEND} |
97 |
- !<net-dns/pdns-2.9.20-r1 |
98 |
- acct-user/pdns |
99 |
- acct-group/pdns" |
100 |
-BDEPEND="virtual/pkgconfig" |
101 |
- |
102 |
-S="${WORKDIR}"/${P/_/-} |
103 |
- |
104 |
-PATCHES=( |
105 |
- "${FILESDIR}"/${P}-parseACL.patch |
106 |
-) |
107 |
- |
108 |
-pkg_setup() { |
109 |
- lua-single_pkg_setup |
110 |
- filter-flags -ftree-vectorize |
111 |
- append-lfs-flags |
112 |
- append-cppflags -D_TIME_BITS=64 |
113 |
-} |
114 |
- |
115 |
-src_configure() { |
116 |
- econf \ |
117 |
- --sysconfdir=/etc/powerdns \ |
118 |
- --with-nod-cache-dir=/var/lib/powerdns \ |
119 |
- --with-service-user=pdns \ |
120 |
- --with-service-group=pdns \ |
121 |
- --with-lua="${ELUA}" \ |
122 |
- $(use_enable debug verbose-logging) \ |
123 |
- $(use_enable systemd) \ |
124 |
- $(use_enable dnstap dnstap) \ |
125 |
- $(use_enable test unit-tests) \ |
126 |
- $(use_with sodium libsodium) \ |
127 |
- $(use_with snmp net-snmp) |
128 |
-} |
129 |
- |
130 |
-src_install() { |
131 |
- default |
132 |
- |
133 |
- mv "${D}"/etc/powerdns/recursor.conf{-dist,} |
134 |
- |
135 |
- # set defaults: setuid=nobody, setgid=nobody |
136 |
- sed -i \ |
137 |
- -e 's/^# set\([ug]\)id=$/set\1id=pdns/' \ |
138 |
- -e 's/^# quiet=$/quiet=on/' \ |
139 |
- -e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \ |
140 |
- "${D}"/etc/powerdns/recursor.conf |
141 |
- |
142 |
- newinitd "${FILESDIR}"/pdns-recursor-r2 pdns-recursor |
143 |
-} |
144 |
- |
145 |
-pkg_postinst() { |
146 |
- local old |
147 |
- |
148 |
- for old in ${REPLACING_VERSIONS}; do |
149 |
- ver_test ${old} -lt 4.0.0-r1 || continue |
150 |
- |
151 |
- ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor" |
152 |
- ewarn "to pdns-recursor, please update your runlevels accordingly." |
153 |
- |
154 |
- break |
155 |
- done |
156 |
-} |
157 |
|
158 |
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.7.0.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.7.0.ebuild |
159 |
deleted file mode 100644 |
160 |
index fe258d909f08..000000000000 |
161 |
--- a/net-dns/pdns-recursor/pdns-recursor-4.7.0.ebuild |
162 |
+++ /dev/null |
163 |
@@ -1,88 +0,0 @@ |
164 |
-# Copyright 1999-2022 Gentoo Authors |
165 |
-# Distributed under the terms of the GNU General Public License v2 |
166 |
- |
167 |
-EAPI=7 |
168 |
- |
169 |
-LUA_COMPAT=( lua5-{1..4} luajit ) |
170 |
- |
171 |
-inherit flag-o-matic lua-single |
172 |
- |
173 |
-DESCRIPTION="The PowerDNS Recursor" |
174 |
-HOMEPAGE="https://www.powerdns.com/" |
175 |
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2" |
176 |
- |
177 |
-LICENSE="GPL-2" |
178 |
-SLOT="0" |
179 |
-KEYWORDS="~amd64 ~arm ~x86" |
180 |
-IUSE="debug dnstap snmp sodium systemd test" |
181 |
-REQUIRED_USE="${LUA_REQUIRED_USE}" |
182 |
-RESTRICT="!test? ( test )" |
183 |
- |
184 |
-DEPEND="${LUA_DEPS} |
185 |
- dnstap? ( dev-libs/fstrm ) |
186 |
- systemd? ( sys-apps/systemd:0= ) |
187 |
- snmp? ( net-analyzer/net-snmp ) |
188 |
- sodium? ( dev-libs/libsodium:= ) |
189 |
- elibc_glibc? ( |
190 |
- arm? ( >=sys-libs/glibc-2.34 ) |
191 |
- x86? ( >=sys-libs/glibc-2.34 ) |
192 |
- ) |
193 |
- dev-libs/openssl:= |
194 |
- >=dev-libs/boost-1.35:=[context]" |
195 |
-RDEPEND="${DEPEND} |
196 |
- !<net-dns/pdns-2.9.20-r1 |
197 |
- acct-user/pdns |
198 |
- acct-group/pdns" |
199 |
-BDEPEND="virtual/pkgconfig" |
200 |
- |
201 |
-S="${WORKDIR}"/${P/_/-} |
202 |
- |
203 |
-pkg_setup() { |
204 |
- lua-single_pkg_setup |
205 |
- filter-flags -ftree-vectorize |
206 |
- append-lfs-flags |
207 |
- append-cppflags -D_TIME_BITS=64 |
208 |
-} |
209 |
- |
210 |
-src_configure() { |
211 |
- econf \ |
212 |
- --sysconfdir=/etc/powerdns \ |
213 |
- --with-nod-cache-dir=/var/lib/powerdns \ |
214 |
- --with-service-user=pdns \ |
215 |
- --with-service-group=pdns \ |
216 |
- --with-lua="${ELUA}" \ |
217 |
- $(use_enable debug verbose-logging) \ |
218 |
- $(use_enable systemd) \ |
219 |
- $(use_enable dnstap dnstap) \ |
220 |
- $(use_enable test unit-tests) \ |
221 |
- $(use_with sodium libsodium) \ |
222 |
- $(use_with snmp net-snmp) |
223 |
-} |
224 |
- |
225 |
-src_install() { |
226 |
- default |
227 |
- |
228 |
- mv "${D}"/etc/powerdns/recursor.conf{-dist,} |
229 |
- |
230 |
- # set defaults: setuid=nobody, setgid=nobody |
231 |
- sed -i \ |
232 |
- -e 's/^# set\([ug]\)id=$/set\1id=pdns/' \ |
233 |
- -e 's/^# quiet=$/quiet=on/' \ |
234 |
- -e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \ |
235 |
- "${D}"/etc/powerdns/recursor.conf |
236 |
- |
237 |
- newinitd "${FILESDIR}"/pdns-recursor-r2 pdns-recursor |
238 |
-} |
239 |
- |
240 |
-pkg_postinst() { |
241 |
- local old |
242 |
- |
243 |
- for old in ${REPLACING_VERSIONS}; do |
244 |
- ver_test ${old} -lt 4.0.0-r1 || continue |
245 |
- |
246 |
- ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor" |
247 |
- ewarn "to pdns-recursor, please update your runlevels accordingly." |
248 |
- |
249 |
- break |
250 |
- done |
251 |
-} |