Control: tags 1037747 + patch
Control: tags 1037747 + pending

Dear maintainer,

I've prepared an NMU for libwebsockets (versioned as 4.1.6-4) and
uploaded.

diff -Nru libwebsockets-4.1.6/debian/changelog 
libwebsockets-4.1.6/debian/changelog
--- libwebsockets-4.1.6/debian/changelog        2022-08-07 10:46:31.000000000 
+0200
+++ libwebsockets-4.1.6/debian/changelog        2023-07-20 17:27:19.000000000 
+0200
@@ -1,3 +1,12 @@
+libwebsockets (4.1.6-4) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/patches/f9d1f25abe896b9fa1de780e4a5cb41116926a29.patch:
+    - cherry-pick upstream patch to fix a build failure with gcc-13
+      (Closes: #1037747)
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org>  Thu, 20 Jul 2023 
17:27:19 +0200
+
 libwebsockets (4.1.6-3) unstable; urgency=medium

   * Update self-testing.
diff -Nru 
libwebsockets-4.1.6/debian/patches/f9d1f25abe896b9fa1de780e4a5cb41116926a29.patch
 
libwebsockets-4.1.6/debian/patches/f9d1f25abe896b9fa1de780e4a5cb41116926a29.patch
--- 
libwebsockets-4.1.6/debian/patches/f9d1f25abe896b9fa1de780e4a5cb41116926a29.patch
   1970-01-01 01:00:00.000000000 +0100
+++ 
libwebsockets-4.1.6/debian/patches/f9d1f25abe896b9fa1de780e4a5cb41116926a29.patch
   2023-07-20 17:27:19.000000000 +0200
@@ -0,0 +1,30 @@
+From f9d1f25abe896b9fa1de780e4a5cb41116926a29 Mon Sep 17 00:00:00 2001
+From: Andy Green <a...@warmcat.com>
+Date: Wed, 14 Jun 2023 07:14:23 +0100
+Subject: [PATCH] openssl-server: enum vs int disagreement
+
+https://github.com/warmcat/libwebsockets/issues/2907
+---
+ lib/tls/openssl/openssl-server.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/tls/openssl/openssl-server.c 
b/lib/tls/openssl/openssl-server.c
+index f2e77324f..1fc819293 100644
+--- a/lib/tls/openssl/openssl-server.c
++++ b/lib/tls/openssl/openssl-server.c
+@@ -607,13 +607,13 @@ lws_tls_server_new_nonblocking(struct lw
+       return 0;
+ }
+
+-int
++enum lws_ssl_capable_status
+ lws_tls_server_abort_connection(struct lws *wsi)
+ {
+       SSL_shutdown(wsi->tls.ssl);
+       SSL_free(wsi->tls.ssl);
+
+-      return 0;
++      return LWS_SSL_CAPABLE_DONE;
+ }
+
+ enum lws_ssl_capable_status
diff -Nru libwebsockets-4.1.6/debian/patches/series 
libwebsockets-4.1.6/debian/patches/series
--- libwebsockets-4.1.6/debian/patches/series   2020-09-08 01:12:45.000000000 
+0200
+++ libwebsockets-4.1.6/debian/patches/series   2023-07-20 17:27:19.000000000 
+0200
@@ -1,3 +1,4 @@
 #echo-actually-exit.patch
 #echo-off-by-one.patch
 #add-missing-headers.patch
+f9d1f25abe896b9fa1de780e4a5cb41116926a29.patch

Attachment: OpenPGP_signature
Description: OpenPGP digital signature

Reply via email to