From 73c318acdaf6f8309d68bd266051e6dd1f1bd787 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 8 Jun 2019 09:04:53 +0100 Subject: gentoo resync : 08.06.2019 --- dev-libs/xmlsec/Manifest | 5 +- dev-libs/xmlsec/files/xmlsec-1.2.27-gnutls.patch | 47 --------------- dev-libs/xmlsec/xmlsec-1.2.27-r1.ebuild | 74 ------------------------ dev-libs/xmlsec/xmlsec-1.2.28.ebuild | 2 +- 4 files changed, 2 insertions(+), 126 deletions(-) delete mode 100644 dev-libs/xmlsec/files/xmlsec-1.2.27-gnutls.patch delete mode 100644 dev-libs/xmlsec/xmlsec-1.2.27-r1.ebuild (limited to 'dev-libs/xmlsec') diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest index 13c7c8d4a28e..d4bf735560ca 100644 --- a/dev-libs/xmlsec/Manifest +++ b/dev-libs/xmlsec/Manifest @@ -1,7 +1,4 @@ -AUX xmlsec-1.2.27-gnutls.patch 1638 BLAKE2B 0368f307fbadbc9f90b130e339abe7d1f5774207eff4853f5415986d9d97ed85027f9679d74b76705ab53931060be52586a053c191b9be9954e6594092e0922a SHA512 e5c6398ff234f69d72531e1997dee28b1f0fc10f7ee67d2b70036760ac2e3c0bfa4c3caca29ab05feeafe402ef8e87f95b3c96e7c9fac9df90e74bae3199fc13 AUX xmlsec-1.2.28-test.patch 2418 BLAKE2B e5cf92fd7f72be16d95fe67da99c96fc8e1bc8e7dadbfdbf5970ff7c148aa95868c2a4db8a03e86a2b67dd54c6bb71f0409bc4e075ad2b7148da1f489e672dee SHA512 48e72e197a23d4a0f3c7679dad438b1d9e140f2c9a311959748d432c543e4f48d32a52a4f65bd971d0263038cf6fde4a753e0eb2616ac6d5db092279cdc08b46 -DIST xmlsec1-1.2.27.tar.gz 2013651 BLAKE2B fa46a25e3aaef432134d1c98a0e7bf0aba83f2ef6d1aff3774d6d37c5f6f392d1c2c11a0fe433ee910c39b56400c96b74ab061577948622b14a1116fa1ec2947 SHA512 01f7231d7d7ac8037aecc1f922acc572cbfe0903abf5bd5879d836438c36684e23402b803d20806fff6b1cdc5ad9af114d1341b10b336f71c0bce28b4716f920 DIST xmlsec1-1.2.28.tar.gz 1995599 BLAKE2B 5d90646d9a72024856da2638adb6d0d00d5142f8d3eaa5b12a993e2e6ae78ad49aab69822ebe331191bf1fc5b98431b85e113545aec84e2bb7d5c5add9028df0 SHA512 17fa59e4ffee5e024caa4895e8ed21d1435f14e3a37d0ed781b1dd216333ae3b6099c460efd45d4a8097d0202522150b7b0ad543b47c1596d8473b6922270480 -EBUILD xmlsec-1.2.27-r1.ebuild 1566 BLAKE2B 07937e208f8d123a8bc02efae6e83a0da1dc3c89bf8046e8e0f3e1b4378952e1071c71f2ce26230c97058ca4e828769565a5771d528ff20fbe648a6eac7fc6e0 SHA512 fe3ec7050c90a5edd33cc9ed6a8ecb7c03c8bfe71641897aac9f8aeab720bee92a565d51bda30546eb9cb603d399bcc654cadf832da78821e4f6de5dc772f126 -EBUILD xmlsec-1.2.28.ebuild 1372 BLAKE2B 6694591d9ead51d34ba1701adb642cfe14009032a8e04fa8bcda9a89afff7ed0dd6beb0a4c17e00d2ca0e67db2bc72c74f54295d777622d8cf833c7c1486d737 SHA512 7c4c195d528d89681930054f9433e18aa9772396274858d5fef10afa01ec6906c3ccdee99a7a34dde4a0899d0e51c8adec1ac4e46aa9dd04f44cb68e703e5bce +EBUILD xmlsec-1.2.28.ebuild 1371 BLAKE2B fc6c926519bf9172d3bc4e868e2b97cde93a63cd170495d95141d4270ed7df1763196e3cf9d5f78204939c5470a4b93a0bdb944401da650432eca4c71c2d6c09 SHA512 b6f80d712fb05f116b8c62cfd65a4332360149031428e62a96b830af149c18769a427e20203efde0004c56220269a696ecc0597dde03a17b13e6cdba0c9874fc MISC metadata.xml 487 BLAKE2B 0e191be30487c618789a7eaf8c2ca9ba0e801649213674adc85e76a5402853055d384efb9d6b534099683de4b2935dafa613ac029fd810125993d039cf9caec8 SHA512 1be5c6aa74ba9542e7b4b85adb8dd743fbeb72b4fee345996ee1b5bc662d9455d910f00ca37b16e644f53039a346ef44afc5e49abba19c5f8d4d00cbdf37d660 diff --git a/dev-libs/xmlsec/files/xmlsec-1.2.27-gnutls.patch b/dev-libs/xmlsec/files/xmlsec-1.2.27-gnutls.patch deleted file mode 100644 index 2837420e0dc7..000000000000 --- a/dev-libs/xmlsec/files/xmlsec-1.2.27-gnutls.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 321e62add243cf8f024d6278da4c5ff030bae3b9 Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Mon, 1 Apr 2019 01:28:18 +0300 -Subject: [PATCH] gnutls: allow SHA-1 signed certificate when not in strict - checks (#250) (#251) - -This is required for gnutls-3.6.x. - -Allow tests to use no strict checks until all certificates will be converted -to stronger signature than SHA-1. - -Signed-off-by: Alon Bar-Lev ---- - src/gnutls/x509vfy.c | 3 +++ - tests/testrun.sh | 2 +- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/gnutls/x509vfy.c b/src/gnutls/x509vfy.c -index a9c956a3..4c753344 100644 ---- a/src/gnutls/x509vfy.c -+++ b/src/gnutls/x509vfy.c -@@ -295,6 +295,9 @@ xmlSecGnuTLSX509StoreVerify(xmlSecKeyDataStorePtr store, - if((keyInfoCtx->flags & XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS) != 0) { - flags |= GNUTLS_VERIFY_ALLOW_SIGN_RSA_MD2; - flags |= GNUTLS_VERIFY_ALLOW_SIGN_RSA_MD5; -+#if GNUTLS_VERSION_NUMBER >= 0x030600 -+ flags |= GNUTLS_VERIFY_ALLOW_SIGN_WITH_SHA1; -+#endif - } - - /* We are going to build all possible cert chains and try to verify them */ -diff --git a/tests/testrun.sh b/tests/testrun.sh -index 02484d09..ea65802b 100755 ---- a/tests/testrun.sh -+++ b/tests/testrun.sh -@@ -59,7 +59,7 @@ if [ "z$XMLSEC_DEFAULT_CRYPTO" != "z" ] ; then - elif [ "z$crypto" != "z" ] ; then - xmlsec_params="$xmlsec_params --crypto $crypto" - fi --xmlsec_params="$xmlsec_params --crypto-config $crypto_config" -+xmlsec_params="$xmlsec_params --X509-skip-strict-checks --crypto-config $crypto_config" - - # - # Setup keys config --- -2.21.0 - diff --git a/dev-libs/xmlsec/xmlsec-1.2.27-r1.ebuild b/dev-libs/xmlsec/xmlsec-1.2.27-r1.ebuild deleted file mode 100644 index 56460816acfd..000000000000 --- a/dev-libs/xmlsec/xmlsec-1.2.27-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Command line tool for signing, verifying, encrypting and decrypting XML" -HOMEPAGE="https://www.aleksey.com/xmlsec" -SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~sparc x86" -IUSE="doc gcrypt gnutls libressl nss +openssl static-libs test" -REQUIRED_USE="|| ( gcrypt gnutls nss openssl ) - gnutls? ( gcrypt )" - -RDEPEND=">=dev-libs/libxml2-2.7.4:= - >=dev-libs/libxslt-1.0.20:= - gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0= ) - gnutls? ( >=net-libs/gnutls-2.8.0:= ) - nss? ( - >=dev-libs/nspr-4.4.1:= - >=dev-libs/nss-3.9:= - ) - openssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig - test? ( - nss? ( - >=dev-libs/nss-3.9[utils] - ) - )" - -S="${WORKDIR}/${PN}1-${PV}" - -PATCHES=( - "${FILESDIR}/${P}-gnutls.patch" -) - -src_prepare() { - default - # conditionally install extra documentation - if ! use doc ; then - sed -i '/^SUBDIRS/s/docs//' Makefile.am || die - eautoreconf - fi -} - -src_configure() { - econf \ - --enable-pkgconfig \ - --with-html-dir=/usr/share/doc/${PF}/html \ - $(use_enable static-libs static) \ - $(use_with gcrypt) \ - $(use_with gnutls) \ - $(use_with nss) \ - $(use_with nss nspr) \ - $(use_with openssl) \ - $(use_enable openssl aes) -} - -src_test() { - emake TMPFOLDER="${T}" check -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-libs/xmlsec/xmlsec-1.2.28.ebuild b/dev-libs/xmlsec/xmlsec-1.2.28.ebuild index ff93864ba19a..a47903e5571f 100644 --- a/dev-libs/xmlsec/xmlsec-1.2.28.ebuild +++ b/dev-libs/xmlsec/xmlsec-1.2.28.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz" 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" REQUIRED_USE="|| ( gcrypt gnutls nss openssl ) gnutls? ( gcrypt )" -- cgit v1.2.3