From 30db7a6cc4eac8e5f4c78fb8d57a5f89d51ebacf Mon Sep 17 00:00:00 2001
From: bougyman <bougyman@rubyists.com>
Date: Thu, 26 Mar 2015 12:17:06 -0500
Subject: [PATCH 1/5] wpa_supplicant: add service directory

---
 srcpkgs/wpa_supplicant/files/wpa_supplicant/conf    | 1 +
 srcpkgs/wpa_supplicant/files/wpa_supplicant/log/run | 4 ++++
 srcpkgs/wpa_supplicant/files/wpa_supplicant/run     | 5 +++++
 srcpkgs/wpa_supplicant/template                     | 5 +++--
 4 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/wpa_supplicant/files/wpa_supplicant/conf
 create mode 100755 srcpkgs/wpa_supplicant/files/wpa_supplicant/log/run
 create mode 100755 srcpkgs/wpa_supplicant/files/wpa_supplicant/run

diff --git a/srcpkgs/wpa_supplicant/files/wpa_supplicant/conf b/srcpkgs/wpa_supplicant/files/wpa_supplicant/conf
new file mode 100644
index 00000000000..f8e4231118f
--- /dev/null
+++ b/srcpkgs/wpa_supplicant/files/wpa_supplicant/conf
@@ -0,0 +1 @@
+WPA_INTERFACE=wlan0
diff --git a/srcpkgs/wpa_supplicant/files/wpa_supplicant/log/run b/srcpkgs/wpa_supplicant/files/wpa_supplicant/log/run
new file mode 100755
index 00000000000..e819b778c2d
--- /dev/null
+++ b/srcpkgs/wpa_supplicant/files/wpa_supplicant/log/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -d /var/log/wpa_supplicant ] || mkdir -p /var/log/wpa_supplicant
+echo "Logging to /var/log/wpa_supplicant/current"
+exec chpst -u root:daemon svlogd -t /var/log/wpa_supplicant
diff --git a/srcpkgs/wpa_supplicant/files/wpa_supplicant/run b/srcpkgs/wpa_supplicant/files/wpa_supplicant/run
new file mode 100755
index 00000000000..d09cd61204b
--- /dev/null
+++ b/srcpkgs/wpa_supplicant/files/wpa_supplicant/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+[ -r ./conf ] && . ./conf
+: ${WPA_INTERFACE:=wlan0}
+exec 2>&1
+exec wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -i ${WPA_INTERFACE}
diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index 918ec830b59..22cc79a10f7 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,7 +1,7 @@
 # Template file for 'wpa_supplicant'
 pkgname=wpa_supplicant
 version=2.4
-revision=1
+revision=2
 build_wrksrc=$pkgname
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -13,7 +13,7 @@ checksum=058dc832c096139a059e6df814080f50251a8d313c21b13364c54a1e70109122
 build_pie=yes
 hostmakedepends="pkg-config"
 makedepends="libnl3-devel libressl-devel>=2.1.4 dbus-devel readline-devel>=6.3"
