[pkg-wpa-devel] r847 - in /wpasupplicant/trunk/debian: ./ patches/

kelmo-guest at users.alioth.debian.org kelmo-guest at users.alioth.debian.org
Fri Jun 1 12:56:16 UTC 2007 

Author: kelmo-guest
Date: Fri Jun  1 12:56:15 2007
New Revision: 847

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=847
Log:
* New upstream release.
  - restructured source layout
* Adjust debian/wpasupplicant.examples, debian/wpagui.install,
  debian/wpasupplicant.install, debian/wpasupplicant.manpages, and
  debian/wpasupplicant.docs for new layout.
* Redjust debian/patches/30_dbus_policy.dpatch and
  debian/patches/40_debian_doc_examples.dpatch to apply against new layout.
* Drop debian/patches/10_config.dpatch and
  debian/patches/21_madwifi_includes.dpatch.
* Introduce makefile fragment for wpa_supplicant .config creation. Call it
  from debian/rules. It is named debian/dot.config.mk.
* Add WPADIR variable to debian/rules, adjust build and install targets to
  use WPADIR.

Added:
    wpasupplicant/trunk/debian/dot.config.mk
Removed:
    wpasupplicant/trunk/debian/patches/10_config.dpatch
    wpasupplicant/trunk/debian/patches/21_madwifi_includes.dpatch
Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/patches/00list
    wpasupplicant/trunk/debian/patches/30_dbus_policy.dpatch
    wpasupplicant/trunk/debian/patches/40_debian_doc_examples.dpatch
    wpasupplicant/trunk/debian/rules
    wpasupplicant/trunk/debian/wpagui.install
    wpasupplicant/trunk/debian/wpasupplicant.docs
    wpasupplicant/trunk/debian/wpasupplicant.examples
    wpasupplicant/trunk/debian/wpasupplicant.install
    wpasupplicant/trunk/debian/wpasupplicant.manpages

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=847&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Fri Jun  1 12:56:15 2007
@@ -1,8 +1,20 @@
 wpasupplicant (0.6.0-1) UNRELEASED; urgency=low
 
-  * (NOT RELEASED YET) New upstream release
-
- -- Kel Modderman <kel at otaku42.de>  Fri, 01 Jun 2007 21:11:47 +1000
+  * New upstream release.
+    - restructured source layout
+  * Adjust debian/wpasupplicant.examples, debian/wpagui.install,
+    debian/wpasupplicant.install, debian/wpasupplicant.manpages, and
+    debian/wpasupplicant.docs for new layout.
+  * Redjust debian/patches/30_dbus_policy.dpatch and
+    debian/patches/40_debian_doc_examples.dpatch to apply against new layout.
+  * Drop debian/patches/10_config.dpatch and
+    debian/patches/21_madwifi_includes.dpatch.
+  * Introduce makefile fragment for wpa_supplicant .config creation. Call it
+    from debian/rules. It is named debian/dot.config.mk.
+  * Add WPADIR variable to debian/rules, adjust build and install targets to
+    use WPADIR.
+
+ -- Kel Modderman <kel at otaku42.de>  Fri, 01 Jun 2007 22:49:37 +1000
 
 wpasupplicant (0.6.0~cvs20070224-3) unstable; urgency=low
 

Added: wpasupplicant/trunk/debian/dot.config.mk
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/dot.config.mk?rev=847&op=file
==============================================================================
--- wpasupplicant/trunk/debian/dot.config.mk (added)
+++ wpasupplicant/trunk/debian/dot.config.mk Fri Jun  1 12:56:15 2007
@@ -1,0 +1,42 @@
+# Makefile fragment for creating .config file for wpa_supplicant
+#
+# Usage: make -f dot.config.mk DOTCONFIG=path/to/.config
+#
+
+$(DOTCONFIG):
+	echo '# Debian Configuration'		>  $(DOTCONFIG)
+	echo CONFIG_DRIVER_ATMEL=y		>> $(DOTCONFIG)
+	echo CONFIG_DRIVER_HOSTAP=y		>> $(DOTCONFIG)
+	echo CONFIG_DRIVER_IPW=y		>> $(DOTCONFIG)
+	echo CONFIG_DRIVER_MADWIFI=y		>> $(DOTCONFIG)
+	echo CFLAGS+=-I../driver_madwifi	>> $(DOTCONFIG)
+	echo CONFIG_DRIVER_NDISWRAPPER=y	>> $(DOTCONFIG)
+	echo CONFIG_DRIVER_WEXT=y		>> $(DOTCONFIG)
+	echo CONFIG_DRIVER_WIRED=y		>> $(DOTCONFIG)
+	echo CONFIG_WIRELESS_EXTENSION=y	>> $(DOTCONFIG)
+	echo CONFIG_DRIVER_TEST=y		>> $(DOTCONFIG)
+#	echo CONFIG_DRIVER_PRISM54=y	# Prism54 support broken upstream
+#	echo CONFIG_DRIVER_NDIS=y	# Windows only
+#	echo CONFIG_DRIVER_HERMES=y	# Non-GPL header required
+#	echo CONFIG_DRIVER_BROADCOM=y	# Non-GPL header required
+	echo CONFIG_IEEE8021X_EAPOL=y		>> $(DOTCONFIG)
+	echo CONFIG_EAP_MD5=y			>> $(DOTCONFIG)
+	echo CONFIG_EAP_MSCHAPV2=y		>> $(DOTCONFIG)
+#	echo CONFIG_EAP_FAST=y		# Requires OpenSSL rebuild
+	echo CONFIG_EAP_TLS=y			>> $(DOTCONFIG)
+	echo CONFIG_EAP_PEAP=y			>> $(DOTCONFIG)
+	echo CONFIG_EAP_TTLS=y			>> $(DOTCONFIG)
+	echo CONFIG_EAP_GTC=y			>> $(DOTCONFIG)
+	echo CONFIG_EAP_OTP=y			>> $(DOTCONFIG)
+#	echo CONFIG_EAP_SIM=y
+	echo CONFIG_EAP_PSK=y			>> $(DOTCONFIG)
+	echo CONFIG_EAP_PAX=y			>> $(DOTCONFIG)
+	echo CONFIG_EAP_LEAP=y			>> $(DOTCONFIG)
+#	echo CONFIG_EAP_AKA=y
+#	echo CONFIG_EAP_SAKE=y
+	echo CONFIG_PKCS12=y			>> $(DOTCONFIG)
+	echo CONFIG_SMARTCARD=y			>> $(DOTCONFIG)
+#	echo CONFIG_PCSC=y
+	echo CONFIG_CTRL_IFACE=y		>> $(DOTCONFIG)
+	echo CONFIG_CTRL_IFACE_DBUS=y		>> $(DOTCONFIG)
+	echo CONFIG_READLINE=y			>> $(DOTCONFIG)

Modified: wpasupplicant/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/00list?rev=847&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/00list (original)
+++ wpasupplicant/trunk/debian/patches/00list Fri Jun  1 12:56:15 2007
@@ -1,5 +1,3 @@
-10_config
 20_madwifi_headers
-21_madwifi_includes
 30_dbus_policy
 40_debian_doc_examples

Modified: wpasupplicant/trunk/debian/patches/30_dbus_policy.dpatch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/30_dbus_policy.dpatch?rev=847&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/30_dbus_policy.dpatch (original)
+++ wpasupplicant/trunk/debian/patches/30_dbus_policy.dpatch Fri Jun  1 12:56:15 2007
@@ -6,9 +6,9 @@
 ## DP: D-Bus interface.
 
 @DPATCH@
-diff -urNad wpa_supplicant-0.5.7~/dbus-wpa_supplicant.conf wpa_supplicant-0.5.7/dbus-wpa_supplicant.conf
---- wpa_supplicant-0.5.7~/dbus-wpa_supplicant.conf	2006-06-26 04:54:47.000000000 +0200
-+++ wpa_supplicant-0.5.7/dbus-wpa_supplicant.conf	2007-03-03 02:44:49.000000000 +0100
+diff -urNad wpa_supplicant-0.6.0~/wpa_supplicant/dbus-wpa_supplicant.conf wpa_supplicant-0.6.0/wpa_supplicant/dbus-wpa_supplicant.conf
+--- wpa_supplicant-0.6.0~/wpa_supplicant/dbus-wpa_supplicant.conf
++++ wpa_supplicant-0.6.0/wpa_supplicant/dbus-wpa_supplicant.conf
 @@ -12,6 +12,10 @@
                  <allow send_destination="fi.epitest.hostap.WPASupplicant"/>
                  <allow send_interface="fi.epitest.hostap.WPASupplicant"/>

Modified: wpasupplicant/trunk/debian/patches/40_debian_doc_examples.dpatch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/40_debian_doc_examples.dpatch?rev=847&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/40_debian_doc_examples.dpatch (original)
+++ wpasupplicant/trunk/debian/patches/40_debian_doc_examples.dpatch Fri Jun  1 12:56:15 2007
@@ -4,9 +4,9 @@
 ## DP: Add Debian specific path to docs and examples to wpa_supplicant.conf(8)
 
 @DPATCH@
-diff -Nrup wpa_supplicant-0.5.5.orig/doc/docbook/wpa_supplicant.conf.5 wpa_supplicant-0.5.5/doc/docbook/wpa_supplicant.conf.5
---- wpa_supplicant-0.5.5.orig/doc/docbook/wpa_supplicant.conf.5	2006-08-28 14:19:12.000000000 +1000
-+++ wpa_supplicant-0.5.5/doc/docbook/wpa_supplicant.conf.5	2006-11-07 16:09:32.000000000 +1000
+diff -Nrup wpa_supplicant-0.6.0.orig/doc/docbook/wpa_supplicant.conf.5 wpa_supplicant-0.6.0/doc/docbook/wpa_supplicant.conf.5
+--- wpa_supplicant-0.6.0.orig/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5
++++ wpa_supplicant-0.6.0/doc/wpa_supplicant/docbook/wpa_supplicant.conf.5
 @@ -16,6 +16,11 @@ probably in \fB/usr/share/doc/wpa_suppli
  detailed information about the configuration format and supported
  fields.

Modified: wpasupplicant/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/rules?rev=847&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/rules (original)
+++ wpasupplicant/trunk/debian/rules Fri Jun  1 12:56:15 2007
@@ -3,35 +3,39 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
 
+WPADIR=wpa_supplicant/
 QMAKE=qmake-qt4
 WPAGUI=wpa_gui
 
 build/wpagui::
-	cd $(WPAGUI) && $(QMAKE)
-	$(MAKE) -C $(WPAGUI)
+	$(MAKE) -C $(WPADIR) $(WPAGUI)
 
 build/wpasupplicant::
-	$(MAKE)
-	# prepare upstream example configuration file
-	sed 's/^\([^#]\+=.*\|}\)/#\1/' < wpa_supplicant.conf \
+	$(MAKE) -f debian/dot.config.mk DOTCONFIG=$(WPADIR).config
+	$(MAKE) -C $(WPADIR)
+	# comment upstream example configuration file
+	sed 's/^\([^#]\+=.*\|}\)/#\1/' < $(WPADIR)wpa_supplicant.conf \
 		> README.wpa_supplicant.conf
 
 install/wpasupplicant::
+	# ifupdown
 	install --mode=755 -D debian/ifupdown/ifupdown.sh \
 		debian/wpasupplicant/etc/wpa_supplicant/ifupdown.sh
 	install --mode=755 -D debian/ifupdown/functions.sh \
 		debian/wpasupplicant/etc/wpa_supplicant/functions.sh
 	install --mode=755 -D debian/ifupdown/wpa_action.sh \
 		debian/wpasupplicant/sbin/wpa_action
-	install --mode=644 -D dbus-wpa_supplicant.conf \
+	dh_installinit --name=wpa-ifupdown --no-start -- start 15 0 6 .
+	# wpa_action
+	dh_installlogrotate --name=wpa_action
+	# D-Bus
+	install --mode=644 -D $(WPADIR)dbus-wpa_supplicant.conf \
 		debian/wpasupplicant/etc/dbus-1/system.d/wpa_supplicant.conf
 	install --mode=644 -D debian/dbus-wpa_supplicant.service \
 		debian/wpasupplicant/usr/share/dbus-1/services/wpa_supplicant.service
-	dh_installinit --name=wpa-ifupdown --no-start \
-		--update-rcd-params="start 15 0 6 ."
-	dh_installlogrotate --name=wpa_action
 	
 clean::
-	$(MAKE) clean
-	-$(MAKE) -C $(WPAGUI) distclean
-	-rm -f $(WPAGUI)/Makefile README.wpa_supplicant.conf
+	$(MAKE) -C $(WPADIR) clean
+	-$(MAKE) -C $(WPADIR)$(WPAGUI) distclean
+	-rm -f $(WPADIR)$(WPAGUI)/Makefile
+	-rm -f $(WPADIR).config README.wpa_supplicant.conf

Modified: wpasupplicant/trunk/debian/wpagui.install
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpagui.install?rev=847&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/wpagui.install (original)
+++ wpasupplicant/trunk/debian/wpagui.install Fri Jun  1 12:56:15 2007
@@ -1,1 +1,1 @@
-wpa_gui/wpa_gui usr/sbin/
+wpa_supplicant/wpa_gui/wpa_gui usr/sbin/

Modified: wpasupplicant/trunk/debian/wpasupplicant.docs
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpasupplicant.docs?rev=847&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/wpasupplicant.docs (original)
+++ wpasupplicant/trunk/debian/wpasupplicant.docs Fri Jun  1 12:56:15 2007
@@ -1,2 +1,2 @@
 debian/README.modes
-eap_testing.txt
+wpa_supplicant/eap_testing.txt

Modified: wpasupplicant/trunk/debian/wpasupplicant.examples
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpasupplicant.examples?rev=847&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/wpasupplicant.examples (original)
+++ wpasupplicant/trunk/debian/wpasupplicant.examples Fri Jun  1 12:56:15 2007
@@ -1,3 +1,3 @@
 README.wpa_supplicant.conf
-examples/*.conf
+wpa_supplicant/examples/*.conf
 debian/wpa_supplicant.conf.template

Modified: wpasupplicant/trunk/debian/wpasupplicant.install
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpasupplicant.install?rev=847&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/wpasupplicant.install (original)
+++ wpasupplicant/trunk/debian/wpasupplicant.install Fri Jun  1 12:56:15 2007
@@ -1,3 +1,3 @@
-wpa_cli sbin/
-wpa_passphrase usr/bin/
-wpa_supplicant sbin/
+wpa_supplicant/wpa_cli sbin/
+wpa_supplicant/wpa_passphrase usr/bin/
+wpa_supplicant/wpa_supplicant sbin/

Modified: wpasupplicant/trunk/debian/wpasupplicant.manpages
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpasupplicant.manpages?rev=847&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/wpasupplicant.manpages (original)
+++ wpasupplicant/trunk/debian/wpasupplicant.manpages Fri Jun  1 12:56:15 2007
@@ -1,6 +1,6 @@
 debian/ifupdown/wpa_action.8
-doc/docbook/wpa_background.8
-doc/docbook/wpa_cli.8
-doc/docbook/wpa_passphrase.8
-doc/docbook/wpa_supplicant.8
-doc/docbook/wpa_supplicant.conf.5
+wpa_supplicant/doc/docbook/wpa_background.8
+wpa_supplicant/doc/docbook/wpa_cli.8
+wpa_supplicant/doc/docbook/wpa_passphrase.8
+wpa_supplicant/doc/docbook/wpa_supplicant.8
+wpa_supplicant/doc/docbook/wpa_supplicant.conf.5

More information about the Pkg-wpa-devel mailing list