[osm-tile-server] 36/117: Fix hardening and library dependencies

[Ruben Undheim]

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 752f0df2bf0cac882e82052c972d2ed3f4a641e0
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Thu Sep 3 19:27:44 2015 +0200

    Fix hardening and library dependencies
---
 debian/control | 2 +-
 debian/rules   | 5 +++++
 src/Makefile   | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 5db6481..a553dd7 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Description: Metapackage for installing OSM tile server
 
 Package: osm-tile-server-base
 Architecture: any
-Depends: ${misc:Depends},
+Depends: ${shlibs:Depends}, ${misc:Depends},
         openstreetmap-carto, node-carto,
         postgis, postgresql-contrib, osm2pgsql, adduser
 Description: Common files for OSM tile server
diff --git a/debian/rules b/debian/rules
index 4cbf11c..1cd70d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,11 @@
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/default.mk
 
+
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
 %:
 	dh $@ 
 
diff --git a/src/Makefile b/src/Makefile
index af11744..e917c13 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -7,7 +7,7 @@ install: osm-tile-server-import
 	install osm-tile-server-import ${DESTDIR}/usr/bin/
 
 osm-tile-server-import: osm-tile-server-import.o
-	${CC} -o osm-tile-server-import osm-tile-server-import.o
+	${CC} ${LDFLAGS} -o osm-tile-server-import osm-tile-server-import.o
 
 clean:
 	${RM} *.o osm-tile-server-import

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm-tile-server.git