Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
d565a146f6
!31 Upgrade to 0.9.77
From: @starlet-dx 
Reviewed-by: @wk333 
Signed-off-by: @wk333
2024-01-12 02:12:57 +00:00
starlet-dx
03daa847a0 Upgrade to 0.9.77 2024-01-12 09:39:47 +08:00
openeuler-ci-bot
002d153761
!29 [sync] PR-28: 修复libmicrohttpd编译chapters/websocket.inc文件找不到问题
From: @openeuler-sync-bot 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
2023-10-10 00:56:04 +00:00
wu-leilei
817d9bcc23 Fixed missing websocket.inc in dist files
(cherry picked from commit 6647721d3893b38bd565620104c8bd9346b0b143)
2023-10-09 09:10:59 +08:00
openeuler-ci-bot
45b777453e
!21 Fix CVE-2023-27371
From: @starlet-dx 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
2023-03-13 06:33:02 +00:00
starlet-dx
ea84008882 Fix CVE-2023-27371 2023-03-13 11:28:52 +08:00
openeuler-ci-bot
30cf431bd2
!13 [sync] PR-12: 修复22.09分支编译失败
From: @openeuler-sync-bot 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
2022-08-05 09:21:43 +00:00
lyn1001
9530f7895f Fixed missing websocket.inc in dist files
(cherry picked from commit cbff08286333b084ca6a375cec7c3f917b512bb6)
2022-08-05 17:08:31 +08:00
openeuler-ci-bot
89bf8c4ebb
!11 [sync] PR-10: libmicrohttpd 在22.03-LTS-Next update to 0.9.75
From: @openeuler-sync-bot 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
2022-04-19 08:28:04 +00:00
xigaoxinyan
0d8af68be2 update to 0.9.75
(cherry picked from commit df66f349c0953d032c8391e07a7347e4fc7c02d1)
2022-04-12 14:40:19 +08:00
6 changed files with 85 additions and 16 deletions

View File

@ -0,0 +1,25 @@
From 0f8920325cc523883df9e5073bd20ddc9c3d1b71 Mon Sep 17 00:00:00 2001
From: xigaoxinyan <xigaoxinyan@huawei.com>
Date: Thu, 13 Jan 2022 17:33:26 +0800
Subject: [PATCH] gnutls-utilize-system-crypto-policy.patch
---
src/microhttpd/daemon.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 5ca612e..6c0947a 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -6498,7 +6498,7 @@ MHD_start_daemon_va (unsigned int flags,
if (0 != (*pflags & MHD_USE_TLS))
{
gnutls_priority_init (&daemon->priority_cache,
- "NORMAL",
+ "@SYSTEM",
NULL);
}
#endif /* HTTPS_SUPPORT */
--
2.27.0

View File

@ -0,0 +1,41 @@
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

View File

@ -1,11 +0,0 @@
--- libmicrohttpd-0.9.53/src/microhttpd/daemon.c.orig 2017-04-12 08:31:18.243540128 +0200
+++ libmicrohttpd-0.9.53/src/microhttpd/daemon.c 2017-04-12 08:34:19.851158371 +0200
@@ -5415,7 +5415,7 @@
if (0 != (*pflags & MHD_USE_TLS))
{
gnutls_priority_init (&daemon->priority_cache,
- "NORMAL",
+ "@SYSTEM",
NULL);
}
#endif /* HTTPS_SUPPORT */

Binary file not shown.

BIN
libmicrohttpd-0.9.77.tar.gz Normal file

Binary file not shown.

View File

@ -1,13 +1,14 @@
Name: libmicrohttpd
Version: 0.9.59
Release: 5
Version: 0.9.77
Release: 1
Epoch: 1
Summary: Lightweight library for embedding a webserver in applications
License: LGPLv2+
URL: http://www.gnu.org/software/libmicrohttpd/
Source0: https://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz
Patch0001: gnutls-utilize-system-crypto-policy.patch
Patch0001: 0001-gnutls-utilize-system-crypto-policy.patch
Patch0002: fix-libmicrohttpd-tutorial-info.patch
Patch0003: fixed-missing-websocket.inc-in-dist-files.patch
BuildRequires: autoconf automake libtool gettext-devel texinfo gnutls-devel doxygen graphviz
Requires(post): info
@ -38,7 +39,6 @@ The help package contains manual pages and doc files for libmicrohttpd
%autosetup -p1
%build
autoreconf --install --force
%configure --disable-static --with-gnutls --enable-https=yes
%make_build
make -C doc/doxygen full
@ -54,6 +54,7 @@ cp src/examples/*.c examples
cp doc/examples/*.c examples
chmod 644 examples/*.c
cp -R doc/doxygen/html html
%post help
install-info %{_infodir}/libmicrohttpd.info.gz %{_infodir}/dir || :
install-info %{_infodir}/libmicrohttpd-tutorial.info.gz %{_infodir}/dir || :
@ -79,7 +80,6 @@ fi
%{_libdir}/pkgconfig/libmicrohttpd.pc
%exclude %{_libdir}/libmicrohttpd.la
%exclude %{_infodir}/dir
%exclude %{_bindir}/demo
%files help
%doc AUTHORS ChangeLog examples html README
@ -89,6 +89,20 @@ fi
%{_infodir}/libmicrohttpd_performance_data.png.gz
%changelog
* Fri Jan 12 2024 yaoxin <yao_xin001@hoperun.com> - 1:0.9.77-1
- Upgrade to 0.9.77
* 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
- Fix CVE-2023-27371
* Fri Aug 5 2022 liyanan <liyanan32@h-partners.com> - 1:0.9.75-2
- Fixed missing websocket.inc in dist files
* Fri Jan 14 2022 xigaoxinyan<xigaoxinyan@huawei.com> - 0.9.75-1
- update to 0.9.75
* Thu Aug 05 2021 caodongxia<caodongxia@huawei.com> - 0.9.59-5
- Fix libmicrohttpd-tutorial info