From dfd04df55bc68fc42f567f40f0594edfcd3dbe8f Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Sat, 31 Oct 2015 22:09:05 +0100
Subject: [PATCH] Enable syslog by default

This gives more relevant data to journal than logging in stdout. Also, pid file
is no longer needed, since we're a Type=dbus service.

The flat logging file is removed since it's not needed when we're logging into
journal. We probably can remove the logrotate file too.

The -u argument is moved into the service file as we can't really remove it
without changing the service's Type.
---
 build-config             | 1 +
 wpa_supplicant.service   | 2 +-
 wpa_supplicant.spec      | 6 +++++-
 wpa_supplicant.sysconfig | 9 ++-------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build-config b/build-config
index 6471bbf..49e2044 100644
--- a/build-config
+++ b/build-config
@@ -26,6 +26,7 @@ CONFIG_WPS=y
 CONFIG_EAP_IKEV2=y
 CONFIG_PKCS12=y
 CONFIG_SMARTCARD=y
+CONFIG_DEBUG_SYSLOG=y
 CONFIG_DEBUG_FILE=y
 CONFIG_BACKEND=file
 CONFIG_PEERKEY=y
diff --git a/wpa_supplicant.service b/wpa_supplicant.service
index 814c853..b717e82 100644
--- a/wpa_supplicant.service
+++ b/wpa_supplicant.service
@@ -6,7 +6,7 @@ Before=network.target
 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 $OTHER_ARGS
+ExecStart=/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -u $INTERFACES $DRIVERS $OTHER_ARGS
 
 [Install]
 WantedBy=multi-user.target
diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec
index bea0093..c759011 100644
--- a/wpa_supplicant.spec
+++ b/wpa_supplicant.spec
@@ -7,7 +7,7 @@ Summary: WPA/WPA2/IEEE 802.1X Supplicant
 Name: wpa_supplicant
 Epoch: 1
 Version: 2.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Base
 Source0: http://w1.fi/releases/%{name}-%{version}%{rcver}%{snapshot}.tar.gz
@@ -207,6 +207,10 @@ fi
 %endif
 
 %changelog
+* Sat Oct 31 2015 Lubomir Rintel <lkundrak@v3.sk> - 1:2.5-2
+- Enable syslog by default
+- Drop writing a pid and log file
+
 * Tue Oct 27 2015 Lubomir Rintel <lkundrak@v3.sk> - 1:2.5-1
 - Update to version 2.5
 
diff --git a/wpa_supplicant.sysconfig b/wpa_supplicant.sysconfig
index 23fc1e7..33bd7af 100644
--- a/wpa_supplicant.sysconfig
+++ b/wpa_supplicant.sysconfig
@@ -7,10 +7,5 @@ INTERFACES=""
 DRIVERS=""
 
 # Other arguments
-#   -u   Enable the D-Bus interface (required for use with NetworkManager)
-#   -f   Log to /var/log/wpa_supplicant.log
-#   -P   Write pid file to /var/run/wpa_supplicant.pid 
-#        required to return proper codes by init scripts (e.g. double "start" action)
-#        -B to daemonize that has to be used together with -P is already in wpa_supplicant.init.d
-OTHER_ARGS="-u -f /var/log/wpa_supplicant.log -P /var/run/wpa_supplicant.pid"
-
+#   -s   Use syslog logging backend
+OTHER_ARGS="-s"