summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-01-07 15:57:35 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-01-07 15:57:35 +0100
commit894a9c79465bab71443b574776da307cddd6a656 (patch)
tree941bafd366cb98868adea879da4dab10570d7580 /debian
parent748da1b2182cf8785bd5b6ddb595eb35db7e2a2c (diff)
Add buildflags into Makefiles, remove useless tags
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog12
-rw-r--r--debian/control3
-rw-r--r--debian/patches/500-buildflags.patch22
-rw-r--r--debian/patches/series1
-rwxr-xr-xdebian/rules2
5 files changed, 36 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index a9df1ae..4abf157 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+shotwell (0.20.2-1) unstable; urgency=medium
+
+ * New upstream release (Closes: #769025).
+ * debian/control:
+ - Remove useless ${shlibs:Depends} from shotwell-dbg.
+ * debian/rules:
+ - Remove useless hardening parts.
+ * New debian/patches/500-buildflags.patch:
+ - Poke buildflags into Makefile
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net> Wed, 07 Jan 2015 14:23:48 +0100
+
shotwell (0.20.1-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index 8f9e7e1..5575478 100644
--- a/debian/control
+++ b/debian/control
@@ -62,8 +62,7 @@ Package: shotwell-dbg
Priority: extra
Section: debug
Architecture: linux-any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
+Depends: ${misc:Depends},
shotwell (= ${binary:Version})
Description: digital photo organizer - debugging symbols
Shotwell is a digital photo organizer designed for the GNOME desktop
diff --git a/debian/patches/500-buildflags.patch b/debian/patches/500-buildflags.patch
new file mode 100644
index 0000000..fa493ab
--- /dev/null
+++ b/debian/patches/500-buildflags.patch
@@ -0,0 +1,22 @@
+Description: Poke requested Debian buildflags for hardening into Makefile
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Last-Update: 2015-01-07
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/Makefile
+===================================================================
+--- trunk.orig/Makefile
++++ trunk/Makefile
+@@ -394,10 +394,11 @@ VALA_CFLAGS := `pkg-config --cflags $(EX
+ $(foreach def,$(DEFINES),-D$(def))
+
+ VALA_LDFLAGS := `pkg-config --libs $(EXT_PKGS) $(DIRECT_LIBS) gthread-2.0`
++VALA_LDFLAGS += -fPIE -pie -Wl,-z,relro -Wl,-z,now
+
+ # REQUIRED_CFLAGS absolutely get appended to CFLAGS, whatever the
+ # the value of CFLAGS in the environment
+-REQUIRED_CFLAGS := -fPIC
++REQUIRED_CFLAGS := -fPIC -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2
+
+ # setting CFLAGS in configure.mk overrides build type
+ ifndef CFLAGS
diff --git a/debian/patches/series b/debian/patches/series
index 2535d18..bfb8f07 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+500-buildflags.patch
hardening.patch
libexec.patch
diff --git a/debian/rules b/debian/rules
index 49701c2..71e7242 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,6 @@
#!/usr/bin/make -f
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
export VALAFLAGS:=$(foreach w,$(CPPFLAGS) $(CFLAGS) $(LDFLAGS),-X $(w))