[pkg-wpa-devel] r877 - in /wpasupplicant/trunk/debian: ./ dbus/ examples/ madwifi/ patches/
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Sat Nov 3 07:47:44 UTC 2007
Author: kelmo-guest
Date: Sat Nov 3 07:47:43 2007
New Revision: 877
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=877
Log:
* Convert to non-cdbs traditional debhelper-centric debian/rules and remove
build dependency on cdbs. This converges with style of hostapd package.
* Correct poorly formatted debian/NEWS entry that was causing lintian to
complain.
* Cleanup files in ./debian/*
- move debian/wpa_supplicant.conf.template to debian/examples/
- move debian/mk-madwifi-header-patch to debian/madwifi/
- move debian/dbus-wpa_supplicant.service to debian/dbus/
- rename debian/dot.config.mk to debian/defconfig.mk
* Remove MADWIFI variable from debian/defconfig.mk.
* No longer build "ndiswrapper" or "ipw" backends. Etch shipped with a
kernel in which neither of these backends could work (> Linux 2.6.14) so
it is about time we no longer pretended to support for them.
* Add debian/patches/60_dbus_deprecated_get_fd.dpatch to fix deprecated
usage of dbus_watch_get_fd(). Instead use dbus_watch_get_unix_fd().
* dbus_watch_get_unix_fd() requires versioned build dependency on
libdbus-1-dev (>= 1.1.1-1).
* Add debian/patches/70_fix_deprecated_conversion_of_string_constant.dpatch
to fix pedantic g++ warnings.
* Activate D-Bus system activation support. Install the service file into
/usr/share/dbus-1/system-service/. The filename reflects the service bus
name of "fi.epitest.hostap.WPASupplicant". In addition, the service must
be started by root user. Thanks to Michael Biebl. (Closes: #412179)
Added:
wpasupplicant/trunk/debian/dbus/
wpasupplicant/trunk/debian/dbus/dbus-wpa_supplicant.service
- copied, changed from r876, wpasupplicant/trunk/debian/dbus-wpa_supplicant.service
wpasupplicant/trunk/debian/defconfig.mk
- copied, changed from r876, wpasupplicant/trunk/debian/dot.config.mk
wpasupplicant/trunk/debian/examples/
wpasupplicant/trunk/debian/examples/wpa_supplicant.conf.template
- copied unchanged from r876, wpasupplicant/trunk/debian/wpa_supplicant.conf.template
wpasupplicant/trunk/debian/madwifi/
wpasupplicant/trunk/debian/madwifi/mk-madwifi-header-patch
- copied unchanged from r876, wpasupplicant/trunk/debian/mk-madwifi-header-patch
wpasupplicant/trunk/debian/patches/60_dbus_deprecated_get_fd.dpatch
wpasupplicant/trunk/debian/patches/70_fix_deprecated_conversion_of_string_constant.dpatch
Removed:
wpasupplicant/trunk/debian/dbus-wpa_supplicant.service
wpasupplicant/trunk/debian/dot.config.mk
wpasupplicant/trunk/debian/mk-madwifi-header-patch
wpasupplicant/trunk/debian/wpa_supplicant.conf.template
Modified:
wpasupplicant/trunk/debian/NEWS
wpasupplicant/trunk/debian/changelog
wpasupplicant/trunk/debian/control
wpasupplicant/trunk/debian/patches/00list
wpasupplicant/trunk/debian/rules
wpasupplicant/trunk/debian/wpasupplicant.examples
Modified: wpasupplicant/trunk/debian/NEWS
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/NEWS?rev=877&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/NEWS (original)
+++ wpasupplicant/trunk/debian/NEWS Sat Nov 3 07:47:43 2007
@@ -62,10 +62,10 @@
The installed wpa_* binaries have moved. They are installed to the
following locations:-
-
- /sbin/wpa_cli
- /sbin/wpa_supplicant
- /usr/bin/wpa_passphrase
+
+ /sbin/wpa_cli
+ /sbin/wpa_supplicant
+ /usr/bin/wpa_passphrase
Please adjust your scripts as neccessary.
Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=877&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Sat Nov 3 07:47:43 2007
@@ -1,3 +1,31 @@
+wpasupplicant (0.6.0-5) UNRELEASED; urgency=low
+
+ * Convert to non-cdbs traditional debhelper-centric debian/rules and remove
+ build dependency on cdbs. This converges with style of hostapd package.
+ * Correct poorly formatted debian/NEWS entry that was causing lintian to
+ complain.
+ * Cleanup files in ./debian/*
+ - move debian/wpa_supplicant.conf.template to debian/examples/
+ - move debian/mk-madwifi-header-patch to debian/madwifi/
+ - move debian/dbus-wpa_supplicant.service to debian/dbus/
+ - rename debian/dot.config.mk to debian/defconfig.mk
+ * Remove MADWIFI variable from debian/defconfig.mk.
+ * No longer build "ndiswrapper" or "ipw" backends. Etch shipped with a
+ kernel in which neither of these backends could work (> Linux 2.6.14) so
+ it is about time we no longer pretended to support for them.
+ * Add debian/patches/60_dbus_deprecated_get_fd.dpatch to fix deprecated
+ usage of dbus_watch_get_fd(). Instead use dbus_watch_get_unix_fd().
+ * dbus_watch_get_unix_fd() requires versioned build dependency on
+ libdbus-1-dev (>= 1.1.1-1).
+ * Add debian/patches/70_fix_deprecated_conversion_of_string_constant.dpatch
+ to fix pedantic g++ warnings.
+ * Activate D-Bus system activation support. Install the service file into
+ /usr/share/dbus-1/system-service/. The filename reflects the service bus
+ name of "fi.epitest.hostap.WPASupplicant". In addition, the service must
+ be started by root user. Thanks to Michael Biebl. (Closes: #412179)
+
+ -- Kel Modderman <kel at otaku42.de> Sat, 03 Nov 2007 17:03:52 +1000
+
wpasupplicant (0.6.0-4) unstable; urgency=low
* Fix stack overflow condition that could exist if driver reported bad tsf
Modified: wpasupplicant/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/control?rev=877&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/control (original)
+++ wpasupplicant/trunk/debian/control Sat Nov 3 07:47:43 2007
@@ -4,7 +4,7 @@
Maintainer: Debian/Ubuntu wpasupplicant Maintainers <pkg-wpa-devel at lists.alioth.debian.org>
Uploaders: Kyle McMartin <kyle at debian.org>, Reinhard Tartler <siretart at tauware.de>, Kel Modderman <kel at otaku42.de>
Standards-Version: 3.7.2
-Build-Depends: cdbs, debhelper (>= 5.0.0), dpatch, libssl-dev, libreadline5-dev, libqt4-dev, libdbus-1-dev
+Build-Depends: debhelper (>= 5), dpatch, libssl-dev, libreadline5-dev, libqt4-dev, libdbus-1-dev (>= 1.1.1-1)
Vcs-Svn: svn://svn.debian.org/pkg-wpa/wpasupplicant/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/
Homepage: http://w1.fi/wpa_supplicant/
Copied: wpasupplicant/trunk/debian/dbus/dbus-wpa_supplicant.service (from r876, wpasupplicant/trunk/debian/dbus-wpa_supplicant.service)
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/dbus/dbus-wpa_supplicant.service?rev=877&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/dbus-wpa_supplicant.service (original)
+++ wpasupplicant/trunk/debian/dbus/dbus-wpa_supplicant.service Sat Nov 3 07:47:43 2007
@@ -1,3 +1,4 @@
[D-BUS Service]
Name=fi.epitest.hostap.WPASupplicant
Exec=/sbin/wpa_supplicant -u
+User=root
Copied: wpasupplicant/trunk/debian/defconfig.mk (from r876, wpasupplicant/trunk/debian/dot.config.mk)
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/defconfig.mk?rev=877&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/dot.config.mk (original)
+++ wpasupplicant/trunk/debian/defconfig.mk Sat Nov 3 07:47:43 2007
@@ -1,29 +1,27 @@
# Makefile fragment for creating .config file for wpa_supplicant
#
-# Usage: make -f dot.config.mk DOTCONFIG=path/to/.config
+# Usage: make -f defconfig.mk DOTCONFIG=path/to/.config
#
$(DOTCONFIG):
echo CONFIG_DRIVER_ATMEL=y > $@
echo CONFIG_DRIVER_HOSTAP=y >> $@
- echo CONFIG_DRIVER_IPW=y >> $@
-ifdef MADWIFI
+# echo CONFIG_DRIVER_IPW=y # Deprecated since ~ Linux 2.6.14
echo CONFIG_DRIVER_MADWIFI=y >> $@
echo CFLAGS+=-I../driver_madwifi >> $@
-endif
- echo CONFIG_DRIVER_NDISWRAPPER=y >> $@
+# echo CONFIG_DRIVER_NDISWRAPPER=y # Deprecated since ~ Linux 2.6.14
echo CONFIG_DRIVER_WEXT=y >> $@
echo CONFIG_DRIVER_WIRED=y >> $@
echo CONFIG_WIRELESS_EXTENSION=y >> $@
echo CONFIG_DRIVER_TEST=y >> $@
-# 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_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 >> $@
echo CONFIG_EAP_MD5=y >> $@
echo CONFIG_EAP_MSCHAPV2=y >> $@
-# echo CONFIG_EAP_FAST=y # Requires OpenSSL rebuild
+# echo CONFIG_EAP_FAST=y # Requires OpenSSL rebuild
echo CONFIG_EAP_TLS=y >> $@
echo CONFIG_EAP_PEAP=y >> $@
echo CONFIG_EAP_TTLS=y >> $@
Modified: wpasupplicant/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/00list?rev=877&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/00list (original)
+++ wpasupplicant/trunk/debian/patches/00list Sat Nov 3 07:47:43 2007
@@ -3,3 +3,5 @@
30_dbus_policy
40_debian_doc_examples
50_fix_wext_tsf_stack_overflow
+60_dbus_deprecated_get_fd
+70_fix_deprecated_conversion_of_string_constant
Added: wpasupplicant/trunk/debian/patches/60_dbus_deprecated_get_fd.dpatch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/60_dbus_deprecated_get_fd.dpatch?rev=877&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/60_dbus_deprecated_get_fd.dpatch (added)
+++ wpasupplicant/trunk/debian/patches/60_dbus_deprecated_get_fd.dpatch Sat Nov 3 07:47:43 2007
@@ -1,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 60_dbus_deprecated_get_fd.dpatch by Kel Modderman <kel at otaku42.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: dbus_watch_get_fd() is deprecated in dbus >= 1.1.1
+
+ at DPATCH@
+diff -Nrup wpa_supplicant-0.6.0/wpa_supplicant/ctrl_iface_dbus.c wpa_supplicant-0.6.0.dbus/wpa_supplicant/ctrl_iface_dbus.c
+--- wpa_supplicant-0.6.0/wpa_supplicant/ctrl_iface_dbus.c 2007-05-29 03:26:55.000000000 +1000
++++ wpa_supplicant-0.6.0.dbus/wpa_supplicant/ctrl_iface_dbus.c 2007-11-03 13:05:41.000000000 +1000
+@@ -83,7 +83,7 @@ static void connection_setup_add_watch(s
+ return;
+
+ flags = dbus_watch_get_flags(watch);
+- fd = dbus_watch_get_fd(watch);
++ fd = dbus_watch_get_unix_fd(watch);
+
+ eloop_register_sock(fd, EVENT_TYPE_EXCEPTION, process_watch_exception,
+ iface, watch);
+@@ -108,7 +108,7 @@ static void connection_setup_remove_watc
+ int fd;
+
+ flags = dbus_watch_get_flags(watch);
+- fd = dbus_watch_get_fd(watch);
++ fd = dbus_watch_get_unix_fd(watch);
+
+ eloop_unregister_sock(fd, EVENT_TYPE_EXCEPTION);
+
Added: wpasupplicant/trunk/debian/patches/70_fix_deprecated_conversion_of_string_constant.dpatch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/70_fix_deprecated_conversion_of_string_constant.dpatch?rev=877&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/70_fix_deprecated_conversion_of_string_constant.dpatch (added)
+++ wpasupplicant/trunk/debian/patches/70_fix_deprecated_conversion_of_string_constant.dpatch Sat Nov 3 07:47:43 2007
@@ -1,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 70_fix_deprecated_conversion_of_string_constant.dpatch by
+## Kel Modderman <kel at otaku42.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix compilation warnings
+
+ at DPATCH@
+diff -Nrup wpa_supplicant-0.6.0/wpa_supplicant/wpa_gui/networkconfig.ui.h wpa_supplicant-0.6.0.pedantic-warnings/wpa_supplicant/wpa_gui/networkconfig.ui.h
+--- wpa_supplicant-0.6.0/wpa_supplicant/wpa_gui/networkconfig.ui.h 2007-05-29 03:26:55.000000000 +1000
++++ wpa_supplicant-0.6.0.pedantic-warnings/wpa_supplicant/wpa_gui/networkconfig.ui.h 2007-11-03 13:16:55.000000000 +1000
+@@ -131,7 +131,7 @@ void NetworkConfig::addNetwork()
+
+ setNetworkParam(id, "ssid", ssidEdit->text().ascii(), true);
+
+- char *key_mgmt = NULL, *proto = NULL, *pairwise = NULL;
++ const char *key_mgmt = NULL, *proto = NULL, *pairwise = NULL;
+ switch (auth) {
+ case AUTH_NONE:
+ key_mgmt = "NONE";
Modified: wpasupplicant/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/rules?rev=877&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/rules (original)
+++ wpasupplicant/trunk/debian/rules Sat Nov 3 07:47:43 2007
@@ -1,42 +1,103 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
-WPADIR=wpa_supplicant/
+include /usr/share/dpatch/dpatch.make
+
QMAKE=qmake-qt4
WPAGUI=wpa_gui
-build/wpagui::
- cd $(WPADIR)$(WPAGUI) ; $(QMAKE)
- $(MAKE) -C $(WPADIR)$(WPAGUI)
+CFLAGS = -Wall -g
-build/wpasupplicant::
- $(MAKE) -f debian/dot.config.mk DOTCONFIG=$(WPADIR).config MADWIFI=1
- $(MAKE) -C $(WPADIR)
- # comment upstream example configuration file
- sed 's/^\([^#]\+=.*\|}\)/#\1/' < $(WPADIR)wpa_supplicant.conf \
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+build: patch build-stamp
+build-stamp:
+ dh_testdir
+
+ # wpa_supplicant
+ $(MAKE) -f debian/defconfig.mk DOTCONFIG=wpa_supplicant/.config
+ $(MAKE) -C wpa_supplicant
+
+ # sanitise the example configuration
+ sed 's/^\([^#]\+=.*\|}\)/#\1/' < wpa_supplicant/wpa_supplicant.conf \
> README.wpa_supplicant.conf
+
+ # wpa_gui
+ cd wpa_supplicant/$(WPAGUI) && $(QMAKE)
+ $(MAKE) -C wpa_supplicant/$(WPAGUI)
+
+ touch build-stamp
-install/wpasupplicant::
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ $(MAKE) -C wpa_supplicant clean
+
+ if [ -f wpa_supplicant/$(WPAGUI)/Makefile ]; then \
+ $(MAKE) -C wpa_supplicant/$(WPAGUI) distclean ; \
+ rm -f wpa_supplicant/$(WPAGUI)/Makefile ; \
+ fi
+
+ -rm -f wpa_supplicant/.config README.wpa_supplicant.conf
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
# 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
+
+ # wpa_action
install --mode=755 -D debian/ifupdown/wpa_action.sh \
debian/wpasupplicant/sbin/wpa_action
- 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 \
+ install --mode=644 -D wpa_supplicant/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
-
-clean::
- $(MAKE) -C $(WPADIR) clean
- [ ! -f $(WPADIR)$(WPAGUI)/Makefile ] || $(MAKE) -C $(WPADIR)$(WPAGUI) distclean
- -rm -f $(WPADIR)$(WPAGUI)/Makefile
- -rm -f $(WPADIR).config README.wpa_supplicant.conf
+ install --mode=644 -D debian/dbus/dbus-wpa_supplicant.service \
+ debian/wpasupplicant/usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service
+
+# Build architecture-independent files here.
+binary-indep: build install
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs wpa_supplicant/ChangeLog
+ dh_installdocs
+ dh_installexamples
+ dh_install
+ dh_installlogrotate --package=wpasupplicant --name=wpa_action
+ dh_installinit --package=wpasupplicant --name=wpa-ifupdown --no-start -- start 15 0 6 .
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
Modified: wpasupplicant/trunk/debian/wpasupplicant.examples
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpasupplicant.examples?rev=877&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/wpasupplicant.examples (original)
+++ wpasupplicant/trunk/debian/wpasupplicant.examples Sat Nov 3 07:47:43 2007
@@ -1,3 +1,3 @@
README.wpa_supplicant.conf
wpa_supplicant/examples/*.conf
-debian/wpa_supplicant.conf.template
+debian/examples/wpa_supplicant.conf.template
More information about the Pkg-wpa-devel
mailing list