SliTaz Repositories

     1.1 --- a/wpa_supplicant/receipt	Mon Apr 22 22:23:56 2013 +0200
     1.2 +++ b/wpa_supplicant/receipt	Mon Apr 22 23:05:52 2013 +0200
     1.3 @@ -1,18 +1,19 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="wpa_supplicant"
     1.7 -VERSION="1.0"
     1.8 +VERSION="1.1"
     1.9  CATEGORY="utilities"
    1.10  SHORT_DESC="WPA Supplicant with support for WPA and WPA2"
    1.11  MAINTAINER="0dddba11@googlemail.com"
    1.12 -DEPENDS="libssl slitaz-base-files libcrypto libnl"
    1.13 -BUILD_DEPENDS="openssl-dev libcrypto libcrypto-dev libnl-dev"
    1.14  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.15  WEB_SITE="http://hostap.epitest.fi/wpa_supplicant/"
    1.16  WGET_URL="http://hostap.epitest.fi/releases/$TARBALL"
    1.17  CONFIG_FILES="/etc/wpa_supplicant.conf"
    1.18  TAGS="wireless"
    1.19  
    1.20 +DEPENDS="libssl slitaz-base-files libcrypto libnl"
    1.21 +BUILD_DEPENDS="openssl-dev libcrypto libcrypto-dev libnl-dev dbus-dev"
    1.22 +
    1.23  # Rules to configure and make the package.
    1.24  compile_rules()
    1.25  {
    1.26 @@ -21,28 +22,44 @@
    1.27  	sed 's/-lnl-3-genl/-lnl-genl-3/g' -i ../src/drivers/drivers.mak
    1.28  	cp -a ./defconfig ./.config
    1.29  	cat >> .config << EOF
    1.30 +CONFIG_AP=y
    1.31 +CONFIG_BGSCAN_SIMPLE=y
    1.32 +CONFIG_CTRL_IFACE_DBUS=y
    1.33 +CONFIG_CTRL_IFACE_DBUS_NEW=y
    1.34 +CONFIG_CTRL_IFACE_DBUS_INTRO=y
    1.35  CONFIG_LIBNL20=y
    1.36  CFLAGS += -I/usr/include/libnl3
    1.37  EOF
    1.38 -	make
    1.39 +	make BINDIR=/usr/bin LIBDIR=/lib
    1.40  }
    1.41  
    1.42  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.43  genpkg_rules()
    1.44  {
    1.45 +	# commands
    1.46  	mkdir -p $fs/usr/bin
    1.47 -	mkdir -p $fs/etc
    1.48 -	cp -a $src/$PACKAGE/wpa_cli $fs/usr/bin
    1.49 -	cp -a $src/$PACKAGE/wpa_supplicant $fs/usr/bin
    1.50 -	cp -a $src/$PACKAGE/wpa_passphrase $fs/usr/bin
    1.51 +	install -v -m755 $src/$PACKAGE/wpa_cli $fs/usr/bin
    1.52 +	install -v -m755 $src/$PACKAGE/wpa_supplicant $fs/usr/bin
    1.53 +	install -v -m755 $src/$PACKAGE/wpa_passphrase $fs/usr/bin
    1.54  
    1.55 -	# dont copy the original
    1.56 -	# cp -a $src/$PACKAGE/wpa_supplicant.conf $fs/etc
    1.57 +	# D-Bus control
    1.58 +	mkdir -p $fs/usr/share/dbus-1/system-services
    1.59 +	install -v -m644 \
    1.60 +		$src/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service \
    1.61 +		$fs/usr/share/dbus-1/system-services
    1.62 +	install -v -m644 \
    1.63 +		$src/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service \
    1.64 +		$fs/usr/share/dbus-1/system-services
    1.65 +
    1.66 +	mkdir -p $fs/etc/dbus-1/system.d
    1.67 +	install -v -m644 \
    1.68 +		$src/wpa_supplicant/dbus/dbus-wpa_supplicant.conf \
    1.69 +		$fs/etc/dbus-1/system.d/wpa_supplicant.conf
    1.70  
    1.71  	# Startup script and cleaned up wpa_supplicant.conf
    1.72  	cp -a stuff/etc $fs
    1.73 -
    1.74 -
    1.75 +	# dont copy the original
    1.76 +	# cp -a $src/$PACKAGE/wpa_supplicant.conf $fs/etc
    1.77  }
    1.78  
    1.79  # Pre and post install commands for Tazpkg.
    1.80 @@ -50,7 +67,7 @@
    1.81  {
    1.82  	grep -q ^WPA_OPTIONS= $1/etc/daemons.conf || cat >> $1/etc/daemons.conf <<EOT
    1.83  # wpa_supplicant daemon options
    1.84 -WPA_OPTIONS="-B -P/var/run/wpa_supplicant.pid -c/etc/wpa_supplicant.conf -i\$(. /etc/network.conf ; echo \$WIFI_INTERFACE)"
    1.85 +WPA_OPTIONS="-B -u -P /var/run/wpa_supplicant.pid -c /etc/wpa_supplicant.conf -i \$(. /etc/network.conf ; echo \$WIFI_INTERFACE)"
    1.86  
    1.87  EOT
    1.88  	# 'w' option dont exist anymore with < 0.6.9

     2.1 --- a/wpa_supplicant/stuff/etc/wpa_supplicant.conf	Mon Apr 22 22:23:56 2013 +0200
     2.2 +++ b/wpa_supplicant/stuff/etc/wpa_supplicant.conf	Mon Apr 22 23:05:52 2013 +0200
     2.3 @@ -106,7 +106,7 @@
     2.4  #    the driver reports successful association; each network block should have
     2.5  #    explicit security policy (i.e., only one option in the lists) for
     2.6  #    key_mgmt, pairwise, group, proto variables
     2.7 -ap_scan=1
     2.8 +ap_scan=0
     2.9  
    2.10  # EAP fast re-authentication
    2.11  # By default, fast re-authentication is enabled for all EAP methods that