!1 wpa_supplicant: modify wpa_supplicant.service

Merge pull request !1 from syyhao/next

add-options-of-wpa_supplicant-service.patch

@@ -0,0 +1,42 @@
+From edb7c242b5177f13ff4f57f61257838e80fb48ed Mon Sep 17 00:00:00 2001
+From: guoxiaoqi <guoxiaoqi2@huawei.com>
+Date: Tue, 31 Dec 2019 15:52:23 +0800
+Subject: [PATCH] add options of wpa_supplicant.service
+
+Signed-off-by: guoxiaoqi <guoxiaoqi2@huawei.com>
+---
+ wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in | 5 ++++-
+ wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in           | 5 ++++-
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in b/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in
+index a75918f..19b4d79 100644
+--- a/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in
++++ b/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in
+@@ -1,5 +1,8 @@
+ [D-BUS Service]
+ Name=fi.epitest.hostap.WPASupplicant
+-Exec=@BINDIR@/wpa_supplicant -u
++Environment=DEBUG_LOGGER=/var/log/wpa_supplicant.log
++Environment=DEBUG_CONF=/etc/wpa_supplicant/wpa_supplicant.conf
++Environment=PID_FILE=/var/run/wpa_supplicant.pid
++Exec=@BINDIR@/wpa_supplicant -u -f ${DEBUG_LOGGER} -c ${DEBUG_CONF} -P ${PID_FILE}
+ User=root
+ SystemdService=wpa_supplicant.service
+diff --git a/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in b/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in
+index d97ff39..fd1e10b 100644
+--- a/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in
++++ b/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in
+@@ -1,5 +1,8 @@
+ [D-BUS Service]
+ Name=fi.w1.wpa_supplicant1
+-Exec=@BINDIR@/wpa_supplicant -u
++Environment=DEBUG_LOGGER=/var/log/wpa_supplicant.log
++Environment=DEBUG_CONF=/etc/wpa_supplicant/wpa_supplicant.conf
++Environment=PID_FILE=/var/run/wpa_supplicant.pid
++Exec=@BINDIR@/wpa_supplicant -u -f ${DEBUG_LOGGER} -c ${DEBUG_CONF} -P ${PID_FILE}
+ User=root
+ SystemdService=wpa_supplicant.service
+-- 
+1.8.3.1
+

wpa_supplicant-dbus-service-file-args.patch

@@ -1,20 +0,0 @@
-diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in.fedora wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in
---- wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in.fedora	2008-03-02 20:58:35.000000000 -0500
-+++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in	2008-03-02 20:58:41.000000000 -0500
-@@ -1,5 +1,5 @@
- [D-BUS Service]
- Name=fi.w1.wpa_supplicant1
--Exec=@BINDIR@/wpa_supplicant -u
-+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-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in.fedora wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in
---- wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in.fedora	2008-03-02 20:58:35.000000000 -0500
-+++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in	2008-03-02 20:58:41.000000000 -0500
-@@ -1,5 +1,5 @@
- [D-BUS Service]
- Name=fi.epitest.hostap.WPASupplicant
--Exec=@BINDIR@/wpa_supplicant -u
-+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

wpa_supplicant.spec

@@ -1,7 +1,7 @@
 Name:          wpa_supplicant
 Epoch:         1
 Version:       2.6
-Release:       21
+Release:       22
 Summary:       A WPA Supplicant with support for WPA and WPA2 (IEEE 802.11i / RSN)
 License:       BSD
 Url:           https://w1.fi/wpa_supplicant/
@@ -16,7 +16,6 @@ Source5:       %{name}.logrotate
 #patches number ranging between [6000,9000) are backport from higher versions, including some CVE fixes
 Patch0000:     wpa_supplicant-assoc-timeout.patch
 Patch0001:     wpa_supplicant-flush-debug-output.patch
-Patch0002:     wpa_supplicant-dbus-service-file-args.patch
 Patch0003:     wpa_supplicant-quiet-scan-results-message.patch
 Patch0004:     wpa_supplicant-gui-qt4.patch
 Patch0005:     rh837402-less-aggressive-roaming.patch
@@ -93,6 +92,8 @@ Patch6065:     CVE-2019-9498-and-CVE-2019-9499.patch
 Patch6066:     CVE-2019-11555-1.patch
 Patch6067:     CVE-2019-11555-2.patch
 
+Patch9000:     add-options-of-wpa_supplicant-service.patch
+
 BuildRequires: qt-devel >= 4.0 openssl-devel readline-devel dbus-devel libnl3-devel systemd-units docbook-utils
 Requires(post): systemd-sysv
 Requires(post): systemd
@@ -187,6 +188,9 @@ install -m644 %{name}/doc/docbook/*.5 %{buildroot}%{_mandir}/man5
 %{_mandir}/man5/*
 
 %changelog
+* Tue Dec 31 2019 openEuler Buildteam <buildteam@openeuler.org> - 1:2.6-22
+- add options of wpa_supplicant.service
+
 * Sat Dec 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 1:2.6-21
 - Modify requires