gentoo resync : 05.12.2021

7 files changed, 36 insertions, 149 deletions

diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest
index b7a4ccb749b8..e372af5599ba 100644
--- a/net-dns/opendnssec/Manifest
+++ b/net-dns/opendnssec/Manifest
@@ -1,10 +1,7 @@
-AUX opendnssec-drop-privileges-2.0.x.patch 813 BLAKE2B 231537d3f8f40e1524eb76212abb7e00d965acaa39717de2c72e9d7ec93f866150510d971ba465f7a48c3eb588f1a78631ed33beef0ebe1fb369472f73062d80 SHA512 425eb123452183b4e4a3e87e9a71afa81684fe4af9c111d1bad3433ee640907cf3caa1065711f67286bb0336fd8d82e3f4bfeef94e3ff620bcbdaf960d4137b8
-AUX opendnssec-fix-localstatedir-2.0.x.patch 1161 BLAKE2B 28469aaad2878cdb1f58f247db0e7b9603ec9fab35ec9ded597dfba50889cd30e474cdaf2f0397e75147cb0374c049d9863f95f961eccce47a7e4874dae48fcc SHA512 1d07f2108238c041041c96b4efaaec1e75740ed54fbd6390fa45f5ccf7f631c1e8d4400bb9cb95023c8909ae10abc3c93aaa137f954921af75825c06a6d94d9a
-AUX opendnssec-fix-run-dir-2.0.x.patch 1188 BLAKE2B c11d3e120dac17f4d9bb24c561cf67e33806c906391e0033677e1ecfa423ddae563cb20680a73b8dec4c50e0b1fd2dbc0cf0adb82c77e67f50a5f4a40e26a871 SHA512 293c2ceb336623ed52028ca3144c4249eaf426dd2eb84890be9f1ed53e27d4ff5fd6a699d41426ca57d6362c2f83dd8b3556691da2815235f72e69ab4ef45165
-AUX opendnssec-openssl1.1.patch 1823 BLAKE2B e94d97755bde512efa87751f99655903a9b9627d0a4896294f643d89adbf7aa6fa1a0edf9098d0d2a1fc059aeaf2e19f6c814807b9fd2716fdf98401e3c15b06 SHA512 17dac7598339ba5a8d1459c93c837344d926cd939b830502040e5c41514bb6261d25486dbfce5e2d9994c01d990dbf88108563aab1b04b02c6a69ba988503a73
+AUX opendnssec-fix-run-dir-2.1.x.patch 1364 BLAKE2B be870fded9a3dfadfe2b131c7bf0dca3e8ec3b89f0baae469148e8c9ef81ceac1f6ace024373536fa34fa1fa31aa23b432ee97fce7d79c7324aee84eaa3014ec SHA512 c476a5808d914e2056c75d49a3297f4c9a6f9f20882734af21208d563d3a1f9b1aca387ea53159a7c91e6faacc38280ba7b72a3bd3d4a6dd7b4ffb3cfd749b33
 AUX opendnssec-use-system-trang.patch 618 BLAKE2B 32e1b6784f1666e0485e6109af40b06373fbdc974f90bf3a3d6fc564d7c69728151afc5a9f793c96a3be77593bb2679af9dee4456bf69e89367fa459f8b70435 SHA512 316b89a2c6ba56c4fe45d00ad1bc31316fa20ba7177a2cc0979c23f11aba4234cd2f0b8972f98e4f14be9535b704fdc3177a514a41c489eb43016f8ff878795c
 AUX opendnssec.confd 393 BLAKE2B 47f83e11292c01cb999fae36dbea2d0b45cb970493bfbab43c43682fe26e574e12bbe7f7096e71ff7bd0b8b49827f13e4de858a38868706fa769cc92ceb1f307 SHA512 17bd24efef9bd6b7a907c75126809a6012db23a6c8547169c41dbc62fc91775331f445905282bc6c2ef13357f92eccab5008d4605419d98acdb723806b63a924
 AUX opendnssec.initd 1854 BLAKE2B 358bcf513123f7a38b7795f142f56e6a186062d1ad80bb70bee46ba7ebe7a137b4d2830a6c27ae690add23e0296ed2bd3a7a5d7ee88e1ee7ee3a8a9631306916 SHA512 75bce27c152b55ba2ba7d0770c6f2149493ef4b145f2257328e7e4b6865ad2d644695a688c3e06be02705ac42752e031846551b80b560e19a73e595e5ad15def
