The wicd daemon doesn't currently disconnect any active links when it
terminates. Doing so results in wpa-supplicant being correctly stopped.

Attached is a proposed patch (I've also uploaded a build of the package
to mentors.debian.net).

I'm very new to Debian packaging and workflow, so please review
carefully and give relevant feedback!
From bc568d2e7158b27fd49e55217720c340a7532100 Mon Sep 17 00:00:00 2001
From: David Edmondson <d...@dme.org>
Date: Tue, 20 Nov 2012 13:49:32 +0000
Subject: [PATCH] Disconnect any active links when the daemon terminates.

---
 debian/changelog                                |    7 +++++++
 debian/patches/33-disconnect-on-terminate.patch |   12 ++++++++++++
 debian/patches/series                           |    1 +
 3 files changed, 20 insertions(+)
 create mode 100644 debian/patches/33-disconnect-on-terminate.patch

diff --git a/debian/changelog b/debian/changelog
index 1e0c95c..909f0c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+wicd (1.7.2.4-4.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Disconnect any active links when the daemon terminates (Closes: #692413)
+
+ -- David Edmondson <d...@dme.org>  Wed, 21 Nov 2012 13:16:05 +0000
+
 wicd (1.7.2.4-4) unstable; urgency=low
 
   * Move user-adding code from debconf-config to wicd-daemon postinst
diff --git a/debian/patches/33-disconnect-on-terminate.patch b/debian/patches/33-disconnect-on-terminate.patch
new file mode 100644
index 0000000..79741cf
--- /dev/null
+++ b/debian/patches/33-disconnect-on-terminate.patch
@@ -0,0 +1,12 @@
+Disconnect any active links when the daemon terminates.
+--- a/wicd/wicd-daemon.py
++++ b/wicd/wicd-daemon.py
+@@ -814,7 +814,7 @@
+     @dbus.service.signal(dbus_interface='org.wicd.daemon', signature='')
+     def DaemonClosing(self):
+         """ Emits a signal indicating the daemon will be closing. """
+-        pass
++        self.Disconnect()
+ 
+     @dbus.service.method('org.wicd.daemon', in_signature='uav')
+     def EmitStatusChanged(self, state, info):
diff --git a/debian/patches/series b/debian/patches/series
index d6f65fb..304452c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 04-fix_resolv.conf_backup-restore.patch
 26-support_etc-network_scripts.patch
 32-prefer_gksu.patch
+33-disconnect-on-terminate.patch
-- 
1.7.10.4

Attachment: pgpkfOJAjshDG.pgp
Description: PGP signature

Reply via email to