summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/0001_jam.patch2
-rwxr-xr-xdebian/rules4
3 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index ff449fa..a3cf2d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,10 +12,14 @@ argyll (1.9.1+repack-1) unstable; urgency=medium
* debian/rules:
- Make the build reproducible (Closes: #835265).
(Thanks to Chris Lamb <lamby@debian.org>)
+ - Remove License4.txt from argyll-doc.
* debian/watch:
- Bump Version to 4 (no changes required).
+ * Enable hardening:
+ - Refresh debian/patches/0001_jam.patch.
+ - Add hardening=+all to DEB_BUILD_MAINT_OPTIONS at debian/rules.
- -- Jörg Frings-Fürst <debian@jff-webhosting.net> Tue, 11 Oct 2016 00:26:31 +0200
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net> Tue, 11 Oct 2016 22:51:17 +0200
argyll (1.8.3+repack-2) unstable; urgency=medium
diff --git a/debian/patches/0001_jam.patch b/debian/patches/0001_jam.patch
index 251f61f..69156bd 100644
--- a/debian/patches/0001_jam.patch
+++ b/debian/patches/0001_jam.patch
@@ -13,7 +13,7 @@ Index: trunk/Jambase
# UNIX defaults
- CCFLAGS ?= -DUNIX -D_THREAD_SAFE -pipe ;
-+ CCFLAGS ?= $(CPPFLAGS) -g -DUNIX -D_THREAD_SAFE -pipe ;
++ CCFLAGS ?= $(CPPFLAGS) -g -DUNIX -D_THREAD_SAFE -pipe -fPIC ;
CCOPTFLAG ?= -O2 ;
CCDEBUGFLAG ?= -g ;
CCPROFFLAG ?= ;
diff --git a/debian/rules b/debian/rules
index 2b78baa..8cd2669 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,9 @@
export DH_OPTIONS
+# hardening
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
NO_PROC=$(shell cat /proc/cpuinfo | grep processor | wc -l)
JAMCMDLINE = -q -fJambase -j$(NO_PROC) -sPREFIX=/usr -sDESTDIR=$(CURDIR)/debian/tmp -sREFSUBDIR=share/color/argyll/ref
@@ -33,6 +36,7 @@ override_dh_installdocs:
rm -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/License.txt
rm -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/License2.txt
rm -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/License3.txt
+ rm -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/License4.txt
rm -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/DocLicense.txt
rm -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/afiles