=== removed file '.pc/applied-patches'
=== modified file 'debian/changelog'
--- debian/changelog	2012-08-10 16:09:49 +0000
+++ debian/changelog	2012-09-07 19:34:35 +0000
@@ -1,3 +1,11 @@
+networkmanagement (0.9.0.4-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/patches/use_ibss_rsn_instead_of_wpa-none.patch: Use IBSS-RSN rather
+    than WPA-None when creating ad-hoc networks; WPA-None is broken in the
+    kernel anyway. (LP: #1046918)
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Fri, 07 Sep 2012 11:30:55 -0400
+
 networkmanagement (0.9.0.4-0ubuntu1) quantal; urgency=low
 
   * New upstream release (LP: #1029550)

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-03-01 18:51:11 +0000
+++ debian/patches/series	2012-09-07 15:28:28 +0000
@@ -1,1 +1,2 @@
 # patches for plasma-widget-networkmanagement
+use_ibss_rsn_instead_of_wpa-none.patch

=== added file 'debian/patches/use_ibss_rsn_instead_of_wpa-none.patch'
--- debian/patches/use_ibss_rsn_instead_of_wpa-none.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/use_ibss_rsn_instead_of_wpa-none.patch	2012-09-07 19:36:34 +0000
@@ -0,0 +1,31 @@
+From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
+Subject: Use IBSS-RSN (WPA2 for adhoc) instead of WPA-None.
+Bug-Ubuntu: http://bugs.launchpad.net/bugs/1046918
+
+... Because WPA-None creates networks with no security due to a long standing
+kernel bug; WPA2 is better anyway, and we disabled wpa-none in NM to replace
+it with IBSS-RSN.
+
+---
+ libs/ui/security/wirelesssecuritysettingwidget.cpp |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+Index: b/libs/ui/security/wirelesssecuritysettingwidget.cpp
+===================================================================
+--- a/libs/ui/security/wirelesssecuritysettingwidget.cpp
++++ b/libs/ui/security/wirelesssecuritysettingwidget.cpp
+@@ -331,10 +331,10 @@ void WirelessSecuritySettingWidget::writ
+         d->setting8021x->setEnabled(false);
+         d->settingSecurity->setSecurityType(Knm::WirelessSecuritySetting::EnumSecurityType::WpaPsk); // FIXME
+         if (d->settingWireless->mode() == Knm::WirelessSetting::EnumMode::adhoc) {
+-            d->settingSecurity->setKeymgmt(Knm::WirelessSecuritySetting::EnumKeymgmt::WPANone);
+-            d->settingSecurity->setProto(QStringList() << "wpa");
+-            d->settingSecurity->setPairwise(QStringList() << "none");
+-            d->settingSecurity->setGroup(QStringList() << "tkip");
++            d->settingSecurity->setKeymgmt(Knm::WirelessSecuritySetting::EnumKeymgmt::WPAPSK);
++            d->settingSecurity->setProto(QStringList() << "rsn");
++            d->settingSecurity->setPairwise(QStringList() << "ccmp");
++            d->settingSecurity->setGroup(QStringList() << "ccmp");
+         } else {
+             d->settingSecurity->setKeymgmt(Knm::WirelessSecuritySetting::EnumKeymgmt::WPAPSK);
+         }