[pkg-wpa-devel] r1700 - in /wpa/trunk/debian: ./ patches/ wpa_gui/

kelmo-guest at users.alioth.debian.org kelmo-guest at users.alioth.debian.org
Sun Apr 8 08:16:53 UTC 2012 

Author: kelmo-guest
Date: Sun Apr  8 08:16:51 2012
New Revision: 1700

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1700
Log:
* export BINDIR=/sbin, the build system now requires it when patching
  D-Bus/systemd configuration.
* quieten the upstream build system so that errors/warning are more visible.
* assist with adaptation of debian/rules for merge of wpa_supplicant/hostapd:
  - add docbook-utils to build dependency list and make documentation from
    sgml source
  - ensure shared code under src/ is cleaned between wpa_supplicant/hostapd
    builds
  - put wpa_supplicant/hostapd ifupdown hooks in their own namespace, adapt
    installation of ifupdown hooks
* drop the netdev_wrapper script from wpagui and associated patch
* install systemd service unit file
* refresh D-Bus service activation file patch which starts process with
  syslog and control socket support, also patch systemd service file
* drop 09_dbus_emit_change_events.patch, applied upstream.
* fix ftbfs with gcc/g++ 4.7 (Closes: 667416)

Added:
    wpa/trunk/debian/patches/11_wpa_gui_ftbfs_gcc_4_7.patch
Removed:
    wpa/trunk/debian/patches/09_dbus_emit_change_events.patch
    wpa/trunk/debian/wpa_gui/netdev_wrapper
Modified:
    wpa/trunk/debian/changelog
    wpa/trunk/debian/control
    wpa/trunk/debian/hostapd.install
    wpa/trunk/debian/patches/06_wpa_gui_menu_exec_path.patch
    wpa/trunk/debian/patches/07_dbus_service_syslog.patch
    wpa/trunk/debian/patches/12_wpa_gui_knotify_support.patch
    wpa/trunk/debian/patches/series
    wpa/trunk/debian/rules
    wpa/trunk/debian/wpagui.install
    wpa/trunk/debian/wpagui.menu
    wpa/trunk/debian/wpasupplicant.install

Modified: wpa/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/changelog?rev=1700&op=diff
==============================================================================
--- wpa/trunk/debian/changelog (original)
+++ wpa/trunk/debian/changelog Sun Apr  8 08:16:51 2012
@@ -1,5 +1,6 @@
 wpa (1.0~rc2-1) UNRELEASED; urgency=low
 
+  [ Stefan Lippers-Hollmann ]
   * NOT RELEASED YET
   * import new upstream snapshot 1.0-rc2:
     - fixes:
@@ -18,7 +19,25 @@
   * update dep-5 version to final 1.0, no changes necessary:
     - order licenses alphabetically.
 
- -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Sun, 08 Apr 2012 01:50:29 +0200
+  [ Kel Modderman ]
+  * export BINDIR=/sbin, the build system now requires it when patching
+    D-Bus/systemd configuration.
+  * quieten the upstream build system so that errors/warning are more visible.
+  * assist with adaptation of debian/rules for merge of wpa_supplicant/hostapd:
+    - add docbook-utils to build dependency list and make documentation from
+      sgml source
+    - ensure shared code under src/ is cleaned between wpa_supplicant/hostapd
+      builds
+    - put wpa_supplicant/hostapd ifupdown hooks in their own namespace, adapt
+      installation of ifupdown hooks
+  * drop the netdev_wrapper script from wpagui and associated patch
+  * install systemd service unit file
+  * refresh D-Bus service activation file patch which starts process with
+    syslog and control socket support, also patch systemd service file
+  * drop 09_dbus_emit_change_events.patch, applied upstream.
+  * fix ftbfs with gcc/g++ 4.7 (Closes: 667416)
+
+ -- Kel Modderman <kel at otaku42.de>  Sun, 08 Apr 2012 18:05:12 +1000
 
 wpasupplicant (0.7.3-6) unstable; urgency=low
 

Modified: wpa/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/control?rev=1700&op=diff
==============================================================================
--- wpa/trunk/debian/control (original)
+++ wpa/trunk/debian/control Sun Apr  8 08:16:51 2012
@@ -17,7 +17,8 @@
  libpcap-dev [kfreebsd-any],
  libbsd-dev [kfreebsd-any],
  pkg-config,
- qt4-qmake
+ qt4-qmake,
+ docbook-utils
 Build-Conflicts: libqt3-dev
 Standards-Version: 3.9.3
 Vcs-Svn: svn://anonscm.debian.org/svn/pkg-wpa/wpa/trunk/

Modified: wpa/trunk/debian/hostapd.install
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/hostapd.install?rev=1700&op=diff
==============================================================================
--- wpa/trunk/debian/hostapd.install (original)
+++ wpa/trunk/debian/hostapd.install Sun Apr  8 08:16:51 2012
@@ -1,3 +1,2 @@
 hostapd/hostapd      usr/sbin/
 hostapd/hostapd_cli  usr/sbin/
-debian/ifupdown.sh   etc/hostapd/

Modified: wpa/trunk/debian/patches/06_wpa_gui_menu_exec_path.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/06_wpa_gui_menu_exec_path.patch?rev=1700&op=diff
==============================================================================
--- wpa/trunk/debian/patches/06_wpa_gui_menu_exec_path.patch (original)
+++ wpa/trunk/debian/patches/06_wpa_gui_menu_exec_path.patch Sun Apr  8 08:16:51 2012
@@ -1,5 +1,5 @@
 Description: Debian specific patch to desktop meny entry, so that we may exec
- wpa_gui with best estimated privilege level via /usr/share/netdev_wrapper.
+ wpa_gui which being in /usr/sbin may not be in the PATH
 Author: Kel Modderman <kel at otaku42.de>
 ---
 --- a/wpa_supplicant/wpa_gui-qt4/wpa_gui.desktop
@@ -9,7 +9,7 @@
  Name=wpa_gui
  Comment=Graphical user interface for wpa_supplicant
 -Exec=wpa_gui
-+Exec=/usr/share/wpagui/netdev_wrapper
++Exec=/usr/sbin/wpa_gui
  Icon=wpa_gui
  GenericName=wpa_supplicant user interface
  Terminal=false

Modified: wpa/trunk/debian/patches/07_dbus_service_syslog.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/07_dbus_service_syslog.patch?rev=1700&op=diff
==============================================================================
--- wpa/trunk/debian/patches/07_dbus_service_syslog.patch (original)
+++ wpa/trunk/debian/patches/07_dbus_service_syslog.patch Sun Apr  8 08:16:51 2012
@@ -1,22 +1,35 @@
-Description: Tweak D-Bus service activation configuration file:
+Description: Tweak D-Bus/systemd service activation configuration files:
  * log wpa_supplicant messages to syslog
  * activate control socket interface so that wpa_cli can be used by D-Bus
    activated wpa_supplicant daemon
 Author: Kel Modderman <kel at otaku42.de>
 ---
---- a/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service
-+++ b/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service
-@@ -1,4 +1,4 @@
+--- a/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in
++++ b/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in
+@@ -1,5 +1,5 @@
  [D-BUS Service]
  Name=fi.epitest.hostap.WPASupplicant
--Exec=/sbin/wpa_supplicant -u
-+Exec=/sbin/wpa_supplicant -u -s -O /var/run/wpa_supplicant
+-Exec=@BINDIR@/wpa_supplicant -u
++Exec=@BINDIR@/wpa_supplicant -u -s -O /var/run/wpa_supplicant
  User=root
---- a/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service
-+++ b/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service
-@@ -1,4 +1,4 @@
+ SystemdService=wpa_supplicant.service
+--- a/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in
++++ b/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in
+@@ -1,5 +1,5 @@
  [D-BUS Service]
  Name=fi.w1.wpa_supplicant1
