Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/opendnssec/files/
Date: Sun, 27 Sep 2020 00:15:04
Message-Id: 1601165691.ac80ac59b84559e6217bb4047e65918313887d00.conikost@gentoo
1 commit: ac80ac59b84559e6217bb4047e65918313887d00
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sat Sep 26 14:43:17 2020 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 27 00:14:51 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac80ac59
7
8 net-dns/opendnssec: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/17683
11 Package-Manager: Portage-3.0.8, Repoman-3.0.1
12 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 .../files/opendnssec-1.3.14-drop-privileges.patch | 43 -------
16 .../files/opendnssec-1.3.14-use-system-trang.patch | 21 ----
17 ...nssec-1.3.18-eppclient-curl-CVE-2012-5582.patch | 12 --
18 .../files/opendnssec-drop-privileges.patch | 28 -----
19 .../files/opendnssec-fix-localstatedir.patch | 32 ------
20 .../opendnssec/files/opendnssec-fix-run-dir.patch | 26 -----
21 net-dns/opendnssec/files/opendnssec.confd-1.3.x | 13 ---
22 net-dns/opendnssec/files/opendnssec.initd-1.3.x | 123 ---------------------
23 8 files changed, 298 deletions(-)
24
25 diff --git a/net-dns/opendnssec/files/opendnssec-1.3.14-drop-privileges.patch b/net-dns/opendnssec/files/opendnssec-1.3.14-drop-privileges.patch
26 deleted file mode 100644
27 index 7c9f72355d2..00000000000
28 --- a/net-dns/opendnssec/files/opendnssec-1.3.14-drop-privileges.patch
29 +++ /dev/null
30 @@ -1,43 +0,0 @@
31 -Index: conf/conf.xml.in
32 -===================================================================
33 ---- conf/conf.xml.in (revision 3022)
34 -+++ conf/conf.xml.in (working copy)
35 -@@ -38,12 +38,10 @@
36 - </Common>
37 -
38 - <Enforcer>
39 --<!--
40 - <Privileges>
41 - <User>opendnssec</User>
42 - <Group>opendnssec</Group>
43 - </Privileges>
44 ---->
45 -
46 - <Datastore><SQLite>@OPENDNSSEC_STATE_DIR@/kasp.db</SQLite></Datastore>
47 - <Interval>PT3600S</Interval>
48 -@@ -56,12 +54,10 @@
49 - </Enforcer>
50 -
51 - <Signer>
52 --<!--
53 - <Privileges>
54 - <User>opendnssec</User>
55 - <Group>opendnssec</Group>
56 - </Privileges>
57 ---->
58 -
59 - <WorkingDirectory>@OPENDNSSEC_STATE_DIR@/tmp</WorkingDirectory>
60 - <WorkerThreads>8</WorkerThreads>
61 -@@ -80,12 +76,10 @@
62 - </Signer>
63 -
64 - <Auditor>
65 --<!--
66 - <Privileges>
67 - <User>opendnssec</User>
68 - <Group>opendnssec</Group>
69 - </Privileges>
70 ---->
71 -
72 - <WorkingDirectory>@OPENDNSSEC_STATE_DIR@/tmp</WorkingDirectory>
73 - </Auditor>
74
75 diff --git a/net-dns/opendnssec/files/opendnssec-1.3.14-use-system-trang.patch b/net-dns/opendnssec/files/opendnssec-1.3.14-use-system-trang.patch
76 deleted file mode 100644
77 index 39678408264..00000000000
78 --- a/net-dns/opendnssec/files/opendnssec-1.3.14-use-system-trang.patch
79 +++ /dev/null
80 @@ -1,21 +0,0 @@
81 -diff -urN opendnssec-1.3.0rc3.old/conf/Makefile.am opendnssec-1.3.0rc3/conf/Makefile.am
82 ---- opendnssec-1.3.0rc3.old/conf/Makefile.am 2011-07-01 21:15:25.000000000 +0200
83 -+++ opendnssec-1.3.0rc3/conf/Makefile.am 2011-07-01 21:17:00.000000000 +0200
84 -@@ -7,7 +7,7 @@
85 - XML = conf.xml kasp.xml zonelist.xml signconf.xml zonefetch.xml
86 - XSL= kasp2html.xsl
87 -
88 --TRANG= $(srcdir)/trang/trang.jar
89 -+TRANG= /usr/bin/trang
90 -
91 - sysconfdir = @sysconfdir@/opendnssec
92 - datadir = @datadir@/opendnssec
93 -@@ -25,7 +25,7 @@
94 - .rnc.rng:
95 - @test -x "${JAVA}" || \
96 - (echo "java is required for converting RelaxNG Compact to RelaxNG"; false)
97 -- ${JAVA} -jar ${TRANG} $< $@
98 -+ ${TRANG} $< $@
99 -
100 - regress: $(RNG)
101 - @test -x "${XMLLINT}" || \
102
103 diff --git a/net-dns/opendnssec/files/opendnssec-1.3.18-eppclient-curl-CVE-2012-5582.patch b/net-dns/opendnssec/files/opendnssec-1.3.18-eppclient-curl-CVE-2012-5582.patch
104 deleted file mode 100644
105 index a0676dd091b..00000000000
106 --- a/net-dns/opendnssec/files/opendnssec-1.3.18-eppclient-curl-CVE-2012-5582.patch
107 +++ /dev/null
108 @@ -1,12 +0,0 @@
109 -diff -urN opendnssec-1.3.18.orig/plugins/eppclient/src/epp.c opendnssec-1.3.18/plugins/eppclient/src/epp.c
110 ---- opendnssec-1.3.18.orig/plugins/eppclient/src/epp.c 2014-07-21 11:16:10.000000000 +0200
111 -+++ opendnssec-1.3.18/plugins/eppclient/src/epp.c 2016-03-23 22:25:18.679354984 +0100
112 -@@ -390,7 +390,7 @@
113 - curl_easy_setopt(curl, CURLOPT_URL, url);
114 - curl_easy_setopt(curl, CURLOPT_CONNECT_ONLY, 1L);
115 - curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 1L);
116 -- curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 1L);
117 -+ curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 2L);
118 - curl_easy_setopt(curl, CURLOPT_USE_SSL, CURLUSESSL_ALL);
119 - curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curlerr);
120 - curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1L);
121
122 diff --git a/net-dns/opendnssec/files/opendnssec-drop-privileges.patch b/net-dns/opendnssec/files/opendnssec-drop-privileges.patch
123 deleted file mode 100644
124 index c1972bbc3d1..00000000000
125 --- a/net-dns/opendnssec/files/opendnssec-drop-privileges.patch
126 +++ /dev/null
127 @@ -1,28 +0,0 @@
128 ---- conf/conf.xml.in.orig 2013-05-12 22:36:47.530988182 +0200
129 -+++ conf/conf.xml.in 2013-05-12 22:37:56.459817918 +0200
130 -@@ -38,12 +38,10 @@
131 - </Common>
132 -
133 - <Enforcer>
134 --<!--
135 - <Privileges>
136 - <User>opendnssec</User>
137 - <Group>opendnssec</Group>
138 - </Privileges>
139 ---->
140 - <!-- NOTE: Enforcer worker threads are not used; this option is ignored -->
141 - <!--
142 - <WorkerThreads>4</WorkerThreads>
143 -@@ -60,12 +58,10 @@
144 - </Enforcer>
145 -
146 - <Signer>
147 --<!--
148 - <Privileges>
149 - <User>opendnssec</User>
150 - <Group>opendnssec</Group>
151 - </Privileges>
152 ---->
153 -
154 - <WorkingDirectory>@OPENDNSSEC_STATE_DIR@/tmp</WorkingDirectory>
155 - <WorkerThreads>4</WorkerThreads>
156
157 diff --git a/net-dns/opendnssec/files/opendnssec-fix-localstatedir.patch b/net-dns/opendnssec/files/opendnssec-fix-localstatedir.patch
158 deleted file mode 100644
159 index 3958c6c70cc..00000000000
160 --- a/net-dns/opendnssec/files/opendnssec-fix-localstatedir.patch
161 +++ /dev/null
162 @@ -1,32 +0,0 @@
163 -diff -urN opendnssec-1.3.0rc2.old/Makefile.am opendnssec-1.3.0rc2/Makefile.am
164 ---- opendnssec-1.3.0rc2.old/Makefile.am 2011-06-02 13:48:56.000000000 +0200
165 -+++ opendnssec-1.3.0rc2/Makefile.am 2011-06-02 13:49:19.000000000 +0200
166 -@@ -31,11 +31,11 @@
167 -
168 - install-data-hook:
169 - $(INSTALL) -d $(DESTDIR)$(localstatedir)
170 -- $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec
171 -- $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/tmp
172 -- $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signconf
173 -- $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/unsigned
174 -- $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signed
175 -+ $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec
176 -+ $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/tmp
177 -+ $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signconf
178 -+ $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/unsigned
179 -+ $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signed
180 - $(INSTALL) -d $(DESTDIR)$(localstatedir)/run
181 - $(INSTALL) -d $(DESTDIR)$(localstatedir)/run/opendnssec
182 -
183 -diff -urN opendnssec-1.3.0rc2.old/m4/opendnssec_common.m4 opendnssec-1.3.0rc2/m4/opendnssec_common.m4
184 ---- opendnssec-1.3.0rc2.old/m4/opendnssec_common.m4 2011-06-02 13:48:56.000000000 +0200
185 -+++ opendnssec-1.3.0rc2/m4/opendnssec_common.m4 2011-06-02 13:49:36.000000000 +0200
186 -@@ -18,7 +18,7 @@
187 - OPENDNSSEC_LIBEXEC_DIR=$full_libexecdir/opendnssec
188 - OPENDNSSEC_DATA_DIR=$full_datadir/opendnssec
189 - OPENDNSSEC_SYSCONF_DIR=$full_sysconfdir/opendnssec
190 --OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/opendnssec"
191 -+OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/lib/opendnssec"
192 - OPENDNSSEC_PID_DIR="$full_localstatedir/run/opendnssec"
193 -
194 - AC_SUBST([OPENDNSSEC_BIN_DIR])
195
196 diff --git a/net-dns/opendnssec/files/opendnssec-fix-run-dir.patch b/net-dns/opendnssec/files/opendnssec-fix-run-dir.patch
197 deleted file mode 100644
198 index fe5b504344c..00000000000
199 --- a/net-dns/opendnssec/files/opendnssec-fix-run-dir.patch
200 +++ /dev/null
201 @@ -1,26 +0,0 @@
202 -diff -ur opendnssec-1.3.12.orig/m4/opendnssec_common.m4 opendnssec-1.3.12/m4/opendnssec_common.m4
203 ---- opendnssec-1.3.12.orig/m4/opendnssec_common.m4 2013-01-31 13:46:01.122201232 +0100
204 -+++ opendnssec-1.3.12/m4/opendnssec_common.m4 2013-01-31 13:54:47.648861211 +0100
205 -@@ -19,7 +19,7 @@
206 - OPENDNSSEC_DATA_DIR=$full_datadir/opendnssec
207 - OPENDNSSEC_SYSCONF_DIR=$full_sysconfdir/opendnssec
208 - OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/lib/opendnssec"
209 --OPENDNSSEC_PID_DIR="$full_localstatedir/run/opendnssec"
210 -+OPENDNSSEC_PID_DIR="${destdir}/run/opendnssec"
211 -
212 - AC_SUBST([OPENDNSSEC_BIN_DIR])
213 - AC_SUBST([OPENDNSSEC_SBIN_DIR])
214 -diff -ur opendnssec-1.3.12.orig/Makefile.am opendnssec-1.3.12/Makefile.am
215 ---- opendnssec-1.3.12.orig/Makefile.am 2013-01-31 13:46:01.122201232 +0100
216 -+++ opendnssec-1.3.12/Makefile.am 2013-01-31 13:47:08.569951675 +0100
217 -@@ -37,8 +37,8 @@
218 - $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signconf
219 - $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/unsigned
220 - $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signed
221 -- $(INSTALL) -d $(DESTDIR)$(localstatedir)/run
222 -- $(INSTALL) -d $(DESTDIR)$(localstatedir)/run/opendnssec
223 -+
224 -+
225 -
226 - docs:
227 - (cd libhsm; $(MAKE) doxygen)
228
229 diff --git a/net-dns/opendnssec/files/opendnssec.confd-1.3.x b/net-dns/opendnssec/files/opendnssec.confd-1.3.x
230 deleted file mode 100644
231 index 63121af7f0c..00000000000
232 --- a/net-dns/opendnssec/files/opendnssec.confd-1.3.x
233 +++ /dev/null
234 @@ -1,13 +0,0 @@
235 -# Copyright 1999-2013 Gentoo Foundation
236 -# Distributed under the terms of the GNU General Public License v2
237 -
238 -# Variables containing default binaries used in the opendnssec
239 -# initscript. You can alter them to another applications/paths
240 -# if required.
241 -
242 -CHECKCONFIG_BIN=/usr/bin/ods-kaspcheck
243 -CONTROL_BIN=/usr/sbin/ods-control
244 -ENFORCER_BIN=/usr/sbin/ods-enforcerd
245 -SIGNER_BIN=/usr/sbin/ods-signerd
246 -EPPCLIENT_BIN=/usr/sbin/eppclientd
247 -EPPCLIENT_PIDFILE=/run/opendnssec/eppclientd.pid
248
249 diff --git a/net-dns/opendnssec/files/opendnssec.initd-1.3.x b/net-dns/opendnssec/files/opendnssec.initd-1.3.x
250 deleted file mode 100644
251 index 9f4adbd184a..00000000000
252 --- a/net-dns/opendnssec/files/opendnssec.initd-1.3.x
253 +++ /dev/null
254 @@ -1,123 +0,0 @@
255 -#!/sbin/openrc-run
256 -# Copyright 1999-2014 Gentoo Foundation
257 -# Distributed under the terms of the GNU General Public License v2
258 -
259 -description="An open-source turn-key solution for DNSSEC"
260 -
261 -depend() {
262 - use logger
263 -}
264 -
265 -checkconfig() {
266 - if [ -z "${CHECKCONFIG_BIN}" ]; then
267 - # no config checker configured, skip config check
268 - return 0
269 - fi
270 - if [ -x "${CHECKCONFIG_BIN}" ]; then
271 - output=$(${CHECKCONFIG_BIN} 2>&1| grep -v -E "^/etc/opendnssec/(conf|kasp).xml validates")
272 - if [ -n "$output" ]; then
273 - echo $output
274 - fi
275 -
276 - errors=$(echo $output | grep ERROR | wc -l)
277 - if [ $errors -gt 0 ]; then
278 - ewarn "$errors error(s) found in OpenDNSSEC configuration."
279 - fi
280 - return $errors
281 - fi
282 - eerror "Unable to execute ${CHECKCONFIG_BIN:-config binary}"
283 - # can't validate config, just die
284 - return 1
285 -}
286 -
287 -start_enforcer() {
288 - if [ -n "${ENFORCER_BIN}" ] && [ -x "${ENFORCER_BIN}" ]; then
289 - ebegin "Starting OpenDNSSEC Enforcer"
290 - ${CONTROL_BIN} enforcer start > /dev/null
291 - eend $?
292 - else
293 - if [ -n "${ENFORCER_BIN}" ]; then
294 - eerror "OpenDNSSEC Enforcer binary not executable"
295 - return 1
296 - fi
297 - einfo "OpenDNSSEC Enforcer not used."
298 - fi
299 -}
300 -
301 -stop_enforcer() {
302 - if [ -x "${ENFORCER_BIN}" ]; then
303 - ebegin "Stopping OpenDNSSEC Enforcer"
304 - ${CONTROL_BIN} enforcer stop > /dev/null
305 - eend $?
306 - fi
307 -}
308 -
309 -start_signer() {
310 - if [ -n "${SIGNER_BIN}" ] && [ -x "${SIGNER_BIN}" ]; then
311 - ebegin "Starting OpenDNSSEC Signer"
312 - ${CONTROL_BIN} signer start > /dev/null 2>&1
313 - eend $?
314 - else
315 - if [ -n "${SIGNER_BIN}" ]; then
316 - eerror "OpenDNSSEC Signer binary not executable"
317 - return 1
318 - fi
319 - einfo "OpenDNSSEC Signer not used."
320 - fi
321 -}
322 -
323 -stop_signer() {
324 - if [ -x "${SIGNER_BIN}" ]; then
325 - ebegin "Stopping OpenDNSSEC Signer"
326 - ${CONTROL_BIN} signer stop > /dev/null 2>&1
327 - eend $?
328 - fi
329 -}
330 -
331 -start_eppclient() {
332 - if [ -n "${EPPCLIENT_BIN}" ] && [ -x "${EPPCLIENT_BIN}" ]; then
333 - ebegin "Starting OpenDNSSEC Eppclient"
334 - start-stop-daemon \
335 - --start \
336 - --user opendnssec --group opendnssec \
337 - --exec "${EPPCLIENT_BIN}" \
338 - --pidfile "${EPPCLIENT_PIDFILE}" > /dev/null
339 - eend $?
340 - else
341 - # eppclient is ofptional so if we use the default binary and it
342 - # is not used we won't die
343 - if [ -n "${EPPCLIENT_BIN}" ] && \
344 - [ "${EPPCLIENT_BIN}" != "/usr/sbin/eppclientd" ]; then
345 - eerror "OpenDNSSEC Eppclient binary not executable"
346 - return 1
347 - fi
348 - einfo "OpenDNSSEC Eppclient not used."
349 - fi
350 -}
351 -
352 -stop_eppclient() {
353 - if [ -x "${EPPCLIENT_BIN}" ]; then
354 - ebegin "Stopping OpenDNSSEC Eppclient"
355 - start-stop-daemon \
356 - --stop \
357 - --exec "${EPPCLIENT_BIN}" \
358 - --pidfile "${EPPCLIENT_PIDFILE}" > /dev/null
359 - eend $?
360 - fi
361 -}
362 -
363 -start() {
364 - checkconfig || return $?
365 - test -d /run/opendnssec || mkdir -p /run/opendnssec
366 - chown opendnssec:opendnssec /run/opendnssec
367 - start_enforcer || return $?
368 - start_signer || return $?
369 - start_eppclient || return $?
370 -}
371 -
372 -stop() {
373 - stop_eppclient
374 - stop_signer
375 - stop_enforcer
376 - sleep 5
377 -}