Ubuntu
urfkill package

Merge lp:~cmiller/ubuntu/utopic/urfkill/lp1357576-segv-formatstring into lp:ubuntu/utopic/urfkill

  1. Utopic (14.10)
  2. lp1357576-segv-formatstring
  3. Merge into utopic
Proposed by Chad Miller
Status: Merged
Approved by: Iain Lane
Approved revision: 20
Merge reported by: Iain Lane
Merged at revision: not available
Proposed branch: lp:~cmiller/ubuntu/utopic/urfkill/lp1357576-segv-formatstring
Merge into: lp:ubuntu/utopic/urfkill
Diff against target: 66 lines (+16/-6)
4 files modified
debian/changelog (+8/-0)
debian/control (+1/-1)
debian/patches/urfkill-debug-input.patch (+6/-5)
src/urf-input.c (+1/-0)
To merge this branch: bzr merge lp:~cmiller/ubuntu/utopic/urfkill/lp1357576-segv-formatstring
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
Ubuntu Sponsors Pending
Review via email: mp+231897@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-07-11 09:33:33 +0000
3+++ debian/changelog 2014-08-22 14:02:43 +0000
4@@ -1,3 +1,11 @@
5+urfkill (0.6.0~20140708.110711.a0581f3-0ubuntu3) UNRELEASED; urgency=medium
6+
7+ * debian/control: Depend on python3, because of scripts in debian/scripts/
8+ * debian/patches/urfkill-debug-input.patch: Too few arguments to format
9+ string causing SEGVs. (LP: #1357576)
10+
11+ -- Chad MILLER <chad.miller@canonical.com> Fri, 22 Aug 2014 09:38:28 -0400
12+
13 urfkill (0.6.0~20140708.110711.a0581f3-0ubuntu2) utopic; urgency=medium
14
15 * debian/patches/ignore_input_monitor_startup.patch: don't fail startup if
16
17=== modified file 'debian/control'
18--- debian/control 2014-01-24 11:53:26 +0000
19+++ debian/control 2014-08-22 14:02:43 +0000
20@@ -11,7 +11,7 @@
21 Architecture: any
22 Multi-Arch: foreign
23 Pre-Depends: ${misc:Pre-Depends}
24-Depends: ${shlibs:Depends}, ${misc:Depends}, libglib2.0-0, libdbus-1-3, libdbus-glib-1-2, dbus, libgudev-1.0-0, libpolkit-gobject-1-0, libexpat1, systemd-services
25+Depends: ${shlibs:Depends}, ${misc:Depends}, libglib2.0-0, libdbus-1-3, libdbus-glib-1-2, dbus, libgudev-1.0-0, libpolkit-gobject-1-0, libexpat1, systemd-services, python3
26 Description: wireless killswitch management daemon for laptops
27 The urfkill daemon allow managing the rfkill-related hotkeys
28 and the killswitches in a more configurable way for the common RF
29
30=== modified file 'debian/patches/urfkill-debug-input.patch'
31--- debian/patches/urfkill-debug-input.patch 2013-12-23 14:12:32 +0000
32+++ debian/patches/urfkill-debug-input.patch 2014-08-22 14:02:43 +0000
33@@ -5,15 +5,16 @@
34 input event handler; try to get additional information so we can actually
35 debug this if there really is an issue.
36
37-diff --git a/src/urf-input.c b/src/urf-input.c
38-index f53a222..9f1d377 100644
39---- a/src/urf-input.c
40-+++ b/src/urf-input.c
41-@@ -83,6 +83,12 @@ input_event_cb (GIOChannel *source,
42+Index: urfkill/src/urf-input.c
43+===================================================================
44+--- urfkill.orig/src/urf-input.c
45++++ urfkill/src/urf-input.c
46+@@ -83,6 +83,13 @@ input_event_cb (GIOChannel *source,
47 GIOCondition condition,
48 UrfInput *input)
49 {
50 + g_debug ("input event condition %x (%s%s%s%s )",
51++ condition,
52 + condition & G_IO_IN ? " G_IO_IN" : "",
53 + condition & G_IO_ERR ? " G_IO_ERR" : "",
54 + condition & G_IO_HUP ? " G_IO_HUP" : "",
55
56=== modified file 'src/urf-input.c'
57--- src/urf-input.c 2013-12-23 14:12:32 +0000
58+++ src/urf-input.c 2014-08-22 14:02:43 +0000
59@@ -84,6 +84,7 @@
60 UrfInput *input)
61 {
62 g_debug ("input event condition %x (%s%s%s%s )",
63+ condition,
64 condition & G_IO_IN ? " G_IO_IN" : "",
65 condition & G_IO_ERR ? " G_IO_ERR" : "",
66 condition & G_IO_HUP ? " G_IO_HUP" : "",

Subscribers

People subscribed via source and target branches

to all changes: