gentoo resync : 20.02.2019

4 files changed, 66 insertions, 13 deletions

diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest
index 9f1951c10749..de64a0aff011 100644
--- a/net-dns/opendnssec/Manifest
+++ b/net-dns/opendnssec/Manifest
@@ -7,7 +7,8 @@ AUX opendnssec-fix-localstatedir-2.0.x.patch 1161 BLAKE2B 28469aaad2878cdb1f58f2
 AUX opendnssec-fix-localstatedir.patch 1693 BLAKE2B 82220ef1f5c5da994fd01671436b9e47a5f0a08737e52a440866499792326389bc495de00305853dbdc6a08ef8b6288e509a8b2310461724f6f4d42aa2245614 SHA512 86700c97bb482f5fa6d99fe8f105c41e8798de542e6cf5fd4d6c14da11237e4fd11eccb2900de4893898d7855e31beb6572c709c2dad9774d5fe440673af2627
 AUX opendnssec-fix-run-dir-2.0.x.patch 1188 BLAKE2B c11d3e120dac17f4d9bb24c561cf67e33806c906391e0033677e1ecfa423ddae563cb20680a73b8dec4c50e0b1fd2dbc0cf0adb82c77e67f50a5f4a40e26a871 SHA512 293c2ceb336623ed52028ca3144c4249eaf426dd2eb84890be9f1ed53e27d4ff5fd6a699d41426ca57d6362c2f83dd8b3556691da2815235f72e69ab4ef45165
 AUX opendnssec-fix-run-dir.patch 1204 BLAKE2B 8109370737931c9172d7e89a02cf08cdb38524f91429c8526d27a18f90672586fc95eed671e3a2222698832e1df4cfad292950bd8b364af67ca9242e7dd074f4 SHA512 f604ab24731bd84498f33dc3213b937335e55f805d4913e80b037b91cc5bf14f406cb2af14cc455a9a23c45a3475ef1b3901c68760188d9e4a36d314d29f8f84
-AUX opendnssec-use-system-trang.patch 614 BLAKE2B 87d80d468c0ab85d88a495d5e2b506520e965645a5b4a7129c8cf9b6bbf9898f01516d08d665d76905e2f2e0c7fa5377137bbcfc6a5669e7bb7ba399d3f32813 SHA512 9e95943d145ce7a05e32af60a944c6ee6d74fdff0fa9f0ea233070b44567bce4f5ca6bde57411effa7bab192ec58face34cddf2c349ccff3b78fc66c1f35074d
+AUX opendnssec-openssl1.1.patch 1823 BLAKE2B e94d97755bde512efa87751f99655903a9b9627d0a4896294f643d89adbf7aa6fa1a0edf9098d0d2a1fc059aeaf2e19f6c814807b9fd2716fdf98401e3c15b06 SHA512 17dac7598339ba5a8d1459c93c837344d926cd939b830502040e5c41514bb6261d25486dbfce5e2d9994c01d990dbf88108563aab1b04b02c6a69ba988503a73
+AUX opendnssec-use-system-trang.patch 618 BLAKE2B 32e1b6784f1666e0485e6109af40b06373fbdc974f90bf3a3d6fc564d7c69728151afc5a9f793c96a3be77593bb2679af9dee4456bf69e89367fa459f8b70435 SHA512 316b89a2c6ba56c4fe45d00ad1bc31316fa20ba7177a2cc0979c23f11aba4234cd2f0b8972f98e4f14be9535b704fdc3177a514a41c489eb43016f8ff878795c
 AUX opendnssec.confd 393 BLAKE2B 47f83e11292c01cb999fae36dbea2d0b45cb970493bfbab43c43682fe26e574e12bbe7f7096e71ff7bd0b8b49827f13e4de858a38868706fa769cc92ceb1f307 SHA512 17bd24efef9bd6b7a907c75126809a6012db23a6c8547169c41dbc62fc91775331f445905282bc6c2ef13357f92eccab5008d4605419d98acdb723806b63a924
 AUX opendnssec.confd-1.3.x 477 BLAKE2B e131ba95566a4d9cdab721551c7056c9ab07c0cd62b100ac4a84c4363a8ec96482758c13ec35f6188581764550364936123ea8011359278ef054f2ca03a509e0 SHA512 e45cd05e9d972dce5254f333ce21fd599ed905e8009f67de636c3a72dcd49e43fb75f702e21665dd3f19602fb9a5be5b6ff34e147ac4e29844560cc4f65f727c
 AUX opendnssec.initd 1854 BLAKE2B 358bcf513123f7a38b7795f142f56e6a186062d1ad80bb70bee46ba7ebe7a137b4d2830a6c27ae690add23e0296ed2bd3a7a5d7ee88e1ee7ee3a8a9631306916 SHA512 75bce27c152b55ba2ba7d0770c6f2149493ef4b145f2257328e7e4b6865ad2d644695a688c3e06be02705ac42752e031846551b80b560e19a73e595e5ad15def
@@ -21,5 +22,5 @@ EBUILD opendnssec-1.3.18-r1.ebuild 5693 BLAKE2B 4dd186eb49ed5d4b293c0a43907d8b43
 EBUILD opendnssec-1.4.12-r1.ebuild 5780 BLAKE2B 28b72f5541667b5218f5bb631593855394084405d95dfcbf16afe36325ab7171708e3eb0111a3c403f747c52d1e44c897436f4775f1b7cdebb0578d09ca4ac6f SHA512 3e0ac6197e86315794dd604de6adb605845c09f8a00958189f35d3432b748de2e2d8589c217035c4dd167971452026d56a6b2ca38db0af8d7eb18ad8f888237c
 EBUILD opendnssec-1.4.8.2.ebuild 5830 BLAKE2B 162c6e75f89225d73b455191f65c37ba680eefbeccdc12d21bac984257ff4b5ceb82843c42020b43b4330af2dea4cb70c6a74eb83dc0b00d70f02ae5d91e0fc1 SHA512 d9cb344ca13a2a926f46e4dd041453132cb669d0ae23f4180dda38ca12fa41f6aa6187d7e9cf70ca8e36ec4266cd75569a36d928c9ab65800c68ecc11ec6da80
 EBUILD opendnssec-2.0.1-r1.ebuild 6763 BLAKE2B e4f38470013f4d90ba567d3d5520df89fa15d5d77b6b3f7a9faa224fe1f60e1eef6980f20f83b69688d44d860e94f7f56cf98b8259acc07a1d89d03fd17deaf1 SHA512 9398125ccf2e3bc05ffc8c87e9582374075cb89d079e3e01364134f6529f399fa7556afd1d489f43235a31f6e2c7e13726b6552ab59d757df761680668ad7102
-EBUILD opendnssec-2.0.3.ebuild 6763 BLAKE2B e4f38470013f4d90ba567d3d5520df89fa15d5d77b6b3f7a9faa224fe1f60e1eef6980f20f83b69688d44d860e94f7f56cf98b8259acc07a1d89d03fd17deaf1 SHA512 9398125ccf2e3bc05ffc8c87e9582374075cb89d079e3e01364134f6529f399fa7556afd1d489f43235a31f6e2c7e13726b6552ab59d757df761680668ad7102
+EBUILD opendnssec-2.0.3-r1.ebuild 6732 BLAKE2B e1cb04da8eab2d36761f775c9af776665771276bb274cd51d0537069e1e3fd67eecf862f5766b8137dfefef31ba114a14c1f1365e0355324be72bb548e1d0a8c SHA512 0dbc6c60279574513b0d1eb60b4583a845b7961e9615eec81a0f09488cdaa40d6532895bada99c016af7eb59fdf3011c61178e2c149410965c86849d9bf49a43
 MISC metadata.xml 906 BLAKE2B 87ce475aaab1ed562daa0c2102e206f32abc25b9fd77932bd6a33e5f31990864dd0da48e48e7165debc10ae0653f6bed364c12a52df48dd448e29590bf6f7141 SHA512 9cddc6b15c7a959cb885bc639c19e166ee202dd4b45db50c9bbb3b61fe9e84311f023a3d34cfc44e689cf81df092211fa4cb88427fb143c113bdfc1e7897112e
