rpms/libmicrohttpd
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 0.9.5

Browse Source
This commit is contained in:
Tim Niemueller 2011-01-25 00:34:31 +01:00
parent f6200400f0
commit 80b8b2a24a
6 changed files with 42 additions and 435 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,4 +1,4 @@
/libmicrohttpd-0.9.2* /libmicrohttpd-0.9.5*
.build* .build*
/noarch /noarch
/x86_64 /x86_64

429
libmicrohttpd-0.9.2-fix-https-tests.patch
View File

@ -1,429 +0,0 @@
diff -urN libmicrohttpd-0.9.2/configure.ac libmicrohttpd-0.9.2.fix-https-tests/configure.ac
--- libmicrohttpd-0.9.2/configure.ac 2010-10-16 06:38:19.000000000 -0400
+++ libmicrohttpd-0.9.2.fix-https-tests/configure.ac 2010-11-16 01:03:08.368649717 -0500
@@ -211,9 +211,11 @@
MHD_REQ_CURL_VERSION=7.16.4
MHD_REQ_CURL_OPENSSL_VERSION=0.9.8
MHD_REQ_CURL_GNUTLS_VERSION=2.2.3
+ MHD_REQ_CURL_NSS_VERSION=3.12.0
AC_DEFINE_UNQUOTED([MHD_REQ_CURL_VERSION], "$MHD_REQ_CURL_VERSION", [required cURL version to run tests])
AC_DEFINE_UNQUOTED([MHD_REQ_CURL_OPENSSL_VERSION], "$MHD_REQ_CURL_OPENSSL_VERSION", [required cURL SSL version to run tests])
AC_DEFINE_UNQUOTED([MHD_REQ_CURL_GNUTLS_VERSION], "$MHD_REQ_CURL_GNUTLS_VERSION", [gnuTLS lib version - used in conjunction with cURL])
+ AC_DEFINE_UNQUOTED([MHD_REQ_CURL_NSS_VERSION], "$MHD_REQ_CURL_NSS_VERSION", [NSS lib version - used in conjunction with cURL])
fi
LIBS=$SAVE_LIBS
AM_CONDITIONAL(HAVE_CURL, test x$curl = x1)
diff -urN libmicrohttpd-0.9.2/MHD_config.h.in libmicrohttpd-0.9.2.fix-https-tests/MHD_config.h.in
--- libmicrohttpd-0.9.2/MHD_config.h.in 2010-10-16 06:39:18.000000000 -0400
+++ libmicrohttpd-0.9.2.fix-https-tests/MHD_config.h.in 2010-11-16 01:03:40.574650260 -0500
@@ -200,6 +200,9 @@
/* required cURL SSL version to run tests */
#undef MHD_REQ_CURL_OPENSSL_VERSION
+/* required cURL NSS SSL version to run tests */
+#undef MHD_REQ_CURL_NSS_VERSION
+
/* required cURL version to run tests */
#undef MHD_REQ_CURL_VERSION
diff -urN libmicrohttpd-0.9.2/src/testcurl/curl_version_check.c libmicrohttpd-0.9.2.fix-https-tests/src/testcurl/curl_version_check.c
--- libmicrohttpd-0.9.2/src/testcurl/curl_version_check.c 2010-07-27 13:53:24.000000000 -0400
+++ libmicrohttpd-0.9.2.fix-https-tests/src/testcurl/curl_version_check.c 2010-11-16 01:47:24.080629155 -0500
@@ -67,6 +67,13 @@
return s;
}
+#if HTTPS_SUPPORT
+int
+curl_uses_nss_ssl()
+{
+ return (strstr(curl_version(), " NSS/") != NULL) ? 0 : -1;
+}
+#endif
/*
* check local libcurl version matches required version
@@ -135,6 +142,11 @@
ssl_ver = strchr (ssl_ver, '/');
req_ssl_ver = MHD_REQ_CURL_OPENSSL_VERSION;
}
+ else if (strncmp ("NSS", ssl_ver, strlen ("NSS")) == 0)
+ {
+ ssl_ver = strchr (ssl_ver, '/');
+ req_ssl_ver = MHD_REQ_CURL_NSS_VERSION;
+ }
else
{
fprintf (stderr, "Error: unrecognized curl ssl library\n");
diff -urN libmicrohttpd-0.9.2/src/testcurl/https/Makefile.am libmicrohttpd-0.9.2.fix-https-tests/src/testcurl/https/Makefile.am
--- libmicrohttpd-0.9.2/src/testcurl/https/Makefile.am 2010-08-20 07:20:57.000000000 -0400
+++ libmicrohttpd-0.9.2.fix-https-tests/src/testcurl/https/Makefile.am 2010-11-16 02:12:45.787619291 -0500
@@ -19,12 +19,14 @@
tls_authentication_test \
mhds_multi_daemon_test \
mhds_get_test \
- mhds_get_test_select \
mhds_session_info_test \
tls_thread_mode_test \
tls_multi_thread_mode_test \
tls_session_time_out_test
+# disabled atm
+#mhds_get_test_select
+
EXTRA_DIST = cert.pem key.pem tls_test_keys.h tls_test_common.h
# tls_authentication_test currently fails for unknown reasons
@@ -32,13 +34,15 @@
tls_daemon_options_test \
mhds_multi_daemon_test \
mhds_get_test \
- mhds_get_test_select \
mhds_session_info_test \
tls_thread_mode_test \
tls_multi_thread_mode_test \
tls_session_time_out_test \
tls_authentication_test
+# disabled atm
+# mhds_get_test_select
+
# cURL dependent tests
tls_session_time_out_test_SOURCES = \
tls_session_time_out_test.c \
@@ -46,7 +50,7 @@
tls_session_time_out_test_LDADD = \
$(top_builddir)/src/testcurl/libcurl_version_check.a \
$(top_builddir)/src/daemon/libmicrohttpd.la \
- @LIBCURL@
+ @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
tls_daemon_options_test_SOURCES = \
tls_daemon_options_test.c \
@@ -54,7 +58,7 @@
tls_daemon_options_test_LDADD = \
$(top_builddir)/src/testcurl/libcurl_version_check.a \
$(top_builddir)/src/daemon/libmicrohttpd.la \
- @LIBCURL@
+ @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
tls_thread_mode_test_SOURCES = \
tls_thread_mode_test.c \
@@ -62,7 +66,7 @@
tls_thread_mode_test_LDADD = \
$(top_builddir)/src/testcurl/libcurl_version_check.a \
$(top_builddir)/src/daemon/libmicrohttpd.la \
- @LIBCURL@
+ @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
tls_multi_thread_mode_test_SOURCES = \
tls_multi_thread_mode_test.c \
@@ -70,7 +74,7 @@
tls_multi_thread_mode_test_LDADD = \
$(top_builddir)/src/testcurl/libcurl_version_check.a \
$(top_builddir)/src/daemon/libmicrohttpd.la \
- @LIBCURL@
+ @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
tls_authentication_test_SOURCES = \
tls_authentication_test.c \
@@ -78,7 +82,7 @@
tls_authentication_test_LDADD = \
$(top_builddir)/src/testcurl/libcurl_version_check.a \
$(top_builddir)/src/daemon/libmicrohttpd.la \
- @LIBCURL@
+ @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
mhds_session_info_test_SOURCES = \
mhds_session_info_test.c \
@@ -86,7 +90,7 @@
mhds_session_info_test_LDADD = \
$(top_builddir)/src/testcurl/libcurl_version_check.a \
$(top_builddir)/src/daemon/libmicrohttpd.la \
- @LIBCURL@
+ @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
mhds_multi_daemon_test_SOURCES = \
mhds_multi_daemon_test.c \
@@ -94,7 +98,7 @@
mhds_multi_daemon_test_LDADD = \
$(top_builddir)/src/testcurl/libcurl_version_check.a \
$(top_builddir)/src/daemon/libmicrohttpd.la \
- @LIBCURL@
+ @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
mhds_get_test_SOURCES = \
mhds_get_test.c \
@@ -102,7 +106,7 @@
mhds_get_test_LDADD = \
$(top_builddir)/src/testcurl/libcurl_version_check.a \
$(top_builddir)/src/daemon/libmicrohttpd.la \
- @LIBCURL@
+ @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
mhds_get_test_select_SOURCES = \
@@ -111,4 +115,5 @@
mhds_get_test_select_LDADD = \
$(top_builddir)/src/testcurl/libcurl_version_check.a \
$(top_builddir)/src/daemon/libmicrohttpd.la \
- @LIBCURL@
+ @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
+
diff -urN libmicrohttpd-0.9.2/src/testcurl/https/mhds_get_test.c libmicrohttpd-0.9.2.fix-https-tests/src/testcurl/https/mhds_get_test.c
--- libmicrohttpd-0.9.2/src/testcurl/https/mhds_get_test.c 2010-08-20 07:20:57.000000000 -0400
+++ libmicrohttpd-0.9.2.fix-https-tests/src/testcurl/https/mhds_get_test.c 2010-11-16 01:45:46.418865809 -0500
@@ -33,6 +33,7 @@
#include "tls_test_common.h"
int curl_check_version (const char *req_version, ...);
+int curl_uses_nss_ssl ();
extern const char srv_key_pem[];
extern const char srv_self_signed_cert_pem[];
extern const char srv_signed_cert_pem[];
@@ -101,12 +102,24 @@
fprintf (stderr, "Error: %s\n", strerror (errno));
return -1;
}
+
+ char *aes256_sha_tlsv1 = "AES256-SHA";
+ char *aes256_sha_sslv3 = "AES256-SHA";
+ char *des_cbc3_sha_tlsv1 = "DES-CBC3-SHA";
+
+ if (curl_uses_nss_ssl() == 0)
+ {
+ aes256_sha_tlsv1 = "rsa_aes_256_sha";
+ aes256_sha_sslv3 = "rsa_aes_256_sha";
+ des_cbc3_sha_tlsv1 = "rsa_aes_128_sha";
+ }
+
errorCount +=
- test_secure_get (NULL, "AES256-SHA", CURL_SSLVERSION_TLSv1);
+ test_secure_get (NULL, aes256_sha_tlsv1, CURL_SSLVERSION_TLSv1);
errorCount +=
- test_secure_get (NULL, "AES256-SHA", CURL_SSLVERSION_SSLv3);
+ test_secure_get (NULL, aes256_sha_sslv3, CURL_SSLVERSION_SSLv3);
errorCount +=
- test_cipher_option (NULL, "DES-CBC3-SHA", CURL_SSLVERSION_TLSv1);
+ test_cipher_option (NULL, des_cbc3_sha_tlsv1, CURL_SSLVERSION_TLSv1);
print_test_result (errorCount, argv[0]);
diff -urN libmicrohttpd-0.9.2/src/testcurl/https/mhds_get_test_select.c libmicrohttpd-0.9.2.fix-https-tests/src/testcurl/https/mhds_get_test_select.c
--- libmicrohttpd-0.9.2/src/testcurl/https/mhds_get_test_select.c 2010-08-20 07:20:57.000000000 -0400
+++ libmicrohttpd-0.9.2.fix-https-tests/src/testcurl/https/mhds_get_test_select.c 2010-11-16 02:03:05.568891406 -0500
@@ -33,6 +33,7 @@
#include "tls_test_common.h"
int curl_check_version (const char *req_version, ...);
+int curl_uses_nss_ssl ();
extern const char srv_key_pem[];
extern const char srv_self_signed_cert_pem[];
extern const char srv_signed_cert_pem[];
@@ -100,10 +101,20 @@
MHD_OPTION_END);
if (d == NULL)
return 256;
+
+ char *aes256_sha = "AES256-SHA";
+ if (curl_uses_nss_ssl() == 0)
+ {
+ aes256_sha = "rsa_aes_256_sha";
+ }
+
c = curl_easy_init ();
curl_easy_setopt (c, CURLOPT_URL, "https://localhost:1082/hello_world");
curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, &copyBuffer);
curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc);
+ /* TLS options */
+ curl_easy_setopt (c, CURLOPT_SSLVERSION, CURL_SSLVERSION_SSLv3);
+ curl_easy_setopt (c, CURLOPT_SSL_CIPHER_LIST, aes256_sha);
curl_easy_setopt (c, CURLOPT_SSL_VERIFYPEER, 0);
curl_easy_setopt (c, CURLOPT_SSL_VERIFYHOST, 0);
curl_easy_setopt (c, CURLOPT_FAILONERROR, 1);
diff -urN libmicrohttpd-0.9.2/src/testcurl/https/mhds_multi_daemon_test.c libmicrohttpd-0.9.2.fix-https-tests/src/testcurl/https/mhds_multi_daemon_test.c
--- libmicrohttpd-0.9.2/src/testcurl/https/mhds_multi_daemon_test.c 2010-08-20 07:20:57.000000000 -0400
+++ libmicrohttpd-0.9.2.fix-https-tests/src/testcurl/https/mhds_multi_daemon_test.c 2010-11-16 01:57:31.641705415 -0500
@@ -106,9 +106,14 @@
return -1;
}
+ char *aes256_sha = "AES256-SHA";
+ if (curl_uses_nss_ssl() == 0)
+ {
+ aes256_sha = "rsa_aes_256_sha";
+ }
errorCount +=
- test_concurent_daemon_pair (NULL, "AES256-SHA", CURL_SSLVERSION_SSLv3);
+ test_concurent_daemon_pair (NULL, aes256_sha, CURL_SSLVERSION_SSLv3);
print_test_result (errorCount, "concurent_daemon_pair");
diff -urN libmicrohttpd-0.9.2/src/testcurl/https/mhds_session_info_test.c libmicrohttpd-0.9.2.fix-https-tests/src/testcurl/https/mhds_session_info_test.c
--- libmicrohttpd-0.9.2/src/testcurl/https/mhds_session_info_test.c 2010-07-26 15:23:08.000000000 -0400
+++ libmicrohttpd-0.9.2.fix-https-tests/src/testcurl/https/mhds_session_info_test.c 2010-11-16 01:57:38.703535871 -0500
@@ -116,6 +116,12 @@
if (d == NULL)
return 2;
+ char *aes256_sha = "AES256-SHA";
+ if (curl_uses_nss_ssl() == 0)
+ {
+ aes256_sha = "rsa_aes_256_sha";
+ }
+
c = curl_easy_init ();
#if DEBUG_HTTPS_TEST
curl_easy_setopt (c, CURLOPT_VERBOSE, 1);
@@ -128,7 +134,7 @@
curl_easy_setopt (c, CURLOPT_FILE, &cbc);
/* TLS options */
curl_easy_setopt (c, CURLOPT_SSLVERSION, CURL_SSLVERSION_SSLv3);
- curl_easy_setopt (c, CURLOPT_SSL_CIPHER_LIST, "AES256-SHA");
+ curl_easy_setopt (c, CURLOPT_SSL_CIPHER_LIST, aes256_sha);
/* currently skip any peer authentication */
curl_easy_setopt (c, CURLOPT_SSL_VERIFYPEER, 0);
curl_easy_setopt (c, CURLOPT_SSL_VERIFYHOST, 0);
diff -urN libmicrohttpd-0.9.2/src/testcurl/https/tls_authentication_test.c libmicrohttpd-0.9.2.fix-https-tests/src/testcurl/https/tls_authentication_test.c
--- libmicrohttpd-0.9.2/src/testcurl/https/tls_authentication_test.c 2010-08-20 07:20:57.000000000 -0400
+++ libmicrohttpd-0.9.2.fix-https-tests/src/testcurl/https/tls_authentication_test.c 2010-11-16 02:05:42.844662619 -0500
@@ -62,7 +62,7 @@
return -1;
}
- ret = test_daemon_get (NULL, cipher_suite, proto_version, DEAMON_TEST_PORT, 1);
+ ret = test_daemon_get (NULL, cipher_suite, proto_version, DEAMON_TEST_PORT, 0);
MHD_stop_daemon (d);
return ret;
@@ -86,8 +86,14 @@
return -1;
}
+ char *aes256_sha = "AES256-SHA";
+ if (curl_uses_nss_ssl() == 0)
+ {
+ aes256_sha = "rsa_aes_256_sha";
+ }
+
errorCount +=
- test_secure_get (NULL, "AES256-SHA", CURL_SSLVERSION_TLSv1);
+ test_secure_get (NULL, aes256_sha, CURL_SSLVERSION_TLSv1);
print_test_result (errorCount, argv[0]);
diff -urN libmicrohttpd-0.9.2/src/testcurl/https/tls_daemon_options_test.c libmicrohttpd-0.9.2.fix-https-tests/src/testcurl/https/tls_daemon_options_test.c
--- libmicrohttpd-0.9.2/src/testcurl/https/tls_daemon_options_test.c 2010-08-20 07:20:57.000000000 -0400
+++ libmicrohttpd-0.9.2.fix-https-tests/src/testcurl/https/tls_daemon_options_test.c 2010-11-16 01:55:19.009616601 -0500
@@ -94,10 +94,20 @@
fprintf (stderr, "Error: %s\n", strerror (errno));
return -1;
}
+
+ char *aes128_sha = "AES128-SHA";
+ char *aes256_sha = "AES256-SHA";
+ if (curl_uses_nss_ssl() == 0)
+ {
+ aes128_sha = "rsa_aes_128_sha";
+ aes256_sha = "rsa_aes_256_sha";
+ }
+
+
errorCount +=
test_wrap ("TLS1.0-AES-SHA1",
&test_https_transfer, NULL, daemon_flags,
- "AES128-SHA1",
+ aes128_sha,
CURL_SSLVERSION_TLSv1,
MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
@@ -106,7 +116,7 @@
errorCount +=
test_wrap ("TLS1.0-AES-SHA1",
&test_https_transfer, NULL, daemon_flags,
- "AES128-SHA1",
+ aes128_sha,
CURL_SSLVERSION_SSLv3,
MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
@@ -116,7 +126,7 @@
errorCount +=
test_wrap ("SSL3.0-AES-SHA1",
&test_https_transfer, NULL, daemon_flags,
- "AES128-SHA1",
+ aes128_sha,
CURL_SSLVERSION_SSLv3,
MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
@@ -141,7 +151,7 @@
errorCount +=
test_wrap ("TLS1.0 vs SSL3",
&test_unmatching_ssl_version, NULL, daemon_flags,
- "AES256-SHA",
+ aes256_sha,
CURL_SSLVERSION_SSLv3,
MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
diff -urN libmicrohttpd-0.9.2/src/testcurl/https/tls_multi_thread_mode_test.c libmicrohttpd-0.9.2.fix-https-tests/src/testcurl/https/tls_multi_thread_mode_test.c
--- libmicrohttpd-0.9.2/src/testcurl/https/tls_multi_thread_mode_test.c 2010-08-20 07:20:57.000000000 -0400
+++ libmicrohttpd-0.9.2.fix-https-tests/src/testcurl/https/tls_multi_thread_mode_test.c 2010-11-16 01:57:50.148631662 -0500
@@ -136,11 +136,17 @@
return -1;
}
+ char *aes256_sha = "AES256-SHA";
+ if (curl_uses_nss_ssl() == 0)
+ {
+ aes256_sha = "rsa_aes_256_sha";
+ }
+
errorCount +=
test_wrap ("multi threaded daemon, single client", &test_single_client,
NULL,
MHD_USE_SSL | MHD_USE_DEBUG | MHD_USE_THREAD_PER_CONNECTION,
- "AES256-SHA", CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
+ aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
srv_self_signed_cert_pem, MHD_OPTION_END);
@@ -148,7 +154,7 @@
test_wrap ("multi threaded daemon, parallel client",
&test_parallel_clients, NULL,
MHD_USE_SSL | MHD_USE_DEBUG | MHD_USE_THREAD_PER_CONNECTION,
- "AES256-SHA", CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
+ aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
srv_self_signed_cert_pem, MHD_OPTION_END);
diff -urN libmicrohttpd-0.9.2/src/testcurl/https/tls_thread_mode_test.c libmicrohttpd-0.9.2.fix-https-tests/src/testcurl/https/tls_thread_mode_test.c
--- libmicrohttpd-0.9.2/src/testcurl/https/tls_thread_mode_test.c 2010-08-20 07:20:57.000000000 -0400
+++ libmicrohttpd-0.9.2.fix-https-tests/src/testcurl/https/tls_thread_mode_test.c 2010-11-16 01:58:05.230615529 -0500
@@ -137,11 +137,17 @@
return -1;
}
+ char *aes256_sha = "AES256-SHA";
+ if (curl_uses_nss_ssl() == 0)
+ {
+ aes256_sha = "rsa_aes_256_sha";
+ }
+
errorCount +=
test_wrap ("single threaded daemon, single client", &test_single_client,
NULL,
MHD_USE_SELECT_INTERNALLY | MHD_USE_SSL | MHD_USE_DEBUG,
- "AES256-SHA", CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
+ aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
srv_self_signed_cert_pem, MHD_OPTION_END);
@@ -149,7 +155,7 @@
test_wrap ("single threaded daemon, parallel clients",
&test_parallel_clients, NULL,
MHD_USE_SELECT_INTERNALLY | MHD_USE_SSL | MHD_USE_DEBUG,
- "AES256-SHA", CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
+ aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
srv_self_signed_cert_pem, MHD_OPTION_END);

19
libmicrohttpd-0.9.5-fix-basic-auth.patch Normal file
View File

@ -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))
{

12
libmicrohttpd-0.9.5-no-abort.patch Normal file
View File

@ -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)