-conf_files="/etc/${pkgname}/${pkgname}.conf"
+conf_files="/etc/sv/wpa_supplicant/conf /etc/sv/wpa_supplicant/log/run /etc/${pkgname}/${pkgname}.conf"
 build_options="systemd"
 
 pre_build() {
@@ -54,4 +54,5 @@ do_install() {
 	fi
 
 	vlicense README
+	vsv wpa_supplicant
 }

From fdf0104cb256f1f2d7ab3de9b47651a990bf046d Mon Sep 17 00:00:00 2001
From: bougyman <bougyman@rubyists.com>
Date: Thu, 26 Mar 2015 15:32:33 -0500
Subject: [PATCH 2/5] wpa_supplicant: support OPTS in run script

---
 srcpkgs/wpa_supplicant/files/wpa_supplicant/conf | 2 ++
 srcpkgs/wpa_supplicant/files/wpa_supplicant/run  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/wpa_supplicant/files/wpa_supplicant/conf b/srcpkgs/wpa_supplicant/files/wpa_supplicant/conf
index f8e4231118f..162f46274f2 100644
--- a/srcpkgs/wpa_supplicant/files/wpa_supplicant/conf
+++ b/srcpkgs/wpa_supplicant/files/wpa_supplicant/conf
@@ -1 +1,3 @@
 WPA_INTERFACE=wlan0
+# Uncommept to enable syslog logging instead of stdout
+#OPTS="-s"
diff --git a/srcpkgs/wpa_supplicant/files/wpa_supplicant/run b/srcpkgs/wpa_supplicant/files/wpa_supplicant/run
index d09cd61204b..82f3c6479a6 100755
--- a/srcpkgs/wpa_supplicant/files/wpa_supplicant/run
+++ b/srcpkgs/wpa_supplicant/files/wpa_supplicant/run
@@ -2,4 +2,4 @@
 [ -r ./conf ] && . ./conf
 : ${WPA_INTERFACE:=wlan0}
 exec 2>&1
-exec wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -i ${WPA_INTERFACE}
+exec wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -i ${WPA_INTERFACE} ${OPTS}

From 62ae6738b5996cbf25d16d21c3001cf3c3fd34cd Mon Sep 17 00:00:00 2001
From: bougyman <bougyman@rubyists.com>
Date: Thu, 26 Mar 2015 15:35:29 -0500
Subject: [PATCH 3/5] wpa_supplicant: log to syslog by default

---
 srcpkgs/wpa_supplicant/files/wpa_supplicant/conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wpa_supplicant/files/wpa_supplicant/conf b/srcpkgs/wpa_supplicant/files/wpa_supplicant/conf
index 162f46274f2..ffec7f0b062 100644
--- a/srcpkgs/wpa_supplicant/files/wpa_supplicant/conf
+++ b/srcpkgs/wpa_supplicant/files/wpa_supplicant/conf
@@ -1,3 +1,3 @@
 WPA_INTERFACE=wlan0
-# Uncommept to enable syslog logging instead of stdout
-#OPTS="-s"
+# Log to syslog by default
+OPTS="-s"

From cb4e71cd8631d40d747d3dde2d5a89fd852ff1aa Mon Sep 17 00:00:00 2001
From: bougyman <bougyman@rubyists.com>
Date: Thu, 26 Mar 2015 15:41:36 -0500
Subject: [PATCH 4/5] wpa_supplicant: use install instead of mkdir for log dir
 creation

---
 srcpkgs/wpa_supplicant/files/wpa_supplicant/log/run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wpa_supplicant/files/wpa_supplicant/log/run b/srcpkgs/wpa_supplicant/files/wpa_supplicant/log/run
index e819b778c2d..0309f17ce0f 100755
--- a/srcpkgs/wpa_supplicant/files/wpa_supplicant/log/run
+++ b/srcpkgs/wpa_supplicant/files/wpa_supplicant/log/run
@@ -1,4 +1,4 @@
 #!/bin/sh
-[ -d /var/log/wpa_supplicant ] || mkdir -p /var/log/wpa_supplicant
+install -D -d -m0750 -o root -g wheel /var/log/wpa_supplicant
 echo "Logging to /var/log/wpa_supplicant/current"
 exec chpst -u root:daemon svlogd -t /var/log/wpa_supplicant

From 3e57b2b8b6412ee9c454b11c08937835091fe20b Mon Sep 17 00:00:00 2001
From: bougyman <bougyman@rubyists.com>
Date: Thu, 26 Mar 2015 15:45:17 -0500
Subject: [PATCH 5/5] wpa_supplicant: remove unecessary install arg

---
 srcpkgs/wpa_supplicant/files/wpa_supplicant/log/run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wpa_supplicant/files/wpa_supplicant/log/run b/srcpkgs/wpa_supplicant/files/wpa_supplicant/log/run
index 0309f17ce0f..5cd14913293 100755
--- a/srcpkgs/wpa_supplicant/files/wpa_supplicant/log/run
+++ b/srcpkgs/wpa_supplicant/files/wpa_supplicant/log/run
@@ -1,4 +1,4 @@
 #!/bin/sh
-install -D -d -m0750 -o root -g wheel /var/log/wpa_supplicant
+install -d -m0750 -o root -g wheel /var/log/wpa_supplicant
 echo "Logging to /var/log/wpa_supplicant/current"
 exec chpst -u root:daemon svlogd -t /var/log/wpa_supplicant