wpa_supplicant: update to 0.7.3

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2451 ec354946-7b23-47d6-9f5a-488ba84defc7

w/wpa_supplicant/wpa_supplicant-vl.spec

@@ -1,32 +1,39 @@
 Summary: WPA/WPA2/IEEE 802.1X Supplicant
 Name: wpa_supplicant
-Version: 0.6.4
+Version: 0.7.3
 Release: 1%{?_dist_release}
-License: GPL
+License: BSD
 Group: System Environment/Base
 URL: http://w1.fi/wpa_supplicant/
 
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
-Source1: %{name}.config
+Source1: %{name}.build-config
 Source2: %{name}.conf
 Source3: %{name}.init.d
 Source4: %{name}.sysconfig
 Source6: %{name}.logrotate
 
+# import from Fedora package
+# distro specific customization and not suitable for upstream,
+# works around busted drivers
 Patch0: wpa_supplicant-assoc-timeout.patch
-Patch1: wpa_supplicant-0.5.7-qmake-location.patch
-Patch2: wpa_supplicant-0.5.7-flush-debug-output.patch
-Patch3: wpa_supplicant-0.5.7-use-IW_ENCODE_TEMP.patch
-Patch4: wpa_supplicant-0.5.10-dbus-service-file.patch
-Patch5: wpa_supplicant-0.6.4-handle-invalid-ies.patch
-Patch6: wpa_supplicant-0.6.4-scan-fixes-1.patch
-Patch7: wpa_supplicant-0.6.4-scan-fixes-2.patch
-Patch8: wpa_supplicant-0.6.4-validate-wext-event.patch
-Patch9: wpa_supplicant-0.6.4-set-mode-handler.patch
+# ensures that debug output gets flushed immediately to help diagnose driver
+# bugs, not suitable for upstream
+Patch1: wpa_supplicant-flush-debug-output.patch
+# disto specific customization for log paths, not suitable for upstream
+Patch2: wpa_supplicant-dbus-service-file-args.patch
+# quiet an annoying and frequent syslog message
+Patch3: wpa_supplicant-quiet-scan-results-message.patch
+# recover from streams of driver disconnect messages (iwl3945)
+Patch4: wpa_supplicant-squelch-driver-disconnect-spam.patch
+# allow more private key encryption algorithms
+Patch5: wpa_supplicant-openssl-more-algs.patch
+# Send PropertyChanged notificationes when the BSS list changes
+Patch7: wpa_supplicant-bss-changed-prop-notify.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-BuildRequires: qt-devel
+BuildRequires: qt4-devel
 BuildRequires: openssl-devel
 BuildRequires: readline-devel
 BuildRequires: dbus-devel
@@ -47,23 +54,20 @@ Summary(ja): wpa_supplicant のグラフィカルユーザインタフェース
 Group: Applications/System
 
 %description gui
-Graphical User Interface for wpa_supplicant written using QT3
+Graphical User Interface for wpa_supplicant written using QT4
 
 %description -l ja gui
-QT3 を用いた wpa_supplicant のグラフィカルユーザインタフェース
+QT4 を用いた wpa_supplicant のグラフィカルユーザインタフェース
 
 %prep
 %setup -q
 %patch0 -p1 -b .assoc-timeout
-%patch1 -p1 -b .qmake-location
-%patch2 -p1 -b .flush-debug-output
-%patch3 -p1 -b .use-IW_ENCODE_TEMP
-%patch4 -p1 -b .dbus-service-file
-%patch5 -p1 -b .handle-invalid-ies
-%patch6 -p1 -b .scan-fixes-1
-%patch7 -p1 -b .scan-fixes-2
-%patch8 -p1 -b .validate-wext-event
-%patch9 -p1 -b .set-mode-handler
+%patch1 -p1 -b .flush-debug-output
+%patch2 -p1 -b .dbus-service-file
+%patch3 -p1 -b .quiet-scan-results-msg
+%patch4 -p1 -b .disconnect-spam
+%patch5 -p1 -b .more-openssl-algs
+%patch7 -p1 -b .bss-changed-prop-notify
 
 %build
 pushd wpa_supplicant
@@ -71,37 +75,32 @@ pushd wpa_supplicant
   CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;
   make %{_smp_mflags}
-  QTDIR=%{_libdir}/qt3 make wpa_gui %{_smp_mflags}
+  PATH=$PATH:%{_libdir}/qt4/bin QTDIR=%{_libdir}/qt4 make wpa_gui-qt4 %{_smp_mflags}
 popd
 
 %install
 rm -rf %{buildroot}
 
 # init scripts
-install -d %{buildroot}/%{_sysconfdir}/rc.d/init.d
-install -d %{buildroot}/%{_sysconfdir}/sysconfig
-install -m 0755 %{SOURCE3} %{buildroot}/%{_sysconfdir}/rc.d/init.d/%{name}
-install -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}
-install -d %{buildroot}/%{_sysconfdir}/logrotate.d
-install -m 0644 %{SOURCE6} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
+install -D -m 0755 %{SOURCE3} %{buildroot}/%{_sysconfdir}/rc.d/init.d/%{name}
+install -D -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}
+install -D -m 0644 %{SOURCE6} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
 
 # config
-install -d %{buildroot}/%{_sysconfdir}/%{name}
-install -m 0600 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}
+install -D -m 0600 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}/%{name}.conf
 
 # binary
 install -d %{buildroot}/%{_sbindir}
 install -m 0755 %{name}/wpa_passphrase %{buildroot}/%{_sbindir}
 install -m 0755 %{name}/wpa_cli %{buildroot}/%{_sbindir}
 install -m 0755 %{name}/wpa_supplicant %{buildroot}/%{_sbindir}
-install -d %{buildroot}/%{_sysconfdir}/dbus-1/system.d/
-install -m 0644 %{name}/dbus-wpa_supplicant.conf %{buildroot}/%{_sysconfdir}/dbus-1/system.d/wpa_supplicant.conf
-install -d %{buildroot}/%{_datadir}/dbus-1/system-services/
-install -m 0644 %{name}/dbus-wpa_supplicant.service %{buildroot}/%{_datadir}/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service
+install -D -m 0644 %{name}/dbus/dbus-wpa_supplicant.conf %{buildroot}/%{_sysconfdir}/dbus-1/system.d/wpa_supplicant.conf
+install -D -m 0644 %{name}/dbus/fi.w1.wpa_supplicant1.service %{buildroot}/%{_datadir}/dbus-1/system-services/fi.w1.wpa_supplicant1.service
+install -D -m 0644 %{name}/dbus/fi.epitest.hostap.WPASupplicant.service %{buildroot}/%{_datadir}/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service
 
 # gui
 install -d %{buildroot}/%{_bindir}
-install -m 0755 %{name}/wpa_gui/wpa_gui %{buildroot}/%{_bindir}
+install -m 0755 %{name}/wpa_gui-qt4/wpa_gui %{buildroot}/%{_bindir}
 
 # running
 mkdir -p %{buildroot}/%{_localstatedir}/run/%{name}
@@ -127,6 +126,7 @@ fi
 %preun
 if [ $1 = 0 ]; then
 	service %{name} stop > /dev/null 2>&1
+        killall -TERM wpa_supplicant >/dev/null 2>&1
 	/sbin/chkconfig --del %{name}
 fi
 
@@ -140,6 +140,7 @@ fi
 %{_sysconfdir}/rc.d/init.d/%{name}
 %{_sysconfdir}/dbus-1/system.d/%{name}.conf
 %{_datadir}/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service
+%{_datadir}/dbus-1/system-services/fi.w1.wpa_supplicant1.service
 %{_sbindir}/wpa_passphrase
 %{_sbindir}/wpa_supplicant
 %{_sbindir}/wpa_cli
@@ -153,6 +154,14 @@ fi
 %{_bindir}/wpa_gui
 
 %changelog
+* Thu Jan 06 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 0.7.3-1
+- new upstream release
+- update patches
+- change License to BSD due to linkage against OpsnSSL since there is no
+  OpenSSL exception in upstream GPLv2 license text.
+- build with qt4
+- update build config
+
 * Wed Jan 28 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 0.6.4-1
 - new upstream release
 - remove hostap/madwifi/prism54 drivers, use 'wext' instead.