gentoo resync : 28.04.2019

4 files changed, 121 insertions, 2 deletions

diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index fe23256d031c..c4d500787327 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -1,6 +1,9 @@
 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.26.tar.gz 1922183 BLAKE2B 8cb8557a7d24df756655a7dfa45091445adc89cb67169a7620d9d1116f3fb3d982ea45199a53475e29300478c07e8e1168cec79cf9c3b5ff1dd6c840123b982b SHA512 1e3dc3c8c192eefee7b055787bef52ce3bcfafa786224f68af065aa45f4d7da93232da973359b3135615c5981ad4df7c124047d3934e552ab78439472685a7a4
 DIST xmlsec1-1.2.27.tar.gz 2013651 BLAKE2B fa46a25e3aaef432134d1c98a0e7bf0aba83f2ef6d1aff3774d6d37c5f6f392d1c2c11a0fe433ee910c39b56400c96b74ab061577948622b14a1116fa1ec2947 SHA512 01f7231d7d7ac8037aecc1f922acc572cbfe0903abf5bd5879d836438c36684e23402b803d20806fff6b1cdc5ad9af114d1341b10b336f71c0bce28b4716f920
-EBUILD xmlsec-1.2.26.ebuild 1551 BLAKE2B 332cf6b782a3ff702657933a8b7c43da5f4dcbdd44ef61c042dd2d75432bdb71b29134a47da618e4063cb855ff18010ff136b7856540568bd25b0df4b3aee35e SHA512 8e40917ce5326f5e511406f9bda9f7693475eba4ab05656a83060f506b069d29e01b97cf8b01d063417980a40b4c087bf16dfe9a6147352da3b38860591224f9
+DIST xmlsec1-1.2.28.tar.gz 1995599 BLAKE2B 5d90646d9a72024856da2638adb6d0d00d5142f8d3eaa5b12a993e2e6ae78ad49aab69822ebe331191bf1fc5b98431b85e113545aec84e2bb7d5c5add9028df0 SHA512 17fa59e4ffee5e024caa4895e8ed21d1435f14e3a37d0ed781b1dd216333ae3b6099c460efd45d4a8097d0202522150b7b0ad543b47c1596d8473b6922270480
+EBUILD xmlsec-1.2.26.ebuild 1551 BLAKE2B f10ce32f0ba423c1e07e66edf9c20d4b516ee88daa9cf7e1c60aa2909b05db67e244dfe721a67ca1bac2f59a65cfb37eca88cff696f491c3e56357273c3b9b54 SHA512 d57d7e4dc58657e1affeebcefdb4315e5f531e32e6a633dac185898e9e45ab510a8fcb1b7974ee9e7c2ab8febaf2acadf8d8af32b2fa099f16fb6063f25eb19d
 EBUILD xmlsec-1.2.27-r1.ebuild 1568 BLAKE2B a0c648ce6a85c11f598e8b4515946bdca93fab9cd4a8a257f5b32011a86bd9f484d0bb568a545ef244401c36977b42052fa75b7e02018bca2a9f3cb75acb5e68 SHA512 3450a47f9ca8539356b699a5a669ce63b39b4f44e1e473ff67319e056061db03291a727013f1bde0bd066940f0f52f52ecef2fe046bd582f018608c8d1e628c2
+EBUILD xmlsec-1.2.28.ebuild 1376 BLAKE2B 6be12c2bf8f0f3582d9927940396a850b33710dcb910d1941a2da9d3cffb1e043cc1f8822581a9142245c4e878aa43ceddd4e788d2131cfb02774d7ba7dfa75c SHA512 e7b8c939c7f472bdb8e4276c4a86c1e06571527abfdb8e365813aa0c1a336daeb649548f5a9276e7b0ee3aedc7ffcaa05e98e6ae839b977b88b0b7422d2a5c3c
 MISC metadata.xml 487 BLAKE2B 0e191be30487c618789a7eaf8c2ca9ba0e801649213674adc85e76a5402853055d384efb9d6b534099683de4b2935dafa613ac029fd810125993d039cf9caec8 SHA512 1be5c6aa74ba9542e7b4b85adb8dd743fbeb72b4fee345996ee1b5bc662d9455d910f00ca37b16e644f53039a346ef44afc5e49abba19c5f8d4d00cbdf37d660
