Bug#885086: Slightly improved version
I've made a small change to the package, changing the new dependency
from gvfs to desktop-file-utils, since that's what's really necessary
(as discovered in #885086).
The new debdiff is attached.
--
Eduardo M KALINOWSKI
eduardo@kalinowski.com.br
diff -Nru kildclient-3.1.0/debian/changelog kildclient-3.1.0/debian/changelog
--- kildclient-3.1.0/debian/changelog 2016-12-04 20:46:22.000000000 -0200
+++ kildclient-3.1.0/debian/changelog 2018-01-20 10:50:25.000000000 -0200
@@ -1,3 +1,10 @@
+kildclient (3.1.0-1+deb9u1) stretch; urgency=low
+
+ * Fix for CVE-2017-17511. New dependency 'desktop-file-utils' required
+ in order to use GTK+ function for opening URLs. Closes: #885007
+
+ -- Eduardo M Kalinowski <eduardo@kalinowski.com.br> Sat, 20 Jan 2018 10:50:25 -0200
+
kildclient (3.1.0-1) unstable; urgency=low
* New upstream version: 3.1.0.
diff -Nru kildclient-3.1.0/debian/control kildclient-3.1.0/debian/control
--- kildclient-3.1.0/debian/control 2016-12-04 20:46:22.000000000 -0200
+++ kildclient-3.1.0/debian/control 2018-01-20 10:50:25.000000000 -0200
@@ -10,7 +10,7 @@
Package: kildclient
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libjson-perl
+Depends: ${shlibs:Depends}, ${misc:Depends}, libjson-perl, desktop-file-utils
Suggests: kildclient-doc, libgtk3-perl
Description: powerful MUD client with a built-in Perl interpreter
KildClient is a MUD Client written with the GTK+ windowing toolkit.
diff -Nru kildclient-3.1.0/debian/NEWS.Debian kildclient-3.1.0/debian/NEWS.Debian
--- kildclient-3.1.0/debian/NEWS.Debian 2016-12-04 20:46:22.000000000 -0200
+++ kildclient-3.1.0/debian/NEWS.Debian 2018-01-20 08:44:40.000000000 -0200
@@ -1,3 +1,10 @@
+kildclient (3.1.0-1+deb9u1) stretch-security; urgency=high
+
+ * The option to define the command used to run a web browser has been
+ removed; the default browser (as selected by gvfs) is now used.
+
+ -- Eduardo M Kalinowski <eduardo@kalinowski.com.br> Sun, 17 Dec 2017 09:42:23 -0200
+
kildclient (2.8.1-1) experimental; urgency=low
The HTML manual is now in the package kildclient-doc.
diff -Nru kildclient-3.1.0/debian/patches/cve-2017-17511.patch kildclient-3.1.0/debian/patches/cve-2017-17511.patch
--- kildclient-3.1.0/debian/patches/cve-2017-17511.patch 1969-12-31 21:00:00.000000000 -0300
+++ kildclient-3.1.0/debian/patches/cve-2017-17511.patch 2018-01-20 08:44:40.000000000 -0200
@@ -0,0 +1,183 @@
+Description: Fix for CVE-2017-17511
+ Uses a GTK+ function to open URLs, instead of using a command
+ supplied by the user or $BROWSER.
+Author: Eduardo M KALINOWSKI <eduardo@kalinowski.com.br>
+Last-Update: 2017-12-17
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/doc/C/kildclient.xml
++++ b/doc/C/kildclient.xml
+@@ -1233,20 +1233,16 @@
+ </mediaobject>
+ </figure>
+
+-<para>In this section you can configure the command that will be run
+-when you right-click in a URL that appears in the MUD window and
+-select <guilabel>Open Link</guilabel>. The command will be executed,
+-with <literal>%s</literal> replaced with the URL's address. The
+-ampersand (<literal>&</literal>) in the end means that the command
+-is to be executed in the background, so that you can continue using
+-KildClient while browsing the URL.</para>
+-
+-<para>You can also set a command used to play audio files (see <xref
++<para>In this section you can set a command used to play audio files (see <xref
+ linkend="sec_sounds"/>). Enter the command, with <literal>%s</literal>
+ in the place of the file path. The default should work (it uses the
+ SOX program, which is usually installed), but you can use other
+ commands if you use ALSA, ARTS, ESD, JACK, etc.</para>
+
++<para>Previously it was also possible to define a command to run a web
++browser. This option has been removed, and the default browser is now
++used instead.</para>
++
+ </sect1>
+
+
+--- a/src/dlgPreferences.ui
++++ b/src/dlgPreferences.ui
+@@ -521,61 +521,6 @@
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+- <object class="GtkLabel" id="label_browser">
+- <property name="can_focus">False</property>
+- <property name="label" translatable="yes"><b>Web browser</b></property>
+- <property name="use_markup">True</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkBox" id="vbox_int_browser">
+- <property name="can_focus">False</property>
+- <property name="margin_start">16</property>
+- <property name="orientation">vertical</property>
+- <property name="spacing">6</property>
+- <child>
+- <object class="GtkLabel" id="label49">
+- <property name="can_focus">False</property>
+- <property name="label" translatable="yes">Enter the command to run a _web browser. %s will be substituted by the web page address:</property>
+- <property name="use_underline">True</property>
+- <property name="wrap">True</property>
+- <property name="mnemonic_widget">txtBrowserCommand</property>
+- <property name="xalign">0</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkEntry" id="txtBrowserCommand">
+- <property name="can_focus">True</property>
+- <property name="tooltip_text" translatable="yes">Specify the command used to launch a web browser</property>
+- <property name="invisible_char">â??</property>
+- <property name="activates_default">True</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- <child>
+ <object class="GtkLabel" id="label_player">
+ <property name="can_focus">False</property>
+ <property name="margin_top">12</property>
+--- a/src/kildclient.h
++++ b/src/kildclient.h
+@@ -628,7 +628,6 @@
+ GtkPositionType tab_position;
+ gboolean hide_single_tab;
+ gboolean urgency_hint;
+- char *browser_command;
+ char *audio_player_command;
+ char *last_open_world;
+ gboolean no_plugin_help_msg;
+--- a/src/prefs.c
++++ b/src/prefs.c
+@@ -92,7 +92,6 @@
+ GObject *txtProxyUser;
+ GObject *txtProxyPassword;
+ #ifndef __MINGW32__
+- GObject *txtBrowserCommand;
+ GObject *txtAudioPlayerCommand;
+ #else
+ GtkWidget *tabPrograms;
+@@ -179,12 +178,6 @@
+
+ #ifndef __MINGW32__
+ /* Load commands */
+- txtBrowserCommand = gtk_builder_get_object(main_builder, "txtBrowserCommand");
+- gtk_entry_set_text(GTK_ENTRY(txtBrowserCommand),
+- globalPrefs.browser_command);
+- g_signal_connect(txtBrowserCommand, "focus_out_event",
+- G_CALLBACK(txt_cmd_focus_out_cb),
+- &globalPrefs.browser_command);
+ txtAudioPlayerCommand
+ = gtk_builder_get_object(main_builder, "txtAudioPlayerCommand");
+ gtk_entry_set_text(GTK_ENTRY(txtAudioPlayerCommand),
+@@ -320,9 +313,6 @@
+ }
+
+ /* Has the commands been set? */
+- if (!globalPrefs.browser_command) {
+- globalPrefs.browser_command = g_strdup("${BROWSER} \"%s\" &");
+- }
+ if (!globalPrefs.audio_player_command) {
+ globalPrefs.audio_player_command = g_strdup("play \"%s\" &");
+ }
+@@ -381,8 +371,6 @@
+ globalPrefs.hide_single_tab = atoi(line + pos + 1);
+ } else if (strcmp(first_word, "urgencyhint") == 0) {
+ globalPrefs.urgency_hint = atoi(line + pos + 1);
+- } else if (strcmp(first_word, "browsercommand") == 0) {
+- globalPrefs.browser_command = g_strdup(line + pos + 1);
+ } else if (strcmp(first_word, "audioplayercommand") == 0) {
+ globalPrefs.audio_player_command = g_strdup(line + pos + 1);
+ } else if (strcmp(first_word, "lastopenworld") == 0) {
+@@ -469,8 +457,6 @@
+ g_string_append_printf(str, "urgencyhint %d\n", globalPrefs.urgency_hint);
+
+ g_string_append_printf(str,
+- "browsercommand %s\n", globalPrefs.browser_command);
+- g_string_append_printf(str,
+ "audioplayercommand %s\n",
+ globalPrefs.audio_player_command);
+
+--- a/src/worldgui.c
++++ b/src/worldgui.c
+@@ -1154,13 +1154,15 @@
+ void
+ menu_url_open(GtkMenuItem *menu, char *url)
+ {
+- char *to_run;
++ GError *err = NULL;
+
+- to_run = g_strdup_printf(globalPrefs.browser_command, url);
++ gtk_show_uri(NULL, url, GDK_CURRENT_TIME, &err);
++ if (err != NULL) {
++ fprintf(stderr, "Error opening URL: %s\nCheck if gvfs is installed\n",
++ err->message);
++ g_error_free(err);
++ }
+
+- system(to_run);
+-
+- g_free(to_run);
+ g_free(url);
+ }
+ #else /* defined __MINGW32__ */
diff -Nru kildclient-3.1.0/debian/patches/series kildclient-3.1.0/debian/patches/series
--- kildclient-3.1.0/debian/patches/series 1969-12-31 21:00:00.000000000 -0300
+++ kildclient-3.1.0/debian/patches/series 2018-01-20 08:44:40.000000000 -0200
@@ -0,0 +1 @@
+cve-2017-17511.patch
Reply to: