[pkg-wpa-devel] r1602 - in /wpasupplicant/trunk/debian: changelog config/linux config/udeb control rules wpasupplicant-udeb.install

kelmo-guest at users.alioth.debian.org kelmo-guest at users.alioth.debian.org
Fri Aug 26 22:51:39 UTC 2011 

Author: kelmo-guest
Date: Fri Aug 26 22:51:38 2011
New Revision: 1602

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1602
Log:
* ACK NMU (Closes: #610931)
  - add wpasupplicant-udeb
  - build against libnl3
* Non-maintainer upload with the agreement of Kel Modderman.

* bump standards version to 3.9.2, no changes necessary.
* Add wpasupplicant-udeb for debian-installer. Thanks to 
  Mathew Palmer for providing the initial patch. (Closes: #610931)
* Build against libnl3

Added:
    wpasupplicant/trunk/debian/config/udeb
    wpasupplicant/trunk/debian/wpasupplicant-udeb.install
Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/config/linux
    wpasupplicant/trunk/debian/control
    wpasupplicant/trunk/debian/rules

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1602&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Fri Aug 26 22:51:38 2011
@@ -1,17 +1,29 @@
-wpasupplicant (0.7.3-4) UNRELEASED; urgency=low
-
-  [ Stefan Lippers-Hollmann ]
-  * bump standards version to 3.9.2, no changes necessary.
-  * use new anonscm URIs for alioth.
-
-  [ Kel Modderman ]
+wpasupplicant (0.7.3-4) unstable; urgency=low
+
   * Support /run/sendsigs.omit.d/ (Closes: #633040):
     - depend on initscripts (>= 2.88dsf-13.3)
     - create new omission pid files in /run/sendsigs.omit.d/ unconditionally
     - migrate existing omission pid files from /lib/init/rw/ to
       /run/sendsigs.omit.d/
-
- -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Mon, 25 Jul 2011 15:55:04 +0200
+  * ACK NMU (Closes: #610931)
+    - add wpasupplicant-udeb
+    - build against libnl3
+
+ -- Kel Modderman <kel at otaku42.de>  Sat, 27 Aug 2011 08:47:57 +1000
+
+wpasupplicant (0.7.3-3.1) unstable; urgency=low
+
+  * Non-maintainer upload with the agreement of Kel Modderman.
+  
+  [ Stefan Lippers-Hollmann ]
+  * bump standards version to 3.9.2, no changes necessary.
+
+  [ Gaudenz Steinlin ]
+  * Add wpasupplicant-udeb for debian-installer. Thanks to 
+    Mathew Palmer for providing the initial patch. (Closes: #610931)
+  * Build against libnl3
+
+ -- Gaudenz Steinlin <gaudenz at debian.org>  Sat, 30 Jul 2011 14:10:31 +0200
 
 wpasupplicant (0.7.3-3) unstable; urgency=low
 

Modified: wpasupplicant/trunk/debian/config/linux
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/config/linux?rev=1602&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/config/linux (original)
+++ wpasupplicant/trunk/debian/config/linux Fri Aug 26 22:51:38 2011
@@ -1,6 +1,7 @@
 # Debian's wpa_supplicant build time configuration
 CONFIG_DRIVER_WEXT=y
 CONFIG_DRIVER_NL80211=y
+CONFIG_LIBNL20=y
 CONFIG_DRIVER_WIRED=y
 CONFIG_AP=y
 CONFIG_IEEE8021X_EAPOL=y

Added: wpasupplicant/trunk/debian/config/udeb
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/config/udeb?rev=1602&op=file
==============================================================================
--- wpasupplicant/trunk/debian/config/udeb (added)
+++ wpasupplicant/trunk/debian/config/udeb Fri Aug 26 22:51:38 2011
@@ -1,0 +1,17 @@
+# Debian's wpa_supplicant build time configuration
+CONFIG_DRIVER_WEXT=y
+CONFIG_DRIVER_NL80211=y
+CONFIG_LIBNL20=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
+

Modified: wpasupplicant/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/control?rev=1602&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/control (original)
+++ wpasupplicant/trunk/debian/control Fri Aug 26 22:51:38 2011
@@ -11,7 +11,7 @@
  libqt4-dev,
  libdbus-1-dev,
  libpcsclite-dev,
- libnl-dev [linux-any],
+ libnl3-dev (>= 3.0-1.1) [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.

Modified: wpasupplicant/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/rules?rev=1602&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/rules (original)
+++ wpasupplicant/trunk/debian/rules Fri Aug 26 22:51:38 2011
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 CFLAGS = -MMD -Wall -g
+UDEB_CFLAGS = -Wall -g -Os
 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

Added: wpasupplicant/trunk/debian/wpasupplicant-udeb.install
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpasupplicant-udeb.install?rev=1602&op=file
==============================================================================
--- wpasupplicant/trunk/debian/wpasupplicant-udeb.install (added)
+++ wpasupplicant/trunk/debian/wpasupplicant-udeb.install Fri Aug 26 22:51:38 2011
@@ -1,0 +1,1 @@
+wpa_supplicant/wpa_supplicant sbin/

More information about the Pkg-wpa-devel mailing list