13
libmicrohttpd.spec
View File

@ -1,13 +1,14 @@
Summary: Lightweight library for embedding a webserver in applications Summary: Lightweight library for embedding a webserver in applications
Name: libmicrohttpd Name: libmicrohttpd
Version: 0.9.2 Version: 0.9.5
Release: 3%{?dist} Release: 1%{?dist}
Group: Development/Libraries Group: Development/Libraries
License: LGPLv2+ License: LGPLv2+
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
URL: http://www.gnu.org/software/libmicrohttpd/ URL: http://www.gnu.org/software/libmicrohttpd/
Source0: ftp://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz 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: autoconf, automake, libtool
BuildRequires: libcurl-devel BuildRequires: libcurl-devel
@ -54,7 +55,8 @@ Doxygen documentation for libmicrohttpd and some example source code
%prep %prep
%setup -q %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 . # The doxygen file contains references to /home/grothoff/svn/libmicrohttpd/... replace these with .
sed s/\\/home\\/grothoff\\/svn\\/libmicrohttpd/./ doc/Doxyfile > tmp sed s/\\/home\\/grothoff\\/svn\\/libmicrohttpd/./ doc/Doxyfile > tmp
@ -124,6 +126,9 @@ fi
%doc html %doc html
%changelog %changelog
* Mon Jan 24 2011 Tim Niemueller <tim@niemueller.de> - 0.9.5-1
- Update to new upstream release 0.9.5
* Tue Nov 16 2010 Tim Niemueller <tim@niemueller.de> - 0.9.2-3 * Tue Nov 16 2010 Tim Niemueller <tim@niemueller.de> - 0.9.2-3
- Add missing BR gnutls-devel and libgcrypt-devel - Add missing BR gnutls-devel and libgcrypt-devel
- Added patch to fix test apps (NSS instead of GnuTLS/OpenSSL curl, - Added patch to fix test apps (NSS instead of GnuTLS/OpenSSL curl,

2
sources
View File

@ -1 +1 @@
4ad4a2f1ad4cf3174d248a6e73cf4d1b libmicrohttpd-0.9.2.tar.gz ade829961dfb17a0b3c54cf51ad34ccd libmicrohttpd-0.9.5.tar.gz