From 1ba945c376cd9f6c4d836c7499209630455eba6c Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: May 01 2012 16:26:41 +0000
Subject: Fix systemd startup ordering (rh #815091)


---

diff --git a/.gitignore b/.gitignore
index 996e0a1..6da2432 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ wpa_supplicant-0.6.8.tar.gz
 /wpa_supplicant-1.0-rc1.tar.gz
 /wpa_supplicant-1.0-rc2.tar.gz
 /wpa_supplicant-1.0-rc2.git20120302.tar.gz
+/wpa_supplicant-1.0-rc3.tar.gz
diff --git a/harmonize-autostart-arguments.patch b/harmonize-autostart-arguments.patch
new file mode 100644
index 0000000..850c872
--- /dev/null
+++ b/harmonize-autostart-arguments.patch
@@ -0,0 +1,21 @@
+diff -up wpa_supplicant-1.0-rc3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in.foo wpa_supplicant-1.0-rc3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in
+--- wpa_supplicant-1.0-rc3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in.foo	2012-05-01 10:04:48.247061583 -0500
++++ wpa_supplicant-1.0-rc3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in	2012-05-01 10:05:52.636256609 -0500
+@@ -1,5 +1,5 @@
+ [D-BUS Service]
+ Name=fi.epitest.hostap.WPASupplicant
+-Exec=@SBINDIR@/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -B -u -f /var/log/wpa_supplicant.log -P /var/run/wpa_supplicant.pid
++Exec=@BINDIR@/wpa_supplicant -B -u -f /var/log/wpa_supplicant.log -c /etc/wpa_supplicant/wpa_supplicant.conf -P /var/run/wpa_supplicant.pid
+ User=root
+ SystemdService=wpa_supplicant.service
+diff -up wpa_supplicant-1.0-rc3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in.foo wpa_supplicant-1.0-rc3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in
+--- wpa_supplicant-1.0-rc3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in.foo	2012-05-01 10:04:38.224186887 -0500
++++ wpa_supplicant-1.0-rc3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in	2012-05-01 10:05:37.702443307 -0500
+@@ -1,5 +1,5 @@
+ [D-BUS Service]
+ Name=fi.w1.wpa_supplicant1
+-Exec=@SBINDIR@/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -B -u -f /var/log/wpa_supplicant.log -P /var/run/wpa_supplicant.pid
++Exec=@BINDIR@/wpa_supplicant -B -u -f /var/log/wpa_supplicant.log -c /etc/wpa_supplicant/wpa_supplicant.conf -P /var/run/wpa_supplicant.pid
+ User=root
+ SystemdService=wpa_supplicant.service
+diff -up wpa_supplicant-1.0-rc3/wpa_supplicant/Makefile.foo wpa_supplicant-1.0-rc3/wpa_supplicant/Makefile
diff --git a/sources b/sources
index bcd4d70..fc67280 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eb3495560baa793f67c423409cc1fd5b  wpa_supplicant-1.0-rc2.git20120302.tar.gz
+8a3134a6df4229877bbd9f577b208ee9  wpa_supplicant-1.0-rc3.tar.gz
diff --git a/wpa_supplicant.service b/wpa_supplicant.service
index 67374d1..45d8b99 100644
--- a/wpa_supplicant.service
+++ b/wpa_supplicant.service
@@ -1,11 +1,13 @@
 [Unit]
 Description=WPA Supplicant daemon
-After=syslog.target network.target
+Before=network.target
+After=syslog.target
 
 [Service]
-Type=forking
+Type=dbus
+BusName=fi.w1.wpa_supplicant1
 EnvironmentFile=-/etc/sysconfig/wpa_supplicant
-ExecStart=/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf $INTERFACES $DRIVERS -B -u $OTHER_ARGS
+ExecStart=/usr/sbin/wpa_supplicant -u -f /var/log/wpa_supplicant.log -c /etc/wpa_supplicant/wpa_supplicant.conf $INTERFACES $DRIVERS $OTHER_ARGS
 
 [Install]
 WantedBy=multi-user.target
diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec
index f5d46fc..ef221b1 100644
--- a/wpa_supplicant.spec
+++ b/wpa_supplicant.spec
@@ -1,11 +1,11 @@
-%define rcver -rc2
-%define snapshot .git20120302
+%define rcver -rc3
+%define snapshot %{nil}
 
 Summary: WPA/WPA2/IEEE 802.1X Supplicant
 Name: wpa_supplicant
 Epoch: 1
 Version: 1.0
-Release: 0.3%{?dist}
+Release: 0.4%{?dist}
 License: BSD
 Group: System Environment/Base
 Source0: http://w1.fi/releases/%{name}-%{version}%{rcver}%{snapshot}.tar.gz
@@ -40,6 +40,8 @@ Patch6: wpa_supplicant-gui-qt4.patch
 Patch7: wpa_supplicant-1.0-wpagui-getopt.patch
 # Fix libnl3 includes path
 Patch8: libnl3-includes.patch
+# Harmonize autostart arguments between dbus and systemd
+Patch9: harmonize-autostart-arguments.patch
 # Dirty hack for WiMAX
 # http://linuxwimax.org/Download?action=AttachFile&do=get&target=wpa-1.5-README.txt
 Patch100: wpa_supplicant-0.7.2-generate-libeap-peer.patch
@@ -105,12 +107,16 @@ Don't use this unless you know what you're doing.
 %patch6 -p1 -b .qt4
 %patch7 -p1 -b .getopt
 %patch8 -p1 -b .libnl3
+%patch9 -p1 -b .harmonize-args
 
 %build
 pushd wpa_supplicant
   cp %{SOURCE1} .config
   CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;
+  # yes, BINDIR=_sbindir
+  BINDIR="%{_sbindir}" ; export BINDIR ;
+  LIBDIR="%{_libdir}" ; export LIBDIR ;
   make %{_smp_mflags}
 %if %{build_gui}
   QTDIR=%{_libdir}/qt4 make wpa_gui-qt4 %{_smp_mflags}
@@ -229,6 +235,10 @@ fi
 %postun -n libeap -p /sbin/ldconfig
 
 %changelog
+* Tue May  1 2012 Dan Williams <dcbw@redhat.com> - 1:1.0-0.4
+- Update to wpa_supplicant 1.0-rc3
+- Fix systemd target dependencies (rh #815091)
+
 * Fri Mar  2 2012 Dan Williams <dcbw@redhat.com> - 1:1.0-0.3
 - Update to latest 1.0 git snapshot
 - Rebuild against libnl3