r51658 - in /desktop/unstable/gvfs/debian: changelog patches/disable-polkit-rules-no-admin.patch patches/series rules

[bigon at users.alioth.debian.org]

Author: bigon
Date: Tue Nov  8 12:22:02 2016
New Revision: 51658

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=51658
Log:
* debian/control.in: Enable all hardening flags
* debian/patches/disable-polkit-rules-no-admin.patch: Do not install polkit
  rules when the admin backend is disabled, should fix FTBFS on !linux

Added:
    desktop/unstable/gvfs/debian/patches/disable-polkit-rules-no-admin.patch
Modified:
    desktop/unstable/gvfs/debian/changelog
    desktop/unstable/gvfs/debian/patches/series
    desktop/unstable/gvfs/debian/rules

Modified: desktop/unstable/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/changelog?rev=51658&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gvfs/debian/changelog	[utf-8] Tue Nov  8 12:22:02 2016
@@ -2,8 +2,11 @@
 
   * New upstream release.
   * Enable NFS backend (Closes: #812590)
-
- -- Laurent Bigonville <bigon at debian.org>  Tue, 08 Nov 2016 09:55:36 +0100
+  * debian/control.in: Enable all hardening flags
+  * debian/patches/disable-polkit-rules-no-admin.patch: Do not install polkit
+    rules when the admin backend is disabled, should fix FTBFS on !linux
+
+ -- Laurent Bigonville <bigon at debian.org>  Tue, 08 Nov 2016 13:18:03 +0100
 
 gvfs (1.30.1.1-1) unstable; urgency=medium
 

Added: desktop/unstable/gvfs/debian/patches/disable-polkit-rules-no-admin.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/disable-polkit-rules-no-admin.patch?rev=51658&op=file
==============================================================================
--- desktop/unstable/gvfs/debian/patches/disable-polkit-rules-no-admin.patch	(added)
+++ desktop/unstable/gvfs/debian/patches/disable-polkit-rules-no-admin.patch	[utf-8] Tue Nov  8 12:22:02 2016
@@ -0,0 +1,14 @@
+--- a/daemon/Makefile.am.old	2016-11-08 13:14:03.467890705 +0100
++++ b/daemon/Makefile.am	2016-11-08 13:08:30.152920469 +0100
+@@ -668,9 +668,11 @@
+ org.gtk.vfs.file-operations.policy: org.gtk.vfs.file-operations.policy.in Makefile
+ 	$(AM_V_GEN) XDG_DATA_DIRS=$(top_srcdir) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ || cp $< $@
+ 
++if HAVE_ADMIN
+ gvfs_polkit_actionsdir = $(datadir)/polkit-1/actions
+ gvfs_polkit_actions_in_files = org.gtk.vfs.file-operations.policy.in
+ gvfs_polkit_actions_DATA = org.gtk.vfs.file-operations.policy
+ 
+ gvfs_polkit_rulesdir = $(datadir)/polkit-1/rules.d
+ dist_gvfs_polkit_rules_DATA = org.gtk.vfs.file-operations.rules
++endif

Modified: desktop/unstable/gvfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/series?rev=51658&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gvfs/debian/patches/series	[utf-8] Tue Nov  8 12:22:02 2016
@@ -4,3 +4,4 @@
 dont-crash-on-null-job.patch
 handle-inactive-vfs.patch
 ref-jobs-in-thread.patch
+disable-polkit-rules-no-admin.patch

Modified: desktop/unstable/gvfs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/rules?rev=51658&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/rules	[utf-8] (original)
+++ desktop/unstable/gvfs/debian/rules	[utf-8] Tue Nov  8 12:22:02 2016
@@ -2,6 +2,7 @@
 
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 #LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)