1 |
commit: 98a218efd4ed121ed1a8f8ffc7b4fbb880fe90eb |
2 |
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 28 01:48:55 2021 +0000 |
4 |
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 28 01:49:48 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98a218ef |
7 |
|
8 |
net-dns/opendnssec: cleanups and improve tests |
9 |
|
10 |
Signed-off-by: Marc Schiffbauer <mschiff <AT> gentoo.org> |
11 |
|
12 |
net-dns/opendnssec/opendnssec-2.1.10.ebuild | 15 +++------------ |
13 |
1 file changed, 3 insertions(+), 12 deletions(-) |
14 |
|
15 |
diff --git a/net-dns/opendnssec/opendnssec-2.1.10.ebuild b/net-dns/opendnssec/opendnssec-2.1.10.ebuild |
16 |
index 2df181514c42..fc1cc54c2d14 100644 |
17 |
--- a/net-dns/opendnssec/opendnssec-2.1.10.ebuild |
18 |
+++ b/net-dns/opendnssec/opendnssec-2.1.10.ebuild |
19 |
@@ -45,6 +45,8 @@ BDEPEND=" |
20 |
doc? ( app-doc/doxygen ) |
21 |
test? ( |
22 |
app-text/trang |
23 |
+ dev-libs/softhsm:* |
24 |
+ dev-util/cunit |
25 |
) |
26 |
" |
27 |
|
28 |
@@ -53,13 +55,6 @@ REQUIRED_USE=" |
29 |
^^ ( softhsm opensc external-hsm ) |
30 |
" |
31 |
|
32 |
-#PATCHES=( |
33 |
-# "${FILESDIR}/${PN}-fix-localstatedir-2.0.x.patch" |
34 |
-# "${FILESDIR}/${PN}-fix-run-dir-2.0.x.patch" |
35 |
-# "${FILESDIR}/${PN}-drop-privileges-2.0.x.patch" |
36 |
-# "${FILESDIR}/${PN}-use-system-trang.patch" |
37 |
-# "${FILESDIR}/${PN}-openssl1.1.patch" |
38 |
-#) |
39 |
PATCHES=( |
40 |
"${FILESDIR}/${PN}-fix-run-dir-2.1.x.patch" |
41 |
"${FILESDIR}/${PN}-use-system-trang.patch" |
42 |
@@ -73,11 +68,7 @@ check_pkcs11_setup() { |
43 |
|
44 |
if use softhsm; then |
45 |
PKCS11_LIB=softhsm |
46 |
- if has_version ">=dev-libs/softhsm-1.3.1"; then |
47 |
- PKCS11_PATH=/usr/$(get_libdir)/softhsm/libsofthsm.so |
48 |
- else |
49 |
- PKCS11_PATH=/usr/$(get_libdir)/libsofthsm.so |
50 |
- fi |
51 |
+ PKCS11_PATH=/usr/$(get_libdir)/softhsm/libsofthsm2.so |
52 |
elog "Building with SoftHSM PKCS#11 library support." |
53 |
fi |
54 |
if use opensc; then |