From df8ce354c26c7e2e2efa9ff4d678ea4df05156e98a47a6c7b8e1af71496621c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Sun, 16 Jan 2011 01:03:51 +0000
Subject: [PATCH] Accepting request 58399 from security:OpenVAS:UNSTABLE:v3

OBS-URL: https://build.opensuse.org/request/show/58399
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libmicrohttpd?expand=0&rev=10
---
 debian.changelog           |  7 +++++++
 debian.rules               | 14 +++++---------
 libmicrohttpd-0.9.4.tar.gz |  3 ---
 libmicrohttpd-0.9.5.tar.gz |  3 +++
 libmicrohttpd.changes      |  5 +++++
 libmicrohttpd.dsc          |  8 ++++----
 libmicrohttpd.spec         |  2 +-
 7 files changed, 25 insertions(+), 17 deletions(-)
 delete mode 100644 libmicrohttpd-0.9.4.tar.gz
 create mode 100644 libmicrohttpd-0.9.5.tar.gz

diff --git a/debian.changelog b/debian.changelog
index e76b0fd..91436a1 100644
--- a/debian.changelog
+++ b/debian.changelog
@@ -1,3 +1,10 @@
+libmicrohttpd (0.9.5-1) unstable; urgency=low
+
+  * Updated to 0.9.5.
+  * Enabled hardening-wrapper
+
+ -- Stephan Kleine <bitshuffler@opensuse.org>  Sat, 15 Jan 2010 16:04:09 +0100
+
 libmicrohttpd (0.9.4-1) unstable; urgency=low
 
   * Updated to 0.9.4.
diff --git a/debian.rules b/debian.rules
index f76e23b..e917885 100644
--- a/debian.rules
+++ b/debian.rules
@@ -1,26 +1,22 @@
 #!/usr/bin/make -f
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+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)
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
 
 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-client-side
+	./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
diff --git a/libmicrohttpd-0.9.4.tar.gz b/libmicrohttpd-0.9.4.tar.gz
deleted file mode 100644
index b1e4e67..0000000
--- a/libmicrohttpd-0.9.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:109823c81a846211a88ecd59ab4b8d88448f85d6b217ed2cac14e5364a6f32f2
-size 751887
diff --git a/libmicrohttpd-0.9.5.tar.gz b/libmicrohttpd-0.9.5.tar.gz
new file mode 100644
index 0000000..bfc14b1
--- /dev/null
+++ b/libmicrohttpd-0.9.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3e6e14a9cd481caed59fd155e7c33132e4835c7a8b43e1c6f700539140ea988b
+size 753091
diff --git a/libmicrohttpd.changes b/libmicrohttpd.changes
index 04626b4..8bb8e00 100644
--- a/libmicrohttpd.changes
+++ b/libmicrohttpd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Jan 15 15:02:29 UTC 2011 - bitshuffler@opensuse.org
+
+- Updated to 0.9.5
+
 -------------------------------------------------------------------
 Wed Dec 29 15:15:48 UTC 2010 - bitshuffler@opensuse.org
 
diff --git a/libmicrohttpd.dsc b/libmicrohttpd.dsc
index fdbb843..47bf26d 100644
--- a/libmicrohttpd.dsc
+++ b/libmicrohttpd.dsc
@@ -2,14 +2,14 @@ Format: 1.0
 Source: libmicrohttpd
 Binary: libmicrohttpd10, libmicrohttpd10-dbg, libmicrohttpd-dev
 Architecture: any
-Version: 0.9.4-1
+Version: 0.9.5-1
 Maintainer: Stephan Kleine <bitshuffler@opensuse.org>
 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
+Build-Depends: debhelper (>= 5), autotools-dev, libcurl4-openssl-dev, libgcrypt11-dev (>= 1.2.4), libgnutls-dev, hardening-wrapper
 
 Files: 
- bcd61ebb10286379f55c7db9c79e0465 843590 libmicrohttpd-0.9.4.tar.gz
- ee55b467a355f4669023ca61fa04aaf4 3595 libmicrohttpd-0.9.4.diff.gz
+ bcd61ebb10286379f55c7db9c79e0465 843590 libmicrohttpd-0.9.5.tar.gz
+ ee55b467a355f4669023ca61fa04aaf4 3595 libmicrohttpd-0.9.5.diff.gz
diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec
index 98e714a..0efc760 100644
--- a/libmicrohttpd.spec
+++ b/libmicrohttpd.spec
@@ -3,7 +3,7 @@
 %define soname 10
 
 Name:           libmicrohttpd
-Version:        0.9.4
+Version:        0.9.5
 Release:        1.0
 License:        GNU LGPL v2.1
 Group:          Productivity/Networking/Web/Servers