Merge branch 'feature/jessie' into feature/7756-reintroduce-whisperback

Conflicts:
	config/chroot_local-includes/etc/whisperback/config.py

5 files changed, 193 insertions, 25 deletions

diff --git a/config/chroot_local-patches/Desktop-Notify:_0001-support_notification_actions.patch b/config/chroot_local-patches/Desktop-Notify:_0001-support_notification_actions.patch
new file mode 100644
index 0000000..7d41d92
--- /dev/null
+++ b/config/chroot_local-patches/Desktop-Notify:_0001-support_notification_actions.patch
@@ -0,0 +1,122 @@
+From e84e1f23168ebfb51fc73c272061c295ed9952d8 Mon Sep 17 00:00:00 2001
+From: intrigeri <intrigeri@boum.org>
+Date: Sun, 8 Mar 2015 23:22:02 +0000
+Subject: [PATCH] Add support for a user-defined function to be called whenever
+ an action is invoked.
+
+---
+ lib/Desktop/Notify.pm              | 30 +++++++++++++++++++++++++++++-
+ lib/Desktop/Notify/Notification.pm | 18 +++++++++++-------
+ 2 files changed, 40 insertions(+), 8 deletions(-)
+
+diff --git a/lib/Desktop/Notify.pm b/lib/Desktop/Notify.pm
+index b8bb248..78f31d4 100644
+--- a/usr/share/perl5/Desktop/Notify.pm
++++ b/usr/share/perl5/Desktop/Notify.pm
+@@ -106,6 +106,8 @@ sub new {
+     $self->{app_name} = $opts{app_name} || basename($0);
+     $self->{notify}->connect_to_signal('NotificationClosed',
+                                        sub {$self->_close_cb(@_)});
++    $self->{notify}->connect_to_signal('ActionInvoked',
++                                       sub {$self->_action_cb(@_)});
+ 
+     bless $self, $class;
+ }
+@@ -140,6 +142,17 @@ sub _close_cb {
+     delete $self->{notes}->{$nid};
+ }
+ 
++sub _action_cb {
++    my ($self, $nid, $action_key) = @_;
++    print __PACKAGE__, ": action invoked\n";
++    if ($self->{action_callback})
++    {
++        print "invoking callback\n";
++        $self->{action_callback}->($self->{notes}->{$nid}, $action_key);
++    }
++    # delete $self->{notes}->{$nid};
++}
++
+ =head2 close_callback $coderef
+ 
+ Sets a user-specified function to be called whenever a notification is closed.
+@@ -151,10 +164,25 @@ just closed.
+ sub close_callback {
+     my ($self, $cb) = @_;
+ 
+-    print "callback is $cb\n";
++    print "close callback is $cb\n";
+     $self->{close_callback} = $cb;
+ }
+ 
++=head2 action_callback $coderef
++
++Sets a user-specified function to be called whenever an action is invoked.
++It will be called with two arguments, which are the Notification object on which
++an action was invoked, and the key of the action invoked.
++
++=cut
++
++sub action_callback {
++    my ($self, $cb) = @_;
++
++    print "action callback is $cb\n";
++    $self->{action_callback} = $cb;
++}
++
+ =head1 AUTHOR
+ 
+ Stephen Cavilia, C<< <sac at atomicradi.us> >>
+diff --git a/lib/Desktop/Notify/Notification.pm b/lib/Desktop/Notify/Notification.pm
+index ee3fe4a..e7710e8 100644
+--- a/usr/share/perl5/Desktop/Notify/Notification.pm
++++ b/usr/share/perl5/Desktop/Notify/Notification.pm
+@@ -59,6 +59,7 @@ sub new {
+     my $self = \%params;
+     $self->{server} = $server;
+     $self->{id} = undef;
++    $self->{actions} ||= {};
+     bless $self, $class;
+ }
+ 
+@@ -81,7 +82,7 @@ sub show {
+                  '',
+                  $self->{summary},
+                  $self->{body},
+-                 [],
++                 [%{$self->{actions}}],
+                  {},
+                  $self->{timeout} || 0,
+                 );
+@@ -125,6 +126,15 @@ The summary text briefly describing the notification.
+ 
+ The optional detailed body text. Can be empty.
+ 
++=item actions
++
++Actions are sent over as a list of pairs. Each even element in the list
++(starting at index 0) represents the identifier for the action. Each odd
++element in the list is the localized string that will be displayed to the user.
++
++A user-specified function to be called whenever an action is invoked can be
++specified with L<Desktop::Notify>'s L<action_callback> method.
++
+ =item timeout
+ 
+ The timeout time in milliseconds since the display of the notification at which
+@@ -145,12 +155,6 @@ supported by L<Desktop::Notify> at this time
+ 
+ The optional program icon of the calling application.
+ 
+-=item actions
+-
+-Actions are sent over as a list of pairs. Each even element in the list
+-(starting at index 0) represents the identifier for the action. Each odd
+-element in the list is the localized string that will be displayed to the user.
+-
+ =item hints
+ 
+ Optional hints that can be passed to the server from the client program.
+-- 
+2.1.4
+
diff --git a/config/chroot_local-patches/Desktop-Notify:_0002-support_hints.patch b/config/chroot_local-patches/Desktop-Notify:_0002-support_hints.patch
new file mode 100644
index 0000000..2c9eec1
--- /dev/null
+++ b/config/chroot_local-patches/Desktop-Notify:_0002-support_hints.patch
@@ -0,0 +1,59 @@
+From fc56108b83af0e4966ad615730d09e9bc11b865c Mon Sep 17 00:00:00 2001
+From: intrigeri <intrigeri@boum.org>
+Date: Mon, 9 Mar 2015 00:46:12 +0000
+Subject: [PATCH 2/2] Add support for passing hints to the notification server.
+
+---
+ lib/Desktop/Notify/Notification.pm | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/lib/Desktop/Notify/Notification.pm b/lib/Desktop/Notify/Notification.pm
+index e7710e8..0ac09cb 100644
+--- a/usr/share/perl5/Desktop/Notify/Notification.pm
++++ b/usr/share/perl5/Desktop/Notify/Notification.pm
+@@ -60,6 +60,7 @@ sub new {
+     $self->{server} = $server;
+     $self->{id} = undef;
+     $self->{actions} ||= {};
++    $self->{hints}   ||= {};
+     bless $self, $class;
+ }
+ 
+@@ -83,7 +84,7 @@ sub show {
+                  $self->{summary},
+                  $self->{body},
+                  [%{$self->{actions}}],
+-                 {},
++                 $self->{hints},
+                  $self->{timeout} || 0,
+                 );
+     $self->{server}->_register_notification($self);
+@@ -135,6 +136,12 @@ element in the list is the localized string that will be displayed to the user.
+ A user-specified function to be called whenever an action is invoked can be
+ specified with L<Desktop::Notify>'s L<action_callback> method.
+ 
++=item hints
++
++Optional hints that can be passed to the server from the client program.
++
++=back
++
+ =item timeout
+ 
+ The timeout time in milliseconds since the display of the notification at which
+@@ -155,12 +162,6 @@ supported by L<Desktop::Notify> at this time
+ 
+ The optional program icon of the calling application.
+ 
+-=item hints
+-
+-Optional hints that can be passed to the server from the client program.
+-
+-=back
+-
+ =cut
+ 
+ 1;  # End of Desktop::Notify::Notification
+-- 
+2.1.4
+
diff --git a/config/chroot_local-patches/disable_macchanger_spoofing.diff b/config/chroot_local-patches/disable_macchanger_spoofing.diff
deleted file mode 100644
index ababa2a..0000000
--- a/config/chroot_local-patches/disable_macchanger_spoofing.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/etc/default/macchanger	2014-11-16 19:59:36.252000000 +0000
-+++ b/etc/default/macchanger	2014-11-16 19:59:49.732000000 +0000
-@@ -2,7 +2,7 @@
- # not guaranteed to prevent leaking your real MAC address before the new one
- # gets assigned!
- #
--ENABLE_ON_POST_DOWN=yes
-+ENABLE_ON_POST_DOWN=no
- 
- 
- # by default, macchanger runs on all network interfaces but loopback (lo).  If
diff --git a/config/chroot_local-patches/gdm-tails-greeter.patch b/config/chroot_local-patches/gdm-tails-greeter.patch
deleted file mode 100644
index 9a2b333..0000000
--- a/config/chroot_local-patches/gdm-tails-greeter.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/etc/gdm3/greeter.dconf-defaults	2014-11-17 11:16:23.916000000 +0000
-+++ b/etc/gdm3/greeter.dconf-defaults	2014-11-17 11:16:51.728000000 +0000
-@@ -33,3 +33,10 @@
- # - Show a login welcome message
- # banner-message-enable=true
- # banner-message-text='Welcome'
-+
-+[org/gnome/desktop/session]
-+session-name='gdm-tails'
-+
-+[org/gnome/desktop/background]
-+picture-uri='file:///usr/share/tails/desktop_wallpaper.png'
-+
-
diff --git a/config/chroot_local-patches/torsocks_liferea.patch b/config/chroot_local-patches/torsocks_liferea.patch
new file mode 100644
index 0000000..0452115
--- /dev/null
+++ b/config/chroot_local-patches/torsocks_liferea.patch
@@ -0,0 +1,12 @@
+--- a/usr/share/applications/liferea.desktop.orig	2015-02-26 10:14:36.644624000 +0000
++++ b/usr/share/applications/liferea.desktop	2015-02-26 10:16:50.216626591 +0000
+@@ -118,7 +118,7 @@
+ Keywords=news;feed;aggregator;blog;podcast;
+ Keywords[ar]=أخبار;تلقيمات;مدونة;تدوين;
+ Keywords[he]=חדשות;ערוץ;הזנה;פיד;מאגד;בלוג;פודקסט;
+-Exec=liferea
++Exec=torsocks liferea
+ Icon=liferea
+ StartupNotify=true
+ Terminal=false
+