diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2016-10-22 17:27:52 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2016-10-22 17:27:52 -0700 |
| commit | c5063c1f96d81c629096fae0c71e702a1bc6bca9 (patch) | |
| tree | 653c79f69b26582c70190b07f79fd3f6f5b0dd95 | |
| parent | 66c8c9f401c7d62cdea752f245bd486d66cae91f (diff) | |
| download | keysafe-c5063c1f96d81c629096fae0c71e702a1bc6bca9.tar.gz | |
enable hardening & simplify rules
Thanks to Joey's changes in today's release
| -rw-r--r-- | debian/keysafe-bin.lintian-overrides | 5 | ||||
| -rwxr-xr-x | debian/rules | 14 |
2 files changed, 3 insertions, 16 deletions
diff --git a/debian/keysafe-bin.lintian-overrides b/debian/keysafe-bin.lintian-overrides index 6d221d1..5cbd6a6 100644 --- a/debian/keysafe-bin.lintian-overrides +++ b/debian/keysafe-bin.lintian-overrides @@ -1,5 +1,2 @@ -# standard Haskell overrides -hardening-no-fortify-functions -hardening-no-bindnow -hardening-no-pie +# standard Haskell override binary-or-shlib-defines-rpath diff --git a/debian/rules b/debian/rules index 9453d1d..c0fd936 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,8 @@ #!/usr/bin/make -f +export DEB_BUILD_MAINT_OPTIONS = hardening=+all export BUILDER=./Setup -# ^ see below +# ^ cabal likes to write to $HOME %: dh $@ @@ -23,14 +24,3 @@ override_dh_strip: # INSTALL) override_dh_installinit: dh_installinit --name=keysafe - -# use Setup.hs directly, not cabal, because cabal likes to write to -# $HOME and can complain about needing a sandbox (this technique -# originally from Joey Hess's hothasktags rules file) -override_dh_auto_configure: - ghc --make Setup - ./Setup configure -override_dh_auto_clean: - if [ -x Setup ]; then ./Setup clean; fi - rm -f Setup Setup.o Setup.hi keysafe - rm -rf dist .stack-work |