gentoo resync : 24.12.2018

4 files changed, 139 insertions, 0 deletions

diff --git a/dev-libs/xml-security-c/Manifest b/dev-libs/xml-security-c/Manifest
index a28fade6e8fe..cc3b8d07c87d 100644
--- a/dev-libs/xml-security-c/Manifest
+++ b/dev-libs/xml-security-c/Manifest
@@ -1,5 +1,9 @@
 AUX xml-security-c-1.6.1-nss-compilation-fix.patch 498 BLAKE2B f6469e552ad6cb300556e80c52c881c64123fb34dbce83fe4d77eb2c48de0f20ac4605edc4d2f2712f991b2b55ffdee9f7d91409cbc5dadf7960b2c5c978692a SHA512 cef34103931356f68a250a89f195e4ad0e67a116c6d0de2ab07407f607d70bec0c1e8d57d9eefa47c8bee7f5750668963409a4d740cead239b7ad16665515bb2
 AUX xml-security-c-1.7.3-fix-c++14.patch 1182 BLAKE2B f534183150d2015b42563bd20ba6a39afbad8469d0af6d6746cc36608911e6fa06f8340611760df7e4c3aea8e1ba8d2ef656aaa0712e5453caedca401361fcf9 SHA512 b1a0154b1a973e8ae4f4687c319694b2b6d22dc20385c2e74e27bf00a1887734075da27e10a48d3204d72d35baa55aaba1965984b75512097a0cc38b192211a1
+AUX xml-security-c-2.0.2-libressl.patch 2224 BLAKE2B 076555d874526180d9842599cbb788819e6b8508d1c11dd20a63ad681e4a2d256b8d3b0d80cfcf6d23741cb735bdc5845a72226bd56526ba24e24f5155374b5f SHA512 f248594d5fadd960d6437b5c17ad12db5455dc1ee3b30849f0c394fbf4ac8e85b3a575a833e0878ca5c6fb2a264878b86e3656a21f3038a105c1162253ce446e
 DIST xml-security-c-1.7.3.tar.gz 909320 BLAKE2B 5fa9f3ae53b93104c191b76f8ae4f9dad69c690d409ae3f13864cf011bbbca740c5378c0718abb496811c9814b5a7f237042af22e697bfa2e5044668ff3fbd2d SHA512 ea46709d6706edf345e19132d9998774e50dc7b5947a7b4a55e3627998f5ac66f976fdff0a5015ef3cee73c03c04f3c4cf993efd397082491c2000c6548b89d2
+DIST xml-security-c-2.0.2.tar.gz 904933 BLAKE2B 8e336dd7539778411755a8d45398daa530a2f602a0d57faa29301d1f0b29ab0a61c3f47ead42b740337ea75a28e03f471ae6735d5cd66d31f56d3d5fe3405b1b SHA512 bebadee2daf27181f5bcc955a909397976e8fd2e67f5e546f5adbede0ca790647cbec9181b0b609da59d525ff3baa9f899af2a3d815bc7a2f3a57bd8b30c011b
 EBUILD xml-security-c-1.7.3.ebuild 963 BLAKE2B 7a2ff075d5996cb995df3e3da595adf636ff4b1a92b73c56e2ae6794b0f1de964a2c5d80738bff05daf80f6758c5fe86e104432f7c9de441d8521ad18d63ca9c SHA512 25370e42290a4d3787af196930b106030ec66d5ffef0277bcfe1afa08b8b853ea929a17e021a1c51ca1c69df38c74c0ca1fff17eee75a0a09e0a3c4658136ba1
+EBUILD xml-security-c-2.0.2-r1.ebuild 907 BLAKE2B 932b2c45d8e9bf2438baa48b75cc148355029bbd86433fee61b507dc114215539d73349dc4fc373ebce7b4ba7b85672e32d0d5d38789775527aa73ac1b1650ec SHA512 e67202e3f24ce6c3c00b932ed08edb41188592a98cd3cd98d169f172e0541787f266deb0fa0da2688caad9b7661cdeb8dafff79cc7611ad523eee81d3d17dbb0
+EBUILD xml-security-c-2.0.2.ebuild 860 BLAKE2B f0187d21d4bd9b23938d81cc9ea64abcb73d1952938fbd11d6da030cbd346d0771a0995dd0c07e4204b788b97b708432a7fe78b5f036346bff27a0cb99271eb1 SHA512 15718df9237da73c333e533b5be5ec3e87d625b830f0ff0c037ce1152abb3b8c2e47a315d33d1a529446a6f48c75d17321f0cf0b254d1c6a3786e17bd99d1eab
 MISC metadata.xml 483 BLAKE2B 184149c1f04282005aa8172c19edca6db6ae769d0ea042261180af79734e08554e325a1bf29f01bb27506dc4a3d5161ccb03395cc6f06c929f6d3f43e171643f SHA512 307df4870d40181dfa0fb62b5791a457ae5c1c4b5f752bcfcd3d6224a3f437ebbc17dad8892b8728ef8be152f2a463814404143e0caf92489c6221c1bf216ef2
diff --git a/dev-libs/xml-security-c/files/xml-security-c-2.0.2-libressl.patch b/dev-libs/xml-security-c/files/xml-security-c-2.0.2-libressl.patch
new file mode 100644
index 000000000000..754ddc6bcf1d
--- /dev/null
+++ b/dev-libs/xml-security-c/files/xml-security-c-2.0.2-libressl.patch
@@ -0,0 +1,52 @@
+diff --git a/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp b/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp
+index 2ad9da6e..a8ea9f1d 100644
+--- a/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp
++++ b/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp
+@@ -48,7 +48,7 @@ XERCES_CPP_NAMESPACE_USE
+ //           Construction/Destruction
+ // --------------------------------------------------------------------------------
+ 
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+ OpenSSLCryptoBase64::OpenSSLCryptoBase64() : mp_ectx(&m_ectx_store), mp_dctx(&m_dctx_store) { }
+ OpenSSLCryptoBase64::~OpenSSLCryptoBase64() { }
+ #else
+diff --git a/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp b/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp
+index c892eac4..82aeb0a1 100644
+--- a/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp
++++ b/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp
+@@ -205,7 +205,7 @@ private :
+     EVP_ENCODE_CTX *mp_ectx;              // Encode context
+     EVP_ENCODE_CTX *mp_dctx;              // Decode context
+ 
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+     EVP_ENCODE_CTX m_ectx_store;
+     EVP_ENCODE_CTX m_dctx_store;
+ #endif 
+diff --git a/xsec/enc/OpenSSL/OpenSSLSupport.cpp b/xsec/enc/OpenSSL/OpenSSLSupport.cpp
+index dfd37eb3..cf874f82 100644
+--- a/xsec/enc/OpenSSL/OpenSSLSupport.cpp
++++ b/xsec/enc/OpenSSL/OpenSSLSupport.cpp
+@@ -273,7 +273,7 @@ int ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s)
+ 
+ #endif
+ 
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+ EvpEncodeCtxRAII::EvpEncodeCtxRAII() : mp_ctx(&mp_ctx_store) { };
+ EvpEncodeCtxRAII::~EvpEncodeCtxRAII() { }
+ #else
+diff --git a/xsec/enc/OpenSSL/OpenSSLSupport.hpp b/xsec/enc/OpenSSL/OpenSSLSupport.hpp
+index e3527fae..b5f67f26 100644
+--- a/xsec/enc/OpenSSL/OpenSSLSupport.hpp
++++ b/xsec/enc/OpenSSL/OpenSSLSupport.hpp
+@@ -88,7 +88,7 @@ public:
+ 
+ private:
+     EVP_ENCODE_CTX *mp_ctx;
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+     EVP_ENCODE_CTX mp_ctx_store;
+ #endif    
+ };
diff --git a/dev-libs/xml-security-c/xml-security-c-2.0.2-r1.ebuild b/dev-libs/xml-security-c/xml-security-c-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..afd103f43067
--- /dev/null
+++ b/dev-libs/xml-security-c/xml-security-c-2.0.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Apache C++ XML security libraries"
+HOMEPAGE="http://santuario.apache.org/"
+SRC_URI="mirror://apache/santuario/c-library/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug examples libressl nss static-libs xalan"
+
+RDEPEND=">=dev-libs/xerces-c-3.2
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	nss? ( dev-libs/nss )
+	xalan? ( dev-libs/xalan-c )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+PATCHES=(
+	"${FILESDIR}/${P}-libressl.patch"
+)
+
+DOCS=( CHANGELOG.txt NOTICE.txt )
+
+src_configure() {
+	econf \
+		--with-openssl \
+		$(use_enable static-libs static) \
+		$(use_enable debug) \
+		$(use_with xalan) \
+		$(use_with nss)
+}
+
+src_install() {
+	default
+	if use examples ; then
+		docinto examples
+		dodoc xsec/samples/*.cpp
+	fi
+}
diff --git a/dev-libs/xml-security-c/xml-security-c-2.0.2.ebuild b/dev-libs/xml-security-c/xml-security-c-2.0.2.ebuild
new file mode 100644
index 000000000000..ea768c10d665
--- /dev/null
+++ b/dev-libs/xml-security-c/xml-security-c-2.0.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Apache C++ XML security libraries"
+HOMEPAGE="http://santuario.apache.org/"
+SRC_URI="mirror://apache/santuario/c-library/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug examples libressl nss static-libs xalan"
+
+RDEPEND=">=dev-libs/xerces-c-3.2
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	nss? ( dev-libs/nss )
+	xalan? ( dev-libs/xalan-c )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( CHANGELOG.txt NOTICE.txt )
+
+src_configure() {
+	econf \
+		--with-openssl \
+		$(use_enable static-libs static) \
+		$(use_enable debug) \
+		$(use_with xalan) \
+		$(use_with nss)
+}
+
+src_install() {
+	default
+	if use examples ; then
+		docinto examples
+		dodoc xsec/samples/*.cpp
+	fi
+}