--- plamo/01_minimum/network.txz/old/wpa_supplicant-20160929/PlamoBuild.wpa_supplicant-2.0	2016-09-29 14:41:35.000000000 +0900
+++ plamo/01_minimum/network.txz/wpa_supplicant/PlamoBuild.wpa_supplicant-2.5	2016-09-29 16:25:35.000000000 +0900
@@ -1,18 +1,17 @@
 #!/bin/sh
 
 ######################################################################
-url="http://hostap.epitest.fi/releases/wpa_supplicant-2.0.tar.gz"
+url="http://hostap.epitest.fi/releases/wpa_supplicant-2.5.tar.gz"
 pkgbase=wpa_supplicant
-vers=2.0
+vers=2.5
 arch=`uname -m`
-build=P2
+build=P1
 src=$pkgbase-$vers
 patchfiles=""
 OPT_CONFIG=""
-DOCS="README
-    `echo wpa_supplicant/{README-HS20,eap_testing.txt,todo.txt,ChangeLog}`
-    `echo wpa_supplicant/README{-P2P,,-WPS,-Windows.txt}`
-    COPYING"
+DOCS="`echo wpa_supplicant/{README-HS20,eap_testing.txt,README-Windows.txt}`
+    `echo wpa_supplicant/{ChangeLog,README-WPS,todo.txt,README-P2P,README}`
+    CONTRIBUTIONS COPYING README"
 ######################################################################
 
 fscheck() {
@@ -237,41 +236,36 @@
     done
   done
   cd $B
-  cp -p wpa_supplicant/Makefile{,.orig}
-  sed '/^export/s@/local\(.*\)/$@\1@g' wpa_supplicant/Makefile.orig \
-      > wpa_supplicant/Makefile
   cp -p wpa_supplicant/{defconfig,.config}
   cat <<- "EOF" | patch wpa_supplicant/.config
-	10a11
-	> CFLAGS += -I/usr/include/libnl3
-	199c200
+	44c44
+	< #CONFIG_LIBNL32=y
+	---
+	> CONFIG_LIBNL32=y
+	151c151
 	< #CONFIG_WPS=y
 	---
 	> CONFIG_WPS=y
-	245c246
+	203c203
 	< #CONFIG_READLINE=y
 	---
 	> CONFIG_READLINE=y
-	376c377
+	331c331
 	< #CONFIG_CTRL_IFACE_DBUS=y
 	---
 	> CONFIG_CTRL_IFACE_DBUS=y
-	380c381
+	335c335
 	< #CONFIG_CTRL_IFACE_DBUS_NEW=y
 	---
 	> CONFIG_CTRL_IFACE_DBUS_NEW=y
-	383c384
+	338c338
 	< #CONFIG_CTRL_IFACE_DBUS_INTRO=y
 	---
 	> CONFIG_CTRL_IFACE_DBUS_INTRO=y
-	410c411
+	365c365
 	< #CONFIG_DEBUG_FILE=y
 	---
 	> CONFIG_DEBUG_FILE=y
-	523a525,527
-	> 
-	> CONFIG_IPV6=y
-	> CONFIG_LIBNL32=y
 	EOF
   for i in `seq 0 $((${#B[@]} - 1))` ; do
     cd ${B[$i]}/wpa_supplicant
@@ -295,7 +289,7 @@
       make
     fi
   done
-  ( cd wpa_gui-qt4 ; qmake ; make )
+  make wpa_gui-qt4
 fi
 if [ $opt_package -eq 1 ] ; then
   if [ `id -u` -ne 0 ] ; then
@@ -310,7 +304,7 @@
   for i in `seq 0 $((${#B[@]} - 1))` ; do
     cd ${B[$i]}/wpa_supplicant
     if [ -f Makefile ] ; then
-      make install DESTDIR=$P
+      make install DESTDIR=$P BINDIR=/usr/sbin
     fi
   done
   wpadir=$B/wpa_supplicant
@@ -343,6 +337,7 @@
   install -m 644 $wpadir/doc/docbook/wpa_priv.8 $mandir/man8
   install -m 644 $wpadir/doc/docbook/wpa_gui.8 $mandir/man8
   install -m 644 $wpadir/doc/docbook/wpa_background.8 $mandir/man8
+  install -m 644 $wpadir/doc/docbook/eapol_test.8 $mandir/man8
   install -d $P/etc/rc.d/init.d
   cat <<- "EOF" > $P/etc/rc.d/init.d/wpa_supplicant
 	#!/bin/sh
@@ -382,7 +377,7 @@
 	exit 0
 	EOF
   chmod 644 $P/etc/rc.d/init.d/wpa_supplicant
-  cat <<- "EOF" | unexpand > $P/etc/wpa_supplicant.conf.dist
+  cat <<- "EOF" | unexpand > $P/etc/wpa_supplicant.conf.new
 	ctrl_interface=/var/run/wpa_supplicant
 	ctrl_interface_group=wheel
 	network={
@@ -416,17 +411,15 @@
   cp -a $S/wpa_supplicant/examples $docdir/$src/wpa_supplicant
   chmod -R g-w $docdir/$src/wpa_supplicant/examples
   chown -R root.root $docdir/$src/wpa_supplicant/examples
-  mv $docdir/$src/wpa_supplicant/{examples,README-{WPS,Windows.txt}.gz} $C
-  mv $C/{examples,README-{WPS,Windows.txt}.gz} $docdir/$src/wpa_supplicant
   touch -r $S $docdir/$src/wpa_supplicant
   convert
   install -d $P/install
   cat <<- "EOF" > $P/install/doinst.sh
+	mv etc/wpa_supplicant.conf.new /tmp
 	if [ -f etc/wpa_supplicant.conf ] ; then
-	  rm etc/wpa_supplicant.conf.dist
+	  mv /tmp/wpa_supplicant.conf.new etc/wpa_supplicant.conf.dist
 	else
-	  mv etc/wpa_supplicant.conf.dist /tmp
-	  mv /tmp/wpa_supplicant.conf.dist etc/wpa_supplicant.conf
+	  mv /tmp/wpa_supplicant.conf.new etc/wpa_supplicant.conf
 	fi
 	EOF
   touch -t `date '+%m%d0900'` $P/install/doinst.sh
@@ -434,7 +427,7 @@
   tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/dbus-1/system-services | tail -n+2`
   tar rvpf $pkg.tar -C $P etc/dbus-1/system.d/wpa_supplicant.conf
   tar rvpf $pkg.tar -C $P etc/rc.d/init.d/wpa_supplicant
-  tar rvpf $pkg.tar -C $P etc/wpa_supplicant.conf.dist
+  tar rvpf $pkg.tar -C $P etc/wpa_supplicant.conf.new
   tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man5 | tail -n+2`
   tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man8 | tail -n+2`
   tar rvpf $pkg.tar -C $P usr/share/doc/$src