Re: git: 097c9235d921 - main - security/xmlsec1: update to 1.2.34
- Reply: Hiroki Sato : "Re: git: 097c9235d921 - main - security/xmlsec1: update to 1.2.34,Re: git: 097c9235d921 - main - security/xmlsec1: update to 1.2.34"
- In reply to: Hiroki Sato : "git: 097c9235d921 - main - security/xmlsec1: update to 1.2.34"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 06 May 2022 21:29:36 UTC
Hiroki Sato wrote:
> diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile
> index 6a1359ffb91e..6d6ccfa6822c 100644
> --- a/security/xmlsec1/Makefile
> +++ b/security/xmlsec1/Makefile
> @@ -25,6 +24,7 @@ USE_LDCONFIG= yes
> GNU_CONFIGURE= yes
> CONFIGURE_ARGS= --with-openssl="${OPENSSLBASE}" \
> --with-gcrypt="${LOCALBASE}" \
> + --enable-werror \
Why? This single-handedly caused PR 263826, though it did expose missing
symbols on the LibreSSL side of things.
> diff --git a/security/xmlsec1/files/patch-src_openssl_openssl__compat.h b/security/xmlsec1/files/patch-src_openssl_openssl__compat.h
> index ab20e6310f2d..21eed249a79a 100644
> --- a/security/xmlsec1/files/patch-src_openssl_openssl__compat.h
> +++ b/security/xmlsec1/files/patch-src_openssl_openssl__compat.h
> @@ -1,11 +1,9 @@
> ---- src/openssl/openssl_compat.h.orig 2017-09-12 13:21:09 UTC
> +--- src/openssl/openssl_compat.h.orig 2022-05-03 14:36:17 UTC
> +++ src/openssl/openssl_compat.h
> -@@ -49,4 +49,19 @@
> +@@ -51,6 +51,21 @@
>
> - #endif /* !defined(XMLSEC_OPENSSL_API_110) */
> -
> -+/******************************************************************************
> -+ *
> + /******************************************************************************
> + *
> + * LibreSSL 2.7+ compatibility (implements most of OpenSSL 1.1 API)
> + *
> + *****************************************************************************/
> @@ -19,4 +17,8 @@
> +#define X509_OBJECT_free(x) { X509_OBJECT_free_contents(x); free(x); }
> +#endif
> +
> - #endif /* __XMLSEC_OPENSSL_OPENSSL_COMPAT_H__ */
> ++/******************************************************************************
> ++ *
> + * boringssl compatibility
> + *
> + *****************************************************************************/
This patch hasn't been needed for a while now. Everything in here had
already been upstreamed, partially by myself.
--
Charlie Li
…nope, still don't have an exit line.