Bug#604066: unblock: network-manager-applet/0.8.1-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: freeze-exception
Please unblock package network-manager-applet
I cherry-picks two patches from upstream git to fix an important bug
(which one could consider security related).
Changelog:
etwork-manager-applet (0.8.1-2) unstable; urgency=low
* debian/patches/02-hide-pin-in-pin-puk-dialog-by-default.patch
- Hide PIN in PIN/PUK dialog by default. (Closes: #592364)
Patch cherry-picked from upstream Git.
* debian/patches/03-enter-closes-pin-puk-dialog.patch
- Ensure Enter closes the PIN/PUK dialog.
Patch cherry-picked from upstream Git.
-- Michael Biebl <biebl@debian.org> Wed, 17 Nov 2010 23:49:29 +0100
debdiff is attached
Michael
unblock network-manager-applet/0.8.1-2
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable'), (200, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.32-5-686 (SMP w/1 CPU core)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Index: debian/changelog
===================================================================
--- debian/changelog (Revision 3687)
+++ debian/changelog (Revision 3774)
@@ -1,3 +1,14 @@
+network-manager-applet (0.8.1-2) unstable; urgency=low
+
+ * debian/patches/02-hide-pin-in-pin-puk-dialog-by-default.patch
+ - Hide PIN in PIN/PUK dialog by default. (Closes: #592364)
+ Patch cherry-picked from upstream Git.
+ * debian/patches/03-enter-closes-pin-puk-dialog.patch
+ - Ensure Enter closes the PIN/PUK dialog.
+ Patch cherry-picked from upstream Git.
+
+ -- Michael Biebl <biebl@debian.org> Wed, 17 Nov 2010 23:49:29 +0100
+
network-manager-applet (0.8.1-1) unstable; urgency=low
* New upstream release.
Index: debian/patches/03-enter-closes-pin-puk-dialog.patch
===================================================================
--- debian/patches/03-enter-closes-pin-puk-dialog.patch (Revision 0)
+++ debian/patches/03-enter-closes-pin-puk-dialog.patch (Revision 3774)
@@ -0,0 +1,62 @@
+From f09e5d92055544a5ac4abeb6a2f0495724a63590 Mon Sep 17 00:00:00 2001
+From: Dan Williams <dcbw@redhat.com>
+Date: Sun, 08 Aug 2010 04:05:35 +0000
+Subject: mobile: ensure Enter closes the PIN/PUK dialog (rh #611831)
+
+---
+diff --git a/src/applet.glade b/src/applet.glade
+index 86c7dd0..645febe 100644
+--- a/src/applet.glade
++++ b/src/applet.glade
+@@ -1894,6 +1894,7 @@ Version 1</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="invisible_char">●</property>
++ <property name="activates_default">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+@@ -1917,6 +1918,7 @@ Version 1</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
++ <property name="activates_default">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+@@ -1942,6 +1944,7 @@ Version 1</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
++ <property name="activates_default">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+@@ -1951,12 +1954,6 @@ Version 1</property>
+ </packing>
+ </child>
+ <child>
+- <placeholder/>
+- </child>
+- <child>
+- <placeholder/>
+- </child>
+- <child>
+ <widget class="GtkHBox" id="progress_hbox">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+@@ -2009,6 +2006,12 @@ Version 1</property>
+ <property name="bottom_attach">4</property>
+ </packing>
+ </child>
++ <child>
++ <placeholder/>
++ </child>
++ <child>
++ <placeholder/>
++ </child>
+ </widget>
+ </child>
+ </widget>
+--
+cgit v0.8.3.1
Index: debian/patches/02-hide-pin-in-pin-puk-dialog-by-default.patch
===================================================================
--- debian/patches/02-hide-pin-in-pin-puk-dialog-by-default.patch (Revision 0)
+++ debian/patches/02-hide-pin-in-pin-puk-dialog-by-default.patch (Revision 3774)
@@ -0,0 +1,189 @@
+commit cda2ffae25954d28fbce803b05cf65cfb2a6cd46
+Author: Dan Williams <dcbw@redhat.com>
+Date: Sat Aug 7 22:21:21 2010 -0500
+
+ mobile: hide PIN in PIN/PUK dialog by default (bgo #620480) (rh #615085) (lp:589139)
+
+Index: network-manager-applet-0.8.1/src/applet-device-gsm.c
+===================================================================
+--- network-manager-applet-0.8.1.orig/src/applet-device-gsm.c 2010-07-12 21:40:12.000000000 +0200
++++ network-manager-applet-0.8.1/src/applet-device-gsm.c 2010-11-17 23:14:39.843528212 +0100
+@@ -947,6 +947,7 @@
+ {
+ const char *header = NULL;
+ const char *title = NULL;
++ const char *show_pass_label = NULL;
+ char *desc = NULL;
+ const char *label1 = NULL, *label2 = NULL, *label3 = NULL;
+ const char *device_desc;
+@@ -970,6 +971,7 @@
+ label1 = _("PIN code:");
+ label1_min = 4;
+ label1_max = 8;
++ show_pass_label = _("Show PIN code");
+ unlock_code = UNLOCK_CODE_PIN;
+ } else if (!strcmp (info->unlock_required, "sim-puk")) {
+ title = _("SIM PUK unlock required");
+@@ -983,6 +985,7 @@
+ label2_min = label3_min = 4;
+ label2_max = label3_max = 8;
+ match23 = TRUE;
++ show_pass_label = _("Show PIN/PUK codes");
+ unlock_code = UNLOCK_CODE_PUK;
+ } else {
+ g_warning ("Unhandled unlock request for '%s'", info->unlock_required);
+@@ -990,7 +993,7 @@
+ }
+
+ /* Construct and run the dialog */
+- info->dialog = applet_mobile_pin_dialog_new (title, header, desc);
++ info->dialog = applet_mobile_pin_dialog_new (title, header, desc, show_pass_label);
+ g_free (desc);
+ g_return_if_fail (info->dialog != NULL);
+
+Index: network-manager-applet-0.8.1/src/applet-dialogs.c
+===================================================================
+--- network-manager-applet-0.8.1.orig/src/applet-dialogs.c 2010-06-26 03:46:37.000000000 +0200
++++ network-manager-applet-0.8.1/src/applet-dialogs.c 2010-11-17 23:14:39.859524662 +0100
+@@ -831,10 +831,32 @@
+ gtk_dialog_response (dialog, GTK_RESPONSE_CANCEL);
+ }
+
++static void
++show_toggled_cb (GtkWidget *button, gpointer user_data)
++{
++ GtkWidget *dialog = GTK_WIDGET (user_data);
++ gboolean show;
++ GtkWidget *widget;
++ GladeXML *xml;
++
++ xml = g_object_get_data (G_OBJECT (dialog), "xml");
++ g_return_if_fail (xml != NULL);
++
++ show = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
++
++ widget = glade_xml_get_widget (xml, "code1_entry");
++ gtk_entry_set_visibility (GTK_ENTRY (widget), show);
++ widget = glade_xml_get_widget (xml, "code2_entry");
++ gtk_entry_set_visibility (GTK_ENTRY (widget), show);
++ widget = glade_xml_get_widget (xml, "code3_entry");
++ gtk_entry_set_visibility (GTK_ENTRY (widget), show);
++}
++
+ GtkWidget *
+ applet_mobile_pin_dialog_new (const char *title,
+ const char *header,
+- const char *desc)
++ const char *desc,
++ const char *show_password_label)
+ {
+ char *glade_file, *str;
+ GladeXML *xml;
+@@ -844,6 +866,7 @@
+ g_return_val_if_fail (title != NULL, NULL);
+ g_return_val_if_fail (header != NULL, NULL);
+ g_return_val_if_fail (desc != NULL, NULL);
++ g_return_val_if_fail (show_password_label != NULL, NULL);
+
+ glade_file = g_build_filename (GLADEDIR, "applet.glade", NULL);
+ g_return_val_if_fail (glade_file != NULL, NULL);
+@@ -870,6 +893,12 @@
+ widget = glade_xml_get_widget (xml, "desc_label");
+ gtk_label_set_text (GTK_LABEL (widget), desc);
+
++ widget = glade_xml_get_widget (xml, "show_password_checkbutton");
++ gtk_button_set_label (GTK_BUTTON (widget), show_password_label);
++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE);
++ g_signal_connect (widget, "toggled", G_CALLBACK (show_toggled_cb), dialog);
++ show_toggled_cb (widget, dialog);
++
+ g_signal_connect (dialog, "delete-event", G_CALLBACK (mpd_cancel_dialog), NULL);
+
+ mpd_entry_changed (NULL, dialog);
+@@ -1099,6 +1128,9 @@
+ gtk_widget_set_sensitive (widget, FALSE);
+ widget = glade_xml_get_widget (xml, "unlock_cancel_button");
+ gtk_widget_set_sensitive (widget, FALSE);
++
++ widget = glade_xml_get_widget (xml, "show_password_checkbutton");
++ gtk_widget_set_sensitive (widget, FALSE);
+ }
+
+ void
+@@ -1139,5 +1171,8 @@
+ gtk_widget_set_sensitive (widget, TRUE);
+ widget = glade_xml_get_widget (xml, "unlock_cancel_button");
+ gtk_widget_set_sensitive (widget, TRUE);
++
++ widget = glade_xml_get_widget (xml, "show_password_checkbutton");
++ gtk_widget_set_sensitive (widget, TRUE);
+ }
+
+Index: network-manager-applet-0.8.1/src/applet-dialogs.h
+===================================================================
+--- network-manager-applet-0.8.1.orig/src/applet-dialogs.h 2010-06-26 03:46:37.000000000 +0200
++++ network-manager-applet-0.8.1/src/applet-dialogs.h 2010-11-17 23:14:39.863524333 +0100
+@@ -41,7 +41,8 @@
+
+ GtkWidget *applet_mobile_pin_dialog_new (const char *title,
+ const char *header,
+- const char *desc);
++ const char *desc,
++ const char *show_password_label);
+
+ void applet_mobile_pin_dialog_present (GtkWidget *dialog, gboolean now);
+
+Index: network-manager-applet-0.8.1/src/applet.glade
+===================================================================
+--- network-manager-applet-0.8.1.orig/src/applet.glade 2010-06-26 03:46:37.000000000 +0200
++++ network-manager-applet-0.8.1/src/applet.glade 2010-11-17 23:14:39.867525122 +0100
+@@ -1874,7 +1874,7 @@
+ <child>
+ <widget class="GtkTable" id="table14">
+ <property name="visible">True</property>
+- <property name="n_rows">4</property>
++ <property name="n_rows">5</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
+@@ -1954,6 +1954,9 @@
+ <placeholder/>
+ </child>
+ <child>
++ <placeholder/>
++ </child>
++ <child>
+ <widget class="GtkHBox" id="progress_hbox">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+@@ -1984,13 +1987,28 @@
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+- <property name="top_attach">3</property>
+- <property name="bottom_attach">4</property>
++ <property name="top_attach">4</property>
++ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ <property name="y_padding">6</property>
+ </packing>
+ </child>
++ <child>
++ <widget class="GtkCheckButton" id="show_password_checkbutton">
++ <property name="label" translatable="yes">Show it</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">False</property>
++ <property name="draw_indicator">True</property>
++ </widget>
++ <packing>
++ <property name="left_attach">1</property>
++ <property name="right_attach">2</property>
++ <property name="top_attach">3</property>
++ <property name="bottom_attach">4</property>
++ </packing>
++ </child>
+ </widget>
+ </child>
+ </widget>
Index: debian/patches/series
===================================================================
--- debian/patches/series (Revision 3687)
+++ debian/patches/series (Revision 3774)
@@ -1,3 +1,5 @@
# Debian patches for network-manager-applet
01-dbus_access_nm_applet.patch
+02-hide-pin-in-pin-puk-dialog-by-default.patch
+03-enter-closes-pin-puk-dialog.patch
04-autostart.patch
Reply to: