Bug#821535: nagios3: diff for NMU version 3.5.1.dfsg-2.2

[Mattia Rizzolo]

Control: tags 821535 + patch
Control: tags 821535 + pending
Control: tags 822004 + pending
Control: tags 836638 + patch
Control: tags 836638 + pending

Dear maintainer,

I've prepared an NMU for nagios3 (versioned as 3.5.1.dfsg-2.2) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
regards,
                        Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540      .''`.
more about me:  https://mapreri.org                             : :'  :
Launchpad user: https://launchpad.net/~mapreri                  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-

diffstat for nagios3-3.5.1.dfsg nagios3-3.5.1.dfsg

 changelog |   12 ++++++++++++
 control   |    3 +--
 rules     |   17 ++++++-----------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff -Nru nagios3-3.5.1.dfsg/debian/changelog nagios3-3.5.1.dfsg/debian/changelog
--- nagios3-3.5.1.dfsg/debian/changelog	2016-01-24 17:55:32.000000000 +0000
+++ nagios3-3.5.1.dfsg/debian/changelog	2016-09-27 21:57:50.000000000 +0000
@@ -1,3 +1,15 @@
+nagios3 (3.5.1.dfsg-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Stop using hardening-wrapper, make use of dpkg-buildflags with
+        DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
+    instead.  Closes: #836638
+  * Add patch from Santiago Vila <sanv...@unex.es> to add support for
+    build-arch and build-indep targets.  Closes: #822004
+  * Move to PHP 7.0 dependencies.  Closes: #821535
+
+ -- Mattia Rizzolo <mat...@debian.org>  Tue, 27 Sep 2016 21:57:50 +0000
+
 nagios3 (3.5.1.dfsg-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru nagios3-3.5.1.dfsg/debian/control nagios3-3.5.1.dfsg/debian/control
--- nagios3-3.5.1.dfsg/debian/control	2016-01-24 17:38:28.000000000 +0000
+++ nagios3-3.5.1.dfsg/debian/control	2016-09-27 21:40:56.000000000 +0000
@@ -12,7 +12,6 @@
 Build-Depends: autotools-dev,
                debhelper (>= 7),
                dpkg-dev (>= 1.13.19),
-               hardening-wrapper,
                libgd-dev,
                libperl-dev,
                libpng-dev,
@@ -62,7 +61,7 @@
 Depends: adduser,
          apache2-utils,
          coreutils (>= 4.5.3),
-         libapache2-mod-php5 | php5 | php5-cgi,
+         libapache2-mod-php | php | php-cgi,
          libjs-jquery,
          nagios3-common (= ${source:Version}),
          ucf (>= 0.28),
diff -Nru nagios3-3.5.1.dfsg/debian/rules nagios3-3.5.1.dfsg/debian/rules
--- nagios3-3.5.1.dfsg/debian/rules	2014-01-03 22:52:08.000000000 +0000
+++ nagios3-3.5.1.dfsg/debian/rules	2016-09-27 21:56:31.000000000 +0000
@@ -4,22 +4,15 @@
 # $Id$
 
 # export DH_VERBOSE=1
-export DEB_BUILD_HARDENING=1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
 
 b := $(shell pwd)/debian
 
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-# -Wall disabled until source is fixed to not print tons of warnings with it. :)
-#CFLAGS = -Wall -g
-CFLAGS = -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -O0
-else
-CFLAGS += -O2
-endif
-
 SHELL		= /bin/sh -e
 CONFIGURE	= CFLAGS='$(CFLAGS)' ./configure --prefix=/usr \
 				--mandir=/usr/share/man \
@@ -81,6 +74,8 @@
 	$(CONFIGURE)
 	touch configure-stamp
 
+build-arch: build
+build-indep: build
 build: build-stamp
 build-stamp: configure-stamp
 	dh_testdir -a
@@ -154,4 +149,4 @@
 	dh_md5sums           -i
 	dh_builddeb          -i
 
-.PHONY: binary-indep binary-arch build configure binary install 
+.PHONY: binary-indep binary-arch build build-arch build-indep configure binary install

signature.asc
Description: PGP signature