From dc63608a20f6ed9df7e0e4cf1d8902f2bd1a0ece5e9fa2ddb429f0c53555b9bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Fri, 22 Oct 2010 14:35:08 +0000 Subject: [PATCH] Accepting request 51202 from security:OpenVAS:STABLE:v3 OBS-URL: https://build.opensuse.org/request/show/51202 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libmicrohttpd?expand=0&rev=7 --- debian.changelog | 12 ++++++++++++ debian.control | 11 +++++------ ...httpd8.install => debian.libmicrohttpd10.install | 0 debian.rules | 4 ++-- libmicrohttpd-0.9.0.tar.gz | 3 --- libmicrohttpd-0.9.2.tar.gz | 3 +++ libmicrohttpd.changes | 10 ++++++++++ libmicrohttpd.dsc | 11 +++++------ libmicrohttpd.spec | 13 +++++++++---- 9 files changed, 46 insertions(+), 21 deletions(-) rename debian.libmicrohttpd8.install => debian.libmicrohttpd10.install (100%) delete mode 100644 libmicrohttpd-0.9.0.tar.gz create mode 100644 libmicrohttpd-0.9.2.tar.gz diff --git a/debian.changelog b/debian.changelog index 047874d..54ac40d 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,3 +1,15 @@ +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. diff --git a/debian.control b/debian.control index e2da963..41d47b0 100644 --- a/debian.control +++ b/debian.control @@ -1,15 +1,14 @@ Source: libmicrohttpd Section: libs Priority: optional -Maintainer: Debian GNUnet Maintainers -Uploaders: Daniel Baumann +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: libmicrohttpd8 +Package: libmicrohttpd10 Section: libs Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} @@ -19,11 +18,11 @@ Description: library embedding HTTP server functionality . It will be used in future GNUnet versions as part of the HTTP transport. -Package: libmicrohttpd8-dbg +Package: libmicrohttpd10-dbg Section: debug Priority: extra Architecture: any -Depends: ${misc:Depends}, libmicrohttpd8 (= ${binary:Version}), libmicrohttpd-dev (= ${binary:Version}) +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. @@ -33,7 +32,7 @@ Description: library embedding HTTP server functionality (debug) Package: libmicrohttpd-dev Section: libdevel Architecture: any -Depends: ${misc:Depends}, libmicrohttpd8 (= ${binary:Version}), +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. diff --git a/debian.libmicrohttpd8.install b/debian.libmicrohttpd10.install similarity index 100% rename from debian.libmicrohttpd8.install rename to debian.libmicrohttpd10.install diff --git a/debian.rules b/debian.rules index 0f41e8f..f76e23b 100644 --- a/debian.rules +++ b/debian.rules @@ -20,7 +20,7 @@ config.status: configure dh_testdir # Configuring package - CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --disable-static --enable-curl --enable-messages --enable-https --enable-client-side + CFLAGS="$(CFLAGS)" ./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 @@ -69,7 +69,7 @@ binary-arch: build install rm -f debian/tmp/usr/share/info/dir* dh_install --fail-missing --sourcedir=debian/tmp dh_link - dh_strip --dbg-package=libmicrohttpd8-dbg + dh_strip --dbg-package=libmicrohttpd10-dbg dh_compress dh_fixperms dh_makeshlibs diff --git a/libmicrohttpd-0.9.0.tar.gz b/libmicrohttpd-0.9.0.tar.gz deleted file mode 100644 index c4f73d0..0000000 --- a/libmicrohttpd-0.9.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:106f0599d60c9caaee36334d96cc4198ed6d392b1a45523e46f226bd24a680d5 -size 686311 diff --git a/libmicrohttpd-0.9.2.tar.gz b/libmicrohttpd-0.9.2.tar.gz new file mode 100644 index 0000000..71227f5 --- /dev/null +++ b/libmicrohttpd-0.9.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18a5b69f228ba09f2c5117038cdff4d8bb849ac214c29d117ebe5bfad9060d39 +size 741470 diff --git a/libmicrohttpd.changes b/libmicrohttpd.changes index 44b4edb..b76a53d 100644 --- a/libmicrohttpd.changes +++ b/libmicrohttpd.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Oct 21 13:21:06 UTC 2010 - bitshuffler@opensuse.org + +- Updated to 0.9.2 + +------------------------------------------------------------------- +Mon Sep 20 17:17:03 UTC 2010 - bitshuffler@opensuse.org + +- Updated to 0.9.1 + ------------------------------------------------------------------- Tue Jul 27 07:26:27 UTC 2010 - bitshuffler@opensuse.org diff --git a/libmicrohttpd.dsc b/libmicrohttpd.dsc index 8be54e9..a45465f 100644 --- a/libmicrohttpd.dsc +++ b/libmicrohttpd.dsc @@ -1,10 +1,9 @@ Format: 1.0 Source: libmicrohttpd -Binary: libmicrohttpd8, libmicrohttpd8-dbg, libmicrohttpd-dev +Binary: libmicrohttpd10, libmicrohttpd10-dbg, libmicrohttpd-dev Architecture: any -Version: 0.9.0-1 -Maintainer: Debian GNUnet Maintainers -Uploaders: Daniel Baumann +Version: 0.9.2-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 @@ -12,5 +11,5 @@ 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 Files: - bcd61ebb10286379f55c7db9c79e0465 843590 libmicrohttpd-0.9.0.tar.gz - ee55b467a355f4669023ca61fa04aaf4 3595 libmicrohttpd-0.9.0.diff.gz + bcd61ebb10286379f55c7db9c79e0465 843590 libmicrohttpd-0.9.2.tar.gz + ee55b467a355f4669023ca61fa04aaf4 3595 libmicrohttpd-0.9.2.diff.gz diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec index 363cc45..4d5022f 100644 --- a/libmicrohttpd.spec +++ b/libmicrohttpd.spec @@ -1,9 +1,9 @@ # norootforbuild -%define soname 8 +%define soname 10 Name: libmicrohttpd -Version: 0.9.0 +Version: 0.9.2 Release: 1.0 License: GNU LGPL v2.1 Group: Productivity/Networking/Web/Servers @@ -119,8 +119,6 @@ application, check it out. %build %configure --disable-static \ --enable-curl \ - --enable-messages \ - --enable-https \ --enable-client-side %__make %{?_smp_mflags} @@ -137,14 +135,17 @@ find %{buildroot} -name "*.la" -delete %post devel %if 0%{?fedora_version} /sbin/install-info --info-dir=%{_infodir} --info-file=%{_infodir}/microhttpd.info%{ext_info} +/sbin/install-info --info-dir=%{_infodir} --info-file=%{_infodir}/microhttpd-tutorial.info%{ext_info} %endif %if 0%{?mandriva_version} %_install_info libmicrohttpd.info +%_install_info libmicrohttpd-tutorial.info %endif %if 0%{?suse_version} %install_info --info-dir=%{_infodir} %{_infodir}/libmicrohttpd.info%{ext_info} +%install_info --info-dir=%{_infodir} %{_infodir}/libmicrohttpd-tutorial.info%{ext_info} %endif %postun -n %{name}%{soname} -p /sbin/ldconfig @@ -152,14 +153,17 @@ find %{buildroot} -name "*.la" -delete %postun devel %if 0%{?fedora_version} /sbin/install-info --delete --info-dir=%{_infodir} --info-file=%{_infodir}/microhttpd.info%{ext_info} +/sbin/install-info --delete --info-dir=%{_infodir} --info-file=%{_infodir}/microhttpd-tutorial.info%{ext_info} %endif %if 0%{?mandriva_version} %_remove_install_info libmicrohttpd.info +%_remove_install_info libmicrohttpd-tutorial.info %endif %if 0%{?suse_version} %install_info_delete --info-dir=%{_infodir} %{_infodir}/libmicrohttpd.info%{ext_info} +%install_info_delete --info-dir=%{_infodir} %{_infodir}/libmicrohttpd-tutorial.info%{ext_info} %endif %clean @@ -176,6 +180,7 @@ test "%{buildroot}" != "/" && %__rm -rf "%{buildroot}" %{_libdir}/libmicrohttpd.so %{_libdir}/pkgconfig/libmicrohttpd.pc %{_infodir}/microhttpd.info* +%{_infodir}/microhttpd-tutorial.info* %{_mandir}/man3/libmicrohttpd.3* # Do NOT delete this cause I need it for Fedora & Mandriva too!