Compare commits

..

No commits in common. "d565a146f6efe6a7799154478a8fd990d79e5865" and "ebbdc62eefb2021f9cfcbc325faf1e698fec32b6" have entirely different histories.

6 changed files with 16 additions and 85 deletions

View File

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

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

@ -0,0 +1,11 @@
--- 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 */

BIN
libmicrohttpd-0.9.59.tar.gz Normal file

Binary file not shown.

Binary file not shown.

View File

@ -1,14 +1,13 @@
Name: libmicrohttpd Name: libmicrohttpd
Version: 0.9.77 Version: 0.9.59
Release: 1 Release: 5
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+
URL: http://www.gnu.org/software/libmicrohttpd/ URL: http://www.gnu.org/software/libmicrohttpd/
Source0: https://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz Source0: https://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz
Patch0001: 0001-gnutls-utilize-system-crypto-policy.patch Patch0001: gnutls-utilize-system-crypto-policy.patch
Patch0002: fix-libmicrohttpd-tutorial-info.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 BuildRequires: autoconf automake libtool gettext-devel texinfo gnutls-devel doxygen graphviz
Requires(post): info Requires(post): info
@ -39,6 +38,7 @@ The help package contains manual pages and doc files for libmicrohttpd
%autosetup -p1 %autosetup -p1
%build %build
autoreconf --install --force
%configure --disable-static --with-gnutls --enable-https=yes %configure --disable-static --with-gnutls --enable-https=yes
%make_build %make_build
make -C doc/doxygen full make -C doc/doxygen full
@ -54,7 +54,6 @@ cp src/examples/*.c examples
cp doc/examples/*.c examples cp doc/examples/*.c examples
chmod 644 examples/*.c chmod 644 examples/*.c
cp -R doc/doxygen/html html cp -R doc/doxygen/html html
%post help %post help
install-info %{_infodir}/libmicrohttpd.info.gz %{_infodir}/dir || : install-info %{_infodir}/libmicrohttpd.info.gz %{_infodir}/dir || :
install-info %{_infodir}/libmicrohttpd-tutorial.info.gz %{_infodir}/dir || : install-info %{_infodir}/libmicrohttpd-tutorial.info.gz %{_infodir}/dir || :
@ -80,6 +79,7 @@ fi
%{_libdir}/pkgconfig/libmicrohttpd.pc %{_libdir}/pkgconfig/libmicrohttpd.pc
%exclude %{_libdir}/libmicrohttpd.la %exclude %{_libdir}/libmicrohttpd.la
%exclude %{_infodir}/dir %exclude %{_infodir}/dir
%exclude %{_bindir}/demo
%files help %files help
%doc AUTHORS ChangeLog examples html README %doc AUTHORS ChangeLog examples html README
@ -89,20 +89,6 @@ fi
%{_infodir}/libmicrohttpd_performance_data.png.gz %{_infodir}/libmicrohttpd_performance_data.png.gz
%changelog %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 * Thu Aug 05 2021 caodongxia<caodongxia@huawei.com> - 0.9.59-5
- Fix libmicrohttpd-tutorial info - Fix libmicrohttpd-tutorial info