!29 [sync] PR-28: 修复libmicrohttpd编译chapters/websocket.inc文件找不到问题

From: @openeuler-sync-bot 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2023-10-10 00:56:04 +00:00 committed by Gitee
commit 002d153761
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 45 additions and 21 deletions

View File

@ -1,20 +1,41 @@
From bf89bd95f8d4401ddaabdb59023175e66bdbd80f Mon Sep 17 00:00:00 2001 diff -Nur a/doc/libmicrohttpd-tutorial.texi b/doc/libmicrohttpd-tutorial.texi
From: "Evgeny Grin (Karlson2k)" <k2k@narod.ru> --- a/doc/libmicrohttpd-tutorial.texi 2021-12-27 01:30:00.000000000 +0800
Date: Sun, 9 Jan 2022 19:50:37 +0300 +++ b/doc/libmicrohttpd-tutorial.texi 2022-08-27 10:39:16.578248526 +0800
Subject: [PATCH] doc: fixed missing 'websocket.inc' in dist files @@ -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
doc/Makefile.am | 1 ++- -@chapter Websockets
1 file changed, 1 insertions(+) -@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
diff -Nur a/doc/Makefile.am b/doc/Makefile.am @node hellobrowser.c
--- a/doc/Makefile.am 2021-12-27 01:30:00.000000000 +0800 @@ -184,10 +178,4 @@
+++ b/doc/Makefile.am 2022-08-05 16:13:42.056733987 +0800 @verbatiminclude examples/tlsauthentication.c
@@ -27,6 +27,7 @@ @end smalldisplay
chapters/responseheaders.inc \
chapters/tlsauthentication.inc \ -@node websocket.c
chapters/sessions.inc \ -@section websocket.c
+ chapters/websocket.inc \ -@smalldisplay
fdl-1.3.texi \ -@verbatiminclude examples/websocket.c
gpl-2.0.texi \ -@end smalldisplay
lgpl.texi \ -
@bye

View File

@ -1,6 +1,6 @@
Name: libmicrohttpd Name: libmicrohttpd
Version: 0.9.75 Version: 0.9.75
Release: 3 Release: 4
Epoch: 1 Epoch: 1
Summary: Lightweight library for embedding a webserver in applications Summary: Lightweight library for embedding a webserver in applications
License: LGPLv2+ License: LGPLv2+
@ -90,6 +90,9 @@ fi
%{_infodir}/libmicrohttpd_performance_data.png.gz %{_infodir}/libmicrohttpd_performance_data.png.gz
%changelog %changelog
* Sun Oct 08 2023 wulei <wulei80@h-partners.com> - 1:0.9.75-4
- Fixed missing websocket.inc in dist files
* Mon Mar 13 2023 yaoxin <yaoxin30@h-partners.com> - 1:0.9.75-3 * Mon Mar 13 2023 yaoxin <yaoxin30@h-partners.com> - 1:0.9.75-3
- Fix CVE-2023-27371 - Fix CVE-2023-27371