diff --git a/dev-libs/xmlsec/files/xmlsec-1.2.28-test.patch b/dev-libs/xmlsec/files/xmlsec-1.2.28-test.patch
new file mode 100644
index 000000000000..ae80e1fa5f36
--- /dev/null
+++ b/dev-libs/xmlsec/files/xmlsec-1.2.28-test.patch
@@ -0,0 +1,51 @@
+From 3d5c9e38d9576aea252ba186dd2913c57a7a8dd8 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Tue, 16 Apr 2019 23:07:08 +0300
+Subject: [PATCH] tests: workout test --X509-skip-strict-checks
+
+Apply --X509-skip-strict-checks parameter to verify commands.
+
+[PORT]
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+diff --git a/tests/testrun.sh b/tests/testrun.sh
+index ea65802b..9950d4fb 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 --X509-skip-strict-checks --crypto-config $crypto_config"
++xmlsec_params="$xmlsec_params --crypto-config $crypto_config"
+ 
+ #
+ # Setup keys config
+@@ -308,8 +308,9 @@ execDSigTest() {
+     # run tests
+     if [ -n "$params1" ] ; then
+         printf "    Verify existing signature                            "
+-        echo "$VALGRIND $xmlsec_app verify $xmlsec_params $params1 $full_file.xml" >> $curlogfile
+-        $VALGRIND $xmlsec_app verify $xmlsec_params $params1 $full_file.xml >> $curlogfile 2>> $curlogfile
++        params1="$(echo $params1 | sed 's/--X509-skip-strict-checks//')"
++        echo "$VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params1 $full_file.xml" >> $curlogfile
++        $VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params1 $full_file.xml >> $curlogfile 2>> $curlogfile
+         printRes $expected_res $?
+         if [ $? != 0 ]; then
+             failures=`expr $failures + 1`
+@@ -328,8 +328,9 @@ execDSigTest() {
+ 
+     if [ -n "$params3" -a -z "$PERF_TEST" ] ; then
+         printf "    Verify new signature                                 "
+-        echo "$VALGRIND $xmlsec_app verify $xmlsec_params $params3 $tmpfile" >> $curlogfile
+-        $VALGRIND $xmlsec_app verify $xmlsec_params $params3 $tmpfile >> $curlogfile 2>> $curlogfile
++        params3="$(echo $params3 | sed 's/--X509-skip-strict-checks//')"
++        echo "$VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params3 $tmpfile" >> $curlogfile
++        $VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params3 $tmpfile >> $curlogfile 2>> $curlogfile
+         printRes $res_success $?
+         if [ $? != 0 ]; then
+             failures=`expr $failures + 1`
+-- 
+2.21.0
+
diff --git a/dev-libs/xmlsec/xmlsec-1.2.26.ebuild b/dev-libs/xmlsec/xmlsec-1.2.26.ebuild
index f8f0ce257d51..16f8db947c10 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.26.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-libs/xmlsec/xmlsec-1.2.28.ebuild b/dev-libs/xmlsec/xmlsec-1.2.28.ebuild
new file mode 100644
index 000000000000..50ec11983a80
--- /dev/null
+++ b/dev-libs/xmlsec/xmlsec-1.2.28.ebuild
@@ -0,0 +1,65 @@
+# 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}-test.patch"
+)
+
+src_configure() {
+	econf \
+		$(use_enable doc docs) \
+		$(use_enable static-libs static) \
+		$(use_with gcrypt) \
+		$(use_with gnutls) \
+		$(use_with nss nspr) \
+		$(use_with nss) \
+		$(use_with openssl) \
+		--enable-mans \
+		--enable-pkgconfig
+}
+
+src_test() {
+	emake TMPFOLDER="${T}" check
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}