diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-02-13 21:41:11 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-02-13 21:41:11 +0000 |
| commit | c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (patch) | |
| tree | c44943ee0563a3fa957716de909fed683117fcb9 /dev-libs/xmlsec | |
| parent | 69051588e2f955485fe5d45d45e616bc60a2de57 (diff) | |
gentoo (valentine's day) resync : 14.02.2021
Diffstat (limited to 'dev-libs/xmlsec')
| -rw-r--r-- | dev-libs/xmlsec/Manifest | 3 | ||||
| -rw-r--r-- | dev-libs/xmlsec/files/xmlsec-1.2.31-fix-nss-3.59.patch | 29 | ||||
| -rw-r--r-- | dev-libs/xmlsec/xmlsec-1.2.31.ebuild | 8 |
3 files changed, 37 insertions, 3 deletions
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest index fa80560a3b49..0c4c16709de0 100644 --- a/dev-libs/xmlsec/Manifest +++ b/dev-libs/xmlsec/Manifest @@ -1,5 +1,6 @@ +AUX xmlsec-1.2.31-fix-nss-3.59.patch 980 BLAKE2B fb0d28e3a33a2d581796f03f2121f08c26cb964a727876a1bc7a1b9e63f92056a0213d315a0accc94bb582d9224fcbe10ef0c95528f70f29d6d69a34fa5e342d SHA512 a1857ad89b0d4d20d92deda23112abac814b312525a662af85edc44150c78e58fe54142d0cc92857e01a14719e698a810585df350ea4844544328eb7848b4680 DIST xmlsec1-1.2.30.tar.gz 1989670 BLAKE2B b363d1661ba5fdf968725948598954c7d514ad92c4ad05b490aa3ac9ffb6be861ee81d660be30d37e26ae1cb327cdecd1c76d60055ec5aa900e390a4083099b3 SHA512 07152470a9fe5d077f8a358608ca1d8a79ee0d2777660f61ed5717dc640714a3adfe66843e6a4023898eb0f5ed79771d70c41132571f3a1aeda82c1894b69c98 DIST xmlsec1-1.2.31.tar.gz 1989144 BLAKE2B ddc55e34867d5870fa434c739825ceaa68500a11fb2eabb482945901ad7fa0ba0d5fce7cd6c5f1b49c24d5bc07cee2875ff21833f09c0ec2ffeaf63875f5b001 SHA512 7a0e3d6f66746a22cf6468eb4d0691879c7468e4bef71fd8720e6a56b420f076a1d8a3094c35e721471dd029a643f5c4a553ef5788be5509f2786a419da1b7af EBUILD xmlsec-1.2.30.ebuild 1400 BLAKE2B 33a78b6d284196e366c67719cc2d0e292696e761c297fc0bc2e3cdfb13cbd3fd732ad3ebb5b1ffc7c3ef4d1992ad368dee5f392900849e1970e7db67730f1f29 SHA512 8dd204f7d770a323c0f1943c555cabf67fa9ae3a83d89fe325f23be24b21cad29f62565cba9c8eae733453b76c1547f022ccd2a263edb85a2aba0ea6efb0b6cd -EBUILD xmlsec-1.2.31.ebuild 1405 BLAKE2B 0f41b67a723a978e8510ef16f2a3455d7aaac2eedce8ceb16a5d2bc91d14642b5f05f6112eb205d88a9faa040697e51a50e711c97bca6e9b4ff92985476190ec SHA512 7f09fa4ef386bfa3f1a7ea1f27dec14a6a21eb02e22fe159739ac2554c825d03f58a96162c8f2eed7ac31507a5a7180aa896869d0c644e8a210a402101ca12b2 +EBUILD xmlsec-1.2.31.ebuild 1454 BLAKE2B ddda57c716158a60039edcedd03c3dfa2f7d2f454f30a6b8f99800bebe8af259c8de06dc64adf67d4355868f98b92033e43dce1fceefb5be7b35634d23c7453c SHA512 3ab54a0b41148d4ecc79b94d5bd503080ea63809771505f68db24b80223615fa3f1c3e35a455c3d3b723948ba692b127ecb5fac541bec598f3ebca2576d0146c MISC metadata.xml 492 BLAKE2B f1d4308323da79d17e6f5e0025fff338024b6d74c90584c469917418ebb06aa9be43a1b1d5f8a8e4a25aa0584b8b96aadc5508a2aca1b9f6d3924c81bb33f41b SHA512 920fe71d66278f82b0fcb18044998d5b72cc69a07966e8d1d2527a0d1a7e78c89536e165f105dc4ed9de84377a80f3ef55804bd26f71d868808077ffcd6b39c3 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 000000000000..b70b8cf2d61b --- /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@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 2da2a8e15d6d..08c8ae220183 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 @@ -10,7 +10,7 @@ S="${WORKDIR}/${PN}1-${PV}" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~sparc x86" IUSE="doc gcrypt gnutls libressl nss +openssl static-libs test" RESTRICT="!test? ( test )" REQUIRED_USE="|| ( gcrypt gnutls nss openssl ) @@ -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 \ |