Update to latest upstream release 0.9.7

This commit is contained in:
Tim Niemueller 2011-02-27 11:24:45 +01:00
parent f7b84018b1
commit ea79c74953
5 changed files with 8 additions and 40 deletions

2
.gitignore vendored
View File

@ -1,4 +1,4 @@
/libmicrohttpd-0.9.6*
/libmicrohttpd-0.9.7*
.build*
/noarch
/x86_64

View File

@ -1,19 +0,0 @@
diff -urN libmicrohttpd-0.9.5/src/daemon/digestauth.c libmicrohttpd-0.9.5.fix-basic-auth/src/daemon/digestauth.c
--- libmicrohttpd-0.9.5/src/daemon/digestauth.c 2011-01-10 14:06:56.000000000 +0100
+++ libmicrohttpd-0.9.5.fix-basic-auth/src/daemon/digestauth.c 2011-01-24 21:24:52.204949568 +0100
@@ -723,12 +723,12 @@
struct MHD_Response *response)
{
int ret;
- size_t hlen = strlen(realm) + strlen("Basic realm=\"\"") + 1;
- char header[hlen];
+ size_t hlen = strlen(realm) + strlen("Basic realm=\"\"");
+ char header[hlen + 1];
if (hlen !=
snprintf(header,
- sizeof(header),
+ hlen + 1,
"Basic realm=\"%s\"",
realm))
{

View File

@ -1,12 +0,0 @@
diff -urN libmicrohttpd-0.9.5/src/daemon/internal.h libmicrohttpd-0.9.5.no-abort/src/daemon/internal.h
--- libmicrohttpd-0.9.5/src/daemon/internal.h 2010-12-25 22:32:15.000000000 +0100
+++ libmicrohttpd-0.9.5.no-abort/src/daemon/internal.h 2011-01-24 21:01:13.519614064 +0100
@@ -33,7 +33,7 @@
#include <gnutls/gnutls.h>
#endif
-#define EXTRA_CHECKS MHD_YES
+#define EXTRA_CHECKS MHD_NO
#define MHD_MAX(a,b) ((a)<(b)) ? (b) : (a)
#define MHD_MIN(a,b) ((a)<(b)) ? (a) : (b)

View File

@ -1,16 +1,13 @@
Summary: Lightweight library for embedding a webserver in applications
Name: libmicrohttpd
Version: 0.9.6
Release: 2%{?dist}
Version: 0.9.7
Release: 1%{?dist}
Group: Development/Libraries
License: LGPLv2+
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
URL: http://www.gnu.org/software/libmicrohttpd/
Source0: ftp://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz
Patch0: %{name}-0.9.5-no-abort.patch
Patch1: %{name}-0.9.5-fix-basic-auth.patch
BuildRequires: autoconf, automake, libtool
%if 0%{?rhel} == 5
BuildRequires: curl-devel
@ -61,8 +58,6 @@ Doxygen documentation for libmicrohttpd and some example source code
%prep
%setup -q
%patch0 -p1 -b .no-abort
%patch1 -p1 -b .fix-basic-auth
# The doxygen file contains references to /home/grothoff/svn/libmicrohttpd/... replace these with .
sed s/\\/home\\/grothoff\\/svn\\/libmicrohttpd/./ doc/Doxyfile > tmp
@ -132,6 +127,10 @@ fi
%doc html
%changelog
* Sun Feb 27 2011 Tim Niemueller <tim@niemueller.de> - 0.9.7-1
- Update to new upstream release 0.9.7
- Remove upstreamed patches
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

View File

@ -1 +1 @@
cc90284bcbe99e829bb8265840a60f10 libmicrohttpd-0.9.6.tar.gz
a16b50a7167fd4e64b67e182a3d9a7c2 libmicrohttpd-0.9.7.tar.gz