rpm/wpa_supplicant
SHA256
1
0
Fork 0
forked from pool/wpa_supplicant
Code Pull Requests Activity

Accepting request 359998 from home:lnussel:branches:hardware

Browse Source 
- add aliases for both provided dbus names to avoid systemd stopping the
  service when switching runlevels (boo#966535)

OBS-URL: https://build.opensuse.org/request/show/359998
OBS-URL: https://build.opensuse.org/package/show/hardware/wpa_supplicant?expand=0&rev=58
This commit is contained in:
Ismail Dönmez 2016-02-18 12:03:21 +00:00 committed by Git OBS Bridge
parent 81f0769d04
commit 473bbb6dec
2 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wpa_supplicant.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Feb 17 13:47:43 UTC 2016 - lnussel@suse.de
- add aliases for both provided dbus names to avoid systemd stopping the
service when switching runlevels (boo#966535)
-------------------------------------------------------------------
Thu May 7 17:18:29 CEST 2015 - ro@suse.de

66
wpa_supplicant.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package wpa_supplicant
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,24 +16,16 @@
#
Name: wpa_supplicant
BuildRequires: dbus-1-devel
BuildRequires: libqt4
BuildRequires: libqt4-devel
BuildRequires: openssl-devel
BuildRequires: pkg-config
BuildRequires: readline-devel
%if 0%{?suse_version} > 1230
BuildRequires: systemd-rpm-macros
%systemd_requires
%if ! %{defined _rundir}
%define _rundir %{_localstatedir}/run
%endif
BuildRequires: libnl3-devel
Url: http://hostap.epitest.fi/wpa_supplicant/
Name: wpa_supplicant
Version: 2.4
Release: 0
Summary: WPA supplicant implementation
License: BSD-3-Clause and GPL-2.0+
Group: Productivity/Networking/Other
Url: http://hostap.epitest.fi/wpa_supplicant/
Source: http://hostap.epitest.fi/releases/wpa_supplicant-%{version}.tar.gz
Source1: config
Source2: %{name}.conf
@ -50,7 +42,7 @@ Patch2: wpa_supplicant-sigusr1-changes-debuglevel.patch
Patch3: 0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
Patch4: wpa_supplicant-alloc_size.patch
# PATCH-FIX-UPSTREAM wpa_s-D-Bus-Fix-operations-when-P2P-management-interface-is-used.patch arch#44740 zaitor@opensuse.org -- Fix Segmentation fault in wpa_supplicant. Patch taken from upstream master git.
Patch5: wpa_s-D-Bus-Fix-operations-when-P2P-management-interface-is-used.patch
Patch5: wpa_s-D-Bus-Fix-operations-when-P2P-management-interface-is-used.patch
# PATCH-FIX-UPSTREAM 0001-WPS-Fix-HTTP-chunked-transfer-encoding-parser.patch bnc#930077
Patch6: 0001-WPS-Fix-HTTP-chunked-transfer-encoding-parser.patch
# PATCH-FIX-UPSTREAM 0001-AP-WMM-Fix-integer-underflow-in-WMM-Action-frame-par.patch bnc#930078
@ -65,11 +57,18 @@ Patch10: 0003-EAP-pwd-peer-Fix-Total-Length-parsing-for-fragment-r.patch
Patch11: 0004-EAP-pwd-server-Fix-Total-Length-parsing-for-fragment.patch
# PATCH-FIX-UPSTREAM 0005-EAP-pwd-peer-Fix-asymmetric-fragmentation-behavior.patch bnc#930079
Patch12: 0005-EAP-pwd-peer-Fix-asymmetric-fragmentation-behavior.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-devel
BuildRequires: libnl3-devel
BuildRequires: libqt4
BuildRequires: libqt4-devel
BuildRequires: openssl-devel
BuildRequires: pkg-config
BuildRequires: readline-devel
Requires: logrotate
%if ! %{defined _rundir}
%define _rundir %{_localstatedir}/run
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} > 1230
BuildRequires: systemd-rpm-macros
%systemd_requires
%endif
%description
@ -78,11 +77,6 @@ i.e., the part that runs in the client stations. It implements key
negotiation with a WPA Authenticator and it controls the roaming and
IEEE 802.11 authentication/association of the wlan driver.
Authors:
--------
Jouni Malinen <jkmaline@cc.hut.fi>
%package gui
Summary: WPA supplicant graphical front-end
Group: System/Monitoring
@ -92,16 +86,11 @@ Requires: wpa_supplicant
This package contains a graphical front-end to wpa_supplicant, an
implementation of the WPA Supplicant component.
Authors:
--------
Jouni Malinen <jkmaline@cc.hut.fi>
%prep
%setup -q -n wpa_supplicant-%{version}
rm -rf wpa_supplicant-%{version}/patches
cp %{SOURCE1} wpa_supplicant/.config
%patch1 -p0
%patch1
%patch2 -p1
%patch3 -p1
%patch4 -p1
@ -116,9 +105,9 @@ cp %{SOURCE1} wpa_supplicant/.config
%build
cd wpa_supplicant
CFLAGS="$RPM_OPT_FLAGS" make V=1 %{?_smp_mflags}
CFLAGS="%{optflags}" make V=1 %{?_smp_mflags}
cd wpa_gui-qt4
qmake QMAKE_CXXFLAGS="$RPM_OPT_FLAGS" QMAKE_CFLAGS="$RPM_OPT_FLAGS"
qmake QMAKE_CXXFLAGS="%{optflags}" QMAKE_CFLAGS="%{optflags}"
make %{?_smp_mflags}
%install
@ -149,6 +138,11 @@ install -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}
%endif
# avoid spurious dependency on /usr/bin/python
chmod -x wpa_supplicant/examples/*.py
%if 0%{?suse_version} > 1230
# dbus auto activation boo#966535
ln -s wpa_supplicant.service %{buildroot}%{_unitdir}/dbus-fi.epitest.hostap.WPASupplicant.service
ln -s wpa_supplicant.service %{buildroot}%{_unitdir}/dbus-fi.w1.wpa_supplicant1.service
%endif
%if 0%{?suse_version} > 1230
%pre
@ -180,15 +174,17 @@ chmod -x wpa_supplicant/examples/*.py
%endif
%if 0%{?suse_version} > 1230
%{_unitdir}/wpa_supplicant.service
%{_unitdir}/dbus-fi.epitest.hostap.WPASupplicant.service
%{_unitdir}/dbus-fi.w1.wpa_supplicant1.service
%endif
%dir %{_sysconfdir}/%{name}
%doc %{_mandir}/man8/*
%{_mandir}/man8/*
%exclude %{_mandir}/man8/wpa_gui.*
%doc %{_mandir}/man5/*
%{_mandir}/man5/*
%files gui
%defattr(-,root,root)
/usr/sbin/wpa_gui
%doc %{_mandir}/man8/wpa_gui.*
%{_sbindir}/wpa_gui
%{_mandir}/man8/wpa_gui.*
%changelog