--Exec=/sbin/wpa_supplicant -u
-+Exec=/sbin/wpa_supplicant -u -s -O /var/run/wpa_supplicant
+-Exec=@BINDIR@/wpa_supplicant -u
++Exec=@BINDIR@/wpa_supplicant -u -s -O /var/run/wpa_supplicant
  User=root
+ SystemdService=wpa_supplicant.service
+--- a/wpa_supplicant/systemd/wpa_supplicant.service.in
++++ b/wpa_supplicant/systemd/wpa_supplicant.service.in
+@@ -4,7 +4,7 @@ Description=WPA supplicant
+ [Service]
+ Type=dbus
+ BusName=fi.epitest.hostap.WPASupplicant
+-ExecStart=@BINDIR@/wpa_supplicant -u
++ExecStart=@BINDIR@/wpa_supplicant -u -s -O /var/run/wpa_supplicant
+ 
+ [Install]
+ WantedBy=multi-user.target

Added: wpa/trunk/debian/patches/11_wpa_gui_ftbfs_gcc_4_7.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/11_wpa_gui_ftbfs_gcc_4_7.patch?rev=1700&op=file
==============================================================================
--- wpa/trunk/debian/patches/11_wpa_gui_ftbfs_gcc_4_7.patch (added)
+++ wpa/trunk/debian/patches/11_wpa_gui_ftbfs_gcc_4_7.patch Sun Apr  8 08:16:51 2012
@@ -1,0 +1,23 @@
+Description: Fix FTBFS with gcc/g++ 4.7
+Author: Kel Modderman <kel at otaku42.de>
+Bug-Debian: bugs.debian.org/667416
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+@@ -12,16 +12,12 @@
+  * See README and COPYING for more details.
+  */
+ 
+-#ifdef __MINGW32__
+-/* Need to get getopt() */
+-#include <unistd.h>
+-#endif
+-
+ #ifdef CONFIG_NATIVE_WINDOWS
+ #include <windows.h>
+ #endif /* CONFIG_NATIVE_WINDOWS */
+ 
+ #include <cstdio>
++#include <unistd.h>
+ #include <QMessageBox>
+ #include <QCloseEvent>
+ #include <QImageReader>

Modified: wpa/trunk/debian/patches/12_wpa_gui_knotify_support.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/12_wpa_gui_knotify_support.patch?rev=1700&op=diff
==============================================================================
--- wpa/trunk/debian/patches/12_wpa_gui_knotify_support.patch (original)
+++ wpa/trunk/debian/patches/12_wpa_gui_knotify_support.patch Sun Apr  8 08:16:51 2012
@@ -4,11 +4,12 @@
 ---
 --- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
 +++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
-@@ -22,10 +22,13 @@
+@@ -17,11 +17,14 @@
  #endif /* CONFIG_NATIVE_WINDOWS */
  
  #include <cstdio>
 +#include <cstdlib>
+ #include <unistd.h>
  #include <QMessageBox>
  #include <QCloseEvent>
  #include <QImageReader>
@@ -18,7 +19,7 @@
  
  #include "wpagui.h"
  #include "dirent.h"
-@@ -1343,10 +1346,21 @@ void WpaGui::createTrayIcon(bool trayOnl
+@@ -1339,10 +1342,21 @@ void WpaGui::createTrayIcon(bool trayOnl
  void WpaGui::showTrayMessage(QSystemTrayIcon::MessageIcon type, int sec,
  			     const QString & msg)
  {

Modified: wpa/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/series?rev=1700&op=diff
==============================================================================
--- wpa/trunk/debian/patches/series (original)
+++ wpa/trunk/debian/patches/series Sun Apr  8 08:16:51 2012
@@ -60,8 +60,8 @@
 01_use_pkg-config_for_pcsc-lite_module.patch
 02_dbus_group_policy.patch
 06_wpa_gui_menu_exec_path.patch
-#07_dbus_service_syslog.patch
-#09_dbus_emit_change_events.patch
+07_dbus_service_syslog.patch
+11_wpa_gui_ftbfs_gcc_4_7.patch
 12_wpa_gui_knotify_support.patch
 13_human_readable_signal.patch
 hostap_allow-linking-with-libnl-3.2.patch

Modified: wpa/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/rules?rev=1700&op=diff
==============================================================================
--- wpa/trunk/debian/rules (original)
+++ wpa/trunk/debian/rules Sun Apr  8 08:16:51 2012
@@ -4,7 +4,8 @@
 UCFLAGS  = -MMD -Wall -g -Os
 CXXFLAGS = -g
 LDFLAGS  = -Wl,--as-needed
-V = 1
+BINDIR   = /sbin
+V = 0
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS   += -O0
@@ -14,10 +15,10 @@
 	CXXFLAGS += -O2
 endif
 
-export CFLAGS CXXFLAGS LDFLAGS V
+export CFLAGS CXXFLAGS LDFLAGS BINDIR V
 
 DEB_HOST_ARCH_OS              ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-HOSTAPD_DOT_CONFIG            := debian/config/wpasupplicant/$(DEB_HOST_ARCH_OS)
+HOSTAPD_DOT_CONFIG            := debian/config/hostapd/$(DEB_HOST_ARCH_OS)
 WPASUPPLICANT_DOT_CONFIG      := debian/config/wpasupplicant/$(DEB_HOST_ARCH_OS)
 WPASUPPLICANT_UDEB_DOT_CONFIG := debian/config/wpasupplicant/$(DEB_HOST_ARCH_OS)-udeb
 
@@ -27,6 +28,10 @@
 	                  --buildsystem=qmake
 
 override_dh_auto_build:
+	# build documentation
+	dh_auto_build --sourcedirectory=wpa_supplicant/doc/docbook \
+	              --buildsystem=makefile \
+		      --parallel
 	# build wpasupplicant-udeb
 	cp -v --remove-destination $(WPASUPPLICANT_UDEB_DOT_CONFIG) wpa_supplicant/.config
 	CFLAGS="$(UCFLAGS)" dh_auto_build --sourcedirectory=wpa_supplicant \
@@ -36,26 +41,31 @@
 	dh_auto_clean --sourcedirectory=wpa_supplicant \
 	              --buildsystem=makefile
 	# build wpasupplicant
-	cp -v --remove-destination $(WPASUPPLICANT_UDEB_DOT_CONFIG) wpa_supplicant/.config
+	cp -v --remove-destination $(WPASUPPLICANT_DOT_CONFIG) wpa_supplicant/.config
 	dh_auto_build --sourcedirectory=wpa_supplicant \
 	              --buildsystem=makefile \
 		      --parallel
+	# build wpa_gui-qt4
 	dh_auto_build --sourcedirectory=wpa_supplicant/wpa_gui-qt4 \
 	              --buildsystem=qmake \
 		      --parallel
+	dh_auto_clean --sourcedirectory=src --buildsystem=makefile
 	# build hostapd
-	cp --remove-destination $(HOSTAPD_DOT_CONFIG) hostapd/.config
+	cp -v --remove-destination $(HOSTAPD_DOT_CONFIG) hostapd/.config
 	dh_auto_build --sourcedirectory=hostapd \
 	              --buildsystem=makefile \
 		      --parallel
+	dh_auto_clean --sourcedirectory=src --buildsystem=makefile
 
 override_dh_auto_clean:
+	dh_auto_clean --sourcedirectory=wpa_supplicant/doc/docbook \
+	              --buildsystem=makefile
 	dh_auto_clean --sourcedirectory=wpa_supplicant \
 	              --buildsystem=makefile
 	dh_auto_clean --sourcedirectory=wpa_supplicant/wpa_gui-qt4 \
 	              --buildsystem=qmake
 	find wpa_supplicant/wpa_gui-qt4 -type d \
-		-name \.moc -o -name \.ui -o -name \.obj | xargs rm -rf
+		-name \.moc -o -name \.ui -o -name \.obj -delete
 	dh_auto_clean --sourcedirectory=hostapd \
 	              --buildsystem=makefile
 
@@ -63,17 +73,14 @@
 	$(info Skip dh_auto_install ...)
 
 override_dh_clean:
-	dh_clean hostapd/.config
-	dh_clean wpa_supplicant/.config
-
-override_dh_fixperms:
-	dh_fixperms
-	chmod 0755 debian/hostapd/etc/hostapd/ifupdown.sh
-	chmod 0755 debian/wpasupplicant/etc/wpa_supplicant/*.sh
-	chmod 0755 debian/wpagui/usr/share/wpagui/netdev_wrapper
+	dh_clean wpa_supplicant/.config hostapd/.config wpa_supplicant/wpa_supplicant-udeb
 
 override_dh_install:
 	dh_install
+	# install systemd support
+	install --mode=644 -D wpa_supplicant/systemd/wpa_supplicant.service \
+		debian/wpasupplicant/lib/systemd/system/wpa_supplicant.service
+	# install D-Bus service activation files & configuration
 	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 \
@@ -82,6 +89,15 @@
 		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
+	# install ifupdown hook scripts
+	install --mode=755 -D debian/ifupdown/action_wpa.sh \
+		debian/wpasupplicant/etc/wpa_supplicant/action_wpa.sh
+	install --mode=755 -D debian/ifupdown/functions.sh \
+		debian/wpasupplicant/etc/wpa_supplicant/functions.sh
+	install --mode=755 -D debian/ifupdown/wpasupplicant.sh \
+		debian/wpasupplicant/etc/wpa_supplicant/ifupdown.sh
+	install --mode=755 -D debian/ifupdown/hostapd.sh \
+		debian/hostapd/etc/hostapd/ifupdown.sh
 	# Install udeb
 	install --mode=755 -D wpa_supplicant/wpa_supplicant-udeb \
 		debian/wpasupplicant-udeb/sbin/wpa_supplicant

Modified: wpa/trunk/debian/wpagui.install
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/wpagui.install?rev=1700&op=diff
==============================================================================
--- wpa/trunk/debian/wpagui.install (original)
+++ wpa/trunk/debian/wpagui.install Sun Apr  8 08:16:51 2012
@@ -1,4 +1,3 @@
-debian/wpa_gui/netdev_wrapper usr/share/wpagui/
 debian/wpa_gui/wpa_gui*.xpm usr/share/pixmaps/
 wpa_supplicant/wpa_gui-qt4/wpa_gui usr/sbin/
 wpa_supplicant/wpa_gui-qt4/wpa_gui.desktop usr/share/applications/

Modified: wpa/trunk/debian/wpagui.menu
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/wpagui.menu?rev=1700&op=diff
==============================================================================
--- wpa/trunk/debian/wpagui.menu (original)
+++ wpa/trunk/debian/wpagui.menu Sun Apr  8 08:16:51 2012
@@ -4,4 +4,4 @@
 	title="wpa_supplicant user interface" \
 	icon32x32="/usr/share/pixmaps/wpa_gui.xpm" \
 	icon16x16="/usr/share/pixmaps/wpa_gui-16.xpm" \
-	command="/usr/share/wpagui/netdev_wrapper"
+	command="/usr/sbin/wpa_gui"

Modified: wpa/trunk/debian/wpasupplicant.install
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/wpasupplicant.install?rev=1700&op=diff
==============================================================================
--- wpa/trunk/debian/wpasupplicant.install (original)
+++ wpa/trunk/debian/wpasupplicant.install Sun Apr  8 08:16:51 2012
@@ -1,4 +1,3 @@
-debian/ifupdown/*.sh etc/wpa_supplicant/
 debian/ifupdown/wpa_action sbin/
 wpa_supplicant/wpa_cli sbin/
 wpa_supplicant/wpa_passphrase usr/bin/

More information about the Pkg-wpa-devel mailing list