-DIST opendnssec-2.0.3.tar.gz 1103355 BLAKE2B b64e729003de86e4139efaad60c9feae9f4e19c16a29fdced55d66f5896c4b7d76c4b8c57a8330d55c0c03e87de1ebe6ec49ef9d1b6e215be963680d2c805579 SHA512 4745a9ac317cc65d6f5b14be640687efd5fde2149541f692fb607a458378d27e903f175023c1aa16a777d17cef9cc68f1a84e7e7cdb233466d26756721b34424
-EBUILD opendnssec-2.0.3-r2.ebuild 6846 BLAKE2B aee3a4fb1f3037143d7f08726f2f3bdeb8c737a710b051faf33c669ddd6b4e79b35449635fffe46472fd4f1b45cfd3e0c192ed05a18b2a3ff1b7e6e24d664b12 SHA512 c443bcfffee145b1a71d629de68ec08ae68e3f6fa670ac48e179348f5bee8e91ec07a8d3dfe8b7fff3d6b8765e6bfca812a3617365a726a14bd5104157704d73
+DIST opendnssec-2.1.10.tar.gz 1142027 BLAKE2B 063650744ffd1c6d6d3b702400c9617883394c6794743f7d61bd63f7bdaf688a3f2a80f47612e561a133a5689dad8b5f7392eec69779d1dc5632a121d9a41c8f SHA512 c7fdbf1c3867d7b53ac11ab5cb5e636af4595dbee8d704429c7fb84cc3a6b2082ed490c33aad7747d4ee1a2c580afcf24a260bc3ed29eaf5e9d337004045b82d
+EBUILD opendnssec-2.1.10.ebuild 6691 BLAKE2B f9cd99406b5408b5ce2e06635912c1d8fd6f279b4325264852809b21ba5a379f577bb004575cdcf09a18598e4985b280ea52a58fb492aa6ceae17452f771bacc SHA512 b6052b62fcfe746326b20792641feda1d299f8e312578402bf779f6b30fbc866a961b0f800ae80e6fa2ade66612a02211c65d0993e176e25337a105a85c568b8
 MISC metadata.xml 718 BLAKE2B c6369b0a0f4df6fba454e7101d5254dcbd6b2294f9f6227d21d7f1defa04bde31809883d715b44c939fc9192447138d79b1955dc4964d17b0e8fc8341ab032aa SHA512 1b5144f8aca23a9798dd45a32b91fbdb37be1832d3d7b73bbafb3a3b4a7e003a00016ba84094fd662d9c0db5fe1b032a6a3e389b8c921c32fea61e5b0cd30c44
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
deleted file mode 100644
index f3adc487dee9..000000000000
--- a/net-dns/opendnssec/files/opendnssec-drop-privileges-2.0.x.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ur opendnssec-2.0.1.orig/conf/conf.xml.in opendnssec-2.0.1/conf/conf.xml.in
---- opendnssec-2.0.1.orig/conf/conf.xml.in	2016-07-21 16:15:27.000000000 +0200
-+++ opendnssec-2.0.1/conf/conf.xml.in	2016-08-23 15:21:09.633384446 +0200
-@@ -36,12 +36,10 @@
- 	</Common>
- 
- 	<Enforcer>
--<!--
- 		<Privileges>
- 			<User>opendnssec</User>
- 			<Group>opendnssec</Group>
- 		</Privileges>
---->
- 
- 		<Datastore><SQLite>@OPENDNSSEC_STATE_DIR@/kasp.db</SQLite></Datastore>
- 		<!--The enforcer interval parameter is no long used in 2.0 and will be deprecated in 2.1 -->
-@@ -60,12 +58,10 @@
- 	</Enforcer>
- 
- 	<Signer>
--<!--
- 		<Privileges>
- 			<User>opendnssec</User>
- 			<Group>opendnssec</Group>
- 		</Privileges>
---->
- 
- 		<WorkingDirectory>@OPENDNSSEC_STATE_DIR@/signer</WorkingDirectory>
- 		<WorkerThreads>4</WorkerThreads>
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
deleted file mode 100644
index 5940c2f050e6..000000000000
--- a/net-dns/opendnssec/files/opendnssec-fix-localstatedir-2.0.x.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur opendnssec-2.0.1.orig/Makefile.am opendnssec-2.0.1/Makefile.am
---- opendnssec-2.0.1.orig/Makefile.am	2016-07-21 16:15:00.000000000 +0200
-+++ opendnssec-2.0.1/Makefile.am	2016-08-23 14:01:50.618393034 +0200
-@@ -30,12 +30,12 @@
- 
- install-data-hook:
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signer
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/enforcer
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signconf
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/unsigned
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signed
-+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec
-+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signer
-+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/enforcer
-+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signconf
-+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/unsigned
-+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signed
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run/opendnssec
- 
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
deleted file mode 100644
index 5ea9c80f2ba7..000000000000
--- a/net-dns/opendnssec/files/opendnssec-fix-run-dir-2.0.x.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur opendnssec-2.0.1.orig/m4/opendnssec_common.m4 opendnssec-2.0.1/m4/opendnssec_common.m4
---- opendnssec-2.0.1.orig/m4/opendnssec_common.m4	2016-07-21 16:15:00.000000000 +0200
-+++ opendnssec-2.0.1/m4/opendnssec_common.m4	2016-08-23 14:42:35.033460972 +0200
-@@ -17,7 +17,7 @@
- OPENDNSSEC_DATA_DIR=$full_datadir/opendnssec
- OPENDNSSEC_SYSCONF_DIR=$full_sysconfdir/opendnssec
- OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/opendnssec"
--OPENDNSSEC_PID_DIR="$full_localstatedir/run/opendnssec"
-+OPENDNSSEC_PID_DIR="${destdir}/run/opendnssec"
- 
- AC_SUBST([OPENDNSSEC_BIN_DIR])
- AC_SUBST([OPENDNSSEC_SBIN_DIR])
-diff -ur opendnssec-2.0.1.orig/Makefile.am opendnssec-2.0.1/Makefile.am
---- opendnssec-2.0.1.orig/Makefile.am	2016-08-23 14:40:10.009951791 +0200
-+++ opendnssec-2.0.1/Makefile.am	2016-08-23 14:43:20.377870776 +0200
-@@ -36,8 +36,6 @@
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signconf
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/unsigned
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signed
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run/opendnssec
- 
- docs:
- 	(cd libhsm; $(MAKE) doxygen)
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
new file mode 100644
index 000000000000..87560e090e82
--- /dev/null
+++ b/net-dns/opendnssec/files/opendnssec-fix-run-dir-2.1.x.patch
@@ -0,0 +1,24 @@
+diff -ur opendnssec-2.1.10.orig/m4/opendnssec_common.m4 opendnssec-2.1.10/m4/opendnssec_common.m4
+--- opendnssec-2.1.10.orig/m4/opendnssec_common.m4	2021-09-10 09:11:17.000000000 -1000
++++ opendnssec-2.1.10/m4/opendnssec_common.m4	2021-11-27 14:18:26.430202347 -1000
+@@ -17,7 +17,7 @@
+ OPENDNSSEC_DATA_DIR=$full_datadir/opendnssec
+ OPENDNSSEC_SYSCONF_DIR=$full_sysconfdir/opendnssec
+ OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/opendnssec"
+-OPENDNSSEC_PID_DIR="$full_localstatedir/run/opendnssec"
++OPENDNSSEC_PID_DIR="${destdir}/run/opendnssec"
+ 
+ AC_SUBST([OPENDNSSEC_BIN_DIR])
+ AC_SUBST([OPENDNSSEC_SBIN_DIR])
+diff -ur opendnssec-2.1.10.orig/Makefile.am opendnssec-2.1.10/Makefile.am
+--- opendnssec-2.1.10.orig/Makefile.am	2021-09-10 09:11:17.000000000 -1000
++++ opendnssec-2.1.10/Makefile.am	2021-11-27 14:19:02.685418411 -1000
+@@ -38,8 +38,6 @@
+ 	$(INSTALL) @INSTALLATIONUSERARG@ @INSTALLATIONGROUPARG@ -d $(DESTDIR)$(localstatedir)/opendnssec/signconf
+ 	$(INSTALL) @INSTALLATIONUSERARG@ @INSTALLATIONGROUPARG@ -d $(DESTDIR)$(localstatedir)/opendnssec/unsigned
+ 	$(INSTALL) @INSTALLATIONUSERARG@ @INSTALLATIONGROUPARG@ -d $(DESTDIR)$(localstatedir)/opendnssec/signed
+-	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run
+-	$(INSTALL) @INSTALLATIONUSERARG@ @INSTALLATIONGROUPARG@ -d $(DESTDIR)$(localstatedir)/run/opendnssec
+ 
+ docs:
+ 	(cd libhsm; $(MAKE) doxygen)
diff --git a/net-dns/opendnssec/files/opendnssec-openssl1.1.patch b/net-dns/opendnssec/files/opendnssec-openssl1.1.patch
deleted file mode 100644
index b81068c4b9fd..000000000000
--- a/net-dns/opendnssec/files/opendnssec-openssl1.1.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/signer/src/wire/tsig-openssl.c
-+++ b/signer/src/wire/tsig-openssl.c
-@@ -126,7 +126,11 @@ static void
- cleanup_context(void *data)
- {
-     HMAC_CTX* context = (HMAC_CTX*) data;
-+#ifdef HAVE_SSL_NEW_HMAC
-+    HMAC_CTX_free(context);
-+#else
-     HMAC_CTX_cleanup(context);
-+#endif
- }
- 
- static void
-@@ -146,8 +150,13 @@ static void*
- create_context()
- {
-     HMAC_CTX* context;
-+#ifdef HAVE_SSL_NEW_HMAC
-+    CHECKALLOC(context = HMAC_CTX_new());
-+    HMAC_CTX_reset(context);
-+#else
-     CHECKALLOC(context = (HMAC_CTX*) malloc(sizeof(HMAC_CTX)));
-     HMAC_CTX_init(context);
-+#endif
-     context_add_cleanup(context);
-     return context;
- }
---- a/m4/acx_ssl.m4	2016-10-14 09:40:13.000000000 -0400
-+++ b/m4/acx_ssl.m4	2019-02-18 13:52:49.861127549 -0500
-@@ -35,12 +35,21 @@
-             if test x_$ssldir = x_/usr/sfw; then
-                 SSL_LIBS="$SSL_LIBS -R$ssldir/lib";
-             fi
--            AC_CHECK_LIB(crypto, HMAC_CTX_init,, [
--                    AC_MSG_ERROR([OpenSSL found in $ssldir, but version 0.9.7 or higher is required])
--            ])
-+            save_LIBS=$LIBS
-+            AC_CHECK_LIB(crypto, HMAC_CTX_reset, [
-+                    AC_DEFINE_UNQUOTED([HAVE_SSL_NEW_HMAC], [], [Define if you have the SSL libraries with new HMAC related functions.])
-+            ], [
-+                    AC_CHECK_LIB(crypto, HMAC_CTX_init,, [
-+                            AC_MSG_ERROR([OpenSSL found in $ssldir, but version 0.9.7 or higher is required])
-+                    ])
-+            ] )
-+            SSL_LIBS="$SSL_LIBS -lcrypto";
-+            LIBS="$SSL_LIBS $LIBS"
-             AC_CHECK_FUNCS([EVP_sha1 EVP_sha256])
-+            LIBS=$saveLIBS
-         fi
-         AC_SUBST(HAVE_SSL)
-+        AC_SUBST(HAVE_SSL_NEW_HMAC)
-         AC_SUBST(SSL_INCLUDES)
-         AC_SUBST(SSL_LIBS)
-     fi
diff --git a/net-dns/opendnssec/opendnssec-2.0.3-r2.ebuild b/net-dns/opendnssec/opendnssec-2.1.10.ebuild
index 17efc48d4904..fc1cc54c2d14 100644
--- a/net-dns/opendnssec/opendnssec-2.0.3-r2.ebuild
+++ b/net-dns/opendnssec/opendnssec-2.1.10.ebuild
@@ -45,6 +45,8 @@ BDEPEND="
 	doc? ( app-doc/doxygen )
 	test? (
 		app-text/trang
+		dev-libs/softhsm:*
+		dev-util/cunit
 	)
 "
 
