From bf66d6fba0909241ebd9b57957151d866bd0f38a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:51:04 +0000 Subject: [PATCH 1/5] 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 94e7688c55653f16baf2ab2098ab727d3b9d6fc9 Mon Sep 17 00:00:00 2001 From: epienbro Date: Sun, 4 Jul 2010 14:20:20 +0000 Subject: [PATCH 2/5] 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 3/5] 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 84ddd7b7364fcc164c3efdd815d98923ed08c35a Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Sun, 7 Nov 2010 20:42:29 -0500 Subject: [PATCH 4/5] 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 5/5] 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