diff --git a/net-dns/opendnssec/files/opendnssec-openssl1.1.patch b/net-dns/opendnssec/files/opendnssec-openssl1.1.patch
new file mode 100644
index 000000000000..b81068c4b9fd
--- /dev/null
+++ b/net-dns/opendnssec/files/opendnssec-openssl1.1.patch
@@ -0,0 +1,55 @@
+--- 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/files/opendnssec-use-system-trang.patch b/net-dns/opendnssec/files/opendnssec-use-system-trang.patch
index 745b277e1339..4cc564c265a3 100644
--- a/net-dns/opendnssec/files/opendnssec-use-system-trang.patch
+++ b/net-dns/opendnssec/files/opendnssec-use-system-trang.patch
@@ -1,5 +1,5 @@
---- conf/Makefile.am.orig	2013-05-12 22:45:26.514768943 +0200
-+++ conf/Makefile.am	2013-05-12 22:46:33.399545628 +0200
+--- a/conf/Makefile.am.orig	2013-05-12 22:45:26.514768943 +0200
++++ b/conf/Makefile.am	2013-05-12 22:46:33.399545628 +0200
 @@ -7,7 +7,7 @@
  XML =	addns.xml conf.xml kasp.xml zonelist.xml signconf.xml enforcerstate.xml
  XSL=	kasp2html.xsl
diff --git a/net-dns/opendnssec/opendnssec-2.0.3.ebuild b/net-dns/opendnssec/opendnssec-2.0.3-r1.ebuild
index f4ecf0b3f3eb..d8769127684e 100644
--- a/net-dns/opendnssec/opendnssec-2.0.3.ebuild
+++ b/net-dns/opendnssec/opendnssec-2.0.3-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P="${P/_}"
 PKCS11_IUSE="+softhsm opensc external-hsm"
-inherit autotools eutils multilib user
+inherit autotools user
 
 DESCRIPTION="An open-source turn-key solution for DNSSEC"
 HOMEPAGE="http://www.opendnssec.org/"
@@ -22,7 +22,7 @@ RDEPEND="
 	dev-libs/libxslt
 	net-libs/ldns
 	mysql? (
-		virtual/mysql
+		dev-db/mysql-connector-c:0=
 		dev-perl/DBD-mysql
 	)
 	opensc? ( dev-libs/opensc )
@@ -50,6 +50,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-fix-run-dir-2.0.x.patch"
 	"${FILESDIR}/${PN}-drop-privileges-2.0.x.patch"
 	"${FILESDIR}/${PN}-use-system-trang.patch"
+	"${FILESDIR}/${PN}-openssl1.1.patch"
 )
 
 S="${WORKDIR}/${MY_P}"
@@ -130,11 +131,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	local patch
 	default
-	for patch in "${PATCHES[@]}"; do
-		epatch "$patch"
-	done
 	eautoreconf
 }
 
@@ -199,7 +196,7 @@ src_install() {
 		-e 's,^SCHEMA=../src/db/,SCHEMA=/usr/share/opendnssec/db/sql/,' \
 		-e 's,^SCHEMA=../../src/db/,SCHEMA=/usr/share/opendnssec/db/sql/,' \
 		"${ED}"/usr/share/opendnssec/db/convert_* \
-		"${ED}"/usr/share/opendnssec/db/1.4-2.0_db_convert/convert_*
+		"${ED}"/usr/share/opendnssec/db/1.4-2.0_db_convert/convert_* || die
 
 	# fix permissions
 	fowners root:opendnssec /etc/opendnssec