logrotation fixed; made lintian happy (mostly)
authorMatthias Förste <foerste@schlittermann.de>
Wed, 18 Jun 2014 16:19:01 +0200
changeset 2 5979296311cb
parent 1 70b0d05afad2
child 3 2d91f287b9b6
logrotation fixed; made lintian happy (mostly)
debian/changelog
debian/control
debian/havp.logrotate
debian/rules
--- a/debian/changelog	Wed Jun 18 16:17:31 2014 +0200
+++ b/debian/changelog	Wed Jun 18 16:19:01 2014 +0200
@@ -1,3 +1,11 @@
+havp (0.92a-3~ius.1) stable oldstable; urgency=low
+
+  * Non-maintainer upload.
+  * logrotation fixed 
+  * made lintian happy (mostly)
+
+ -- Matthias Förste <foerste@schlittermann.de>  Thu, 12 Jun 2014 14:05:08 +0200
+
 havp (0.92a-2.ius.2) stable; urgency=low
 
   * Non-maintainer upload.
--- a/debian/control	Wed Jun 18 16:17:31 2014 +0200
+++ b/debian/control	Wed Jun 18 16:19:01 2014 +0200
@@ -2,9 +2,9 @@
 Section: net
 Priority: optional
 Maintainer: Rene Mayrhofer <rene.mayrhofer@gibraltar.at>
-Build-Depends: debhelper (>= 7.0.0), autotools-dev, libssl-dev, libclamav-dev, docbook-to-man, po-debconf, 
-    quilt (>= 0.46-7~)
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 7.0.0), autotools-dev, libssl-dev, libclamav-dev,
+ docbook-to-man, po-debconf, quilt (>= 0.46-7~), hardening-includes
+Standards-Version: 3.9.4
 
 Package: havp
 Architecture: any
--- a/debian/havp.logrotate	Wed Jun 18 16:17:31 2014 +0200
+++ b/debian/havp.logrotate	Wed Jun 18 16:19:01 2014 +0200
@@ -9,7 +9,8 @@
         sharedscripts
         postrotate
                 if [ -f /var/run/havp/havp.pid ]; then
-                        /etc/init.d/havp reload > /dev/null
+                        # reload doesnt work for children: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=524045
+                        /etc/init.d/havp restart > /dev/null
                 fi
         endscript
 }
--- a/debian/rules	Wed Jun 18 16:17:31 2014 +0200
+++ b/debian/rules	Wed Jun 18 16:19:01 2014 +0200
@@ -28,10 +28,15 @@
 	extra_opts += --disable-locking
 endif
 
+include /usr/share/hardening-includes/hardening.make
+CFLAGS += $(HARDENING_CFLAGS)
+LDFLAGS += $(HARDENING_LDFLAGS)
+CXXFLAGS += $(HARDENING_CFLAGS)
+
 config.status: patch configure
 	dh_testdir
 	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" CPPFLAGS="-I/usr/include/openssl" \
+	CFLAGS="$(CFLAGS)" CPPFLAGS="-I/usr/include/openssl" LDFLAGS="$(LDFLAGS)" \
 		./configure \
 		--enable-ssl-tunnel \
 		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
@@ -40,8 +45,9 @@
 		--localstatedir=/var $(extra_opts)
 
 
-build: build-stamp
-
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 build-stamp:  config.status
 	dh_testdir