deb: turn on full hardening, needs v9 dh

diff --git a/debian/compat b/debian/compat
index 7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69..ec635144f60048986bc560c5576355344005e6e7 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9

diff --git a/debian/control b/debian/control
index ab161a70901ac9ff05871ddd1c4b6f46bbefe1df..fc8290e0fd2a9d6284546933c746aa4fc93c8478 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,15 @@ Section: database
 Priority: extra
 Maintainer: Marko Kreen <marko.kreen@skype.net>
 Standards-Version: 3.6.2
-Build-Depends: cdbs, debhelper (>= 7), libevent-dev (>= 1.3b), asciidoc, xmlto, make (>= 3.81)
+Build-Depends: debhelper (>= 9), libevent-dev (>= 2.0), python-docutils, make (>= 3.81), libssl-dev (>= 1.0.1), libc-ares-dev
 
 Package: pgbouncer
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
 Description: Lightweight connection pooler for PostgreSQL
+ PgBouncer is a PostgreSQL connection pooler. Any target application can be
+ connected to pgbouncer as if it were a PostgreSQL server, and pgbouncer will
+ create a connection to the actual server, or it will reuse one of its existing
+ connections.
  .
+ The aim of pgbouncer is to lower the performance impact of opening new connections to PostgreSQL.

diff --git a/debian/rules b/debian/rules
index 0df2aa7fddd31cb899b5cbdf4518745cf335248b..19af87bc515567f394f6b02b82e5ce603202fbea 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,13 @@
 #! /usr/bin/make -f
 
-DH_VERBOSE = 1
+export V=1
+export DH_VERBOSE = 1
+export DEB_BUILD_OPTIONS = nostrip
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-DEB_BUILD_OPTIONS = nostrip
-export DEB_BUILD_OPTIONS
+%:
+       dh $@
 
-override DEB_CONFIGURE_EXTRA_FLAGS = --enable-debug
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+override_dh_auto_clean:
+       if test -f config.mak; then $(MAKE) clean; fi