From 981ed25de6d21c77d3b78de3740d2de1b5815091 Mon Sep 17 00:00:00 2001 From: epienbro Date: Fri, 3 Oct 2008 19:14:01 +0000 Subject: [PATCH 01/23] Initial import --- .cvsignore | 1 + import.log | 1 + libmicrohttpd.spec | 134 +++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 137 insertions(+) create mode 100644 import.log create mode 100644 libmicrohttpd.spec diff --git a/.cvsignore b/.cvsignore index e69de29..fc85fad 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +libmicrohttpd-0.3.1.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..5b4a959 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +libmicrohttpd-0_3_1-3_fc10:HEAD:libmicrohttpd-0.3.1-3.fc10.src.rpm:1223061159 diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec new file mode 100644 index 0000000..4442728 --- /dev/null +++ b/libmicrohttpd.spec @@ -0,0 +1,134 @@ +Summary: Lightweight library for embedding a webserver in applications +Name: libmicrohttpd +Version: 0.3.1 +Release: 3%{?dist} +Group: Development/Libraries +Source0: ftp://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz + +# This project was originally GPLv2+, but was changed later to LGPLv2+ +# http://crisp.cs.du.edu/pipermail/libmicrohttpd/2007/000001.html +# +# However, the 0.3.1 release contains pieces of code from opencdk (GPLv2+) +# and openpgp (GPLv3+) which are linked in the library. +# Thus, the resulting license should be GPLv3+ +# +# Upstream has removed from GPL code from the SVN repository, but +# no new release has been made yet, so for now the license is GPLv3+ +# and in the next release it will be changed to LGPLv2+ +License: GPLv3+ + +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +URL: http://www.gnu.org/software/libmicrohttpd/ + +BuildRequires: libcurl-devel +BuildRequires: graphviz +BuildRequires: doxygen + +Requires(post): info +Requires(preun): info + +%description +GNU libmicrohttpd is a small C library that is supposed to make it +easy to run an HTTP server as part of another application. +Key features that distinguish libmicrohttpd from other projects are: + +* C library: fast and small +* API is simple, expressive and fully reentrant +* Implementation is http 1.1 compliant +* HTTP server can listen on multiple ports +* Support for IPv6 +* Support for incremental processing of POST data +* Creates binary of only 25k (for now) +* Three different threading models + +%package devel +Summary: Development files for libmicrohttpd +Group: %{group} +Requires: %{name} = %{version}-%{release} + +%description devel +Development files for libmicrohttpd + +%package doc +Summary: Documentation for libmicrohttpd +Group: Documentation +Requires: %{name} = %{version}-%{release} + +%description doc +Doxygen documentation for libmicrohttpd and some example source code + +%prep +%setup -q + +# The doxygen file contains references to /home/grothoff/svn/libmicrohttpd/... replace these with . +sed s/\\/home\\/grothoff\\/svn\\/libmicrohttpd/./ doc/Doxyfile > tmp +unlink doc/Doxyfile +mv tmp doc/Doxyfile + +%build +%configure --disable-static +make %{?_smp_mflags} +doxygen doc/Doxyfile + +%check +make check %{?_smp_mflags} + +%install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} + +rm -f %{buildroot}%{_libdir}/libmicrohttpd.la +rm -f %{buildroot}%{_infodir}/dir + +# Install some examples in /usr/share/doc/libmicrohttpd-%{version}/examples +mkdir examples +install -m 644 src/examples/*.c examples + +# Install the doxygen documentation in /usr/share/doc/libmicrohttpd-${version}/html +cp -R doc/doxygen/html html + +%clean +rm -rf %{buildroot} + +%post doc +/sbin/install-info %{_infodir}/microhttpd.info.gz %{_infodir}/dir || : + +%preun doc +if [ $1 = 0 ] ; then +/sbin/install-info --delete %{_infodir}/microhttpd.info.gz %{_infodir}/dir || : +fi + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc COPYING +%{_libdir}/libmicrohttpd.so.4 +%{_libdir}/libmicrohttpd.so.4.0.3 + +%files devel +%defattr(-,root,root,-) +%{_includedir}/microhttpd.h +%{_libdir}/libmicrohttpd.so + +%files doc +%defattr(-,root,root,-) +%{_mandir}/man3/libmicrohttpd.3.gz +%{_infodir}/microhttpd.info.gz +%doc AUTHORS README ChangeLog +%doc examples +%doc html + +%changelog +* Sat Sep 6 2008 Erik van Pienbroek - 0.3.1-3 +- Changed license to GPLv3+ and added some comments + regarding the license issues with this package + +* Sun Aug 10 2008 Erik van Pienbroek - 0.3.1-2 +- Changed license to LGPLv2+ +- Moved the COPYING file to the main package + +* Tue Aug 5 2008 Erik van Pienbroek - 0.3.1-1 +- Initial release + diff --git a/sources b/sources index e69de29..7ead5dd 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +ae335b1f6f51488f2db3f216f71c852c libmicrohttpd-0.3.1.tar.gz From e22d5480523f423f46971f41858f96211105a120 Mon Sep 17 00:00:00 2001 From: epienbro Date: Fri, 13 Feb 2009 23:03:31 +0000 Subject: [PATCH 02/23] - Update to version 0.4.0 - This version introduces a API bump (which is required for supporting large files on 32bit environments) - The license issues we had with version 0.3.1 of this package (as discussed in #457924) are resolved in this version. The license of this package is now changed to LGPLv2+ --- .cvsignore | 2 +- libmicrohttpd.spec | 25 +++++++++++-------------- sources | 2 +- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/.cvsignore b/.cvsignore index fc85fad..64abe4c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libmicrohttpd-0.3.1.tar.gz +libmicrohttpd-0.4.0.tar.gz diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec index 4442728..f7847ae 100644 --- a/libmicrohttpd.spec +++ b/libmicrohttpd.spec @@ -1,21 +1,10 @@ Summary: Lightweight library for embedding a webserver in applications Name: libmicrohttpd -Version: 0.3.1 -Release: 3%{?dist} +Version: 0.4.0 +Release: 1%{?dist} Group: Development/Libraries Source0: ftp://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz - -# This project was originally GPLv2+, but was changed later to LGPLv2+ -# http://crisp.cs.du.edu/pipermail/libmicrohttpd/2007/000001.html -# -# However, the 0.3.1 release contains pieces of code from opencdk (GPLv2+) -# and openpgp (GPLv3+) which are linked in the library. -# Thus, the resulting license should be GPLv3+ -# -# Upstream has removed from GPL code from the SVN repository, but -# no new release has been made yet, so for now the license is GPLv3+ -# and in the next release it will be changed to LGPLv2+ -License: GPLv3+ +License: LGPLv2+ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) URL: http://www.gnu.org/software/libmicrohttpd/ @@ -121,6 +110,14 @@ fi %doc html %changelog +* Fri Feb 13 2009 Erik van Pienbroek - 0.4.0-1 +- Update to version 0.4.0 +- This version introduces a API bump (which is required for + supporting large files on 32bit environments) +- The license issues we had with version 0.3.1 of this package (as + discussed in #457924) are resolved in this version. The license + of this package is now changed to LGPLv2+ + * Sat Sep 6 2008 Erik van Pienbroek - 0.3.1-3 - Changed license to GPLv3+ and added some comments regarding the license issues with this package diff --git a/sources b/sources index 7ead5dd..2ed1355 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ae335b1f6f51488f2db3f216f71c852c libmicrohttpd-0.3.1.tar.gz +2e53f7b9c11474857756a72ccc29a91b libmicrohttpd-0.4.0.tar.gz From 28a3d3996f3e9075a0ae179e93f4cc48be2c206d Mon Sep 17 00:00:00 2001 From: epienbro Date: Sat, 14 Feb 2009 10:55:20 +0000 Subject: [PATCH 03/23] Added a patch to fix two testcases on 64bit environments (upstream bug #1454) --- libmicrohttpd.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec index f7847ae..678bd65 100644 --- a/libmicrohttpd.spec +++ b/libmicrohttpd.spec @@ -3,11 +3,14 @@ Name: libmicrohttpd Version: 0.4.0 Release: 1%{?dist} Group: Development/Libraries -Source0: ftp://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz 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 + +# In version 0.4.0, two of the testcases fail on 64bit environments +# Upstream bug #1454 +Patch0: libmicrohttpd_fix_0_4_0_testcase.patch BuildRequires: libcurl-devel BuildRequires: graphviz @@ -48,6 +51,7 @@ Doxygen documentation for libmicrohttpd and some example source code %prep %setup -q +%patch0 -p0 # The doxygen file contains references to /home/grothoff/svn/libmicrohttpd/... replace these with . sed s/\\/home\\/grothoff\\/svn\\/libmicrohttpd/./ doc/Doxyfile > tmp @@ -93,8 +97,8 @@ fi %files %defattr(-,root,root,-) %doc COPYING -%{_libdir}/libmicrohttpd.so.4 -%{_libdir}/libmicrohttpd.so.4.0.3 +%{_libdir}/libmicrohttpd.so.5 +%{_libdir}/libmicrohttpd.so.5.0.0 %files devel %defattr(-,root,root,-) @@ -110,13 +114,14 @@ fi %doc html %changelog -* Fri Feb 13 2009 Erik van Pienbroek - 0.4.0-1 +* Sat Feb 14 2009 Erik van Pienbroek - 0.4.0-1 - Update to version 0.4.0 - This version introduces a API bump (which is required for supporting large files on 32bit environments) - The license issues we had with version 0.3.1 of this package (as discussed in #457924) are resolved in this version. The license of this package is now changed to LGPLv2+ +- Added a patch to fix two testcases on 64bit environments (upstream bug #1454) * Sat Sep 6 2008 Erik van Pienbroek - 0.3.1-3 - Changed license to GPLv3+ and added some comments From 53abf9b1c63d46772a12679e72a9dab4362d8050 Mon Sep 17 00:00:00 2001 From: epienbro Date: Sat, 14 Feb 2009 10:56:43 +0000 Subject: [PATCH 04/23] Missing patch --- libmicrohttpd_fix_0_4_0_testcase.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 libmicrohttpd_fix_0_4_0_testcase.patch diff --git a/libmicrohttpd_fix_0_4_0_testcase.patch b/libmicrohttpd_fix_0_4_0_testcase.patch new file mode 100644 index 0000000..d6ad6d0 --- /dev/null +++ b/libmicrohttpd_fix_0_4_0_testcase.patch @@ -0,0 +1,11 @@ +--- src/testcurl/daemontest_long_header.c.orig 2009-02-14 11:48:18.025431339 +0100 ++++ src/testcurl/daemontest_long_header.c 2009-02-14 11:48:37.442183967 +0100 +@@ -107,7 +107,7 @@ + &ahc_echo, + "GET", + MHD_OPTION_CONNECTION_MEMORY_LIMIT, +- VERY_LONG / 2, MHD_OPTION_END); ++ (size_t) VERY_LONG / 2, MHD_OPTION_END); + if (d == NULL) + return 1; + c = curl_easy_init (); From 9fd9e9ddb4ec88e4c2b62f9d5ee085478d49304c Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 16:14:21 +0000 Subject: [PATCH 05/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- libmicrohttpd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec index 678bd65..04badb6 100644 --- a/libmicrohttpd.spec +++ b/libmicrohttpd.spec @@ -1,7 +1,7 @@ Summary: Lightweight library for embedding a webserver in applications Name: libmicrohttpd Version: 0.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Libraries License: LGPLv2+ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -114,6 +114,9 @@ fi %doc html %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sat Feb 14 2009 Erik van Pienbroek - 0.4.0-1 - Update to version 0.4.0 - This version introduces a API bump (which is required for From 7d9acc3df83d79facca6a8ec6bd246ef553ad149 Mon Sep 17 00:00:00 2001 From: epienbro Date: Fri, 27 Feb 2009 22:43:35 +0000 Subject: [PATCH 06/23] - Update to version 0.4.0a - Drop upstreamed patch - Added a new patch to fix a 64bit issue - The -devel package now contains a pkgconfig file - The configure script is now run with '--enable-messages --enable-https' - Made the -doc subpackage noarch (F11+) --- libmicrohttpd.spec | 23 +++++++++++++++++------ libmicrohttpd_64bit_fix.patch | 11 +++++++++++ libmicrohttpd_fix_0_4_0_testcase.patch | 11 ----------- 3 files changed, 28 insertions(+), 17 deletions(-) create mode 100644 libmicrohttpd_64bit_fix.patch delete mode 100644 libmicrohttpd_fix_0_4_0_testcase.patch diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec index 04badb6..615ded1 100644 --- a/libmicrohttpd.spec +++ b/libmicrohttpd.spec @@ -1,16 +1,15 @@ Summary: Lightweight library for embedding a webserver in applications Name: libmicrohttpd -Version: 0.4.0 -Release: 2%{?dist} +Version: 0.4.0a +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 -# In version 0.4.0, two of the testcases fail on 64bit environments -# Upstream bug #1454 -Patch0: libmicrohttpd_fix_0_4_0_testcase.patch +# https://gnunet.org/mantis/view.php?id=1459 +Patch0: libmicrohttpd_64bit_fix.patch BuildRequires: libcurl-devel BuildRequires: graphviz @@ -45,6 +44,9 @@ Development files for libmicrohttpd Summary: Documentation for libmicrohttpd Group: Documentation Requires: %{name} = %{version}-%{release} +%if 0%{?fedora} >= 11 +BuildArch: noarch +%endif %description doc Doxygen documentation for libmicrohttpd and some example source code @@ -59,7 +61,7 @@ unlink doc/Doxyfile mv tmp doc/Doxyfile %build -%configure --disable-static +%configure --disable-static --enable-messages --enable-https make %{?_smp_mflags} doxygen doc/Doxyfile @@ -104,6 +106,7 @@ fi %defattr(-,root,root,-) %{_includedir}/microhttpd.h %{_libdir}/libmicrohttpd.so +%{_libdir}/pkgconfig/libmicrohttpd.pc %files doc %defattr(-,root,root,-) @@ -114,6 +117,14 @@ fi %doc html %changelog +* Fri Feb 27 2009 Erik van Pienbroek - 0.4.0a-1 +- Update to version 0.4.0a +- Drop upstreamed patch +- Added a new patch to fix a 64bit issue +- The -devel package now contains a pkgconfig file +- The configure script is now run with '--enable-messages --enable-https' +- Made the -doc subpackage noarch (F11+) + * Wed Feb 25 2009 Fedora Release Engineering - 0.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/libmicrohttpd_64bit_fix.patch b/libmicrohttpd_64bit_fix.patch new file mode 100644 index 0000000..0f8442b --- /dev/null +++ b/libmicrohttpd_64bit_fix.patch @@ -0,0 +1,11 @@ +--- src/testcurl/daemontest_large_put.c.orig 2009-02-27 22:58:16.926062599 +0100 ++++ src/testcurl/daemontest_large_put.c 2009-02-27 22:58:20.776312622 +0100 +@@ -274,7 +274,7 @@ + 1082, + NULL, NULL, &ahc_echo, &done_flag, + MHD_OPTION_CONNECTION_MEMORY_LIMIT, +- PUT_SIZE * 4, MHD_OPTION_END); ++ (size_t) PUT_SIZE * 4, MHD_OPTION_END); + if (d == NULL) + return 256; + c = curl_easy_init (); diff --git a/libmicrohttpd_fix_0_4_0_testcase.patch b/libmicrohttpd_fix_0_4_0_testcase.patch deleted file mode 100644 index d6ad6d0..0000000 --- a/libmicrohttpd_fix_0_4_0_testcase.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/testcurl/daemontest_long_header.c.orig 2009-02-14 11:48:18.025431339 +0100 -+++ src/testcurl/daemontest_long_header.c 2009-02-14 11:48:37.442183967 +0100 -@@ -107,7 +107,7 @@ - &ahc_echo, - "GET", - MHD_OPTION_CONNECTION_MEMORY_LIMIT, -- VERY_LONG / 2, MHD_OPTION_END); -+ (size_t) VERY_LONG / 2, MHD_OPTION_END); - if (d == NULL) - return 1; - c = curl_easy_init (); From b31d40f26b111ae12074050eb03e8879e4f4f17e Mon Sep 17 00:00:00 2001 From: epienbro Date: Fri, 27 Feb 2009 23:09:16 +0000 Subject: [PATCH 07/23] Updated sources --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 64abe4c..5532dff 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libmicrohttpd-0.4.0.tar.gz +libmicrohttpd-0.4.0a.tar.gz diff --git a/sources b/sources index 2ed1355..3c2067b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2e53f7b9c11474857756a72ccc29a91b libmicrohttpd-0.4.0.tar.gz +e6f316064d674be55addcb2e4bf22fcd libmicrohttpd-0.4.0a.tar.gz From 855b00cc345aed8a9580f3200d29c854555e4dad Mon Sep 17 00:00:00 2001 From: epienbro Date: Tue, 21 Jul 2009 21:11:38 +0000 Subject: [PATCH 08/23] - Update to version 0.4.2 - Drop upstreamed patch --- .cvsignore | 2 +- libmicrohttpd.spec | 12 ++++++------ sources | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5532dff..d9bb92c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libmicrohttpd-0.4.0a.tar.gz +libmicrohttpd-0.4.2.tar.gz diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec index 615ded1..59b569e 100644 --- a/libmicrohttpd.spec +++ b/libmicrohttpd.spec @@ -1,6 +1,6 @@ Summary: Lightweight library for embedding a webserver in applications Name: libmicrohttpd -Version: 0.4.0a +Version: 0.4.2 Release: 1%{?dist} Group: Development/Libraries License: LGPLv2+ @@ -8,9 +8,6 @@ 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 -# https://gnunet.org/mantis/view.php?id=1459 -Patch0: libmicrohttpd_64bit_fix.patch - BuildRequires: libcurl-devel BuildRequires: graphviz BuildRequires: doxygen @@ -53,7 +50,6 @@ Doxygen documentation for libmicrohttpd and some example source code %prep %setup -q -%patch0 -p0 # The doxygen file contains references to /home/grothoff/svn/libmicrohttpd/... replace these with . sed s/\\/home\\/grothoff\\/svn\\/libmicrohttpd/./ doc/Doxyfile > tmp @@ -100,7 +96,7 @@ fi %defattr(-,root,root,-) %doc COPYING %{_libdir}/libmicrohttpd.so.5 -%{_libdir}/libmicrohttpd.so.5.0.0 +%{_libdir}/libmicrohttpd.so.5.1.0 %files devel %defattr(-,root,root,-) @@ -117,6 +113,10 @@ fi %doc html %changelog +* Tue Jul 21 2009 Erik van Pienbroek - 0.4.2-1 +- Update to version 0.4.2 +- Drop upstreamed patch + * Fri Feb 27 2009 Erik van Pienbroek - 0.4.0a-1 - Update to version 0.4.0a - Drop upstreamed patch diff --git a/sources b/sources index 3c2067b..c8d757a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e6f316064d674be55addcb2e4bf22fcd libmicrohttpd-0.4.0a.tar.gz +2853d8f32417e3c5f3b18fda38f96e52 libmicrohttpd-0.4.2.tar.gz From 2eb3e12bfef1bc0e8962564ae79ac35eeae2edaa Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 06:05:18 +0000 Subject: [PATCH 09/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- libmicrohttpd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec index 59b569e..6912ed7 100644 --- a/libmicrohttpd.spec +++ b/libmicrohttpd.spec @@ -1,7 +1,7 @@ Summary: Lightweight library for embedding a webserver in applications Name: libmicrohttpd Version: 0.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Libraries License: LGPLv2+ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -113,6 +113,9 @@ fi %doc html %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 0.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Tue Jul 21 2009 Erik van Pienbroek - 0.4.2-1 - Update to version 0.4.2 - Drop upstreamed patch From bf66d6fba0909241ebd9b57957151d866bd0f38a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:51:04 +0000 Subject: [PATCH 10/23] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3b20637..d5a72cf 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: libmicrohttpd -# $Id$ +# $Id: Makefile,v 1.1 2008/10/03 05:55:18 huzaifas Exp $ NAME := libmicrohttpd SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 37bb2dc512b380fac63413aaae2c6119ab04c065 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:50:17 +0000 Subject: [PATCH 11/23] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3b20637..d5a72cf 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: libmicrohttpd -# $Id$ +# $Id: Makefile,v 1.1 2008/10/03 05:55:18 huzaifas Exp $ NAME := libmicrohttpd SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 90846def7601079cef84859281ebc58b00b0a4e9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 01:56:45 +0000 Subject: [PATCH 12/23] Initialize branch EL-6 for libmicrohttpd --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From 94e7688c55653f16baf2ab2098ab727d3b9d6fc9 Mon Sep 17 00:00:00 2001 From: epienbro Date: Sun, 4 Jul 2010 14:20:20 +0000 Subject: [PATCH 13/23] Update to 0.4.6 --- .cvsignore | 2 +- libmicrohttpd.spec | 9 ++++++--- libmicrohttpd_64bit_fix.patch | 11 ----------- sources | 2 +- 4 files changed, 8 insertions(+), 16 deletions(-) delete mode 100644 libmicrohttpd_64bit_fix.patch diff --git a/.cvsignore b/.cvsignore index d9bb92c..ddf92ff 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libmicrohttpd-0.4.2.tar.gz +libmicrohttpd-0.4.6.tar.gz diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec index 6912ed7..fc520e0 100644 --- a/libmicrohttpd.spec +++ b/libmicrohttpd.spec @@ -1,7 +1,7 @@ Summary: Lightweight library for embedding a webserver in applications Name: libmicrohttpd -Version: 0.4.2 -Release: 2%{?dist} +Version: 0.4.6 +Release: 1%{?dist} Group: Development/Libraries License: LGPLv2+ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -96,7 +96,7 @@ fi %defattr(-,root,root,-) %doc COPYING %{_libdir}/libmicrohttpd.so.5 -%{_libdir}/libmicrohttpd.so.5.1.0 +%{_libdir}/libmicrohttpd.so.5.2.1 %files devel %defattr(-,root,root,-) @@ -113,6 +113,9 @@ fi %doc html %changelog +* Sun Jun 4 2010 Erik van Pienbroek - 0.4.6-1 +- Update to 0.4.6 + * Fri Jul 24 2009 Fedora Release Engineering - 0.4.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/libmicrohttpd_64bit_fix.patch b/libmicrohttpd_64bit_fix.patch deleted file mode 100644 index 0f8442b..0000000 --- a/libmicrohttpd_64bit_fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/testcurl/daemontest_large_put.c.orig 2009-02-27 22:58:16.926062599 +0100 -+++ src/testcurl/daemontest_large_put.c 2009-02-27 22:58:20.776312622 +0100 -@@ -274,7 +274,7 @@ - 1082, - NULL, NULL, &ahc_echo, &done_flag, - MHD_OPTION_CONNECTION_MEMORY_LIMIT, -- PUT_SIZE * 4, MHD_OPTION_END); -+ (size_t) PUT_SIZE * 4, MHD_OPTION_END); - if (d == NULL) - return 256; - c = curl_easy_init (); diff --git a/sources b/sources index c8d757a..b8cfe5f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2853d8f32417e3c5f3b18fda38f96e52 libmicrohttpd-0.4.2.tar.gz +61698da6aa04744ea076c327f66fc05a libmicrohttpd-0.4.6.tar.gz From 2f8d99450539a093b4e9cc92d72028daf8a04f6d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 21:17:00 +0000 Subject: [PATCH 14/23] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index d5a72cf..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libmicrohttpd -# $Id: Makefile,v 1.1 2008/10/03 05:55:18 huzaifas Exp $ -NAME := libmicrohttpd -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index 5b4a959..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -libmicrohttpd-0_3_1-3_fc10:HEAD:libmicrohttpd-0.3.1-3.fc10.src.rpm:1223061159 From d79982426e5a3bebd2b3133e5fe4d93118c34058 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 21:17:02 +0000 Subject: [PATCH 15/23] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index d5a72cf..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libmicrohttpd -# $Id: Makefile,v 1.1 2008/10/03 05:55:18 huzaifas Exp $ -NAME := libmicrohttpd -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 diff --git a/import.log b/import.log deleted file mode 100644 index 5b4a959..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -libmicrohttpd-0_3_1-3_fc10:HEAD:libmicrohttpd-0.3.1-3.fc10.src.rpm:1223061159 From 84ddd7b7364fcc164c3efdd815d98923ed08c35a Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Sun, 7 Nov 2010 20:42:29 -0500 Subject: [PATCH 16/23] Update to 0.9.2 --- .gitignore | 5 ++++- libmicrohttpd.spec | 11 ++++++++--- sources | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index ddf92ff..568eb03 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ -libmicrohttpd-0.4.6.tar.gz +/libmicrohttpd-0.9.2* +.build* +/noarch +/x86_64 diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec index fc520e0..18fe255 100644 --- a/libmicrohttpd.spec +++ b/libmicrohttpd.spec @@ -1,6 +1,6 @@ Summary: Lightweight library for embedding a webserver in applications Name: libmicrohttpd -Version: 0.4.6 +Version: 0.9.2 Release: 1%{?dist} Group: Development/Libraries License: LGPLv2+ @@ -83,10 +83,12 @@ rm -rf %{buildroot} %post doc /sbin/install-info %{_infodir}/microhttpd.info.gz %{_infodir}/dir || : +/sbin/install-info %{_infodir}/microhttpd-tutorial.info.gz %{_infodir}/dir || : %preun doc if [ $1 = 0 ] ; then /sbin/install-info --delete %{_infodir}/microhttpd.info.gz %{_infodir}/dir || : +/sbin/install-info --delete %{_infodir}/microhttpd-tutorial.info.gz %{_infodir}/dir || : fi %post -p /sbin/ldconfig @@ -95,8 +97,7 @@ fi %files %defattr(-,root,root,-) %doc COPYING -%{_libdir}/libmicrohttpd.so.5 -%{_libdir}/libmicrohttpd.so.5.2.1 +%{_libdir}/libmicrohttpd.so.* %files devel %defattr(-,root,root,-) @@ -108,11 +109,15 @@ fi %defattr(-,root,root,-) %{_mandir}/man3/libmicrohttpd.3.gz %{_infodir}/microhttpd.info.gz +%{_infodir}/microhttpd-tutorial.info.gz %doc AUTHORS README ChangeLog %doc examples %doc html %changelog +* Sun Sep 7 2010 Tim Niemueller - 0.9.2-1 +- Update to 0.9.2 + * Sun Jun 4 2010 Erik van Pienbroek - 0.4.6-1 - Update to 0.4.6 diff --git a/sources b/sources index b8cfe5f..bc90eea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -61698da6aa04744ea076c327f66fc05a libmicrohttpd-0.4.6.tar.gz +4ad4a2f1ad4cf3174d248a6e73cf4d1b libmicrohttpd-0.9.2.tar.gz From 3c11bbdb843e502750f3f93d0ff81a17a1e17d16 Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Tue, 16 Nov 2010 00:00:28 -0500 Subject: [PATCH 17/23] Spec: enable HTTPS again in 0.9.2 build Configuration flags have changed, although stating "--enable-https" this was parsed as "disable HTTPS". --- libmicrohttpd.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec index 18fe255..07b7176 100644 --- a/libmicrohttpd.spec +++ b/libmicrohttpd.spec @@ -1,7 +1,7 @@ Summary: Lightweight library for embedding a webserver in applications Name: libmicrohttpd Version: 0.9.2 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Libraries License: LGPLv2+ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -31,7 +31,7 @@ Key features that distinguish libmicrohttpd from other projects are: %package devel Summary: Development files for libmicrohttpd -Group: %{group} +Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel @@ -57,7 +57,7 @@ unlink doc/Doxyfile mv tmp doc/Doxyfile %build -%configure --disable-static --enable-messages --enable-https +%configure --disable-static make %{?_smp_mflags} doxygen doc/Doxyfile @@ -71,7 +71,7 @@ make install DESTDIR=%{buildroot} rm -f %{buildroot}%{_libdir}/libmicrohttpd.la rm -f %{buildroot}%{_infodir}/dir -# Install some examples in /usr/share/doc/libmicrohttpd-%{version}/examples +# Install some examples in /usr/share/doc/libmicrohttpd-${version}/examples mkdir examples install -m 644 src/examples/*.c examples @@ -115,7 +115,10 @@ fi %doc html %changelog -* Sun Sep 7 2010 Tim Niemueller - 0.9.2-1 +* Tue Nov 16 2010 Tim Niemueller - 0.9.2-2 +- Re-enable HTTPS, configure flags had unexpected result + +* Sun Nov 7 2010 Tim Niemueller - 0.9.2-1 - Update to 0.9.2 * Sun Jun 4 2010 Erik van Pienbroek - 0.4.6-1 From ff336311a8788b0acafbe6c9f9249afcf46d10ed Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Tue, 16 Nov 2010 00:26:22 -0500 Subject: [PATCH 18/23] Add missing BR gnutls-devel and libgcrypt-devel --- libmicrohttpd.spec | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec index 07b7176..3d2e3b8 100644 --- a/libmicrohttpd.spec +++ b/libmicrohttpd.spec @@ -1,16 +1,18 @@ Summary: Lightweight library for embedding a webserver in applications Name: libmicrohttpd Version: 0.9.2 -Release: 2%{?dist} +Release: 3%{?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 -BuildRequires: libcurl-devel -BuildRequires: graphviz -BuildRequires: doxygen +BuildRequires: libcurl-devel +BuildRequires: gnutls-devel +BuildRequires: libgcrypt-devel +BuildRequires: graphviz +BuildRequires: doxygen Requires(post): info Requires(preun): info @@ -30,19 +32,19 @@ Key features that distinguish libmicrohttpd from other projects are: * Three different threading models %package devel -Summary: Development files for libmicrohttpd -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Summary: Development files for libmicrohttpd +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} %description devel Development files for libmicrohttpd %package doc -Summary: Documentation for libmicrohttpd -Group: Documentation -Requires: %{name} = %{version}-%{release} -%if 0%{?fedora} >= 11 -BuildArch: noarch +Summary: Documentation for libmicrohttpd +Group: Documentation +Requires: %{name} = %{version}-%{release} +%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 +BuildArch: noarch %endif %description doc @@ -57,7 +59,7 @@ unlink doc/Doxyfile mv tmp doc/Doxyfile %build -%configure --disable-static +%configure --disable-static --with-gnutls make %{?_smp_mflags} doxygen doc/Doxyfile @@ -93,7 +95,7 @@ fi %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - + %files %defattr(-,root,root,-) %doc COPYING @@ -115,6 +117,9 @@ fi %doc html %changelog +* Tue Nov 16 2010 Tim Niemueller - 0.9.2-2 +- Add missing BR gnutls-devel and libgcrypt-devel + * Tue Nov 16 2010 Tim Niemueller - 0.9.2-2 - Re-enable HTTPS, configure flags had unexpected result From 21f5fd556e817e1012f11c7c9fdf4740f5517b7e Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Tue, 16 Nov 2010 00:28:49 -0500 Subject: [PATCH 19/23] Copied .gitignore from master --- .gitignore | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4ae6af7..568eb03 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -libmicrohttpd-0.9.2* -/.build* -/x86_64 +/libmicrohttpd-0.9.2* +.build* /noarch +/x86_64 From 14b0e6723281eef64d80a14dc1c9d7918b35fd8c Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Tue, 16 Nov 2010 02:20:31 -0500 Subject: [PATCH 20/23] Add missing BR, add patch to fix tests - Add missing BR gnutls-devel and libgcrypt-devel - Added patch to fix test apps (NSS instead of GnuTLS/OpenSSL curl, implicit DSO linking) --- libmicrohttpd-0.9.2-fix-https-tests.patch | 429 ++++++++++++++++++++++ libmicrohttpd.spec | 8 +- 2 files changed, 436 insertions(+), 1 deletion(-) create mode 100644 libmicrohttpd-0.9.2-fix-https-tests.patch diff --git a/libmicrohttpd-0.9.2-fix-https-tests.patch b/libmicrohttpd-0.9.2-fix-https-tests.patch new file mode 100644 index 0000000..41dba0d --- /dev/null +++ b/libmicrohttpd-0.9.2-fix-https-tests.patch @@ -0,0 +1,429 @@ +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, ©Buffer); + 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); + diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec index 3d2e3b8..bca7102 100644 --- a/libmicrohttpd.spec +++ b/libmicrohttpd.spec @@ -7,6 +7,7 @@ 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 BuildRequires: libcurl-devel BuildRequires: gnutls-devel @@ -52,6 +53,7 @@ Doxygen documentation for libmicrohttpd and some example source code %prep %setup -q +%patch0 -p1 -b .explicit-dso # The doxygen file contains references to /home/grothoff/svn/libmicrohttpd/... replace these with . sed s/\\/home\\/grothoff\\/svn\\/libmicrohttpd/./ doc/Doxyfile > tmp @@ -59,6 +61,8 @@ unlink doc/Doxyfile mv tmp doc/Doxyfile %build +# Required because patches modify .am files +autoreconf --force %configure --disable-static --with-gnutls make %{?_smp_mflags} doxygen doc/Doxyfile @@ -117,8 +121,10 @@ fi %doc html %changelog -* Tue Nov 16 2010 Tim Niemueller - 0.9.2-2 +* Tue Nov 16 2010 Tim Niemueller - 0.9.2-3 - Add missing BR gnutls-devel and libgcrypt-devel +- Added patch to fix test apps (NSS instead of GnuTLS/OpenSSL curl, + implicit DSO linking) * Tue Nov 16 2010 Tim Niemueller - 0.9.2-2 - Re-enable HTTPS, configure flags had unexpected result From 6032b219aa05815abb462aafec580ab7bc6208ea Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Tue, 16 Nov 2010 02:29:12 -0500 Subject: [PATCH 21/23] More BR required for patch --- libmicrohttpd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec index bca7102..c0e6e79 100644 --- a/libmicrohttpd.spec +++ b/libmicrohttpd.spec @@ -9,6 +9,7 @@ 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 +BuildRequires: autoconf, automake, libtool BuildRequires: libcurl-devel BuildRequires: gnutls-devel BuildRequires: libgcrypt-devel From f6200400f0b81e18dd593168089de7a506b57ce5 Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Tue, 16 Nov 2010 10:36:14 -0500 Subject: [PATCH 22/23] Disable test cases for now due to false errors, reported upstream --- libmicrohttpd.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec index c0e6e79..2be0d66 100644 --- a/libmicrohttpd.spec +++ b/libmicrohttpd.spec @@ -7,7 +7,7 @@ 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.2-fix-https-tests.patch BuildRequires: autoconf, automake, libtool BuildRequires: libcurl-devel @@ -54,7 +54,7 @@ Doxygen documentation for libmicrohttpd and some example source code %prep %setup -q -%patch0 -p1 -b .explicit-dso +#patch0 -p1 -b .explicit-dso # The doxygen file contains references to /home/grothoff/svn/libmicrohttpd/... replace these with . sed s/\\/home\\/grothoff\\/svn\\/libmicrohttpd/./ doc/Doxyfile > tmp @@ -63,13 +63,15 @@ mv tmp doc/Doxyfile %build # Required because patches modify .am files -autoreconf --force +# autoreconf --force %configure --disable-static --with-gnutls make %{?_smp_mflags} doxygen doc/Doxyfile -%check -make check %{?_smp_mflags} +# Disabled for now due to problems reported at +# https://gnunet.org/bugs/view.php?id=1619 +#check +#make check %{?_smp_mflags} %install rm -rf %{buildroot} @@ -126,6 +128,7 @@ fi - Add missing BR gnutls-devel and libgcrypt-devel - Added patch to fix test apps (NSS instead of GnuTLS/OpenSSL curl, implicit DSO linking) +- Disable test cases for now due to false errors, reported upstream * Tue Nov 16 2010 Tim Niemueller - 0.9.2-2 - Re-enable HTTPS, configure flags had unexpected result From 80b8b2a24ace9118ce03d605532cc4128cdcbcc3 Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Tue, 25 Jan 2011 00:34:31 +0100 Subject: [PATCH 23/23] 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(-) delete mode 100644 libmicrohttpd-0.9.2-fix-https-tests.patch create mode 100644 libmicrohttpd-0.9.5-fix-basic-auth.patch create mode 100644 libmicrohttpd-0.9.5-no-abort.patch 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.2-fix-https-tests.patch b/libmicrohttpd-0.9.2-fix-https-tests.patch deleted file mode 100644 index 41dba0d..0000000 --- a/libmicrohttpd-0.9.2-fix-https-tests.patch +++ /dev/null @@ -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, ©Buffer); - 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); - 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 + #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 - 0.9.5-1 +- Update to new upstream release 0.9.5 + * Tue Nov 16 2010 Tim Niemueller - 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