Control: tags 990363 + patch
Control: tags 990363 + pending

Dear maintainer,

I've prepared an NMU for caml-crush (versioned as 1.0.12-1.1) and
uploaded it.

Regards.

diff -Nru caml-crush-1.0.12/debian/changelog caml-crush-1.0.12/debian/changelog
--- caml-crush-1.0.12/debian/changelog  2021-11-25 16:23:09.000000000 +0100
+++ caml-crush-1.0.12/debian/changelog  2023-01-27 09:11:33.000000000 +0100
@@ -1,3 +1,12 @@
+caml-crush (1.0.12-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * debian/patches/fix-ssl-3.0.patch:
+    - add patch to fix openssl 3.0 related build
+      failure (Closes: #990363)
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org>  Fri, 27 Jan 2023 
09:11:33 +0100
+
 caml-crush (1.0.12-1) unstable; urgency=medium

   * Fix makefile bugs
diff -Nru caml-crush-1.0.12/debian/patches/fix-ssl-3.0.patch 
caml-crush-1.0.12/debian/patches/fix-ssl-3.0.patch
--- caml-crush-1.0.12/debian/patches/fix-ssl-3.0.patch  1970-01-01 
01:00:00.000000000 +0100
+++ caml-crush-1.0.12/debian/patches/fix-ssl-3.0.patch  2023-01-27 
09:11:33.000000000 +0100
@@ -0,0 +1,29 @@
+Description: Fix openssl3.0 build failure due to renamed symbol
+Author: Gianfranco Costamagna <locutusofb...@debian.org>
+Origin: https://forum.nginx.org/read.php?29,292175
+Last-Update: 2022-02-18
+
+--- caml-crush-1.0.12.orig/configure.ac
++++ caml-crush-1.0.12/configure.ac
+@@ -705,8 +705,6 @@ then
+                                       AC_MSG_ERROR(Cannot find symbol in 
openssl library.))
+                       AC_CHECK_LIB(ssl, SSL_connect, OPENSSL_LIB="-lssl",
+                                       AC_MSG_ERROR(Cannot find symbol in 
openssl library.))
+-                      AC_CHECK_LIB(ssl, SSL_get_peer_certificate, 
OPENSSL_LIB="-lssl",
+-                                      AC_MSG_ERROR(Cannot find symbol in 
openssl library.))
+                       AC_CHECK_LIB(ssl, SSL_get_verify_result, 
OPENSSL_LIB="-lssl",
+                                       AC_MSG_ERROR(Cannot find symbol in 
openssl library.))
+                       AC_CHECK_LIB(ssl, SSL_shutdown, OPENSSL_LIB="-lssl",
+--- caml-crush-1.0.12.orig/src/client-lib/modwrap_crpc_ssl.c
++++ caml-crush-1.0.12/src/client-lib/modwrap_crpc_ssl.c
+@@ -826,6 +826,10 @@ int start_openssl(int sock)
+     return -1;
+   }
+
++#if (OPENSSL_VERSION_NUMBER >= 0x30000000L && !defined 
SSL_get_peer_certificate)
++#define SSL_get_peer_certificate(s) SSL_get1_peer_certificate(s)
++#endif
++
+   /* Obtain the server certificate. */
+   peercert = SSL_get_peer_certificate(ssl);
+   if (peercert == NULL) {
diff -Nru caml-crush-1.0.12/debian/patches/series 
caml-crush-1.0.12/debian/patches/series
--- caml-crush-1.0.12/debian/patches/series     1970-01-01 01:00:00.000000000 
+0100
+++ caml-crush-1.0.12/debian/patches/series     2023-01-27 09:11:33.000000000 
+0100
@@ -0,0 +1 @@
+fix-ssl-3.0.patch

Attachment: OpenPGP_signature
Description: OpenPGP digital signature

Reply via email to