This is an automated email from the git hooks/post-receive script. henrich pushed a commit to branch master in repository shutter.
commit 1c7862f366db999cc3b82b7bd9ed50350c3fab13 Author: Hideki Yamane <[email protected]> Date: Mon Feb 12 09:45:34 2018 +0900 adjust patches --- debian/changelog | 7 ++++ ...-utf8-for-retrieved-window-name-from-Gtk2.patch | 45 ---------------------- .../0003-Fix-error-on-executing-xdg-email.patch | 29 -------------- debian/patches/CVE-2016-10081.patch | 43 --------------------- debian/patches/fix-perl-system-calls | 16 ++------ debian/patches/insecure_use_of_system.patch | 23 ----------- debian/patches/series | 4 -- 7 files changed, 10 insertions(+), 157 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1238b33..24215cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,13 @@ shutter (0.94-1) UNRELEASED; urgency=medium - update to version 4 * debian/compat - set 11 + * debian/patches + - drop 0002-Force-utf8-for-retrieved-window-name-from-Gtk2.patch, merged + upstream + - drop 0003-Fix-error-on-executing-xdg-email.patch, merged upstream + - drop insecure_use_of_system.patch, merged upstream + - drop CVE-2016-10081.patch, merged upstream + - refresh fix-perl-system-calls -- Hideki Yamane <[email protected]> Mon, 12 Feb 2018 09:30:17 +0900 diff --git a/debian/patches/0002-Force-utf8-for-retrieved-window-name-from-Gtk2.patch b/debian/patches/0002-Force-utf8-for-retrieved-window-name-from-Gtk2.patch deleted file mode 100644 index 0bdaed3..0000000 --- a/debian/patches/0002-Force-utf8-for-retrieved-window-name-from-Gtk2.patch +++ /dev/null @@ -1,45 +0,0 @@ -Bug: https://bugs.launchpad.net/ubuntu/+source/shutter/+bug/1556021 -Bug-Debian: https://bugs.debian.org/847051 -Forwarded: https://bugs.launchpad.net/shutter/+bug/1652600/comments/6 -From: Boyuan Yang <[email protected]> -Last-Update: 2016-12-05 -Subject: Force utf8 for retrieved window name from Gtk2. -Date: Mon, 5 Dec 2016 16:21:51 +0800 - -Transform the window name retrieved from Gtk2 to utf8 -to prevent messy encoding problem. Otherwise latin-1 -would be used and cause mess. ---- - bin/shutter | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - ---- a/bin/shutter -+++ b/bin/shutter -@@ -30,6 +30,11 @@ - use strict; - use warnings; - -+#Deal with encoding problem -+use 5.12.0; -+use Encode qw/is_utf8 decode/; -+use Encode::X11; -+ - #Gnome2 libraries - use Gnome2; - use Gnome2::Wnck; -@@ -8624,7 +8629,14 @@ - #add all windows to menu to capture it directly - foreach my $win ( $wnck_screen->get_windows_stacked ) { - if ( $active_workspace && $win->is_on_workspace($active_workspace) ) { -- my $window_item = Gtk2::ImageMenuItem->new_with_label( $win->get_name ); -+ my $raw_name = $win->get_name; -+ my $name; -+ eval { $name = decode( 'UTF-8' , $raw_name, 1); }; -+ # fallback if utf-8 decoding fails. -+ # See https://mail.gnome.org/archives/gtk-perl-list/2016-December/msg00004.html -+ $name = decode( 'x11-compound-text', $raw_name ) if $@; -+ -+ my $window_item = Gtk2::ImageMenuItem->new_with_label( $name ); - foreach my $child ( $window_item->get_children ) { - if ( $child =~ /Gtk2::AccelLabel/ ) { - $child->set_width_chars(50); diff --git a/debian/patches/0003-Fix-error-on-executing-xdg-email.patch b/debian/patches/0003-Fix-error-on-executing-xdg-email.patch deleted file mode 100644 index 1a6f1c4..0000000 --- a/debian/patches/0003-Fix-error-on-executing-xdg-email.patch +++ /dev/null @@ -1,29 +0,0 @@ -Bug: https://bugs.launchpad.net/shutter/+bug/1469840 -Bug-Debian: https://bugs.debian.org/819149 -Forwarded: https://bugs.launchpad.net/shutter/+bug/1652600/comments/6 -Origin: https://bugs.launchpad.net/shutter/+bug/1469840 -From: Robin Lee <[email protected]> -Acked-by: Boyuan Yang <[email protected]> -Subject: Fix error on executing xdg-email. -Date: Tue, 6 Dec 2016 17:26:45 +0800 - -This error occurs because shutter passed -"--attach file:///path/to/image" to xdg-email, -but --attach expects a file path, not a URI. ---- - bin/shutter | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bin/shutter b/bin/shutter -index 38eeedd..791057a 100755 ---- a/bin/shutter -+++ b/bin/shutter -@@ -6967,7 +6967,7 @@ else { - ); - } - else { -- push( @files_to_email, $session_screens{$key}->{'uri'}->to_string ); -+ push( @files_to_email, $session_screens{$key}->{'long'} ); - } - - my $mail_string = undef; diff --git a/debian/patches/CVE-2016-10081.patch b/debian/patches/CVE-2016-10081.patch deleted file mode 100644 index 8e7955c..0000000 --- a/debian/patches/CVE-2016-10081.patch +++ /dev/null @@ -1,43 +0,0 @@ -Bug: https://bugs.launchpad.net/shutter/+bug/1652600 -Bug-Debian: https://bugs.debian.org/849777 -Forwarded: https://bugs.launchpad.net/shutter/+bug/1652600/comments/6 -Author: Christoph Biedl <[email protected]> -Description: fix insecure use of perl exec() - The patch attached uses the multi-argument invocation and also changes - it in the code path for non-Perl plugins. ---- a/bin/shutter -+++ b/bin/shutter -@@ -7164,8 +7164,13 @@ - elsif ( $pid == 0 ) { - - #see Bug #661424 -- my $qfilename = quotemeta $session_screens{$key}->{'long'}; -- exec( sprintf( "$^X $plugin_value %d $qfilename $session_screens{$key}->{'width'} $session_screens{$key}->{'height'} $session_screens{$key}->{'filetype'}\n", $socket->get_id ) ); -+ #my $qfilename = quotemeta $session_screens{$key}->{'long'}; -+ exec( $^X, $plugin_value, -+ $socket->get_id, -+ $session_screens{$key}->{'long'}, -+ $session_screens{$key}->{'width'}, -+ $session_screens{$key}->{'height'}, -+ $session_screens{$key}->{'filetype'} ); - } - - $sdialog->show_all; -@@ -7198,11 +7203,15 @@ - my $plugin_process = Proc::Simple->new; - - #see Bug #661424 -- my $qfilename = quotemeta $session_screens{$key}->{'long'}; -+ #my $qfilename = quotemeta $session_screens{$key}->{'long'}; - - $plugin_process->start( - sub { -- system("'$plugin_value' $qfilename '$session_screens{$key}->{'width'}' '$session_screens{$key}->{'height'}' '$session_screens{$key}->{'filetype'}' "); -+ system( $plugin_value, -+ $session_screens{$key}->{'long'}, -+ $session_screens{$key}->{'width'}, -+ $session_screens{$key}->{'height'}, -+ $session_screens{$key}->{'filetype'} ); - POSIX::_exit(0); - } - ); diff --git a/debian/patches/fix-perl-system-calls b/debian/patches/fix-perl-system-calls index 1300545..20b6be7 100644 --- a/debian/patches/fix-perl-system-calls +++ b/debian/patches/fix-perl-system-calls @@ -216,17 +216,7 @@ Description: Fix perl system calls } --- a/share/shutter/resources/modules/Shutter/App/HelperFunctions.pm +++ b/share/shutter/resources/modules/Shutter/App/HelperFunctions.pm -@@ -53,8 +53,7 @@ - - sub xdg_open { - my ( $self, $dialog, $link, $user_data ) = @_; -- my @args = ("xdg-open", $link); -- system(@args); -+ system("xdg-open", $link); - if($?){ - my $response = $self->{_dialogs}->dlg_error_message( - sprintf( $self->{_d}->get("Error while executing %s."), "'xdg-open'"), -@@ -67,8 +66,12 @@ +@@ -67,8 +67,12 @@ } sub xdg_open_mail { @@ -241,7 +231,7 @@ Description: Fix perl system calls if($?){ my $response = $self->{_dialogs}->dlg_error_message( sprintf( $self->{_d}->get("Error while executing %s."), "'xdg-email'"), -@@ -82,7 +85,7 @@ +@@ -82,7 +86,7 @@ sub nautilus_sendto { my ( $self, $user_data ) = @_; @@ -252,7 +242,7 @@ Description: Fix perl system calls sprintf( $self->{_d}->get("Error while executing %s."), "'nautilus-sendto'"), --- a/bin/shutter +++ b/bin/shutter -@@ -6972,12 +6972,9 @@ +@@ -6974,12 +6974,9 @@ push( @files_to_email, $session_screens{$key}->{'long'} ); } diff --git a/debian/patches/insecure_use_of_system.patch b/debian/patches/insecure_use_of_system.patch deleted file mode 100644 index 237f59f..0000000 --- a/debian/patches/insecure_use_of_system.patch +++ /dev/null @@ -1,23 +0,0 @@ -Bug: https://bugs.launchpad.net/shutter/+bug/1495163 -Forwarded: https://bugs.launchpad.net/shutter/+bug/1652600/comments/6 -From: Loke Faraone <[email protected]> -Subject: Fix insecure use of system() -Debian-Bug: https://bugs.debian.org/798862 ---- - share/shutter/resources/modules/Shutter/App/HelperFunctions.pm | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/share/shutter/resources/modules/Shutter/App/HelperFunctions.pm b/share/shutter/resources/modules/Shutter/App/HelperFunctions.pm -index 0de1a6c..ffd0de1 100644 ---- a/share/shutter/resources/modules/Shutter/App/HelperFunctions.pm -+++ b/share/shutter/resources/modules/Shutter/App/HelperFunctions.pm -@@ -53,7 +53,8 @@ sub new { - - sub xdg_open { - my ( $self, $dialog, $link, $user_data ) = @_; -- system("xdg-open $link"); -+ my @args = ("xdg-open", $link); -+ system(@args); - if($?){ - my $response = $self->{_dialogs}->dlg_error_message( - sprintf( $self->{_d}->get("Error while executing %s."), "'xdg-open'"), diff --git a/debian/patches/series b/debian/patches/series index f49a897..9aed89d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1 @@ -insecure_use_of_system.patch -0002-Force-utf8-for-retrieved-window-name-from-Gtk2.patch -0003-Fix-error-on-executing-xdg-email.patch -CVE-2016-10081.patch fix-perl-system-calls -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/shutter.git _______________________________________________ Pkg-perl-cvs-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
