From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 968C61382C5 for ; Tue, 2 Feb 2021 15:24:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C0157E08FC; Tue, 2 Feb 2021 15:24:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A9402E08FC for ; Tue, 2 Feb 2021 15:24:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5536F341741 for ; Tue, 2 Feb 2021 15:24:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D1C1446B for ; Tue, 2 Feb 2021 15:24:34 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1612279464.03615d27a5ab502bbb7a011f546b1b2a9da376a2.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/xmlsec/, dev-libs/xmlsec/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/xmlsec/files/xmlsec-1.2.31-fix-nss-3.59.patch dev-libs/xmlsec/xmlsec-1.2.31.ebuild X-VCS-Directories: dev-libs/xmlsec/files/ dev-libs/xmlsec/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 03615d27a5ab502bbb7a011f546b1b2a9da376a2 X-VCS-Branch: master Date: Tue, 2 Feb 2021 15:24:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ddef6f01-95c6-49d3-8069-4d2a0dc384e5 X-Archives-Hash: ff0098e0c71d7914b32e0cef6391d147 commit: 03615d27a5ab502bbb7a011f546b1b2a9da376a2 Author: Sam James gentoo org> AuthorDate: Tue Feb 2 15:24:06 2021 +0000 Commit: Sam James gentoo 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 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 +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 + #include + ++ ++/* 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 \