From 817d9bcc230529ad99f6e3d6132e687c62322b23 Mon Sep 17 00:00:00 2001 From: wu-leilei Date: Sun, 8 Oct 2023 16:16:07 +0800 Subject: [PATCH] Fixed missing websocket.inc in dist files (cherry picked from commit 6647721d3893b38bd565620104c8bd9346b0b143) --- ...-missing-websocket.inc-in-dist-files.patch | 61 +++++++++++++------ libmicrohttpd.spec | 5 +- 2 files changed, 45 insertions(+), 21 deletions(-) diff --git a/fixed-missing-websocket.inc-in-dist-files.patch b/fixed-missing-websocket.inc-in-dist-files.patch index 34e3d00..b1a2ba4 100644 --- a/fixed-missing-websocket.inc-in-dist-files.patch +++ b/fixed-missing-websocket.inc-in-dist-files.patch @@ -1,20 +1,41 @@ -From bf89bd95f8d4401ddaabdb59023175e66bdbd80f Mon Sep 17 00:00:00 2001 -From: "Evgeny Grin (Karlson2k)" -Date: Sun, 9 Jan 2022 19:50:37 +0300 -Subject: [PATCH] doc: fixed missing 'websocket.inc' in dist files - ---- - doc/Makefile.am | 1 ++- - 1 file changed, 1 insertions(+) - -diff -Nur a/doc/Makefile.am b/doc/Makefile.am ---- a/doc/Makefile.am 2021-12-27 01:30:00.000000000 +0800 -+++ b/doc/Makefile.am 2022-08-05 16:13:42.056733987 +0800 -@@ -27,6 +27,7 @@ - chapters/responseheaders.inc \ - chapters/tlsauthentication.inc \ - chapters/sessions.inc \ -+ chapters/websocket.inc \ - fdl-1.3.texi \ - gpl-2.0.texi \ - lgpl.texi \ +diff -Nur a/doc/libmicrohttpd-tutorial.texi b/doc/libmicrohttpd-tutorial.texi +--- a/doc/libmicrohttpd-tutorial.texi 2021-12-27 01:30:00.000000000 +0800 ++++ b/doc/libmicrohttpd-tutorial.texi 2022-08-27 10:39:16.578248526 +0800 +@@ -68,7 +68,6 @@ + * Improved processing of POST data:: + * Session management:: + * Adding a layer of security:: +-* Websockets:: + * Bibliography:: + * License text:: + * Example programs:: +@@ -110,10 +109,6 @@ + @chapter Adding a layer of security + @include chapters/tlsauthentication.inc + +-@node Websockets +-@chapter Websockets +-@include chapters/websocket.inc +- + @node Bibliography + @appendix Bibliography + @include chapters/bibliography.inc +@@ -133,7 +128,6 @@ + * largepost.c:: + * sessions.c:: + * tlsauthentication.c:: +-* websocket.c:: + @end menu + + @node hellobrowser.c +@@ -184,10 +178,4 @@ + @verbatiminclude examples/tlsauthentication.c + @end smalldisplay + +-@node websocket.c +-@section websocket.c +-@smalldisplay +-@verbatiminclude examples/websocket.c +-@end smalldisplay +- + @bye diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec index d0764e8..c830c47 100644 --- a/libmicrohttpd.spec +++ b/libmicrohttpd.spec @@ -1,6 +1,6 @@ Name: libmicrohttpd Version: 0.9.75 -Release: 3 +Release: 4 Epoch: 1 Summary: Lightweight library for embedding a webserver in applications License: LGPLv2+ @@ -90,6 +90,9 @@ fi %{_infodir}/libmicrohttpd_performance_data.png.gz %changelog +* Sun Oct 08 2023 wulei - 1:0.9.75-4 +- Fixed missing websocket.inc in dist files + * Mon Mar 13 2023 yaoxin - 1:0.9.75-3 - Fix CVE-2023-27371