diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | 0001-stop-using-deprecated-symbols.patch | 54 | ||||
| -rw-r--r-- | PKGBUILD | 22 |
3 files changed, 75 insertions, 5 deletions
@@ -1,7 +1,7 @@ pkgbase = lasso pkgdesc = Lasso is a free software C library aiming to implement the Liberty Alliance standards. ID-WSF and SAML 2.0. pkgver = 2.8.2 - pkgrel = 1 + pkgrel = 2 url = http://lasso.entrouvert.org/ arch = i686 arch = x86_64 @@ -12,6 +12,8 @@ pkgbase = lasso depends = xmlsec depends = openssl source = https://dev.entrouvert.org/releases/lasso/lasso-2.8.2.tar.gz + source = 0001-stop-using-deprecated-symbols.patch sha512sums = f56b5fef68fd1e6025a7cfb0f84d65be9ddf195f0e80d38d60c31d43fcd4377be5a0d67140bc654c224331230f06c10e4eb498671a10ebfadc1d93decadf4c72 + sha512sums = 283000ee20a14efd42e65ed6d6c0358889e3aab54095c68caf7f10b15adc55a050c452c8b10a0dd8c750927b6971f182b044558ae3f426018363b55e73852d81 pkgname = lasso diff --git a/0001-stop-using-deprecated-symbols.patch b/0001-stop-using-deprecated-symbols.patch new file mode 100644 index 000000000000..8b96e8b11e9b --- /dev/null +++ b/0001-stop-using-deprecated-symbols.patch @@ -0,0 +1,54 @@ +diff -Naur a/lasso/lasso.c b/lasso/lasso.c +--- a/lasso/lasso.c 2024-04-02 08:48:00.452071137 -0400 ++++ b/lasso/lasso.c 2024-04-02 08:47:09.337931309 -0400 +@@ -270,7 +270,7 @@ + * xmlsec-crypto library. + */ + #ifdef XMLSEC_CRYPTO_DYNAMIC_LOADING +- if (xmlSecCryptoDLLoadLibrary(BAD_CAST XMLSEC_CRYPTO) < 0) { ++ if (xmlSecCryptoDLLoadLibrary(BAD_CAST xmlSecGetDefaultCrypto()) < 0) { + message(G_LOG_LEVEL_CRITICAL, + "Unable to load default xmlsec-crypto library. Make sure" + "that you have it installed and check shared libraries path" +diff -Naur a/lasso/xml/tools.c b/lasso/xml/tools.c +--- a/lasso/xml/tools.c 2023-03-06 06:05:02.761160572 -0500 ++++ b/lasso/xml/tools.c 2024-04-02 09:09:19.739795636 -0400 +@@ -47,6 +47,7 @@ + #include <libxml/xmlIO.h> + + #include <openssl/evp.h> ++#include <openssl/pem.h> + + #include <xmlsec/base64.h> + #include <xmlsec/crypto.h> +@@ -308,8 +309,8 @@ + pub_key = lasso_get_public_key_from_pem_cert_file(file); + break; + case LASSO_PEM_FILE_TYPE_PUB_KEY: +- pub_key = xmlSecCryptoAppKeyLoad(file, +- xmlSecKeyDataFormatPem, NULL, NULL, NULL); ++ pub_key = xmlSecCryptoAppKeyLoadEx(file, ++ xmlSecKeyDataTypePublic, xmlSecKeyDataFormatPem, NULL, NULL, NULL); + break; + case LASSO_PEM_FILE_TYPE_PRIVATE_KEY: + pub_key = lasso_get_public_key_from_private_key_file(file); +@@ -377,8 +378,8 @@ + static xmlSecKeyPtr + lasso_get_public_key_from_private_key_file(const char *private_key_file) + { +- return xmlSecCryptoAppKeyLoad(private_key_file, +- xmlSecKeyDataFormatPem, NULL, NULL, NULL); ++ return xmlSecCryptoAppKeyLoadEx(private_key_file, ++ xmlSecKeyDataTypePublic, xmlSecKeyDataFormatPem, NULL, NULL, NULL); + } + + /** +@@ -1449,7 +1450,7 @@ + } + } + +-static void structuredErrorFunc (void *userData, xmlErrorPtr error) { ++static void structuredErrorFunc (void *userData, const xmlError * error) { + *(int*)userData = error->code; + } + @@ -1,4 +1,6 @@ # Maintainer: Nikola Ivačič <nikola.ivacic@dropchop.com> +# Maintainer: Dan Fuhry <dan@fuhry.com> +# vim: set ts=2 sw=2 et: ### I AM ONLY THE PACKAGER, NOT THE DEVELOPER ### Please ask support questions about this software in one of: ### 1) The AUR comments; OR @@ -11,18 +13,30 @@ pkgname=lasso pkgver=2.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="Lasso is a free software C library aiming to implement the Liberty Alliance standards. ID-WSF and SAML 2.0." arch=('i686' 'x86_64') url="http://lasso.entrouvert.org/" license=('GNU') depends=('libxml2' 'xmlsec' 'openssl') makedepends=('perl' 'python-six') -source=("https://dev.entrouvert.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") -sha512sums=('f56b5fef68fd1e6025a7cfb0f84d65be9ddf195f0e80d38d60c31d43fcd4377be5a0d67140bc654c224331230f06c10e4eb498671a10ebfadc1d93decadf4c72') +source=("https://dev.entrouvert.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz" + "0001-stop-using-deprecated-symbols.patch") +sha512sums=('f56b5fef68fd1e6025a7cfb0f84d65be9ddf195f0e80d38d60c31d43fcd4377be5a0d67140bc654c224331230f06c10e4eb498671a10ebfadc1d93decadf4c72' + '283000ee20a14efd42e65ed6d6c0358889e3aab54095c68caf7f10b15adc55a050c452c8b10a0dd8c750927b6971f182b044558ae3f426018363b55e73852d81') + +prepare() { + for f in "${source[@]}"; do + if test "${f%.patch}" != "${f}"; then + msg "Applying patch: $f" + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/${f}" + fi + done +} build() { - cd "${pkgname}"-"${pkgver}" + cd "${pkgname}-${pkgver}" ./configure --prefix=/usr --disable-tests make CFLAGS="-g -O2 -w" CXXFLAGS="${CFLAGS}" } |