[gentoo-commits] repo/gentoo:master commit in: dev-libs/xmlsec/, dev-libs/xmlsec/files/

[Sam James]

commit:     03615d27a5ab502bbb7a011f546b1b2a9da376a2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  2 15:24:06 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb  2 15:24:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03615d27

dev-libs/xmlsec: fix tests with >=dev-libs/nss-5.59

MD5 was removed upstream.

Closes: https://bugs.gentoo.org/764437
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../xmlsec/files/xmlsec-1.2.31-fix-nss-3.59.patch  | 29 ++++++++++++++++++++++
 dev-libs/xmlsec/xmlsec-1.2.31.ebuild               |  6 ++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/dev-libs/xmlsec/files/xmlsec-1.2.31-fix-nss-3.59.patch b/dev-libs/xmlsec/files/xmlsec-1.2.31-fix-nss-3.59.patch
new file mode 100644
index 00000000000..b70b8cf2d61
--- /dev/null
+++ b/dev-libs/xmlsec/files/xmlsec-1.2.31-fix-nss-3.59.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/764437
+https://github.com/lsh123/xmlsec/commit/f3a59c721e38a663405093e2bbb30e2bf45853a2.patch
+From f3a59c721e38a663405093e2bbb30e2bf45853a2 Mon Sep 17 00:00:00 2001
+From: lsh123 <aleksey@×××××××.com>
+Date: Fri, 18 Dec 2020 16:22:40 -0800
+Subject: [PATCH] Remove MD5 for NSS 3.59 and above; enable nss test on osx and
+ mingw (issue #305) (#306)
+
+---
+ include/xmlsec/nss/crypto.h      | 6 ++++++
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/include/xmlsec/nss/crypto.h b/include/xmlsec/nss/crypto.h
+index 223c1d85..614ac931 100644
+--- a/include/xmlsec/nss/crypto.h
++++ b/include/xmlsec/nss/crypto.h
+@@ -19,6 +19,12 @@
+ #include <xmlsec/transforms.h>
+ #include <xmlsec/dl.h>
+ 
++
++/* MD5 was removed from NSS */
++#if (NSS_VMAJOR > 3) || ((NSS_VMAJOR == 3) && (NSS_VMINOR > 58))
++#define XMLSEC_NO_MD5 1
++#endif /* (NSS_VMAJOR > 3) || ((NSS_VMAJOR == 3) && (NSS_VMINOR > 58)) */
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif /* __cplusplus */

diff --git a/dev-libs/xmlsec/xmlsec-1.2.31.ebuild b/dev-libs/xmlsec/xmlsec-1.2.31.ebuild
index 2da2a8e15d6..671ed055d22 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.31.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,6 +36,10 @@ BDEPEND="virtual/pkgconfig
 		)
 	)"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-nss-3.59.patch"
+)
+
 src_configure() {
 	# Bash because of bug #721128
 	CONFIG_SHELL=${BASH} econf \