| 1 |
commit: 82c2c9b4e9de553e3eaefeb1e2a378aec55af893 |
| 2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 16 20:23:29 2019 +0000 |
| 4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 16 20:24:59 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82c2c9b4 |
| 7 |
|
| 8 |
dev-libs/xmlsec: version bump |
| 9 |
|
| 10 |
Signed-off-by: Alon Bar-Lev <alonbl <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.11 |
| 12 |
|
| 13 |
dev-libs/xmlsec/Manifest | 1 + |
| 14 |
dev-libs/xmlsec/files/xmlsec-1.2.28-test.patch | 121 +++++++++++++++++++++ |
| 15 |
dev-libs/xmlsec/xmlsec-1.2.26.ebuild | 2 +- |
| 16 |
.../{xmlsec-1.2.26.ebuild => xmlsec-1.2.28.ebuild} | 30 ++--- |
| 17 |
4 files changed, 140 insertions(+), 14 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest |
| 20 |
index 7b78da91ee1..e8c42b63e1d 100644 |
| 21 |
--- a/dev-libs/xmlsec/Manifest |
| 22 |
+++ b/dev-libs/xmlsec/Manifest |
| 23 |
@@ -1,2 +1,3 @@ |
| 24 |
DIST xmlsec1-1.2.26.tar.gz 1922183 BLAKE2B 8cb8557a7d24df756655a7dfa45091445adc89cb67169a7620d9d1116f3fb3d982ea45199a53475e29300478c07e8e1168cec79cf9c3b5ff1dd6c840123b982b SHA512 1e3dc3c8c192eefee7b055787bef52ce3bcfafa786224f68af065aa45f4d7da93232da973359b3135615c5981ad4df7c124047d3934e552ab78439472685a7a4 |
| 25 |
DIST xmlsec1-1.2.27.tar.gz 2013651 BLAKE2B fa46a25e3aaef432134d1c98a0e7bf0aba83f2ef6d1aff3774d6d37c5f6f392d1c2c11a0fe433ee910c39b56400c96b74ab061577948622b14a1116fa1ec2947 SHA512 01f7231d7d7ac8037aecc1f922acc572cbfe0903abf5bd5879d836438c36684e23402b803d20806fff6b1cdc5ad9af114d1341b10b336f71c0bce28b4716f920 |
| 26 |
+DIST xmlsec1-1.2.28.tar.gz 1995599 BLAKE2B 5d90646d9a72024856da2638adb6d0d00d5142f8d3eaa5b12a993e2e6ae78ad49aab69822ebe331191bf1fc5b98431b85e113545aec84e2bb7d5c5add9028df0 SHA512 17fa59e4ffee5e024caa4895e8ed21d1435f14e3a37d0ed781b1dd216333ae3b6099c460efd45d4a8097d0202522150b7b0ad543b47c1596d8473b6922270480 |
| 27 |
|
| 28 |
diff --git a/dev-libs/xmlsec/files/xmlsec-1.2.28-test.patch b/dev-libs/xmlsec/files/xmlsec-1.2.28-test.patch |
| 29 |
new file mode 100644 |
| 30 |
index 00000000000..fa1fa60a6df |
| 31 |
--- /dev/null |
| 32 |
+++ b/dev-libs/xmlsec/files/xmlsec-1.2.28-test.patch |
| 33 |
@@ -0,0 +1,121 @@ |
| 34 |
+From 9d5f2d172ab91fd9fb2c2eddaee86ba62eab2d67 Mon Sep 17 00:00:00 2001 |
| 35 |
+From: Alon Bar-Lev <alon.barlev@×××××.com> |
| 36 |
+Date: Tue, 16 Apr 2019 23:07:08 +0300 |
| 37 |
+Subject: [PATCH] tests: workout test --X509-skip-strict-checks |
| 38 |
+ |
| 39 |
+The --X509-skip-strict-checks parameter is not accepted by all commands, |
| 40 |
+result of skipping many tests. |
| 41 |
+ |
| 42 |
+Reduce impact of the --X509-skip-strict-checks to a workaround to gnutls only. |
| 43 |
+ |
| 44 |
+Filter double --X509-skip-strict-checks commands as cli does not accept |
| 45 |
+multiple instances. |
| 46 |
+ |
| 47 |
+Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
| 48 |
+--- |
| 49 |
+ tests/testrun.sh | 37 ++++++++++++++++++++++--------------- |
| 50 |
+ 1 file changed, 22 insertions(+), 15 deletions(-) |
| 51 |
+ |
| 52 |
+diff --git a/tests/testrun.sh b/tests/testrun.sh |
| 53 |
+index ea65802b..35f4a780 100755 |
| 54 |
+--- a/tests/testrun.sh |
| 55 |
++++ b/tests/testrun.sh |
| 56 |
+@@ -59,7 +59,11 @@ if [ "z$XMLSEC_DEFAULT_CRYPTO" != "z" ] ; then |
| 57 |
+ elif [ "z$crypto" != "z" ] ; then |
| 58 |
+ xmlsec_params="$xmlsec_params --crypto $crypto" |
| 59 |
+ fi |
| 60 |
+-xmlsec_params="$xmlsec_params --X509-skip-strict-checks --crypto-config $crypto_config" |
| 61 |
++xmlsec_params="$xmlsec_params --crypto-config $crypto_config" |
| 62 |
++xmlsec_x509_params= |
| 63 |
++if [ "z${crypto}" = zgnutls ]; then |
| 64 |
++ xmlsec_x509_params="--X509-skip-strict-checks" |
| 65 |
++fi |
| 66 |
+ |
| 67 |
+ # |
| 68 |
+ # Setup keys config |
| 69 |
+@@ -218,8 +222,8 @@ execKeysTest() { |
| 70 |
+ if [ -f $keysfile ] ; then |
| 71 |
+ params="$params --keys-file $keysfile" |
| 72 |
+ fi |
| 73 |
+- echo "$VALGRIND $xmlsec_app keys $params $xmlsec_params $keysfile" >> $curlogfile |
| 74 |
+- $VALGRIND $xmlsec_app keys $params $xmlsec_params $keysfile >> $curlogfile 2>> $curlogfile |
| 75 |
++ echo "$VALGRIND $xmlsec_app keys $params $xmlsec_x509_params $xmlsec_params $keysfile" >> $curlogfile |
| 76 |
++ $VALGRIND $xmlsec_app keys $params $xmlsec_x509_params $xmlsec_params $keysfile >> $curlogfile 2>> $curlogfile |
| 77 |
+ printRes $expected_res $? |
| 78 |
+ if [ $? != 0 ]; then |
| 79 |
+ failures=`expr $failures + 1` |
| 80 |
+@@ -307,9 +311,10 @@ execDSigTest() { |
| 81 |
+ |
| 82 |
+ # run tests |
| 83 |
+ if [ -n "$params1" ] ; then |
| 84 |
++ echo "$params1" | grep -q -- "$xmlsec_x509_params" && _xmlsec_x509_params= || _xmlsec_x509_params="$xmlsec_x509_params" |
| 85 |
+ printf " Verify existing signature " |
| 86 |
+- echo "$VALGRIND $xmlsec_app verify $xmlsec_params $params1 $full_file.xml" >> $curlogfile |
| 87 |
+- $VALGRIND $xmlsec_app verify $xmlsec_params $params1 $full_file.xml >> $curlogfile 2>> $curlogfile |
| 88 |
++ echo "$VALGRIND $xmlsec_app verify $_xmlsec_x509_params $xmlsec_params $params1 $full_file.xml" >> $curlogfile |
| 89 |
++ $VALGRIND $xmlsec_app verify $_xmlsec_x509_params $xmlsec_params $params1 $full_file.xml >> $curlogfile 2>> $curlogfile |
| 90 |
+ printRes $expected_res $? |
| 91 |
+ if [ $? != 0 ]; then |
| 92 |
+ failures=`expr $failures + 1` |
| 93 |
+@@ -317,9 +322,10 @@ execDSigTest() { |
| 94 |
+ fi |
| 95 |
+ |
| 96 |
+ if [ -n "$params2" -a -z "$PERF_TEST" ] ; then |
| 97 |
++ echo "$params2" | grep -q -- "$xmlsec_x509_params" && _xmlsec_x509_params= || _xmlsec_x509_params="$xmlsec_x509_params" |
| 98 |
+ printf " Create new signature " |
| 99 |
+- echo "$VALGRIND $xmlsec_app sign $xmlsec_params $params2 --output $tmpfile $full_file.tmpl" >> $curlogfile |
| 100 |
+- $VALGRIND $xmlsec_app sign $xmlsec_params $params2 --output $tmpfile $full_file.tmpl >> $curlogfile 2>> $curlogfile |
| 101 |
++ echo "$VALGRIND $xmlsec_app sign $_xmlsec_x509_params $_xmlsec_params $params2 --output $tmpfile $full_file.tmpl" >> $curlogfile |
| 102 |
++ $VALGRIND $xmlsec_app sign $_xmlsec_x509_params $_xmlsec_params $params2 --output $tmpfile $full_file.tmpl >> $curlogfile 2>> $curlogfile |
| 103 |
+ printRes $res_success $? |
| 104 |
+ if [ $? != 0 ]; then |
| 105 |
+ failures=`expr $failures + 1` |
| 106 |
+@@ -327,9 +333,10 @@ execDSigTest() { |
| 107 |
+ fi |
| 108 |
+ |
| 109 |
+ if [ -n "$params3" -a -z "$PERF_TEST" ] ; then |
| 110 |
++ echo "$params3" | grep -q -- "$xmlsec_x509_params" && _xmlsec_x509_params= || _xmlsec_x509_params="$xmlsec_x509_params" |
| 111 |
+ printf " Verify new signature " |
| 112 |
+- echo "$VALGRIND $xmlsec_app verify $xmlsec_params $params3 $tmpfile" >> $curlogfile |
| 113 |
+- $VALGRIND $xmlsec_app verify $xmlsec_params $params3 $tmpfile >> $curlogfile 2>> $curlogfile |
| 114 |
++ echo "$VALGRIND $xmlsec_app verify $_xmlsec_x509_params $xmlsec_params $params3 $tmpfile" >> $curlogfile |
| 115 |
++ $VALGRIND $xmlsec_app verify $_xmlsec_x509_params $xmlsec_params $params3 $tmpfile >> $curlogfile 2>> $curlogfile |
| 116 |
+ printRes $res_success $? |
| 117 |
+ if [ $? != 0 ]; then |
| 118 |
+ failures=`expr $failures + 1` |
| 119 |
+@@ -406,8 +413,8 @@ execEncTest() { |
| 120 |
+ if [ -n "$params1" ] ; then |
| 121 |
+ rm -f $tmpfile |
| 122 |
+ printf " Decrypt existing document " |
| 123 |
+- echo "$VALGRIND $xmlsec_app decrypt $xmlsec_params $params1 $full_file.xml" >> $curlogfile |
| 124 |
+- $VALGRIND $xmlsec_app decrypt $xmlsec_params $params1 --output $tmpfile $full_file.xml >> $curlogfile 2>> $curlogfile |
| 125 |
++ echo "$VALGRIND $xmlsec_app decrypt $xmlsec_x509_params $xmlsec_params $params1 $full_file.xml" >> $curlogfile |
| 126 |
++ $VALGRIND $xmlsec_app decrypt $xmlsec_x509_params $xmlsec_params $params1 --output $tmpfile $full_file.xml >> $curlogfile 2>> $curlogfile |
| 127 |
+ res=$? |
| 128 |
+ echo "=== TEST RESULT: $res; expected: $expected_res" >> $curlogfile |
| 129 |
+ if [ $res = 0 -a "$expected_res" = "$res_success" ]; then |
| 130 |
+@@ -428,8 +435,8 @@ execEncTest() { |
| 131 |
+ if [ -n "$params2" -a -z "$PERF_TEST" ] ; then |
| 132 |
+ rm -f $tmpfile |
| 133 |
+ printf " Encrypt document " |
| 134 |
+- echo "$VALGRIND $xmlsec_app encrypt $xmlsec_params $params2 --output $tmpfile $full_file.tmpl" >> $curlogfile |
| 135 |
+- $VALGRIND $xmlsec_app encrypt $xmlsec_params $params2 --output $tmpfile $full_file.tmpl >> $curlogfile 2>> $curlogfile |
| 136 |
++ echo "$VALGRIND $xmlsec_app encrypt $xmlsec_x509_params $xmlsec_params $params2 --output $tmpfile $full_file.tmpl" >> $curlogfile |
| 137 |
++ $VALGRIND $xmlsec_app encrypt $xmlsec_x509_params $xmlsec_params $params2 --output $tmpfile $full_file.tmpl >> $curlogfile 2>> $curlogfile |
| 138 |
+ printRes $res_success $? |
| 139 |
+ if [ $? != 0 ]; then |
| 140 |
+ failures=`expr $failures + 1` |
| 141 |
+@@ -439,8 +446,8 @@ execEncTest() { |
| 142 |
+ if [ -n "$params3" -a -z "$PERF_TEST" ] ; then |
| 143 |
+ rm -f $tmpfile.2 |
| 144 |
+ printf " Decrypt new document " |
| 145 |
+- echo "$VALGRIND $xmlsec_app decrypt $xmlsec_params $params3 --output $tmpfile.2 $tmpfile" >> $curlogfile |
| 146 |
+- $VALGRIND $xmlsec_app decrypt $xmlsec_params $params3 --output $tmpfile.2 $tmpfile >> $curlogfile 2>> $curlogfile |
| 147 |
++ echo "$VALGRIND $xmlsec_app decrypt $xmlsec_x509_params $xmlsec_params $params3 --output $tmpfile.2 $tmpfile" >> $curlogfile |
| 148 |
++ $VALGRIND $xmlsec_app decrypt $xmlsec_x509_params $xmlsec_params $params3 --output $tmpfile.2 $tmpfile >> $curlogfile 2>> $curlogfile |
| 149 |
+ res=$? |
| 150 |
+ if [ $res = 0 ]; then |
| 151 |
+ if [ "z$outputTransform" != "z" ] ; then |
| 152 |
+-- |
| 153 |
+2.21.0 |
| 154 |
+ |
| 155 |
|
| 156 |
diff --git a/dev-libs/xmlsec/xmlsec-1.2.26.ebuild b/dev-libs/xmlsec/xmlsec-1.2.26.ebuild |
| 157 |
index f8f0ce257d5..16f8db947c1 100644 |
| 158 |
--- a/dev-libs/xmlsec/xmlsec-1.2.26.ebuild |
| 159 |
+++ b/dev-libs/xmlsec/xmlsec-1.2.26.ebuild |
| 160 |
@@ -1,4 +1,4 @@ |
| 161 |
-# Copyright 1999-2018 Gentoo Authors |
| 162 |
+# Copyright 1999-2019 Gentoo Authors |
| 163 |
# Distributed under the terms of the GNU General Public License v2 |
| 164 |
|
| 165 |
EAPI=7 |
| 166 |
|
| 167 |
diff --git a/dev-libs/xmlsec/xmlsec-1.2.26.ebuild b/dev-libs/xmlsec/xmlsec-1.2.28.ebuild |
| 168 |
similarity index 71% |
| 169 |
copy from dev-libs/xmlsec/xmlsec-1.2.26.ebuild |
| 170 |
copy to dev-libs/xmlsec/xmlsec-1.2.28.ebuild |
| 171 |
index f8f0ce257d5..1e5834c6fbb 100644 |
| 172 |
--- a/dev-libs/xmlsec/xmlsec-1.2.26.ebuild |
| 173 |
+++ b/dev-libs/xmlsec/xmlsec-1.2.28.ebuild |
| 174 |
@@ -1,4 +1,4 @@ |
| 175 |
-# Copyright 1999-2018 Gentoo Authors |
| 176 |
+# Copyright 1999-2019 Gentoo Authors |
| 177 |
# Distributed under the terms of the GNU General Public License v2 |
| 178 |
|
| 179 |
EAPI=7 |
| 180 |
@@ -11,18 +11,18 @@ SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz" |
| 181 |
|
| 182 |
LICENSE="MIT" |
| 183 |
SLOT="0" |
| 184 |
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86" |
| 185 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" |
| 186 |
IUSE="doc gcrypt gnutls libressl nss +openssl static-libs test" |
| 187 |
REQUIRED_USE="|| ( gcrypt gnutls nss openssl ) |
| 188 |
gnutls? ( gcrypt )" |
| 189 |
|
| 190 |
-RDEPEND=">=dev-libs/libxml2-2.7.4 |
| 191 |
- >=dev-libs/libxslt-1.0.20 |
| 192 |
- gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0 ) |
| 193 |
- gnutls? ( >=net-libs/gnutls-2.8.0 ) |
| 194 |
+RDEPEND=">=dev-libs/libxml2-2.7.4:= |
| 195 |
+ >=dev-libs/libxslt-1.0.20:= |
| 196 |
+ gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0= ) |
| 197 |
+ gnutls? ( >=net-libs/gnutls-2.8.0:= ) |
| 198 |
nss? ( |
| 199 |
- >=dev-libs/nspr-4.4.1 |
| 200 |
- >=dev-libs/nss-3.9 |
| 201 |
+ >=dev-libs/nspr-4.4.1:= |
| 202 |
+ >=dev-libs/nss-3.9:= |
| 203 |
) |
| 204 |
openssl? ( |
| 205 |
!libressl? ( dev-libs/openssl:0= ) |
| 206 |
@@ -38,6 +38,10 @@ BDEPEND="virtual/pkgconfig |
| 207 |
|
| 208 |
S="${WORKDIR}/${PN}1-${PV}" |
| 209 |
|
| 210 |
+PATCHES=( |
| 211 |
+ "${FILESDIR}/${P}-test.patch" |
| 212 |
+) |
| 213 |
+ |
| 214 |
src_prepare() { |
| 215 |
default |
| 216 |
# conditionally install extra documentation |
| 217 |
@@ -52,11 +56,11 @@ src_configure() { |
| 218 |
--enable-pkgconfig \ |
| 219 |
--with-html-dir=/usr/share/doc/${PF}/html \ |
| 220 |
$(use_enable static-libs static) \ |
| 221 |
- $(use_with gcrypt gcrypt "") \ |
| 222 |
- $(use_with gnutls gnutls "") \ |
| 223 |
- $(use_with nss nspr "") \ |
| 224 |
- $(use_with nss nss "") \ |
| 225 |
- $(use_with openssl openssl "") \ |
| 226 |
+ $(use_with gcrypt) \ |
| 227 |
+ $(use_with gnutls) \ |
| 228 |
+ $(use_with nss) \ |
| 229 |
+ $(use_with nss nspr) \ |
| 230 |
+ $(use_with openssl) \ |
| 231 |
$(use_enable openssl aes) |
| 232 |
} |
Archives