@@ -54,11 +56,8 @@ REQUIRED_USE="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-fix-localstatedir-2.0.x.patch"
-	"${FILESDIR}/${PN}-fix-run-dir-2.0.x.patch"
-	"${FILESDIR}/${PN}-drop-privileges-2.0.x.patch"
+	"${FILESDIR}/${PN}-fix-run-dir-2.1.x.patch"
 	"${FILESDIR}/${PN}-use-system-trang.patch"
-	"${FILESDIR}/${PN}-openssl1.1.patch"
 )
 
 DOCS=( MIGRATION NEWS )
@@ -69,11 +68,7 @@ check_pkcs11_setup() {
 
 	if use softhsm; then
 		PKCS11_LIB=softhsm
-		if has_version ">=dev-libs/softhsm-1.3.1"; then
-			PKCS11_PATH=/usr/$(get_libdir)/softhsm/libsofthsm.so
-		else
-			PKCS11_PATH=/usr/$(get_libdir)/libsofthsm.so
-		fi
+		PKCS11_PATH=/usr/$(get_libdir)/softhsm/libsofthsm2.so
 		elog "Building with SoftHSM PKCS#11 library support."
 	fi
 	if use opensc; then
@@ -119,8 +114,7 @@ pkg_pretend() {
 		eerror ""
 		eerror "   emerge \"<net-dns/opendnssec-2\""
 		eerror ""
-		eerror "See https://github.com/opendnssec/opendnssec/blob/2.0/master/MIGRATION"
-		eerror "for details."
+		eerror "See /usr/share/doc/opendnssec-2.1.10/MIGRATION* for details."
 		eerror ""
 		die "Please upgrade to version >=1.4.10 first for proper db migraion"
 	fi
@@ -140,8 +134,10 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		--enable-installation-user=opendnssec \
+		--enable-installation-group=opendnssec \
+		--localstatedir="${EPREFIX}/var/lib" \
 		--without-cunit \
-		--localstatedir="${EPREFIX}/var" \
 		--disable-static \
 		--with-enforcer-database=$(use mysql && echo "mysql")$(use sqlite && echo "sqlite3") \
 		--with-pkcs11-${PKCS11_LIB}=${PKCS11_PATH} \
@@ -230,7 +226,7 @@ pkg_postinst() {
 				ewarn ""
 				ewarn "You are upgrading from version 1.4."
 				ewarn ""
-				ewarn "A migration is needed from 1.4 to 2.0."
+				ewarn "A migration is needed from 1.4 to 2.x."
 				ewarn "For details see /usr/share/doc/${P}/MIGRATION*"
 				ewarn ""
 				ewarn "For your convenience the mentioned migration scripts and README"