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: Thu, 15 Apr 2021 18:05:54
Message-Id: 1618509921.fe44eacb07b35e11f7a7d3dae82c095353824340.conikost@gentoo
1 commit: fe44eacb07b35e11f7a7d3dae82c095353824340
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Mon Apr 5 16:38:55 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 15 18:05:21 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe44eacb
7
8 net-dns/opendnssec: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/20266
11 Package-Manager: Portage-3.0.18, Repoman-3.0.3
12 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
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 net-dns/opendnssec/files/opendnssec.confd-1.3.x | 13 ---
19 net-dns/opendnssec/files/opendnssec.initd-1.3.x | 123 ---------------------
20 5 files changed, 212 deletions(-)
21
22 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
23 deleted file mode 100644
24 index 7c9f72355d2..00000000000
25 --- a/net-dns/opendnssec/files/opendnssec-1.3.14-drop-privileges.patch
26 +++ /dev/null
27 @@ -1,43 +0,0 @@
28 -Index: conf/conf.xml.in
29 -===================================================================
30 ---- conf/conf.xml.in (revision 3022)
31 -+++ conf/conf.xml.in (working copy)
32 -@@ -38,12 +38,10 @@
33 - </Common>
34 -
35 - <Enforcer>
36 --<!--
37 - <Privileges>
38 - <User>opendnssec</User>
39 - <Group>opendnssec</Group>
40 - </Privileges>
41 ---->
42 -
43 - <Datastore><SQLite>@OPENDNSSEC_STATE_DIR@/kasp.db</SQLite></Datastore>
44 - <Interval>PT3600S</Interval>
45 -@@ -56,12 +54,10 @@
46 - </Enforcer>
47 -
48 - <Signer>
49 --<!--
50 - <Privileges>
51 - <User>opendnssec</User>
52 - <Group>opendnssec</Group>
53 - </Privileges>
54 ---->
55 -
56 - <WorkingDirectory>@OPENDNSSEC_STATE_DIR@/tmp</WorkingDirectory>
57 - <WorkerThreads>8</WorkerThreads>
58 -@@ -80,12 +76,10 @@
59 - </Signer>
60 -
61 - <Auditor>
62 --<!--
63 - <Privileges>
64 - <User>opendnssec</User>
65 - <Group>opendnssec</Group>
66 - </Privileges>
67 ---->
68 -
69 - <WorkingDirectory>@OPENDNSSEC_STATE_DIR@/tmp</WorkingDirectory>
70 - </Auditor>
71
72 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
73 deleted file mode 100644
74 index 39678408264..00000000000
75 --- a/net-dns/opendnssec/files/opendnssec-1.3.14-use-system-trang.patch
76 +++ /dev/null
77 @@ -1,21 +0,0 @@
78 -diff -urN opendnssec-1.3.0rc3.old/conf/Makefile.am opendnssec-1.3.0rc3/conf/Makefile.am
79 ---- opendnssec-1.3.0rc3.old/conf/Makefile.am 2011-07-01 21:15:25.000000000 +0200
80 -+++ opendnssec-1.3.0rc3/conf/Makefile.am 2011-07-01 21:17:00.000000000 +0200
81 -@@ -7,7 +7,7 @@
82 - XML = conf.xml kasp.xml zonelist.xml signconf.xml zonefetch.xml
83 - XSL= kasp2html.xsl
84 -
85 --TRANG= $(srcdir)/trang/trang.jar
86 -+TRANG= /usr/bin/trang
87 -
88 - sysconfdir = @sysconfdir@/opendnssec
89 - datadir = @datadir@/opendnssec
90 -@@ -25,7 +25,7 @@
91 - .rnc.rng:
92 - @test -x "${JAVA}" || \
93 - (echo "java is required for converting RelaxNG Compact to RelaxNG"; false)
94 -- ${JAVA} -jar ${TRANG} $< $@
95 -+ ${TRANG} $< $@
96 -
97 - regress: $(RNG)
98 - @test -x "${XMLLINT}" || \
99
100 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
101 deleted file mode 100644
102 index a0676dd091b..00000000000
103 --- a/net-dns/opendnssec/files/opendnssec-1.3.18-eppclient-curl-CVE-2012-5582.patch
104 +++ /dev/null
105 @@ -1,12 +0,0 @@
106 -diff -urN opendnssec-1.3.18.orig/plugins/eppclient/src/epp.c opendnssec-1.3.18/plugins/eppclient/src/epp.c
107 ---- opendnssec-1.3.18.orig/plugins/eppclient/src/epp.c 2014-07-21 11:16:10.000000000 +0200
108 -+++ opendnssec-1.3.18/plugins/eppclient/src/epp.c 2016-03-23 22:25:18.679354984 +0100
109 -@@ -390,7 +390,7 @@
110 - curl_easy_setopt(curl, CURLOPT_URL, url);
111 - curl_easy_setopt(curl, CURLOPT_CONNECT_ONLY, 1L);
112 - curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 1L);
113 -- curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 1L);
114 -+ curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 2L);
115 - curl_easy_setopt(curl, CURLOPT_USE_SSL, CURLUSESSL_ALL);
116 - curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curlerr);
117 - curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1L);
118
119 diff --git a/net-dns/opendnssec/files/opendnssec.confd-1.3.x b/net-dns/opendnssec/files/opendnssec.confd-1.3.x
120 deleted file mode 100644
121 index 63121af7f0c..00000000000
122 --- a/net-dns/opendnssec/files/opendnssec.confd-1.3.x
123 +++ /dev/null
124 @@ -1,13 +0,0 @@
125 -# Copyright 1999-2013 Gentoo Foundation
126 -# Distributed under the terms of the GNU General Public License v2
127 -
128 -# Variables containing default binaries used in the opendnssec
129 -# initscript. You can alter them to another applications/paths
130 -# if required.
131 -
132 -CHECKCONFIG_BIN=/usr/bin/ods-kaspcheck
133 -CONTROL_BIN=/usr/sbin/ods-control
134 -ENFORCER_BIN=/usr/sbin/ods-enforcerd
135 -SIGNER_BIN=/usr/sbin/ods-signerd
136 -EPPCLIENT_BIN=/usr/sbin/eppclientd
137 -EPPCLIENT_PIDFILE=/run/opendnssec/eppclientd.pid
138
139 diff --git a/net-dns/opendnssec/files/opendnssec.initd-1.3.x b/net-dns/opendnssec/files/opendnssec.initd-1.3.x
140 deleted file mode 100644
141 index f4c9fa3c149..00000000000
142 --- a/net-dns/opendnssec/files/opendnssec.initd-1.3.x
143 +++ /dev/null
144 @@ -1,123 +0,0 @@
145 -#!/sbin/openrc-run
146 -# Copyright 1999-2020 Gentoo Authors
147 -# Distributed under the terms of the GNU General Public License v2
148 -
149 -description="An open-source turn-key solution for DNSSEC"
150 -
151 -depend() {
152 - use logger
153 -}
154 -
155 -checkconfig() {
156 - if [ -z "${CHECKCONFIG_BIN}" ]; then
157 - # no config checker configured, skip config check
158 - return 0
159 - fi
160 - if [ -x "${CHECKCONFIG_BIN}" ]; then
161 - output=$(${CHECKCONFIG_BIN} 2>&1| grep -v -E "^/etc/opendnssec/(conf|kasp).xml validates")
162 - if [ -n "$output" ]; then
163 - echo $output
164 - fi
165 -
166 - errors=$(echo $output | grep ERROR | wc -l)
167 - if [ $errors -gt 0 ]; then
168 - ewarn "$errors error(s) found in OpenDNSSEC configuration."
169 - fi
170 - return $errors
171 - fi
172 - eerror "Unable to execute ${CHECKCONFIG_BIN:-config binary}"
173 - # can't validate config, just die
174 - return 1
175 -}
176 -
177 -start_enforcer() {
178 - if [ -n "${ENFORCER_BIN}" ] && [ -x "${ENFORCER_BIN}" ]; then
179 - ebegin "Starting OpenDNSSEC Enforcer"
180 - ${CONTROL_BIN} enforcer start > /dev/null
181 - eend $?
182 - else
183 - if [ -n "${ENFORCER_BIN}" ]; then
184 - eerror "OpenDNSSEC Enforcer binary not executable"
185 - return 1
186 - fi
187 - einfo "OpenDNSSEC Enforcer not used."
188 - fi
189 -}
190 -
191 -stop_enforcer() {
192 - if [ -x "${ENFORCER_BIN}" ]; then
193 - ebegin "Stopping OpenDNSSEC Enforcer"
194 - ${CONTROL_BIN} enforcer stop > /dev/null
195 - eend $?
196 - fi
197 -}
198 -
199 -start_signer() {
200 - if [ -n "${SIGNER_BIN}" ] && [ -x "${SIGNER_BIN}" ]; then
201 - ebegin "Starting OpenDNSSEC Signer"
202 - ${CONTROL_BIN} signer start > /dev/null 2>&1
203 - eend $?
204 - else
205 - if [ -n "${SIGNER_BIN}" ]; then
206 - eerror "OpenDNSSEC Signer binary not executable"
207 - return 1
208 - fi
209 - einfo "OpenDNSSEC Signer not used."
210 - fi
211 -}
212 -
213 -stop_signer() {
214 - if [ -x "${SIGNER_BIN}" ]; then
215 - ebegin "Stopping OpenDNSSEC Signer"
216 - ${CONTROL_BIN} signer stop > /dev/null 2>&1
217 - eend $?
218 - fi
219 -}
220 -
221 -start_eppclient() {
222 - if [ -n "${EPPCLIENT_BIN}" ] && [ -x "${EPPCLIENT_BIN}" ]; then
223 - ebegin "Starting OpenDNSSEC Eppclient"
224 - start-stop-daemon \
225 - --start \
226 - --user opendnssec --group opendnssec \
227 - --exec "${EPPCLIENT_BIN}" \
228 - --pidfile "${EPPCLIENT_PIDFILE}" > /dev/null
229 - eend $?
230 - else
231 - # eppclient is ofptional so if we use the default binary and it
232 - # is not used we won't die
233 - if [ -n "${EPPCLIENT_BIN}" ] && \
234 - [ "${EPPCLIENT_BIN}" != "/usr/sbin/eppclientd" ]; then
235 - eerror "OpenDNSSEC Eppclient binary not executable"
236 - return 1
237 - fi
238 - einfo "OpenDNSSEC Eppclient not used."
239 - fi
240 -}
241 -
242 -stop_eppclient() {
243 - if [ -x "${EPPCLIENT_BIN}" ]; then
244 - ebegin "Stopping OpenDNSSEC Eppclient"
245 - start-stop-daemon \
246 - --stop \
247 - --exec "${EPPCLIENT_BIN}" \
248 - --pidfile "${EPPCLIENT_PIDFILE}" > /dev/null
249 - eend $?
250 - fi
251 -}
252 -
253 -start() {
254 - checkconfig || return $?
255 - test -d /run/opendnssec || mkdir -p /run/opendnssec
256 - chown opendnssec:opendnssec /run/opendnssec
257 - start_enforcer || return $?
258 - start_signer || return $?
259 - start_eppclient || return $?
260 -}
261 -
262 -stop() {
263 - stop_eppclient
264 - stop_signer
265 - stop_enforcer
266 - sleep 5
267 -}