Index: debian/control
===================================================================
--- debian/control	(Revision 1586)
+++ debian/control	(Arbeitskopie)
@@ -11,7 +11,7 @@
  libqt4-dev,
  libdbus-1-dev,
  libpcsclite-dev,
- libnl-dev [linux-any],
+ libnl-dev (>> 1.1-7) [linux-any],
  libpcap-dev [kfreebsd-any],
  libbsd-dev [kfreebsd-any],
  pkg-config,
@@ -41,3 +41,17 @@
  to connect to. It also provides a method for browsing 802.11 SSID scan
  results, an event history log of messages generated by wpa_supplicant,
  and a method to add or edit wpa_supplicant networks.
+
+Package: wpasupplicant-udeb
+Section: debian-installer
+Priority: standard
+Architecture: linux-any
+XC-Package-Type: udeb
+Depends: ${shlibs:Depends}, busybox-udeb
+Description: Client support for WPA and WPA2 (IEEE 802.11i)
+ WPA and WPA2 are methods for securing wireless networks, the former
+ using IEEE 802.1X, and the latter using IEEE 802.11i. This software
+ provides key negotiation with the WPA Authenticator, and controls
+ association with IEEE 802.11i networks.
+ .
+ This is a udeb of wpasupplicant for use by the Debian installer.
Index: debian/changelog
===================================================================
--- debian/changelog	(Revision 1586)
+++ debian/changelog	(Arbeitskopie)
@@ -1,10 +1,15 @@
 wpasupplicant (0.7.3-4) UNRELEASED; urgency=low
 
+  [ Stefan Lippers-Hollmann ]
   * NOT RELEASED YET
   * bump standards version to 3.9.2, no changes necessary.
 
- -- Stefan Lippers-Hollmann <s.l-h@gmx.de>  Fri, 22 Apr 2011 15:08:16 +0200
+  [ Gaudenz Steinlin ]
+  * Unreleased test build of wpasupplicant to provide a udeb for netcfg WPA
+    support.
 
+ -- Gaudenz Steinlin <gaudenz@debian.org>  Fri, 22 Jul 2011 22:33:08 +0200
+
 wpasupplicant (0.7.3-3) unstable; urgency=low
 
   * Restore code which loop waits for wpa_supplicant generated PID and
Index: debian/rules
===================================================================
--- debian/rules	(Revision 1586)
+++ debian/rules	(Arbeitskopie)
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 CFLAGS = -MMD -Wall -g
+UDEB_CFLAGS = -Wall -g -O3
 CXXFLAGS = -g
 LDFLAGS = -Wl,--as-needed
 V = 1
@@ -52,7 +53,7 @@
 	chmod 0755 debian/wpagui/usr/share/wpagui/netdev_wrapper
 
 override_dh_install:
-	dh_install
+	dh_install -Nwpasupplicant-udeb
 	install --mode=644 -D wpa_supplicant/dbus/dbus-wpa_supplicant.conf \
 		debian/wpasupplicant/etc/dbus-1/system.d/wpa_supplicant.conf
 	install --mode=644 -D wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service \
@@ -61,6 +62,12 @@
 		debian/wpasupplicant/usr/share/dbus-1/system-services/fi.w1.wpa_supplicant1.service
 	install --mode=755 -D wpa_supplicant/examples/60_wpa_supplicant \
 		debian/wpasupplicant/usr/lib/pm-utils/sleep.d/60_wpa_supplicant
+	# Build/install udeb... I'm embarrassed to have to put this all here
+	$(MAKE) -C wpa_supplicant clean
+	rm -f wpa_supplicant/.config
+	cp -v debian/config/udeb wpa_supplicant/.config
+	CFLAGS="$(UDEB_CFLAGS)" $(MAKE) -C wpa_supplicant
+	dh_install -pwpasupplicant-udeb
 
 override_dh_installchangelogs:
 	dh_installchangelogs wpa_supplicant/ChangeLog
Index: debian/config/udeb
===================================================================
--- debian/config/udeb	(Revision 0)
+++ debian/config/udeb	(Revision 0)
@@ -0,0 +1,16 @@
+# Debian's wpa_supplicant build time configuration
+CONFIG_DRIVER_WEXT=y
+CONFIG_DRIVER_NL80211=y
+CONFIG_CTRL_IFACE=y
+CONFIG_BACKEND=file
+CONFIG_MAIN=main
+CONFIG_OS=unix
+CONFIG_ELOOP=eloop
+CONFIG_L2_PACKET=linux
+
+# At least one of these two is needed to get 
+# the netlink driver working, why this is the case
+# is currently mysterious
+#CONFIG_IEEE8021X_EAPOL=y
+CONFIG_WPS=y
+
Index: debian/wpasupplicant-udeb.install
===================================================================
--- debian/wpasupplicant-udeb.install	(Revision 0)
+++ debian/wpasupplicant-udeb.install	(Revision 0)
@@ -0,0 +1 @@
+wpa_supplicant/wpa_supplicant sbin/