diff mbox series

[1/1] package/znc: Fix build with LibreSSL

Message ID 20230310165900.46687-1-bernd.kuhls@t-online.de
State Accepted
Headers show
Series [1/1] package/znc: Fix build with LibreSSL | expand

Commit Message

Bernd Kuhls March 10, 2023, 4:59 p.m. UTC 
Fixes:
http://autobuild.buildroot.net/results/3fe/3fec5c3a21af47b5f4e8adcaf4ce1fff5070e00a/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 ...0001-LibreSSL-3.5-opaqued-structures.patch | 27 ++++++++
 .../znc/0002-Fix-build-with-libressl.patch    | 68 +++++++++++++++++++
 ...DH_get0_key-have-existed-since-Libre.patch | 30 ++++++++
 3 files changed, 125 insertions(+)
 create mode 100644 package/znc/0001-LibreSSL-3.5-opaqued-structures.patch
 create mode 100644 package/znc/0002-Fix-build-with-libressl.patch
 create mode 100644 package/znc/0003-DH_set0_pqg-and-DH_get0_key-have-existed-since-Libre.patch

Comments

Arnout Vandecappelle March 10, 2023, 7:53 p.m. UTC | #1 
On 10/03/2023 17:59, Bernd Kuhls wrote:
> Fixes:
> http://autobuild.buildroot.net/results/3fe/3fec5c3a21af47b5f4e8adcaf4ce1fff5070e00a/
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

  Applied to master, thanks.

  Regards,
  Arnout

