[libmicrohttpd] Update to 0.9.5

[Tim Niemueller]

commit 80b8b2a24ace9118ce03d605532cc4128cdcbcc3
Author: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:   Tue Jan 25 00:34:31 2011 +0100

    Update to 0.9.5

 .gitignore                                |    2 +-
 libmicrohttpd-0.9.2-fix-https-tests.patch |  429 -----------------------------
 libmicrohttpd-0.9.5-fix-basic-auth.patch  |   19 ++
 libmicrohttpd-0.9.5-no-abort.patch        |   12 +
 libmicrohttpd.spec                        |   13 +-
 sources                                   |    2 +-
 6 files changed, 42 insertions(+), 435 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 568eb03..18b1a16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-/libmicrohttpd-0.9.2*
+/libmicrohttpd-0.9.5*
 .build*
 /noarch
 /x86_64
diff --git a/libmicrohttpd-0.9.5-fix-basic-auth.patch b/libmicrohttpd-0.9.5-fix-basic-auth.patch
new file mode 100644
index 0000000..82185dd
--- /dev/null
+++ b/libmicrohttpd-0.9.5-fix-basic-auth.patch
@@ -0,0 +1,19 @@
+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))
+     {
diff --git a/libmicrohttpd-0.9.5-no-abort.patch b/libmicrohttpd-0.9.5-no-abort.patch
new file mode 100644
index 0000000..947a002
--- /dev/null
+++ b/libmicrohttpd-0.9.5-no-abort.patch
@@ -0,0 +1,12 @@
+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)
diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec
index 2be0d66..59559a1 100644
--- a/libmicrohttpd.spec
+++ b/libmicrohttpd.spec
@@ -1,13 +1,14 @@
 Summary: Lightweight library for embedding a webserver in applications
 Name: libmicrohttpd
-Version: 0.9.2
-Release: 3%{?dist}
+Version: 0.9.5
+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.2-fix-https-tests.patch
+Patch0: %{name}-0.9.5-no-abort.patch
+Patch1: %{name}-0.9.5-fix-basic-auth.patch
 
 BuildRequires:  autoconf, automake, libtool
 BuildRequires:  libcurl-devel
@@ -54,7 +55,8 @@ Doxygen documentation for libmicrohttpd and some example source code
 
 %prep
 %setup -q
-#patch0 -p1 -b .explicit-dso
+%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
@@ -124,6 +126,9 @@ fi
 %doc html
 
 %changelog
+* Mon Jan 24 2011 Tim Niemueller <tim at niemueller.de> - 0.9.5-1
+- Update to new upstream release 0.9.5
+
 * Tue Nov 16 2010 Tim Niemueller <tim at niemueller.de> - 0.9.2-3
 - Add missing BR gnutls-devel and libgcrypt-devel
 - Added patch to fix test apps (NSS instead of GnuTLS/OpenSSL curl,
diff --git a/sources b/sources
index bc90eea..eff36ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4ad4a2f1ad4cf3174d248a6e73cf4d1b  libmicrohttpd-0.9.2.tar.gz
+ade829961dfb17a0b3c54cf51ad34ccd  libmicrohttpd-0.9.5.tar.gz