Package: src:wpasupplicant
Version: 0.6.10-2.1
Severity: wishlist
Tags: patch
It is planned that the next release of Debian Installer will include WPA
support, a long overdue feature. To make this work, however, we need a udeb
of wpasupplicant that can be built-in to the installer to configure/use WPA.
The attached patch adds a wpasupplicant-udeb package, and modifies
debian/rules to build the necessary binary. I'm not overly keen on the way
that the install target does the build for the udeb, but I'm not familiar
enough with wpasupplicant's build process, nor dh-style rules files, to do a
better job of it.
- Matt
diff -urN wpasupplicant-0.6.10.orig/debian/changelog wpasupplicant-0.6.10/debian/changelog
--- wpasupplicant-0.6.10.orig/debian/changelog 2010-11-28 22:22:10.000000000 +1100
+++ wpasupplicant-0.6.10/debian/changelog 2011-01-24 14:44:37.000000000 +1100
@@ -1,3 +1,10 @@
+wpasupplicant (0.6.10-2.1~di) UNRELEASED; urgency=low
+
+ * Unreleased test build of wpasupplicant to provide a udeb for netcfg WPA
+ support.
+
+ -- Matt Palmer <mpal...@debian.org> Mon, 24 Jan 2011 14:43:58 +1100
+
wpasupplicant (0.6.10-2.1) unstable; urgency=low
* Non-maintainer upload approved by Kel Modderman.
diff -urN wpasupplicant-0.6.10.orig/debian/config/udeb wpasupplicant-0.6.10/debian/config/udeb
--- wpasupplicant-0.6.10.orig/debian/config/udeb 1970-01-01 10:00:00.000000000 +1000
+++ wpasupplicant-0.6.10/debian/config/udeb 2011-01-24 13:28:19.000000000 +1100
@@ -0,0 +1,13 @@
+# Debian Installer's wpa_supplicant build time configuration
+CONFIG_DRIVER_WEXT=y
+CONFIG_BACKEND=file
+#CONFIG_NO_STDOUT_DEBUG=y
+CONFIG_DEBUG_FILE=y
+CONFIG_NO_AES_EXTRAS=y
+#CONFIG_NO_CONFIG_WRITE=y
+CONFIG_NO_CONFIG_BLOBS=y
+CONFIG_MAIN=main
+CONFIG_OS=unix
+CONFIG_ELOOP=eloop
+CONFIG_L2_PACKET=linux
+CONFIG_CTRL_IFACE=y
\ No newline at end of file
diff -urN wpasupplicant-0.6.10.orig/debian/control wpasupplicant-0.6.10/debian/control
--- wpasupplicant-0.6.10.orig/debian/control 2010-02-24 21:05:49.000000000 +1100
+++ wpasupplicant-0.6.10/debian/control 2011-01-24 14:19:08.000000000 +1100
@@ -40,3 +40,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.
diff -urN wpasupplicant-0.6.10.orig/debian/rules wpasupplicant-0.6.10/debian/rules
--- wpasupplicant-0.6.10.orig/debian/rules 2010-02-24 21:05:49.000000000 +1100
+++ wpasupplicant-0.6.10/debian/rules 2011-01-24 14:47:39.000000000 +1100
@@ -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,11 +53,18 @@
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-wpa_supplicant.conf \
debian/wpasupplicant/etc/dbus-1/system.d/wpa_supplicant.conf
install --mode=644 -D wpa_supplicant/dbus-wpa_supplicant.service \
debian/wpasupplicant/usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service
+
+ # 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
diff -urN wpasupplicant-0.6.10.orig/debian/wpasupplicant-udeb.install wpasupplicant-0.6.10/debian/wpasupplicant-udeb.install
--- wpasupplicant-0.6.10.orig/debian/wpasupplicant-udeb.install 1970-01-01 10:00:00.000000000 +1000
+++ wpasupplicant-0.6.10/debian/wpasupplicant-udeb.install 2011-01-24 13:28:19.000000000 +1100
@@ -0,0 +1 @@
+wpa_supplicant/wpa_supplicant sbin/
