1 |
commit: ec3f8d5dc3cf3748f0f93196088cdd12ae7e1b40 |
2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 4 15:28:10 2019 +0000 |
4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 4 15:28:24 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec3f8d5d |
7 |
|
8 |
dev-libs/xmlsec: cleanup old |
9 |
|
10 |
Signed-off-by: Alon Bar-Lev <alonbl <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.66, Repoman-2.3.11 |
12 |
|
13 |
dev-libs/xmlsec/Manifest | 1 - |
14 |
dev-libs/xmlsec/files/xmlsec-1.2.27-gnutls.patch | 47 --------------- |
15 |
dev-libs/xmlsec/xmlsec-1.2.27-r1.ebuild | 74 ------------------------ |
16 |
3 files changed, 122 deletions(-) |
17 |
|
18 |
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest |
19 |
index 8a0d3bf81fb..80e759b5df2 100644 |
20 |
--- a/dev-libs/xmlsec/Manifest |
21 |
+++ b/dev-libs/xmlsec/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST xmlsec1-1.2.27.tar.gz 2013651 BLAKE2B fa46a25e3aaef432134d1c98a0e7bf0aba83f2ef6d1aff3774d6d37c5f6f392d1c2c11a0fe433ee910c39b56400c96b74ab061577948622b14a1116fa1ec2947 SHA512 01f7231d7d7ac8037aecc1f922acc572cbfe0903abf5bd5879d836438c36684e23402b803d20806fff6b1cdc5ad9af114d1341b10b336f71c0bce28b4716f920 |
24 |
DIST xmlsec1-1.2.28.tar.gz 1995599 BLAKE2B 5d90646d9a72024856da2638adb6d0d00d5142f8d3eaa5b12a993e2e6ae78ad49aab69822ebe331191bf1fc5b98431b85e113545aec84e2bb7d5c5add9028df0 SHA512 17fa59e4ffee5e024caa4895e8ed21d1435f14e3a37d0ed781b1dd216333ae3b6099c460efd45d4a8097d0202522150b7b0ad543b47c1596d8473b6922270480 |
25 |
|
26 |
diff --git a/dev-libs/xmlsec/files/xmlsec-1.2.27-gnutls.patch b/dev-libs/xmlsec/files/xmlsec-1.2.27-gnutls.patch |
27 |
deleted file mode 100644 |
28 |
index 2837420e0dc..00000000000 |
29 |
--- a/dev-libs/xmlsec/files/xmlsec-1.2.27-gnutls.patch |
30 |
+++ /dev/null |
31 |
@@ -1,47 +0,0 @@ |
32 |
-From 321e62add243cf8f024d6278da4c5ff030bae3b9 Mon Sep 17 00:00:00 2001 |
33 |
-From: Alon Bar-Lev <alon.barlev@×××××.com> |
34 |
-Date: Mon, 1 Apr 2019 01:28:18 +0300 |
35 |
-Subject: [PATCH] gnutls: allow SHA-1 signed certificate when not in strict |
36 |
- checks (#250) (#251) |
37 |
- |
38 |
-This is required for gnutls-3.6.x. |
39 |
- |
40 |
-Allow tests to use no strict checks until all certificates will be converted |
41 |
-to stronger signature than SHA-1. |
42 |
- |
43 |
-Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
44 |
---- |
45 |
- src/gnutls/x509vfy.c | 3 +++ |
46 |
- tests/testrun.sh | 2 +- |
47 |
- 2 files changed, 4 insertions(+), 1 deletion(-) |
48 |
- |
49 |
-diff --git a/src/gnutls/x509vfy.c b/src/gnutls/x509vfy.c |
50 |
-index a9c956a3..4c753344 100644 |
51 |
---- a/src/gnutls/x509vfy.c |
52 |
-+++ b/src/gnutls/x509vfy.c |
53 |
-@@ -295,6 +295,9 @@ xmlSecGnuTLSX509StoreVerify(xmlSecKeyDataStorePtr store, |
54 |
- if((keyInfoCtx->flags & XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS) != 0) { |
55 |
- flags |= GNUTLS_VERIFY_ALLOW_SIGN_RSA_MD2; |
56 |
- flags |= GNUTLS_VERIFY_ALLOW_SIGN_RSA_MD5; |
57 |
-+#if GNUTLS_VERSION_NUMBER >= 0x030600 |
58 |
-+ flags |= GNUTLS_VERIFY_ALLOW_SIGN_WITH_SHA1; |
59 |
-+#endif |
60 |
- } |
61 |
- |
62 |
- /* We are going to build all possible cert chains and try to verify them */ |
63 |
-diff --git a/tests/testrun.sh b/tests/testrun.sh |
64 |
-index 02484d09..ea65802b 100755 |
65 |
---- a/tests/testrun.sh |
66 |
-+++ b/tests/testrun.sh |
67 |
-@@ -59,7 +59,7 @@ if [ "z$XMLSEC_DEFAULT_CRYPTO" != "z" ] ; then |
68 |
- elif [ "z$crypto" != "z" ] ; then |
69 |
- xmlsec_params="$xmlsec_params --crypto $crypto" |
70 |
- fi |
71 |
--xmlsec_params="$xmlsec_params --crypto-config $crypto_config" |
72 |
-+xmlsec_params="$xmlsec_params --X509-skip-strict-checks --crypto-config $crypto_config" |
73 |
- |
74 |
- # |
75 |
- # Setup keys config |
76 |
--- |
77 |
-2.21.0 |
78 |
- |
79 |
|
80 |
diff --git a/dev-libs/xmlsec/xmlsec-1.2.27-r1.ebuild b/dev-libs/xmlsec/xmlsec-1.2.27-r1.ebuild |
81 |
deleted file mode 100644 |
82 |
index 56460816acf..00000000000 |
83 |
--- a/dev-libs/xmlsec/xmlsec-1.2.27-r1.ebuild |
84 |
+++ /dev/null |
85 |
@@ -1,74 +0,0 @@ |
86 |
-# Copyright 1999-2019 Gentoo Authors |
87 |
-# Distributed under the terms of the GNU General Public License v2 |
88 |
- |
89 |
-EAPI=7 |
90 |
- |
91 |
-inherit autotools |
92 |
- |
93 |
-DESCRIPTION="Command line tool for signing, verifying, encrypting and decrypting XML" |
94 |
-HOMEPAGE="https://www.aleksey.com/xmlsec" |
95 |
-SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz" |
96 |
- |
97 |
-LICENSE="MIT" |
98 |
-SLOT="0" |
99 |
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~sparc x86" |
100 |
-IUSE="doc gcrypt gnutls libressl nss +openssl static-libs test" |
101 |
-REQUIRED_USE="|| ( gcrypt gnutls nss openssl ) |
102 |
- gnutls? ( gcrypt )" |
103 |
- |
104 |
-RDEPEND=">=dev-libs/libxml2-2.7.4:= |
105 |
- >=dev-libs/libxslt-1.0.20:= |
106 |
- gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0= ) |
107 |
- gnutls? ( >=net-libs/gnutls-2.8.0:= ) |
108 |
- nss? ( |
109 |
- >=dev-libs/nspr-4.4.1:= |
110 |
- >=dev-libs/nss-3.9:= |
111 |
- ) |
112 |
- openssl? ( |
113 |
- !libressl? ( dev-libs/openssl:0= ) |
114 |
- libressl? ( dev-libs/libressl:0= ) |
115 |
- )" |
116 |
-DEPEND="${RDEPEND}" |
117 |
-BDEPEND="virtual/pkgconfig |
118 |
- test? ( |
119 |
- nss? ( |
120 |
- >=dev-libs/nss-3.9[utils] |
121 |
- ) |
122 |
- )" |
123 |
- |
124 |
-S="${WORKDIR}/${PN}1-${PV}" |
125 |
- |
126 |
-PATCHES=( |
127 |
- "${FILESDIR}/${P}-gnutls.patch" |
128 |
-) |
129 |
- |
130 |
-src_prepare() { |
131 |
- default |
132 |
- # conditionally install extra documentation |
133 |
- if ! use doc ; then |
134 |
- sed -i '/^SUBDIRS/s/docs//' Makefile.am || die |
135 |
- eautoreconf |
136 |
- fi |
137 |
-} |
138 |
- |
139 |
-src_configure() { |
140 |
- econf \ |
141 |
- --enable-pkgconfig \ |
142 |
- --with-html-dir=/usr/share/doc/${PF}/html \ |
143 |
- $(use_enable static-libs static) \ |
144 |
- $(use_with gcrypt) \ |
145 |
- $(use_with gnutls) \ |
146 |
- $(use_with nss) \ |
147 |
- $(use_with nss nspr) \ |
148 |
- $(use_with openssl) \ |
149 |
- $(use_enable openssl aes) |
150 |
-} |
151 |
- |
152 |
-src_test() { |
153 |
- emake TMPFOLDER="${T}" check |
154 |
-} |
155 |
- |
156 |
-src_install() { |
157 |
- default |
158 |
- find "${D}" -name '*.la' -delete || die |
159 |
-} |