From 018fd30fdefd349fde7fdbd355900f3f8bda0b92 Mon Sep 17 00:00:00 2001
From: Jouke Witteveen <j.witteveen@gmail.com>
Date: Tue, 17 Jul 2012 11:52:11 +0200
Subject: 2.8.8 release updates

---
 Makefile                   | 2 +-
 NEWS                       | 4 ++++
 scripts/netcfg-wpa_actiond | 3 +--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 4d901e6..fdee1f5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-export VERSION = 2.8.7
+export VERSION = 2.8.8
 
 .PHONY: install install-wireless install-docs docs tarball pkgbuild upload clean
 
diff --git a/NEWS b/NEWS
index 319505b..09e8a49 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+version 2.8.8
+- fix killing wpa_actiond (FS#30664)
+- fix tuntap without an IP (FS#30638)
+
 version 2.8.7
 - Fixed parsing of GROUP= part of ctrl_interface for custom wifi configurations
 
diff --git a/scripts/netcfg-wpa_actiond b/scripts/netcfg-wpa_actiond
index 7adde5c..3a6ec22 100755
--- a/scripts/netcfg-wpa_actiond
+++ b/scripts/netcfg-wpa_actiond
@@ -19,8 +19,7 @@ case $1 in
         PIDFILE="/run/wpa_actiond_${interface}.pid"
         [[ -f "$IFACE_DIR/$interface" ]] && source "$IFACE_DIR/$interface"
         netcfg -D "$interface"
-        timeout_wait 1 '[[ ! -f "$PIDFILE" ]]' || \
-            kill "$(< "$PIDFILE")"
+        timeout_wait 1 '[[ ! -f "$PIDFILE" ]]' || kill "$(< "$PIDFILE")"
         # only try to disable software rfkill switches (FS#25514)
         if [[ "$RFKILL" == "soft" ]]; then
             set_rf_state "$interface" disabled $RFKILL_NAME || exit $?
-- 
cgit v1.2.3-24-g4f1b