mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-01 21:23:51 -09:00
package/xml-security-c: remove package
https://santuario.apache.org/ "July 2024 As announced early this year, the C++ library has been officially retired. A fork of this code base has been migrated to the Shibboleth Project, which has been the sole maintainer for a number of years now. See the Shibboleth wiki for notable caveats regarding usage of this code." https://shibboleth.atlassian.net/wiki/spaces/DEV/pages/3726671873/Santuario "The C++ xml-security-c library has been retired at Apache and is now solely maintained by the Shibboleth Project for our use only. Use by any other project, while permitted freely under the license, is ill-advised and unsupported by the Shibboleth Project. While we continue to publish a fork of the code in our repository, and will accept bug reports and certainly security reports, we do not promise any responsiveness to third parties, and urge that no other projects rely on this code. Existing users should seek alternatives or consider forking the code for their own use." The package is unmaintained and will cause build errors with the upcoming bump of OpenSSL to 4.0.0. No other package depends on it so we can safely remove it from buildroot. Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Signed-off-by: Arnout Vandecappelle <arnout@rnout.be>
This commit is contained in:
Bernd Kuhls
committed by
Arnout Vandecappelle
Arnout Vandecappelle
parent
afbc19284b
commit
3ce7034cdd
@@ -992,7 +992,6 @@ package/xen/0002-Fix-build-with-64-bits-time_t.patch lib_patch.Upstream
|
||||
package/xen/0003-libs-light-fix-tv_sec-printf-format.patch lib_patch.Upstream
|
||||
package/xen/0004-libs-light-fix-tv_sec-fprintf-format.patch lib_patch.Upstream
|
||||
package/xl2tp/xl2tpd lib_shellscript.TrailingSpace
|
||||
package/xml-security-c/0001-fix-build-with-libressl-3.5.0.patch lib_patch.Upstream
|
||||
package/yajl/0001-Let-the-shared-and-the-static-library-have-the-same-.patch lib_patch.Upstream
|
||||
package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch lib_patch.Upstream
|
||||
package/yajl/0003-Link-with-shared-libyajl-in-a-shared-build.patch lib_patch.Upstream
|
||||
|
||||
@@ -146,6 +146,13 @@ endif
|
||||
|
||||
comment "Legacy options removed in 2026.05"
|
||||
|
||||
config BR2_PACKAGE_XML_SECURITY_C
|
||||
bool "xml-security-c removed"
|
||||
select BR2_LEGACY
|
||||
help
|
||||
xml-security-c was no longer maintained upstream, so it has
|
||||
been dropped.
|
||||
|
||||
config BR2_PACKAGE_LIBPHIDGET
|
||||
bool "libphidget"
|
||||
select BR2_LEGACY
|
||||
|
||||
@@ -1913,7 +1913,6 @@ menu "JSON/XML"
|
||||
source "package/tinyxml2/Config.in"
|
||||
source "package/valijson/Config.in"
|
||||
source "package/xerces/Config.in"
|
||||
source "package/xml-security-c/Config.in"
|
||||
source "package/yajl/Config.in"
|
||||
source "package/yaml-cpp/Config.in"
|
||||
source "package/zix/Config.in"
|
||||
|
||||
@@ -1,91 +0,0 @@
|
||||
From 66d1d626cf1405119d89c6fd0fb7e9019bd67f6c Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Mon, 6 Jun 2022 10:24:58 +0200
|
||||
Subject: [PATCH] fix build with libressl >= 3.5.0
|
||||
|
||||
Fix the following build failure with libressl >= 3.5.0:
|
||||
|
||||
In file included from ../xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp:36:0,
|
||||
from enc/OpenSSL/OpenSSLCryptoKeyRSA.cpp:35:
|
||||
../xsec/enc/OpenSSL/OpenSSLSupport.hpp:92:20: error: field 'mp_ctx_store' has incomplete type 'EVP_ENCODE_CTX {aka evp_Encode_Ctx_st}'
|
||||
EVP_ENCODE_CTX mp_ctx_store;
|
||||
^~~~~~~~~~~~
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/e908e59ec5b8e1ac505c44900dcb39527f0ec1d3
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://issues.apache.org/jira/browse/SANTUARIO-588]
|
||||
---
|
||||
xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp | 3 ++-
|
||||
xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp | 3 ++-
|
||||
xsec/enc/OpenSSL/OpenSSLSupport.cpp | 5 +++--
|
||||
xsec/enc/OpenSSL/OpenSSLSupport.hpp | 3 ++-
|
||||
4 files changed, 9 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp b/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp
|
||||
index a8ea9f1d..a9a84e3f 100644
|
||||
--- a/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp
|
||||
+++ b/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp
|
||||
@@ -48,7 +48,8 @@ XERCES_CPP_NAMESPACE_USE
|
||||
// Construction/Destruction
|
||||
// --------------------------------------------------------------------------------
|
||||
|
||||
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
|
||||
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
|
||||
+ ((defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L))
|
||||
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 82aeb0a1..7c947d50 100644
|
||||
--- a/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp
|
||||
+++ b/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp
|
||||
@@ -205,7 +205,8 @@ private :
|
||||
EVP_ENCODE_CTX *mp_ectx; // Encode context
|
||||
EVP_ENCODE_CTX *mp_dctx; // Decode context
|
||||
|
||||
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
|
||||
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
|
||||
+ ((defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L))
|
||||
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 cf874f82..c4453004 100644
|
||||
--- a/xsec/enc/OpenSSL/OpenSSLSupport.cpp
|
||||
+++ b/xsec/enc/OpenSSL/OpenSSLSupport.cpp
|
||||
@@ -273,7 +273,8 @@ int ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s)
|
||||
|
||||
#endif
|
||||
|
||||
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
|
||||
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
|
||||
+ ((defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L))
|
||||
EvpEncodeCtxRAII::EvpEncodeCtxRAII() : mp_ctx(&mp_ctx_store) { };
|
||||
EvpEncodeCtxRAII::~EvpEncodeCtxRAII() { }
|
||||
#else
|
||||
@@ -289,4 +290,4 @@ EVP_ENCODE_CTX
|
||||
return mp_ctx;
|
||||
}
|
||||
|
||||
-#endif
|
||||
\ No newline at end of file
|
||||
+#endif
|
||||
diff --git a/xsec/enc/OpenSSL/OpenSSLSupport.hpp b/xsec/enc/OpenSSL/OpenSSLSupport.hpp
|
||||
index b5f67f26..09d50899 100644
|
||||
--- a/xsec/enc/OpenSSL/OpenSSLSupport.hpp
|
||||
+++ b/xsec/enc/OpenSSL/OpenSSLSupport.hpp
|
||||
@@ -88,7 +88,8 @@ public:
|
||||
|
||||
private:
|
||||
EVP_ENCODE_CTX *mp_ctx;
|
||||
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
|
||||
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
|
||||
+ ((defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L))
|
||||
EVP_ENCODE_CTX mp_ctx_store;
|
||||
#endif
|
||||
};
|
||||
--
|
||||
2.35.1
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
config BR2_PACKAGE_XML_SECURITY_C
|
||||
bool "xml-security-c"
|
||||
depends on BR2_INSTALL_LIBSTDCPP # xerces
|
||||
depends on !BR2_STATIC_LIBS # xerces
|
||||
depends on BR2_USE_WCHAR # xerces
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL
|
||||
select BR2_PACKAGE_OPENSSL
|
||||
select BR2_PACKAGE_XERCES
|
||||
help
|
||||
The xml-security-c library is a C++ implementation of
|
||||
the XML Digital Signature and Encryption specifications.
|
||||
|
||||
https://santuario.apache.org/cindex.html
|
||||
|
||||
comment "xml-security-c needs a toolchain w/ C++, wchar, dynamic library, threads, gcc >= 4.7"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
|
||||
BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \
|
||||
!BR2_TOOLCHAIN_HAS_THREADS
|
||||
@@ -1,3 +0,0 @@
|
||||
# From http://www.apache.org/dist/santuario/c-library/xml-security-c-2.0.4.tar.gz.sha256
|
||||
sha256 a78da6720f6c2ba14100d2426131e0d33eac5a2dba5cc11bdd04974b7eb89003 xml-security-c-2.0.4.tar.gz
|
||||
sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE.txt
|
||||
@@ -1,18 +0,0 @@
|
||||
################################################################################
|
||||
#
|
||||
# xml-security-c
|
||||
#
|
||||
################################################################################
|
||||
|
||||
XML_SECURITY_C_VERSION = 2.0.4
|
||||
XML_SECURITY_C_SITE = http://archive.apache.org/dist/santuario/c-library
|
||||
XML_SECURITY_C_LICENSE = Apache-2.0
|
||||
XML_SECURITY_C_LICENSE_FILES = LICENSE.txt
|
||||
XML_SECURITY_C_DEPENDENCIES = openssl xerces
|
||||
XML_SECURITY_C_INSTALL_STAGING = YES
|
||||
|
||||
XML_SECURITY_C_CONF_ENV = \
|
||||
xml_cv_func_getcwd_null=yes \
|
||||
CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user