diff options
-rw-r--r-- | dev-libs/xmlsec/Manifest | 1 | ||||
-rw-r--r-- | dev-libs/xmlsec/files/xmlsec-libressl-27.patch | 61 | ||||
-rw-r--r-- | dev-libs/xmlsec/metadata.xml | 14 | ||||
-rw-r--r-- | dev-libs/xmlsec/xmlsec-1.2.25-r1.ebuild | 67 |
4 files changed, 0 insertions, 143 deletions
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest deleted file mode 100644 index 072e9c5..0000000 --- a/dev-libs/xmlsec/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xmlsec1-1.2.25.tar.gz 1839160 BLAKE2B af480affa84c47c5656889c8114f147e1d9a5ad0f9a494c8913fd180aa5e2cba4773451c4a5f41781026e7617cccf329057182fc3fc3f2bd4e6f007cbe8ac190 SHA512 ac61547a1cbf9016d7f75be3dc5249d6bc8a526bc51715e53ede13f056c1c72c57433a6be200c886000a25826c3e473954ded3ae988f25d37ac4ef4d777c66a6 diff --git a/dev-libs/xmlsec/files/xmlsec-libressl-27.patch b/dev-libs/xmlsec/files/xmlsec-libressl-27.patch deleted file mode 100644 index ea5bb35..0000000 --- a/dev-libs/xmlsec/files/xmlsec-libressl-27.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- ./configure.ac.orig 2018-05-26 19:05:54.108964299 -0400 -+++ ./configure.ac 2018-05-26 19:08:39.382442333 -0400 -@@ -489,11 +489,24 @@ - if test "z$OPENSSL_VERSION" = "z" ; then - AC_EGREP_CPP(yes,[ - #include <openssl/opensslv.h> -- #if OPENSSL_VERSION_NUMBER == 0x20000000L && defined(LIBRESSL_VERSION_NUMBER) -+ #if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L - yes - #endif - ],[ -- OPENSSL_VERSION="1.0.0 (libressl)" -+ OPENSSL_VERSION="1.0.0 (libreSSL < 2.7)" -+ ],[ -+ OPENSSL_VERSION="" -+ ]) -+ fi -+ -+ if test "z$OPENSSL_VERSION" = "z" ; then -+ AC_EGREP_CPP(yes,[ -+ #include <openssl/opensslv.h> -+ #if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L -+ yes -+ #endif -+ ],[ -+ OPENSSL_VERSION="1.1.0 (libreSSL >= 2.7)" - ],[ - OPENSSL_VERSION="" - ]) ---- ./src/openssl/openssl_compat.h.orig 2018-05-26 19:13:31.312645962 -0400 -+++ ./src/openssl/openssl_compat.h 2018-05-26 19:14:12.039255846 -0400 -@@ -47,6 +47,10 @@ - #define X509_OBJECT_free(x) { X509_OBJECT_free_contents(x); free(x); } - #define X509_OBJECT_get0_X509(x) (((x) != NULL) ? ((x)->data.x509) : (X509 *)NULL) - -+#if defined(LIBRESSL_VERSION_NUMBER) && defined(XMLSEC_OPENSSL_API_110) -+#define EVP_CIPHER_CTX_encrypting(x) ((x)->encrypt) -+#endif /* defined(LIBRESSL_VERSION_NUMBER) && defined(XMLSEC_OPENSSL_API_110) */ -+ - #endif /* !defined(XMLSEC_OPENSSL_API_110) */ - - #endif /* __XMLSEC_OPENSSL_OPENSSL_COMPAT_H__ */ ---- ./include/xmlsec/openssl/crypto.h.orig 2018-05-26 19:09:43.282830238 -0400 -+++ ./include/xmlsec/openssl/crypto.h 2018-05-26 19:12:04.161480775 -0400 -@@ -43,11 +43,14 @@ - * What version of the openssl API do we have? (also see configure.ac) - * - *******************************************************************/ --#if OPENSSL_VERSION_NUMBER == 0x20000000L && defined(LIBRESSL_VERSION_NUMBER) --/* Libressl decided to take over OpenSSL version 2.0.0, likely will create -+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L -+/* LibreSSL decided to take over OpenSSL version 2.0.0, likely will create - * issues down the road... - */ - #define XMLSEC_OPENSSL_API_100 1 -+#elif defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L -+/* LibreSSL 2.7 implements (most of) OpenSSL 1.1 API */ -+#define XMLSEC_OPENSSL_API_110 1 - #elif OPENSSL_VERSION_NUMBER >= 0x10100000L - #define XMLSEC_OPENSSL_API_110 1 - #elif OPENSSL_VERSION_NUMBER >= 0x10000000L diff --git a/dev-libs/xmlsec/metadata.xml b/dev-libs/xmlsec/metadata.xml deleted file mode 100644 index e4ce1b0..0000000 --- a/dev-libs/xmlsec/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>crypto@gentoo.org</email> - <name>Crypto</name> - </maintainer> - <use> - <flag name="gcrypt">Install xmlsec-gcrypt library</flag> - <flag name="gnutls">Install xmlsec-gnutls library</flag> - <flag name="nss">Install xmlsec-nss library</flag> - <flag name="openssl">Install xmlsec-openssl library</flag> - </use> -</pkgmetadata> diff --git a/dev-libs/xmlsec/xmlsec-1.2.25-r1.ebuild b/dev-libs/xmlsec/xmlsec-1.2.25-r1.ebuild deleted file mode 100644 index a3842e2..0000000 --- a/dev-libs/xmlsec/xmlsec-1.2.25-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools ltprune - -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" -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} - virtual/pkgconfig" - -S="${WORKDIR}/${PN}1-${PV}" - -PATCHES=( "${FILESDIR}/xmlsec-libressl-27.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 gcrypt "") \ - $(use_with gnutls gnutls "") \ - $(use_with nss nspr "") \ - $(use_with nss nss "") \ - $(use_with openssl openssl "") \ - $(use_enable openssl aes) -} - -src_test() { - emake TMPFOLDER="${T}" check -} - -src_install() { - default - prune_libtool_files --all -} |