From 16f07f9eca01294dc1a4dd62f4b13856ddbdf262 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 25 Sep 2012 21:24:12 -0400
Subject: re-enabled new-style hardening based on how sqlite3 3.7.14-1 does it

---
 debian/rules | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'debian/rules')

diff --git a/debian/rules b/debian/rules
index 7d13b22..c088965 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,9 @@
 
 #export DH_VERBOSE=1
 
-export DEB_BUILD_HARDENING=1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
 
 DESTDIR=$(CURDIR)/debian/tmp
 
@@ -15,15 +17,13 @@ DDEBUG=`if (echo $(DEB_BUILD_OPTIONS) | grep -q debug) then \
 
 
 #export DEB_CFLAGS_MAINT_APPEND = -O2 -fno-strict-aliasing
-CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
-
-CFLAGS += -O2 -fno-strict-aliasing \
+export CFLAGS += -O2 -fno-strict-aliasing \
 	-DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_COLUMN_METADATA \
 	-DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE=1 -DSQLITE_SOUNDEX=1 \
 	-DSQLITE_ENABLE_UNLOCK_NOTIFY \
 	-DSQLITE_OMIT_LOOKASIDE=1 \
 	-DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1 \
+	-DSQLITE_MAX_SCHEMA_RETRY=25 \
 	-DSQLITE_HAS_CODEC
 
 configure: configure-stamp
@@ -39,6 +39,9 @@ configure-stamp:
 	  --libexecdir=\$${libdir}/sqlcipher \
 	  $(DDEBUG)
 
+	# remove double -ldl from sqlcipher.pc
+	sed -i "s/\([-ldl .+]\) -ldl/\1/" sqlcipher.pc
+
 	touch $@
 
 build-arch: build-stamp
@@ -88,6 +91,10 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 
+	for file in libsqlcipher0.install libsqlcipher-dev.install; do \
+		sed -e"s,\$${DEB_HOST_MULTIARCH},${DEB_HOST_MULTIARCH},g" \
+			debian/$${file}.in > debian/$$file; \
+	done
 	dh_install -a --sourcedir=$(DESTDIR)
 	dh_installman -a
 	dh_installdocs -a
-- 
cgit v1.2.3