Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/xml-security-c/files/, profiles/, dev-libs/xml-security-c/
Date: Sat, 12 Oct 2019 08:27:29
Message-Id: 1570868761.8914ea85a9d3e912b52f3f418f4836bba15bddcd.mgorny@gentoo
1 commit: 8914ea85a9d3e912b52f3f418f4836bba15bddcd
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 12 08:24:50 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 12 08:26:01 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8914ea85
7
8 dev-libs/xml-security-c: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/694238
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 dev-libs/xml-security-c/Manifest | 1 -
14 .../files/xml-security-c-2.0.2-libressl.patch | 52 ----------------------
15 dev-libs/xml-security-c/metadata.xml | 11 -----
16 .../xml-security-c/xml-security-c-2.0.2-r1.ebuild | 43 ------------------
17 profiles/package.mask | 5 ---
18 5 files changed, 112 deletions(-)
19
20 diff --git a/dev-libs/xml-security-c/Manifest b/dev-libs/xml-security-c/Manifest
21 deleted file mode 100644
22 index bbb89a08ea1..00000000000
23 --- a/dev-libs/xml-security-c/Manifest
24 +++ /dev/null
25 @@ -1 +0,0 @@
26 -DIST xml-security-c-2.0.2.tar.gz 904933 BLAKE2B 8e336dd7539778411755a8d45398daa530a2f602a0d57faa29301d1f0b29ab0a61c3f47ead42b740337ea75a28e03f471ae6735d5cd66d31f56d3d5fe3405b1b SHA512 bebadee2daf27181f5bcc955a909397976e8fd2e67f5e546f5adbede0ca790647cbec9181b0b609da59d525ff3baa9f899af2a3d815bc7a2f3a57bd8b30c011b
27
28 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
29 deleted file mode 100644
30 index 754ddc6bcf1..00000000000
31 --- a/dev-libs/xml-security-c/files/xml-security-c-2.0.2-libressl.patch
32 +++ /dev/null
33 @@ -1,52 +0,0 @@
34 -diff --git a/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp b/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp
35 -index 2ad9da6e..a8ea9f1d 100644
36 ---- a/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp
37 -+++ b/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp
38 -@@ -48,7 +48,7 @@ XERCES_CPP_NAMESPACE_USE
39 - // Construction/Destruction
40 - // --------------------------------------------------------------------------------
41 -
42 --#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
43 -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
44 - OpenSSLCryptoBase64::OpenSSLCryptoBase64() : mp_ectx(&m_ectx_store), mp_dctx(&m_dctx_store) { }
45 - OpenSSLCryptoBase64::~OpenSSLCryptoBase64() { }
46 - #else
47 -diff --git a/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp b/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp
48 -index c892eac4..82aeb0a1 100644
49 ---- a/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp
50 -+++ b/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp
51 -@@ -205,7 +205,7 @@ private :
52 - EVP_ENCODE_CTX *mp_ectx; // Encode context
53 - EVP_ENCODE_CTX *mp_dctx; // Decode context
54 -
55 --#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
56 -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
57 - EVP_ENCODE_CTX m_ectx_store;
58 - EVP_ENCODE_CTX m_dctx_store;
59 - #endif
60 -diff --git a/xsec/enc/OpenSSL/OpenSSLSupport.cpp b/xsec/enc/OpenSSL/OpenSSLSupport.cpp
61 -index dfd37eb3..cf874f82 100644
62 ---- a/xsec/enc/OpenSSL/OpenSSLSupport.cpp
63 -+++ b/xsec/enc/OpenSSL/OpenSSLSupport.cpp
64 -@@ -273,7 +273,7 @@ int ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s)
65 -
66 - #endif
67 -
68 --#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
69 -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
70 - EvpEncodeCtxRAII::EvpEncodeCtxRAII() : mp_ctx(&mp_ctx_store) { };
71 - EvpEncodeCtxRAII::~EvpEncodeCtxRAII() { }
72 - #else
73 -diff --git a/xsec/enc/OpenSSL/OpenSSLSupport.hpp b/xsec/enc/OpenSSL/OpenSSLSupport.hpp
74 -index e3527fae..b5f67f26 100644
75 ---- a/xsec/enc/OpenSSL/OpenSSLSupport.hpp
76 -+++ b/xsec/enc/OpenSSL/OpenSSLSupport.hpp
77 -@@ -88,7 +88,7 @@ public:
78 -
79 - private:
80 - EVP_ENCODE_CTX *mp_ctx;
81 --#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
82 -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
83 - EVP_ENCODE_CTX mp_ctx_store;
84 - #endif
85 - };
86
87 diff --git a/dev-libs/xml-security-c/metadata.xml b/dev-libs/xml-security-c/metadata.xml
88 deleted file mode 100644
89 index 76ed43fb122..00000000000
90 --- a/dev-libs/xml-security-c/metadata.xml
91 +++ /dev/null
92 @@ -1,11 +0,0 @@
93 -<?xml version="1.0" encoding="UTF-8"?>
94 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
95 -<pkgmetadata>
96 - <!-- maintainer-needed -->
97 - <use>
98 - <flag name="xalan">Enable support for XSLT and XPath parsing
99 - by <pkg>dev-libs/xalan-c</pkg></flag>
100 - <flag name="nss">Use <pkg>dev-libs/nss</pkg> for certain crypto
101 - operations (configureable at runtime)</flag>
102 - </use>
103 -</pkgmetadata>
104
105 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
106 deleted file mode 100644
107 index 278e534140b..00000000000
108 --- a/dev-libs/xml-security-c/xml-security-c-2.0.2-r1.ebuild
109 +++ /dev/null
110 @@ -1,43 +0,0 @@
111 -# Copyright 1999-2018 Gentoo Authors
112 -# Distributed under the terms of the GNU General Public License v2
113 -
114 -EAPI=7
115 -
116 -DESCRIPTION="Apache C++ XML security libraries"
117 -HOMEPAGE="https://santuario.apache.org/"
118 -SRC_URI="mirror://apache/santuario/c-library/${P}.tar.gz"
119 -
120 -LICENSE="Apache-2.0"
121 -SLOT="0"
122 -KEYWORDS="~amd64 ~x86"
123 -IUSE="debug examples libressl nss static-libs xalan"
124 -
125 -RDEPEND=">=dev-libs/xerces-c-3.2
126 - !libressl? ( dev-libs/openssl:0= )
127 - libressl? ( dev-libs/libressl:0= )
128 - nss? ( dev-libs/nss )
129 - xalan? ( dev-libs/xalan-c )"
130 -DEPEND="${RDEPEND}"
131 -BDEPEND="virtual/pkgconfig"
132 -PATCHES=(
133 - "${FILESDIR}/${P}-libressl.patch"
134 -)
135 -
136 -DOCS=( CHANGELOG.txt NOTICE.txt )
137 -
138 -src_configure() {
139 - econf \
140 - --with-openssl \
141 - $(use_enable static-libs static) \
142 - $(use_enable debug) \
143 - $(use_with xalan) \
144 - $(use_with nss)
145 -}
146 -
147 -src_install() {
148 - default
149 - if use examples ; then
150 - docinto examples
151 - dodoc xsec/samples/*.cpp
152 - fi
153 -}
154
155 diff --git a/profiles/package.mask b/profiles/package.mask
156 index e09da191c74..2fac3b1e566 100644
157 --- a/profiles/package.mask
158 +++ b/profiles/package.mask
159 @@ -575,11 +575,6 @@ dev-libs/xmlwrapp
160 # Removal in 30 days. Bug #694240.
161 dev-libs/xmlrpc-epi
162
163 -# Michał Górny <mgorny@g.o> (2019-09-12)
164 -# Unmaintained. No reverse dependencies.
165 -# Removal in 30 days. Bug #694238.
166 -dev-libs/xml-security-c
167 -
168 # Lars Wendler <polynomial-c@g.o> (2019-09-04)
169 # Unofficial build. Superseded by official 2.49.5 release.
170 # Masked for removal.