diff -pruN 0.7.3-6/debian/changelog 0.7.3-6ubuntu2/debian/changelog
--- 0.7.3-6/debian/changelog	2011-12-19 22:31:47.000000000 +0000
+++ 0.7.3-6ubuntu2/debian/changelog	2012-03-16 13:56:46.000000000 +0000
@@ -1,3 +1,18 @@
+wpasupplicant (0.7.3-6ubuntu2) precise; urgency=low
+
+  * debian/wpasupplicant.postinst: don't fail package configuration if the
+    sendsig omission files can't be migrated from /lib/init/rw to /run.
+    Thanks to Anthony Fok for the patch. (LP: #935678)
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Fri, 16 Mar 2012 09:55:12 -0400
+
+wpasupplicant (0.7.3-6ubuntu1) precise; urgency=low
+
+  * debian/patches/dbus-activation-cmdline.patch: have wpasupplicant create
+    a pid file in /run/sendsigs.omit.d when activated by DBus. (LP: #869635)
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Thu, 16 Feb 2012 16:21:29 -0500
+
 wpasupplicant (0.7.3-6) unstable; urgency=low
 
   * add "hostap: Allow linking with libnl-3" from Ben Greear 
diff -pruN 0.7.3-6/debian/patches/dbus-activation-cmdline.patch 0.7.3-6ubuntu2/debian/patches/dbus-activation-cmdline.patch
--- 0.7.3-6/debian/patches/dbus-activation-cmdline.patch	1970-01-01 00:00:00.000000000 +0000
+++ 0.7.3-6ubuntu2/debian/patches/dbus-activation-cmdline.patch	2012-03-13 23:11:24.000000000 +0000
@@ -0,0 +1,30 @@
+From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/wpasupplicant/+bug/869635
+Subject: Have wpasupplicant write a pid file to /run/sendsigs.omit.d
+ when activated via DBUS.
+
+This allows us to skip over killing it right away with sendsigs, because some
+other processes (read: NetworkManager) may be using it and won't be shut down
+just yet. This avoids wpasupplicant being respawned during shutdown for no
+reason and slowing down the shutdown process.
+
+Index: wpasupplicant/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service
+===================================================================
+--- wpasupplicant.orig/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service	2012-02-15 22:07:26.707537000 -0500
++++ wpasupplicant/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service	2012-02-16 16:13:34.954879459 -0500
+@@ -1,4 +1,4 @@
+ [D-BUS Service]
+ Name=fi.epitest.hostap.WPASupplicant
+-Exec=/sbin/wpa_supplicant -u -s -O /var/run/wpa_supplicant
++Exec=/sbin/wpa_supplicant -B -P /run/sendsigs.omit.d/wpasupplicant.pid -u -s -O /var/run/wpa_supplicant
+ User=root
+Index: wpasupplicant/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service
+===================================================================
+--- wpasupplicant.orig/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service	2012-02-15 22:07:26.707537000 -0500
++++ wpasupplicant/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service	2012-02-16 16:13:50.758880376 -0500
+@@ -1,4 +1,4 @@
+ [D-BUS Service]
+ Name=fi.w1.wpa_supplicant1
+-Exec=/sbin/wpa_supplicant -u -s -O /var/run/wpa_supplicant
++Exec=/sbin/wpa_supplicant -B -P /run/sendsigs.omit.d/wpasupplicant.pid -u -s -O /var/run/wpa_supplicant
+ User=root
diff -pruN 0.7.3-6/debian/patches/series 0.7.3-6ubuntu2/debian/patches/series
--- 0.7.3-6/debian/patches/series	2011-12-19 19:42:52.000000000 +0000
+++ 0.7.3-6ubuntu2/debian/patches/series	2012-03-16 13:54:50.000000000 +0000
@@ -7,3 +7,4 @@
 13_human_readable_signal.patch
 hostap_allow-linking-with-libnl-3.2.patch
 for-MS-CHAP-convert-the-password-from-UTF-8-to-UCS-2.patch
+dbus-activation-cmdline.patch
diff -pruN 0.7.3-6/debian/wpasupplicant.postinst 0.7.3-6ubuntu2/debian/wpasupplicant.postinst
--- 0.7.3-6/debian/wpasupplicant.postinst	2011-09-09 21:41:15.000000000 +0000
+++ 0.7.3-6ubuntu2/debian/wpasupplicant.postinst	2012-03-16 13:55:04.000000000 +0000
@@ -30,7 +30,7 @@ case "$1" in
 			for f in /lib/init/rw/sendsigs.omit.d/wpasupplicant.*.pid
 			do
 				if [ -f "$f" ]; then
-					mv "$f" /run/sendsigs.omit.d/
+					mv "$f" /run/sendsigs.omit.d/ || true
 				fi
 			done
 		fi
diff -pruN 0.7.3-6/.pc/applied-patches 0.7.3-6ubuntu2/.pc/applied-patches
--- 0.7.3-6/.pc/applied-patches	2012-03-16 15:44:13.000000000 +0000
+++ 0.7.3-6ubuntu2/.pc/applied-patches	2012-03-16 15:44:14.000000000 +0000
@@ -7,3 +7,4 @@
 13_human_readable_signal.patch
 hostap_allow-linking-with-libnl-3.2.patch
 for-MS-CHAP-convert-the-password-from-UTF-8-to-UCS-2.patch
+dbus-activation-cmdline.patch
diff -pruN 0.7.3-6/.pc/dbus-activation-cmdline.patch/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service 0.7.3-6ubuntu2/.pc/dbus-activation-cmdline.patch/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service
--- 0.7.3-6/.pc/dbus-activation-cmdline.patch/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service	1970-01-01 00:00:00.000000000 +0000
+++ 0.7.3-6ubuntu2/.pc/dbus-activation-cmdline.patch/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service	2012-03-16 15:44:14.000000000 +0000
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=fi.epitest.hostap.WPASupplicant
+Exec=/sbin/wpa_supplicant -u -s -O /var/run/wpa_supplicant
+User=root
diff -pruN 0.7.3-6/.pc/dbus-activation-cmdline.patch/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service 0.7.3-6ubuntu2/.pc/dbus-activation-cmdline.patch/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service
--- 0.7.3-6/.pc/dbus-activation-cmdline.patch/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service	1970-01-01 00:00:00.000000000 +0000
+++ 0.7.3-6ubuntu2/.pc/dbus-activation-cmdline.patch/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service	2012-03-16 15:44:14.000000000 +0000
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=fi.w1.wpa_supplicant1
+Exec=/sbin/wpa_supplicant -u -s -O /var/run/wpa_supplicant
+User=root
diff -pruN 0.7.3-6/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service 0.7.3-6ubuntu2/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service
--- 0.7.3-6/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service	2012-03-16 15:44:13.000000000 +0000
+++ 0.7.3-6ubuntu2/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service	2012-03-16 15:44:14.000000000 +0000
@@ -1,4 +1,4 @@
 [D-BUS Service]
 Name=fi.epitest.hostap.WPASupplicant
-Exec=/sbin/wpa_supplicant -u -s -O /var/run/wpa_supplicant
+Exec=/sbin/wpa_supplicant -B -P /run/sendsigs.omit.d/wpasupplicant.pid -u -s -O /var/run/wpa_supplicant
 User=root
diff -pruN 0.7.3-6/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service 0.7.3-6ubuntu2/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service
--- 0.7.3-6/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service	2012-03-16 15:44:13.000000000 +0000
+++ 0.7.3-6ubuntu2/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service	2012-03-16 15:44:14.000000000 +0000
@@ -1,4 +1,4 @@
 [D-BUS Service]
 Name=fi.w1.wpa_supplicant1
-Exec=/sbin/wpa_supplicant -u -s -O /var/run/wpa_supplicant
+Exec=/sbin/wpa_supplicant -B -P /run/sendsigs.omit.d/wpasupplicant.pid -u -s -O /var/run/wpa_supplicant
 User=root