diff --git a/debian.changelog b/debian.changelog deleted file mode 100644 index af634be..0000000 --- a/debian.changelog +++ /dev/null @@ -1,126 +0,0 @@ -libmicrohttpd (0.9.22-1) unstable; urgency=low - - * Updated to 0.9.22. - - -- Frederic Crozat Fri, Sep 28 2012 12:03:02 +0200 - -libmicrohttpd (0.9.21-1) unstable; urgency=low - - * Updated to 0.9.21. - - -- Stephan Kleine Fri, 10 Aug 2012 23:49:28 +0200 - -libmicrohttpd (0.9.19-1) unstable; urgency=low - - * Updated to 0.9.19. - - -- Stephan Kleine Sun, 05 Feb 2012 14:03:16 +0100 - -libmicrohttpd (0.9.17-1) unstable; urgency=low - - * Updated to 0.9.17. - - -- Stephan Kleine Sun, 27 Nov 2011 14:24:28 +0100 - -libmicrohttpd (0.9.16-1) unstable; urgency=low - - * Updated to 0.9.16. - - -- Stephan Kleine Sat, 12 Nov 2011 21:37:39 +0100 - -libmicrohttpd (0.9.15-1) unstable; urgency=low - - * Updated to 0.9.15. - - -- Stephan Kleine Sun, 16 Oct 2011 13:38:25 +0200 - -libmicrohttpd (0.9.11-1) unstable; urgency=low - - * Updated to 0.9.11. - - -- Stephan Kleine Sat, 21 May 2011 14:30:33 +0200 - -libmicrohttpd (0.9.10-1) unstable; urgency=low - - * Updated to 0.9.10. - - -- Stephan Kleine Fri, 29 Apr 2011 20:06:47 +0200 - -libmicrohttpd (0.9.9-1) unstable; urgency=low - - * Updated to 0.9.9. - - -- Stephan Kleine Wed, 30 Mar 2011 18:50:16 +0200 - -libmicrohttpd (0.9.8-1) unstable; urgency=low - - * Updated to 0.9.8. - - -- Stephan Kleine Sat, 05 Mar 2011 22:37:25 +0100 - -libmicrohttpd (0.9.7-1) unstable; urgency=low - - * Updated to 0.9.7. - - -- Stephan Kleine Tue, 15 Feb 2011 17:55:00 +0100 - -libmicrohttpd (0.9.6-1) unstable; urgency=low - - * Updated to 0.9.6. - - -- Stephan Kleine Thu, 27 Jan 2011 03:34:03 +0100 - -libmicrohttpd (0.9.5-1) unstable; urgency=low - - * Updated to 0.9.5. - * Enabled hardening-wrapper - - -- Stephan Kleine Sat, 15 Jan 2011 16:04:09 +0100 - -libmicrohttpd (0.9.4-1) unstable; urgency=low - - * Updated to 0.9.4. - - -- Stephan Kleine Wed, 29 Dec 2010 16:15:21 +0100 - -libmicrohttpd (0.9.3-1) unstable; urgency=low - - * Updated to 0.9.3. - - -- Stephan Kleine Wed, 24 Nov 2010 17:01:38 +0100 - -libmicrohttpd (0.9.2-1) unstable; urgency=low - - * Updated to 0.9.2. - - -- Stephan Kleine Thu, 21 Oct 2010 15:21:16 +0200 - -libmicrohttpd (0.9.1-1) unstable; urgency=low - - * Updated to 0.9.1. - - -- Stephan Kleine Mon, 20 Sep 2010 19:15:20 +0200 - -libmicrohttpd (0.9.0-1) unstable; urgency=low - - * Updated to 0.9.0. - - -- Stephan Kleine Tue, 27 Jul 2010 09:25:19 +0200 - -libmicrohttpd (0.4.6-1) unstable; urgency=low - - * Updated to 0.4.6. - - -- Pascal Bleser Mon, 15 Mar 2010 09:37:00 +0100 - -libmicrohttpd (0.4.5-1) unstable; urgency=low - - * Updated to 0.4.5. - - -- Stephan Kleine Sat, 02 Feb 2010 13:10:52 +0100 - -libmicrohttpd (0.4.4-1) unstable; urgency=low - - * Initial package. - - -- Stephan Kleine Sat, 23 Jan 2010 14:04:38 +0100 diff --git a/debian.compat b/debian.compat deleted file mode 100644 index 2445c5e..0000000 --- a/debian.compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/debian.control b/debian.control deleted file mode 100644 index 41d47b0..0000000 --- a/debian.control +++ /dev/null @@ -1,40 +0,0 @@ -Source: libmicrohttpd -Section: libs -Priority: optional -Maintainer: Stephan Kleine -Build-Depends: debhelper (>= 5), autotools-dev, libcurl4-openssl-dev, libgcrypt11-dev (>= 1.2.4), libgnutls-dev -Standards-Version: 3.8.3 -Homepage: http://www.gnu.org/software/libmicrohttpd/ -Vcs-Browser: http://git.debian-maintainers.org/?p=gnunet/libmicrohttpd.git -Vcs-Git: git://git.debian-maintainers.org/git/gnunet/libmicrohttpd.git - -Package: libmicrohttpd10 -Section: libs -Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} -Description: library embedding HTTP server functionality - libmicrohttpd is a small C library for embedding HTTP server functionality into - applications. - . - It will be used in future GNUnet versions as part of the HTTP transport. - -Package: libmicrohttpd10-dbg -Section: debug -Priority: extra -Architecture: any -Depends: ${misc:Depends}, libmicrohttpd10 (= ${binary:Version}), libmicrohttpd-dev (= ${binary:Version}) -Description: library embedding HTTP server functionality (debug) - libmicrohttpd is a small C library for embedding HTTP server functionality into - applications. - . - This package contains the debugging symbols. - -Package: libmicrohttpd-dev -Section: libdevel -Architecture: any -Depends: ${misc:Depends}, libmicrohttpd10 (= ${binary:Version}), -Description: library embedding HTTP server functionality (development) - libmicrohttpd is a small C library for embedding HTTP server functionality into - applications. - . - This package contains the development files. diff --git a/debian.libmicrohttpd-dev.install b/debian.libmicrohttpd-dev.install deleted file mode 100644 index 1177906..0000000 --- a/debian.libmicrohttpd-dev.install +++ /dev/null @@ -1,5 +0,0 @@ -/usr/include/* -/usr/lib/*.so -/usr/lib/pkgconfig -/usr/share/info -/usr/share/man diff --git a/debian.libmicrohttpd10.install b/debian.libmicrohttpd10.install deleted file mode 100644 index 2f80f13..0000000 --- a/debian.libmicrohttpd10.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*.so.* diff --git a/debian.rules b/debian.rules deleted file mode 100644 index e917885..0000000 --- a/debian.rules +++ /dev/null @@ -1,79 +0,0 @@ -#!/usr/bin/make -f - -# Uncomment this to turn on verbose mode. -export DH_VERBOSE=1 - -# Enable hardening-wrapper -export DEB_BUILD_HARDENING=1 - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - - -config.status: configure - dh_testdir - - # Configuring package - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --disable-static --enable-curl --enable-client-side - -build: build-stamp -build-stamp: config.status - dh_testdir - - # Building package - $(MAKE) - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Cleaning package - [ ! -f Makefile ] || $(MAKE) distclean -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess -endif - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Installing package - $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install - -binary-indep: build install - -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs - # Removing useless files - rm -f debian/tmp/usr/lib/*.a - rm -f debian/tmp/usr/lib/*.la - rm -f debian/tmp/usr/share/info/dir* - dh_install --fail-missing --sourcedir=debian/tmp - dh_link - dh_strip --dbg-package=libmicrohttpd10-dbg - dh_compress - dh_fixperms - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install diff --git a/libmicrohttpd-0.9.28.tar.gz b/libmicrohttpd-0.9.28.tar.gz deleted file mode 100644 index 01ec159..0000000 --- a/libmicrohttpd-0.9.28.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:10e633d76ea7049562521b0ae5859e4ae7ebe1f824ae24c70e3376650051920e -size 1062922 diff --git a/libmicrohttpd-0.9.28.tar.gz.sig b/libmicrohttpd-0.9.28.tar.gz.sig deleted file mode 100644 index 91511ab..0000000 Binary files a/libmicrohttpd-0.9.28.tar.gz.sig and /dev/null differ diff --git a/libmicrohttpd-0.9.30.tar.gz b/libmicrohttpd-0.9.30.tar.gz new file mode 100644 index 0000000..5adb728 --- /dev/null +++ b/libmicrohttpd-0.9.30.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:80f48c82fc1b00ad5945a06c810f268d5fa6482eee24af677997a38e41e2606c +size 1088922 diff --git a/libmicrohttpd-0.9.30.tar.gz.sig b/libmicrohttpd-0.9.30.tar.gz.sig new file mode 100644 index 0000000..a573908 Binary files /dev/null and b/libmicrohttpd-0.9.30.tar.gz.sig differ diff --git a/libmicrohttpd.changes b/libmicrohttpd.changes index a3366fe..4acaf5f 100644 --- a/libmicrohttpd.changes +++ b/libmicrohttpd.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Thu Oct 3 12:59:19 UTC 2013 - mvyskocil@suse.com + +- Update to 0.9.30 + + implements the "SHOULD" clause of RFC 2616 section 8.1.4, which + may reduce bandwidth consumption when clients cancel requests. + + fixes build errors with various combinations of operating systems, + libc versions, and configure flags. + + fixes a use-after-free crash when using epoll() in combination with + read errors + 0.9.29: + + epoll can now also be used with SSL connections + + following recent HTTP/1.1 clarfications, MHD no longer send + a "Content-length" header in CONNECT responses. + + the "MHD_add_connection" call now consistently sets an "errno" + value to indicate the cause of errors. + Connections added this way are now always processed immediately. + + fixes a recently-introduced bug which prevented HTTP pipelining + from working properly in some cases and a build error in + conjunction with the "--disable-messages" configure option. +- Enable build of (experimental) SPDY support. + ------------------------------------------------------------------- Wed Jul 24 10:18:44 UTC 2013 - mvyskocil@suse.com diff --git a/libmicrohttpd.dsc b/libmicrohttpd.dsc deleted file mode 100644 index a5936b2..0000000 --- a/libmicrohttpd.dsc +++ /dev/null @@ -1,15 +0,0 @@ -Format: 1.0 -Source: libmicrohttpd -Binary: libmicrohttpd10, libmicrohttpd10-dbg, libmicrohttpd-dev -Architecture: any -Version: 0.9.22-1 -Maintainer: Stephan Kleine -Homepage: http://www.gnu.org/software/libmicrohttpd/ -Standards-Version: 3.8.3 -Vcs-Browser: http://git.debian-maintainers.org/?p=gnunet/libmicrohttpd.git -Vcs-Git: git://git.debian-maintainers.org/git/gnunet/libmicrohttpd.git -Build-Depends: debhelper (>= 5), autotools-dev, libcurl4-openssl-dev, libgcrypt11-dev (>= 1.2.4), libgnutls-dev, hardening-wrapper - -Files: - bcd61ebb10286379f55c7db9c79e0465 843590 libmicrohttpd-0.9.11.tar.gz - ee55b467a355f4669023ca61fa04aaf4 3595 libmicrohttpd-0.9.11.diff.gz diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec index 401e3e0..90e7e47 100644 --- a/libmicrohttpd.spec +++ b/libmicrohttpd.spec @@ -17,10 +17,11 @@ # -%define soname 10 +%global libmicrohttpd libmicrohttpd10 +%global libmicrospdy libmicrospdy0 Name: libmicrohttpd -Version: 0.9.28 +Version: 0.9.30 Release: 0 Summary: Small Embeddable HTTP Server Library License: LGPL-2.1+ @@ -38,6 +39,7 @@ BuildRequires: libgcrypt-devel >= 1.2.4 BuildRequires: libtasn1-devel %if 0%{?suse_version} BuildRequires: libgnutls-devel +BuildRequires: libopenssl-devel BuildRequires: pkg-config %if 0%{?suse_version} >= 1230 BuildRequires: gpg-offline @@ -73,70 +75,55 @@ other projects out there that provide that kind of functionality already. Howeve if you want to be able to serve simple WWW pages from within your C or C++ application, check it out. -%package -n %{name}%{soname} +%package -n %{libmicrohttpd} -Summary: Small Embeddable HTTP Server Library -Group: System/Libraries +Summary: Small embeddable http server library +Group: System/libraries -%description -n %{name}%{soname} -GNU libmicrohttpd is a small C library that is supposed to make it easy to run -an HTTP server as part of another application. GNU libmicrohttpd is free software -and part of the GNU project. Key features that distinguish libmicrohttpd from -other projects are: +%description -n %{libmicrohttpd} +Shared library for %{name} (%{summary}). - * 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 30k (without TLS/SSL support) - * Three different threading models - * Supported platforms include GNU/Linux, FreeBSD, OpenBSD, NetBSD, OS X, W32, - Symbian and z/OS - * Optional support for SSL3 and TLS (requires libgcrypt) +%package -n %{libmicrospdy} -libmicrohttpd was started because the author needed an easy way to add a concurrent -HTTP server to other projects. Existing alternatives were either non-free, not -reentrant, standalone, of terrible code quality or a combination thereof. Do not -use libmicrohttpd if you are looking for a standalone http server, there are many -other projects out there that provide that kind of functionality already. However, -if you want to be able to serve simple WWW pages from within your C or C++ -application, check it out. +Summary: Small embeddable http server library +Group: System/libraries + +%description -n %{libmicrospdy} +Shared library for libmicrospdy (%{summary}). + +WARNING: Additionally, a second, still very experimental library is provided +for SPDY (the base for HTTP 2.0) support. libmicrospdy provides a compact API +and implementation of SPDY server. libmicrospdy currently only implements +partially version 3 of SPDY. %package devel -Requires: %{name}%{soname} = %{version} +Requires: %{libmicrohttpd} = %{version} Requires(post): info Requires(postun): info Summary: Small Embeddable HTTP Server Library Group: Development/Libraries/C and C++ %description devel -GNU libmicrohttpd is a small C library that is supposed to make it easy to run -an HTTP server as part of another application. GNU libmicrohttpd is free software -and part of the GNU project. Key features that distinguish libmicrohttpd from -other projects are: +Headers, pkg-config files, so link and other development files for %{name} +(%{summary}). - * 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 30k (without TLS/SSL support) - * Three different threading models - * Supported platforms include GNU/Linux, FreeBSD, OpenBSD, NetBSD, OS X, W32, - Symbian and z/OS - * Optional support for SSL3 and TLS (requires libgcrypt) +%package -n libmicrospdy-devel +Requires: %{libmicrospdy} = %{version} +Summary: Small Embeddable HTTP Server Library +Group: Development/Libraries/C and C++ -libmicrohttpd was started because the author needed an easy way to add a concurrent -HTTP server to other projects. Existing alternatives were either non-free, not -reentrant, standalone, of terrible code quality or a combination thereof. Do not -use libmicrohttpd if you are looking for a standalone http server, there are many -other projects out there that provide that kind of functionality already. However, -if you want to be able to serve simple WWW pages from within your C or C++ -application, check it out. +%description -n libmicrospdy-devel +Headers for libmicrospdy (%{summary}). +%package -n microspdy2http +Summary: Proxy translated SPDY requests to https server +Group: System/Libraries + +%description -n microspdy2http +Translates incoming SPDY requests to http server on +localhost. + * Uses libcurl. + * No error handling for curl requests. %prep %if 0%{?suse_version} >= 1230 @@ -161,9 +148,13 @@ find %{buildroot} -name "*.la" -delete %check %__make %{?_smp_mflags} check -%post -n %{name}%{soname} -p /sbin/ldconfig +%post -n %{libmicrohttpd} -p /sbin/ldconfig -%postun -n %{name}%{soname} -p /sbin/ldconfig +%postun -n %{libmicrohttpd} -p /sbin/ldconfig + +%post -n %{libmicrospdy} -p /sbin/ldconfig + +%postun -n %{libmicrospdy} -p /sbin/ldconfig %post devel %if 0%{?fedora_version} @@ -197,10 +188,9 @@ find %{buildroot} -name "*.la" -delete %install_info_delete --info-dir=%{_infodir} %{_infodir}/libmicrohttpd-tutorial.info%{ext_info} %endif -%files -n %{name}%{soname} +%files -n %{libmicrohttpd} %defattr(-,root,root) -%{_libdir}/%{name}.so.%{soname} -%{_libdir}/%{name}.so.%{soname}.* +%{_libdir}/%{name}.so.* %files devel %defattr(-,root,root) @@ -211,6 +201,19 @@ find %{buildroot} -name "*.la" -delete %{_infodir}/%{name}*.info* %{_mandir}/man3/%{name}.3* +%files -n %{libmicrospdy} +%defattr(-,root,root) +%{_libdir}/libmicrospdy.so.* + +%files -n libmicrospdy-devel +%defattr(-,root,root) +%{_includedir}/microspdy.h +%{_libdir}/libmicrospdy.so + +%files -n microspdy2http +%defattr(-,root,root) +%attr(0755,root,root) %{_bindir}/microspdy2http + # Do NOT delete this cause I need it for Fedora & Mandriva too! %if 0%{?fedora_version} || 0%{?scientificlinux_version} || 0%{?centos_version} %exclude %{_infodir}/dir