1 |
commit: a93883869c71373646f69d6fd5c70fd8052c65c4 |
2 |
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 28 00:40:15 2021 +0000 |
4 |
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 28 00:40:55 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9388386 |
7 |
|
8 |
net-dns/opendnssec: add 2.1.10, drop 2.0.3-r2 |
9 |
|
10 |
Signed-off-by: Marc Schiffbauer <mschiff <AT> gentoo.org> |
11 |
|
12 |
net-dns/opendnssec/Manifest | 2 +- |
13 |
.../files/opendnssec-drop-privileges-2.0.x.patch | 29 ------------ |
14 |
.../files/opendnssec-fix-localstatedir-2.0.x.patch | 22 --------- |
15 |
.../files/opendnssec-fix-run-dir-2.0.x.patch | 24 ---------- |
16 |
.../files/opendnssec-fix-run-dir-2.1.x.patch | 24 ++++++++++ |
17 |
.../opendnssec/files/opendnssec-openssl1.1.patch | 55 ---------------------- |
18 |
...ec-2.0.3-r2.ebuild => opendnssec-2.1.10.ebuild} | 21 +++++---- |
19 |
7 files changed, 38 insertions(+), 139 deletions(-) |
20 |
|
21 |
diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest |
22 |
index b7655458e116..c14ca9969b6a 100644 |
23 |
--- a/net-dns/opendnssec/Manifest |
24 |
+++ b/net-dns/opendnssec/Manifest |
25 |
@@ -1 +1 @@ |
26 |
-DIST opendnssec-2.0.3.tar.gz 1103355 BLAKE2B b64e729003de86e4139efaad60c9feae9f4e19c16a29fdced55d66f5896c4b7d76c4b8c57a8330d55c0c03e87de1ebe6ec49ef9d1b6e215be963680d2c805579 SHA512 4745a9ac317cc65d6f5b14be640687efd5fde2149541f692fb607a458378d27e903f175023c1aa16a777d17cef9cc68f1a84e7e7cdb233466d26756721b34424 |
27 |
+DIST opendnssec-2.1.10.tar.gz 1142027 BLAKE2B 063650744ffd1c6d6d3b702400c9617883394c6794743f7d61bd63f7bdaf688a3f2a80f47612e561a133a5689dad8b5f7392eec69779d1dc5632a121d9a41c8f SHA512 c7fdbf1c3867d7b53ac11ab5cb5e636af4595dbee8d704429c7fb84cc3a6b2082ed490c33aad7747d4ee1a2c580afcf24a260bc3ed29eaf5e9d337004045b82d |
28 |
|
29 |
diff --git a/net-dns/opendnssec/files/opendnssec-drop-privileges-2.0.x.patch b/net-dns/opendnssec/files/opendnssec-drop-privileges-2.0.x.patch |
30 |
deleted file mode 100644 |
31 |
index f3adc487dee9..000000000000 |
32 |
--- a/net-dns/opendnssec/files/opendnssec-drop-privileges-2.0.x.patch |
33 |
+++ /dev/null |
34 |
@@ -1,29 +0,0 @@ |
35 |
-diff -ur opendnssec-2.0.1.orig/conf/conf.xml.in opendnssec-2.0.1/conf/conf.xml.in |
36 |
---- opendnssec-2.0.1.orig/conf/conf.xml.in 2016-07-21 16:15:27.000000000 +0200 |
37 |
-+++ opendnssec-2.0.1/conf/conf.xml.in 2016-08-23 15:21:09.633384446 +0200 |
38 |
-@@ -36,12 +36,10 @@ |
39 |
- </Common> |
40 |
- |
41 |
- <Enforcer> |
42 |
--<!-- |
43 |
- <Privileges> |
44 |
- <User>opendnssec</User> |
45 |
- <Group>opendnssec</Group> |
46 |
- </Privileges> |
47 |
----> |
48 |
- |
49 |
- <Datastore><SQLite>@OPENDNSSEC_STATE_DIR@/kasp.db</SQLite></Datastore> |
50 |
- <!--The enforcer interval parameter is no long used in 2.0 and will be deprecated in 2.1 --> |
51 |
-@@ -60,12 +58,10 @@ |
52 |
- </Enforcer> |
53 |
- |
54 |
- <Signer> |
55 |
--<!-- |
56 |
- <Privileges> |
57 |
- <User>opendnssec</User> |
58 |
- <Group>opendnssec</Group> |
59 |
- </Privileges> |
60 |
----> |
61 |
- |
62 |
- <WorkingDirectory>@OPENDNSSEC_STATE_DIR@/signer</WorkingDirectory> |
63 |
- <WorkerThreads>4</WorkerThreads> |
64 |
|
65 |
diff --git a/net-dns/opendnssec/files/opendnssec-fix-localstatedir-2.0.x.patch b/net-dns/opendnssec/files/opendnssec-fix-localstatedir-2.0.x.patch |
66 |
deleted file mode 100644 |
67 |
index 5940c2f050e6..000000000000 |
68 |
--- a/net-dns/opendnssec/files/opendnssec-fix-localstatedir-2.0.x.patch |
69 |
+++ /dev/null |
70 |
@@ -1,22 +0,0 @@ |
71 |
-diff -ur opendnssec-2.0.1.orig/Makefile.am opendnssec-2.0.1/Makefile.am |
72 |
---- opendnssec-2.0.1.orig/Makefile.am 2016-07-21 16:15:00.000000000 +0200 |
73 |
-+++ opendnssec-2.0.1/Makefile.am 2016-08-23 14:01:50.618393034 +0200 |
74 |
-@@ -30,12 +30,12 @@ |
75 |
- |
76 |
- install-data-hook: |
77 |
- $(INSTALL) -d $(DESTDIR)$(localstatedir) |
78 |
-- $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec |
79 |
-- $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signer |
80 |
-- $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/enforcer |
81 |
-- $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signconf |
82 |
-- $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/unsigned |
83 |
-- $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signed |
84 |
-+ $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec |
85 |
-+ $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signer |
86 |
-+ $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/enforcer |
87 |
-+ $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signconf |
88 |
-+ $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/unsigned |
89 |
-+ $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signed |
90 |
- $(INSTALL) -d $(DESTDIR)$(localstatedir)/run |
91 |
- $(INSTALL) -d $(DESTDIR)$(localstatedir)/run/opendnssec |
92 |
- |
93 |
|
94 |
diff --git a/net-dns/opendnssec/files/opendnssec-fix-run-dir-2.0.x.patch b/net-dns/opendnssec/files/opendnssec-fix-run-dir-2.0.x.patch |
95 |
deleted file mode 100644 |
96 |
index 5ea9c80f2ba7..000000000000 |
97 |
--- a/net-dns/opendnssec/files/opendnssec-fix-run-dir-2.0.x.patch |
98 |
+++ /dev/null |
99 |
@@ -1,24 +0,0 @@ |
100 |
-diff -ur opendnssec-2.0.1.orig/m4/opendnssec_common.m4 opendnssec-2.0.1/m4/opendnssec_common.m4 |
101 |
---- opendnssec-2.0.1.orig/m4/opendnssec_common.m4 2016-07-21 16:15:00.000000000 +0200 |
102 |
-+++ opendnssec-2.0.1/m4/opendnssec_common.m4 2016-08-23 14:42:35.033460972 +0200 |
103 |
-@@ -17,7 +17,7 @@ |
104 |
- OPENDNSSEC_DATA_DIR=$full_datadir/opendnssec |
105 |
- OPENDNSSEC_SYSCONF_DIR=$full_sysconfdir/opendnssec |
106 |
- OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/opendnssec" |
107 |
--OPENDNSSEC_PID_DIR="$full_localstatedir/run/opendnssec" |
108 |
-+OPENDNSSEC_PID_DIR="${destdir}/run/opendnssec" |
109 |
- |
110 |
- AC_SUBST([OPENDNSSEC_BIN_DIR]) |
111 |
- AC_SUBST([OPENDNSSEC_SBIN_DIR]) |
112 |
-diff -ur opendnssec-2.0.1.orig/Makefile.am opendnssec-2.0.1/Makefile.am |
113 |
---- opendnssec-2.0.1.orig/Makefile.am 2016-08-23 14:40:10.009951791 +0200 |
114 |
-+++ opendnssec-2.0.1/Makefile.am 2016-08-23 14:43:20.377870776 +0200 |
115 |
-@@ -36,8 +36,6 @@ |
116 |
- $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signconf |
117 |
- $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/unsigned |
118 |
- $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signed |
119 |
-- $(INSTALL) -d $(DESTDIR)$(localstatedir)/run |
120 |
-- $(INSTALL) -d $(DESTDIR)$(localstatedir)/run/opendnssec |
121 |
- |
122 |
- docs: |
123 |
- (cd libhsm; $(MAKE) doxygen) |
124 |
|
125 |
diff --git a/net-dns/opendnssec/files/opendnssec-fix-run-dir-2.1.x.patch b/net-dns/opendnssec/files/opendnssec-fix-run-dir-2.1.x.patch |
126 |
new file mode 100644 |
127 |
index 000000000000..87560e090e82 |
128 |
--- /dev/null |
129 |
+++ b/net-dns/opendnssec/files/opendnssec-fix-run-dir-2.1.x.patch |
130 |
@@ -0,0 +1,24 @@ |
131 |
+diff -ur opendnssec-2.1.10.orig/m4/opendnssec_common.m4 opendnssec-2.1.10/m4/opendnssec_common.m4 |
132 |
+--- opendnssec-2.1.10.orig/m4/opendnssec_common.m4 2021-09-10 09:11:17.000000000 -1000 |
133 |
++++ opendnssec-2.1.10/m4/opendnssec_common.m4 2021-11-27 14:18:26.430202347 -1000 |
134 |
+@@ -17,7 +17,7 @@ |
135 |
+ OPENDNSSEC_DATA_DIR=$full_datadir/opendnssec |
136 |
+ OPENDNSSEC_SYSCONF_DIR=$full_sysconfdir/opendnssec |
137 |
+ OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/opendnssec" |
138 |
+-OPENDNSSEC_PID_DIR="$full_localstatedir/run/opendnssec" |
139 |
++OPENDNSSEC_PID_DIR="${destdir}/run/opendnssec" |
140 |
+ |
141 |
+ AC_SUBST([OPENDNSSEC_BIN_DIR]) |
142 |
+ AC_SUBST([OPENDNSSEC_SBIN_DIR]) |
143 |
+diff -ur opendnssec-2.1.10.orig/Makefile.am opendnssec-2.1.10/Makefile.am |
144 |
+--- opendnssec-2.1.10.orig/Makefile.am 2021-09-10 09:11:17.000000000 -1000 |
145 |
++++ opendnssec-2.1.10/Makefile.am 2021-11-27 14:19:02.685418411 -1000 |
146 |
+@@ -38,8 +38,6 @@ |
147 |
+ $(INSTALL) @INSTALLATIONUSERARG@ @INSTALLATIONGROUPARG@ -d $(DESTDIR)$(localstatedir)/opendnssec/signconf |
148 |
+ $(INSTALL) @INSTALLATIONUSERARG@ @INSTALLATIONGROUPARG@ -d $(DESTDIR)$(localstatedir)/opendnssec/unsigned |
149 |
+ $(INSTALL) @INSTALLATIONUSERARG@ @INSTALLATIONGROUPARG@ -d $(DESTDIR)$(localstatedir)/opendnssec/signed |
150 |
+- $(INSTALL) -d $(DESTDIR)$(localstatedir)/run |
151 |
+- $(INSTALL) @INSTALLATIONUSERARG@ @INSTALLATIONGROUPARG@ -d $(DESTDIR)$(localstatedir)/run/opendnssec |
152 |
+ |
153 |
+ docs: |
154 |
+ (cd libhsm; $(MAKE) doxygen) |
155 |
|
156 |
diff --git a/net-dns/opendnssec/files/opendnssec-openssl1.1.patch b/net-dns/opendnssec/files/opendnssec-openssl1.1.patch |
157 |
deleted file mode 100644 |
158 |
index b81068c4b9fd..000000000000 |
159 |
--- a/net-dns/opendnssec/files/opendnssec-openssl1.1.patch |
160 |
+++ /dev/null |
161 |
@@ -1,55 +0,0 @@ |
162 |
---- a/signer/src/wire/tsig-openssl.c |
163 |
-+++ b/signer/src/wire/tsig-openssl.c |
164 |
-@@ -126,7 +126,11 @@ static void |
165 |
- cleanup_context(void *data) |
166 |
- { |
167 |
- HMAC_CTX* context = (HMAC_CTX*) data; |
168 |
-+#ifdef HAVE_SSL_NEW_HMAC |
169 |
-+ HMAC_CTX_free(context); |
170 |
-+#else |
171 |
- HMAC_CTX_cleanup(context); |
172 |
-+#endif |
173 |
- } |
174 |
- |
175 |
- static void |
176 |
-@@ -146,8 +150,13 @@ static void* |
177 |
- create_context() |
178 |
- { |
179 |
- HMAC_CTX* context; |
180 |
-+#ifdef HAVE_SSL_NEW_HMAC |
181 |
-+ CHECKALLOC(context = HMAC_CTX_new()); |
182 |
-+ HMAC_CTX_reset(context); |
183 |
-+#else |
184 |
- CHECKALLOC(context = (HMAC_CTX*) malloc(sizeof(HMAC_CTX))); |
185 |
- HMAC_CTX_init(context); |
186 |
-+#endif |
187 |
- context_add_cleanup(context); |
188 |
- return context; |
189 |
- } |
190 |
---- a/m4/acx_ssl.m4 2016-10-14 09:40:13.000000000 -0400 |
191 |
-+++ b/m4/acx_ssl.m4 2019-02-18 13:52:49.861127549 -0500 |
192 |
-@@ -35,12 +35,21 @@ |
193 |
- if test x_$ssldir = x_/usr/sfw; then |
194 |
- SSL_LIBS="$SSL_LIBS -R$ssldir/lib"; |
195 |
- fi |
196 |
-- AC_CHECK_LIB(crypto, HMAC_CTX_init,, [ |
197 |
-- AC_MSG_ERROR([OpenSSL found in $ssldir, but version 0.9.7 or higher is required]) |
198 |
-- ]) |
199 |
-+ save_LIBS=$LIBS |
200 |
-+ AC_CHECK_LIB(crypto, HMAC_CTX_reset, [ |
201 |
-+ AC_DEFINE_UNQUOTED([HAVE_SSL_NEW_HMAC], [], [Define if you have the SSL libraries with new HMAC related functions.]) |
202 |
-+ ], [ |
203 |
-+ AC_CHECK_LIB(crypto, HMAC_CTX_init,, [ |
204 |
-+ AC_MSG_ERROR([OpenSSL found in $ssldir, but version 0.9.7 or higher is required]) |
205 |
-+ ]) |
206 |
-+ ] ) |
207 |
-+ SSL_LIBS="$SSL_LIBS -lcrypto"; |
208 |
-+ LIBS="$SSL_LIBS $LIBS" |
209 |
- AC_CHECK_FUNCS([EVP_sha1 EVP_sha256]) |
210 |
-+ LIBS=$saveLIBS |
211 |
- fi |
212 |
- AC_SUBST(HAVE_SSL) |
213 |
-+ AC_SUBST(HAVE_SSL_NEW_HMAC) |
214 |
- AC_SUBST(SSL_INCLUDES) |
215 |
- AC_SUBST(SSL_LIBS) |
216 |
- fi |
217 |
|
218 |
diff --git a/net-dns/opendnssec/opendnssec-2.0.3-r2.ebuild b/net-dns/opendnssec/opendnssec-2.1.10.ebuild |
219 |
similarity index 92% |
220 |
rename from net-dns/opendnssec/opendnssec-2.0.3-r2.ebuild |
221 |
rename to net-dns/opendnssec/opendnssec-2.1.10.ebuild |
222 |
index 17efc48d4904..2df181514c42 100644 |
223 |
--- a/net-dns/opendnssec/opendnssec-2.0.3-r2.ebuild |
224 |
+++ b/net-dns/opendnssec/opendnssec-2.1.10.ebuild |
225 |
@@ -53,12 +53,16 @@ REQUIRED_USE=" |
226 |
^^ ( softhsm opensc external-hsm ) |
227 |
" |
228 |
|
229 |
+#PATCHES=( |
230 |
+# "${FILESDIR}/${PN}-fix-localstatedir-2.0.x.patch" |
231 |
+# "${FILESDIR}/${PN}-fix-run-dir-2.0.x.patch" |
232 |
+# "${FILESDIR}/${PN}-drop-privileges-2.0.x.patch" |
233 |
+# "${FILESDIR}/${PN}-use-system-trang.patch" |
234 |
+# "${FILESDIR}/${PN}-openssl1.1.patch" |
235 |
+#) |
236 |
PATCHES=( |
237 |
- "${FILESDIR}/${PN}-fix-localstatedir-2.0.x.patch" |
238 |
- "${FILESDIR}/${PN}-fix-run-dir-2.0.x.patch" |
239 |
- "${FILESDIR}/${PN}-drop-privileges-2.0.x.patch" |
240 |
+ "${FILESDIR}/${PN}-fix-run-dir-2.1.x.patch" |
241 |
"${FILESDIR}/${PN}-use-system-trang.patch" |
242 |
- "${FILESDIR}/${PN}-openssl1.1.patch" |
243 |
) |
244 |
|
245 |
DOCS=( MIGRATION NEWS ) |
246 |
@@ -119,8 +123,7 @@ pkg_pretend() { |
247 |
eerror "" |
248 |
eerror " emerge \"<net-dns/opendnssec-2\"" |
249 |
eerror "" |
250 |
- eerror "See https://github.com/opendnssec/opendnssec/blob/2.0/master/MIGRATION" |
251 |
- eerror "for details." |
252 |
+ eerror "See /usr/share/doc/opendnssec-2.1.10/MIGRATION* for details." |
253 |
eerror "" |
254 |
die "Please upgrade to version >=1.4.10 first for proper db migraion" |
255 |
fi |
256 |
@@ -140,8 +143,10 @@ src_prepare() { |
257 |
|
258 |
src_configure() { |
259 |
econf \ |
260 |
+ --enable-installation-user=opendnssec \ |
261 |
+ --enable-installation-group=opendnssec \ |
262 |
+ --localstatedir="${EPREFIX}/var/lib" \ |
263 |
--without-cunit \ |
264 |
- --localstatedir="${EPREFIX}/var" \ |
265 |
--disable-static \ |
266 |
--with-enforcer-database=$(use mysql && echo "mysql")$(use sqlite && echo "sqlite3") \ |
267 |
--with-pkcs11-${PKCS11_LIB}=${PKCS11_PATH} \ |
268 |
@@ -230,7 +235,7 @@ pkg_postinst() { |
269 |
ewarn "" |
270 |
ewarn "You are upgrading from version 1.4." |
271 |
ewarn "" |
272 |
- ewarn "A migration is needed from 1.4 to 2.0." |
273 |
+ ewarn "A migration is needed from 1.4 to 2.x." |
274 |
ewarn "For details see /usr/share/doc/${P}/MIGRATION*" |
275 |
ewarn "" |
276 |
ewarn "For your convenience the mentioned migration scripts and README" |