> ---
>   ...0001-LibreSSL-3.5-opaqued-structures.patch | 27 ++++++++
>   .../znc/0002-Fix-build-with-libressl.patch    | 68 +++++++++++++++++++
>   ...DH_get0_key-have-existed-since-Libre.patch | 30 ++++++++
>   3 files changed, 125 insertions(+)
>   create mode 100644 package/znc/0001-LibreSSL-3.5-opaqued-structures.patch
>   create mode 100644 package/znc/0002-Fix-build-with-libressl.patch
>   create mode 100644 package/znc/0003-DH_set0_pqg-and-DH_get0_key-have-existed-since-Libre.patch
> 
> diff --git a/package/znc/0001-LibreSSL-3.5-opaqued-structures.patch b/package/znc/0001-LibreSSL-3.5-opaqued-structures.patch
> new file mode 100644
> index 0000000000..d0019e21a4
> --- /dev/null
> +++ b/package/znc/0001-LibreSSL-3.5-opaqued-structures.patch
> @@ -0,0 +1,27 @@
> +From 87f3dac8ba8dea5628b05416bdef454b4ef2d236 Mon Sep 17 00:00:00 2001
> +From: Charlie Li <git@vishwin.info>
> +Date: Mon, 14 Mar 2022 17:36:36 -0400
> +Subject: [PATCH] LibreSSL 3.5 opaqued structures
> +
> +Downloaded from upstream commit
> +https://github.com/znc/Csocket/commit/87f3dac8ba8dea5628b05416bdef454b4ef2d236
> +
> +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> +(rebased for znc)
> +---
> + Csocket.cc | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/Csocket.cc b/Csocket.cc
> +index 46a3bfd..a30da14 100644
> +--- a/third_party/Csocket/Csocket.cc
> ++++ b/third_party/Csocket/Csocket.cc
> +@@ -61,7 +61,7 @@
> + #  define OPENSSL_NO_TLS1_1            /* 1.0.1-pre~: openssl/openssl@637f374ad49d5f6d4f81d87d7cdd226428aa470c */
> + #  define OPENSSL_NO_TLS1_2            /* 1.0.1-pre~: openssl/openssl@7409d7ad517650db332ae528915a570e4e0ab88b */
> + # endif
> +-# ifndef LIBRESSL_VERSION_NUMBER /* forked from OpenSSL 1.0.1g, sets high version "with the idea of discouraging software from relying on magic numbers for detecting features"(!) */
> ++# if !defined(LIBRESSL_VERSION_NUMBER) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x03050000fL)
> + #  if OPENSSL_VERSION_NUMBER >= 0x10100000
> + #   undef HAVE_ERR_REMOVE_THREAD_STATE /* 1.1.0-pre4: openssl/openssl@8509dcc9f319190c565ab6baad7c88d37a951d1c */
> + #   undef OPENSSL_NO_SSL2              /* 1.1.0-pre4: openssl/openssl@e80381e1a3309f5d4a783bcaa508a90187a48882 */
> diff --git a/package/znc/0002-Fix-build-with-libressl.patch b/package/znc/0002-Fix-build-with-libressl.patch
> new file mode 100644
> index 0000000000..b8d22445fb
> --- /dev/null
> +++ b/package/znc/0002-Fix-build-with-libressl.patch
> @@ -0,0 +1,68 @@
> +From dcb5f3df82fcfec48aab356252067dc897fb98cf Mon Sep 17 00:00:00 2001
> +From: Alexey Sokolov <alexey+znc@asokolov.org>
> +Date: Sun, 14 Nov 2021 00:45:01 +0000
> +Subject: [PATCH] Fix build with libressl
> +
> +It got another feature of openssl implemented, which broke this
> +
> +Downloaded from upstream commit
> +https://github.com/znc/znc/commit/dcb5f3df82fcfec48aab356252067dc897fb98cf
> +
> +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> +---
> + CMakeLists.txt                   | 14 ++++++++++++++
> + include/znc/zncconfig.h.cmake.in |  1 +
> + modules/schat.cpp                |  3 +--
> + 3 files changed, 16 insertions(+), 2 deletions(-)
> +
> +diff --git a/CMakeLists.txt b/CMakeLists.txt
> +index 0913ff2691..1f77f5632b 100644
> +--- a/CMakeLists.txt
> ++++ b/CMakeLists.txt
> +@@ -82,6 +82,20 @@ endmacro()
> + tristate_option(OPENSSL "Support SSL")
> + if(WANT_OPENSSL)
> + 	find_package(OpenSSL ${TRISTATE_OPENSSL_REQUIRED})
> ++
> ++	if(OPENSSL_FOUND)
> ++		# SSL_SESSION was made opaque in OpenSSL 1.1.0;
> ++		# LibreSSL gained that function later too.
> ++		# TODO: maybe remove this check at some point, and stop supporting old
> ++		# libssl versions
> ++		function(check_SSL_SESSION_get0_cipher)
> ++			set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES})
> ++			set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
> ++			check_cxx_symbol_exists(SSL_SESSION_get0_cipher openssl/ssl.h
> ++				HAVE_SSL_SESSION_get0_cipher)
> ++		endfunction()
> ++		check_SSL_SESSION_get0_cipher()
> ++	endif()
> + endif()
> + set(HAVE_LIBSSL "${OPENSSL_FOUND}")
> +
> +diff --git a/include/znc/zncconfig.h.cmake.in b/include/znc/zncconfig.h.cmake.in
> +index 5426b828af..7b07b99aec 100644
> +--- a/include/znc/zncconfig.h.cmake.in
> ++++ b/include/znc/zncconfig.h.cmake.in
> +@@ -31,6 +31,7 @@
> + #define HAVE_PTHREAD 1
> + #cmakedefine HAVE_THREADED_DNS 1
> + #cmakedefine HAVE_LIBSSL 1
> ++#cmakedefine HAVE_SSL_SESSION_get0_cipher 1
> + #cmakedefine HAVE_IPV6 1
> + #cmakedefine HAVE_ZLIB 1
> + #cmakedefine HAVE_I18N 1
> +diff --git a/modules/schat.cpp b/modules/schat.cpp
> +index aa7a338dcd..66e67e695c 100644
> +--- a/modules/schat.cpp
> ++++ b/modules/schat.cpp
> +@@ -25,8 +25,7 @@
> + #include <znc/User.h>
> + #include <znc/IRCNetwork.h>
> +
> +-#if !defined(OPENSSL_VERSION_NUMBER) || defined(LIBRESSL_VERSION_NUMBER) || \
> +-    OPENSSL_VERSION_NUMBER < 0x10100007
> ++#ifndef HAVE_SSL_SESSION_get0_cipher
> + /* SSL_SESSION was made opaque in OpenSSL 1.1.0, cipher accessor was added 2
> + weeks before the public release.
> + See openssl/openssl@e92813234318635639dba0168c7ef5568757449b. */
> diff --git a/package/znc/0003-DH_set0_pqg-and-DH_get0_key-have-existed-since-Libre.patch b/package/znc/0003-DH_set0_pqg-and-DH_get0_key-have-existed-since-Libre.patch
> new file mode 100644
> index 0000000000..a2946643fc
> --- /dev/null
> +++ b/package/znc/0003-DH_set0_pqg-and-DH_get0_key-have-existed-since-Libre.patch
> @@ -0,0 +1,30 @@
> +From 7c8ac8981a8516edaba469641aff4d8ec452ae9e Mon Sep 17 00:00:00 2001
> +From: Charlie Li <git@vishwin.info>
> +Date: Mon, 14 Mar 2022 18:32:46 -0400
> +Subject: [PATCH] DH_set0_pqg and DH_get0_key have existed since LibreSSL 2.7
> +
> +https://github.com/libressl-portable/openbsd/commit/848e2a019c796b685fc8c5848283b86e48fbe0bf
> +https://github.com/libressl-portable/openbsd/commit/3789e379353c1d53313a249461b3d735de4ac742
> +
> +Downloaded from upstream commit
> +https://github.com/znc/znc/commit/7c8ac8981a8516edaba469641aff4d8ec452ae9e
> +
> +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> +---
> + modules/crypt.cpp | 3 ++-
> + 1 file changed, 2 insertions(+), 1 deletion(-)
> +
> +diff --git a/modules/crypt.cpp b/modules/crypt.cpp
> +index 7655371b6e..68f7aafcea 100644
> +--- a/modules/crypt.cpp
> ++++ b/modules/crypt.cpp
> +@@ -68,7 +68,8 @@ class CCryptMod : public CModule {
> +     CString m_sPrivKey;
> +     CString m_sPubKey;
> +
> +-#if OPENSSL_VERSION_NUMBER < 0X10100000L || defined(LIBRESSL_VERSION_NUMBER)
> ++#if OPENSSL_VERSION_NUMBER < 0X10100000L || \
> ++    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02070000fL)
> +     static int DH_set0_pqg(DH* dh, BIGNUM* p, BIGNUM* q, BIGNUM* g) {
> +         /* If the fields p and g in dh are nullptr, the corresponding input
> +          * parameters MUST be non-nullptr.  q may remain nullptr.
Peter Korsgaard March 17, 2023, 8:26 a.m. UTC | #2 
>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:

 > Fixes:
 > http://autobuild.buildroot.net/results/3fe/3fec5c3a21af47b5f4e8adcaf4ce1fff5070e00a/

 > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Committed to 2022.11.x and 2022.02.x, thanks.
diff mbox series

Patch

diff --git a/package/znc/0001-LibreSSL-3.5-opaqued-structures.patch b/package/znc/0001-LibreSSL-3.5-opaqued-structures.patch
new file mode 100644
index 0000000000..d0019e21a4
--- /dev/null
+++ b/package/znc/0001-LibreSSL-3.5-opaqued-structures.patch
@@ -0,0 +1,27 @@ 
+From 87f3dac8ba8dea5628b05416bdef454b4ef2d236 Mon Sep 17 00:00:00 2001
+From: Charlie Li <git@vishwin.info>
+Date: Mon, 14 Mar 2022 17:36:36 -0400
+Subject: [PATCH] LibreSSL 3.5 opaqued structures
+
+Downloaded from upstream commit
+https://github.com/znc/Csocket/commit/87f3dac8ba8dea5628b05416bdef454b4ef2d236
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+(rebased for znc)
+---
+ Csocket.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Csocket.cc b/Csocket.cc
+index 46a3bfd..a30da14 100644
+--- a/third_party/Csocket/Csocket.cc
++++ b/third_party/Csocket/Csocket.cc
+@@ -61,7 +61,7 @@
+ #  define OPENSSL_NO_TLS1_1            /* 1.0.1-pre~: openssl/openssl@637f374ad49d5f6d4f81d87d7cdd226428aa470c */
+ #  define OPENSSL_NO_TLS1_2            /* 1.0.1-pre~: openssl/openssl@7409d7ad517650db332ae528915a570e4e0ab88b */
+ # endif
+-# ifndef LIBRESSL_VERSION_NUMBER /* forked from OpenSSL 1.0.1g, sets high version "with the idea of discouraging software from relying on magic numbers for detecting features"(!) */
++# if !defined(LIBRESSL_VERSION_NUMBER) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x03050000fL)
+ #  if OPENSSL_VERSION_NUMBER >= 0x10100000
+ #   undef HAVE_ERR_REMOVE_THREAD_STATE /* 1.1.0-pre4: openssl/openssl@8509dcc9f319190c565ab6baad7c88d37a951d1c */
+ #   undef OPENSSL_NO_SSL2              /* 1.1.0-pre4: openssl/openssl@e80381e1a3309f5d4a783bcaa508a90187a48882 */
diff --git a/package/znc/0002-Fix-build-with-libressl.patch b/package/znc/0002-Fix-build-with-libressl.patch
new file mode 100644
index 0000000000..b8d22445fb
--- /dev/null
+++ b/package/znc/0002-Fix-build-with-libressl.patch
@@ -0,0 +1,68 @@ 
+From dcb5f3df82fcfec48aab356252067dc897fb98cf Mon Sep 17 00:00:00 2001
+From: Alexey Sokolov <alexey+znc@asokolov.org>
+Date: Sun, 14 Nov 2021 00:45:01 +0000
+Subject: [PATCH] Fix build with libressl
+
+It got another feature of openssl implemented, which broke this
+
+Downloaded from upstream commit
+https://github.com/znc/znc/commit/dcb5f3df82fcfec48aab356252067dc897fb98cf
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ CMakeLists.txt                   | 14 ++++++++++++++
+ include/znc/zncconfig.h.cmake.in |  1 +
+ modules/schat.cpp                |  3 +--
+ 3 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0913ff2691..1f77f5632b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -82,6 +82,20 @@ endmacro()
+ tristate_option(OPENSSL "Support SSL")
+ if(WANT_OPENSSL)
+ 	find_package(OpenSSL ${TRISTATE_OPENSSL_REQUIRED})
++
++	if(OPENSSL_FOUND)
++		# SSL_SESSION was made opaque in OpenSSL 1.1.0;
++		# LibreSSL gained that function later too.
++		# TODO: maybe remove this check at some point, and stop supporting old
++		# libssl versions
++		function(check_SSL_SESSION_get0_cipher)
++			set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES})
++			set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
++			check_cxx_symbol_exists(SSL_SESSION_get0_cipher openssl/ssl.h
++				HAVE_SSL_SESSION_get0_cipher)
++		endfunction()
++		check_SSL_SESSION_get0_cipher()
++	endif()
+ endif()
+ set(HAVE_LIBSSL "${OPENSSL_FOUND}")
+ 
+diff --git a/include/znc/zncconfig.h.cmake.in b/include/znc/zncconfig.h.cmake.in
+index 5426b828af..7b07b99aec 100644
+--- a/include/znc/zncconfig.h.cmake.in
++++ b/include/znc/zncconfig.h.cmake.in
+@@ -31,6 +31,7 @@
+ #define HAVE_PTHREAD 1
+ #cmakedefine HAVE_THREADED_DNS 1
+ #cmakedefine HAVE_LIBSSL 1
++#cmakedefine HAVE_SSL_SESSION_get0_cipher 1
+ #cmakedefine HAVE_IPV6 1
+ #cmakedefine HAVE_ZLIB 1
+ #cmakedefine HAVE_I18N 1
+diff --git a/modules/schat.cpp b/modules/schat.cpp
+index aa7a338dcd..66e67e695c 100644
+--- a/modules/schat.cpp
++++ b/modules/schat.cpp
+@@ -25,8 +25,7 @@
+ #include <znc/User.h>
+ #include <znc/IRCNetwork.h>
+ 
+-#if !defined(OPENSSL_VERSION_NUMBER) || defined(LIBRESSL_VERSION_NUMBER) || \
+-    OPENSSL_VERSION_NUMBER < 0x10100007
++#ifndef HAVE_SSL_SESSION_get0_cipher
+ /* SSL_SESSION was made opaque in OpenSSL 1.1.0, cipher accessor was added 2
+ weeks before the public release.
+ See openssl/openssl@e92813234318635639dba0168c7ef5568757449b. */
diff --git a/package/znc/0003-DH_set0_pqg-and-DH_get0_key-have-existed-since-Libre.patch b/package/znc/0003-DH_set0_pqg-and-DH_get0_key-have-existed-since-Libre.patch
new file mode 100644
index 0000000000..a2946643fc
--- /dev/null
+++ b/package/znc/0003-DH_set0_pqg-and-DH_get0_key-have-existed-since-Libre.patch
@@ -0,0 +1,30 @@ 
+From 7c8ac8981a8516edaba469641aff4d8ec452ae9e Mon Sep 17 00:00:00 2001
+From: Charlie Li <git@vishwin.info>
+Date: Mon, 14 Mar 2022 18:32:46 -0400
+Subject: [PATCH] DH_set0_pqg and DH_get0_key have existed since LibreSSL 2.7
+
+https://github.com/libressl-portable/openbsd/commit/848e2a019c796b685fc8c5848283b86e48fbe0bf
+https://github.com/libressl-portable/openbsd/commit/3789e379353c1d53313a249461b3d735de4ac742
+
+Downloaded from upstream commit
+https://github.com/znc/znc/commit/7c8ac8981a8516edaba469641aff4d8ec452ae9e
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ modules/crypt.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/modules/crypt.cpp b/modules/crypt.cpp
+index 7655371b6e..68f7aafcea 100644
+--- a/modules/crypt.cpp
++++ b/modules/crypt.cpp
+@@ -68,7 +68,8 @@ class CCryptMod : public CModule {
+     CString m_sPrivKey;
+     CString m_sPubKey;
+ 
+-#if OPENSSL_VERSION_NUMBER < 0X10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0X10100000L || \
++    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02070000fL)
+     static int DH_set0_pqg(DH* dh, BIGNUM* p, BIGNUM* q, BIGNUM* g) {
+         /* If the fields p and g in dh are nullptr, the corresponding input
+          * parameters MUST be non-nullptr.  q may remain nullptr.