SliTaz Repositories

     1.1 --- a/wpa_supplicant/receipt	Sun Dec 20 15:13:45 2015 +0100
     1.2 +++ b/wpa_supplicant/receipt	Sun Oct 15 11:37:03 2017 +0200
     1.3 @@ -1,48 +1,43 @@
     1.4 -# SliTaz package receipt.
     1.5 +# SliTaz package receipt v2.
     1.6  
     1.7  PACKAGE="wpa_supplicant"
     1.8 -VERSION="2.1"
     1.9 +VERSION="2.6"
    1.10  CATEGORY="utilities"
    1.11  SHORT_DESC="WPA Supplicant with support for WPA and WPA2"
    1.12  MAINTAINER="0dddba11@googlemail.com"
    1.13  LICENSE="GPL2"
    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/wpa_supplicant.conf"
    1.18 -TAGS="wireless wifi network"
    1.19 +WEB_SITE="http://w1.fi/wpa_supplicant/"
    1.20  HOST_ARCH="i486 arm"
    1.21  
    1.22 -DEPENDS="libssl libcrypto libnl dbus"
    1.23 -BUILD_DEPENDS="openssl-dev libcrypto-dev libnl-dev dbus-dev"
    1.24 +TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.25 +WGET_URL="http://w1.fi/releases/$TARBALL"
    1.26  
    1.27 -# Arch install
    1.28 -case "$SLITAZ_ARCH" in
    1.29 -	arm*) DEPENDS="libssl libcrypto libnl" ;;
    1.30 -esac
    1.31 -
    1.32 -# Cross compile
    1.33 -case "$ARCH" in
    1.34 -	arm*) BUILD_DEPENDS="openssl-dev libcrypto-dev libnl-dev" ;;
    1.35 -esac
    1.36 +BUILD_DEPENDS_arm="openssl-dev libcrypto-dev libnl-dev"
    1.37 +BUILD_DEPENDS="libnl-dev dbus-dev openssl-dev readline-dev"
    1.38  
    1.39  # Rules to configure and make the package.
    1.40 -compile_rules()
    1.41 -{
    1.42 -	cd $src/$PACKAGE
    1.43 -	cp -a ./defconfig ./.config
    1.44 -	sed 's/-lnl/-lnl-3/g' -i ../src/drivers/drivers.mak
    1.45 -	sed 's/-lnl-3-genl/-lnl-genl-3/g' -i ../src/drivers/drivers.mak
    1.46 +compile_rules() {
    1.47 +	# http://www.linuxfromscratch.org/blfs/view/stable/basicnet/wpa_supplicant.html
    1.48 +
    1.49 +	cd $src/wpa_supplicant
    1.50 +	cp -a defconfig .config
    1.51 +
    1.52  	# Main build configs
    1.53 -	cat >> .config << EOT
    1.54 +	cat >> .config <<EOT
    1.55 +CONFIG_DEBUG_FILE=y
    1.56 +CONFIG_DEBUG_SYSLOG=y
    1.57 +CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON
    1.58 +CONFIG_IPV6=y
    1.59 +CONFIG_LIBNL32=y
    1.60 +CONFIG_READLINE=y
    1.61 +CONFIG_WPS=y
    1.62  CONFIG_AP=y
    1.63  CONFIG_BGSCAN_SIMPLE=y
    1.64 -CONFIG_LIBNL20=y
    1.65  EOT
    1.66 -	# Dont use DBUS on ARM arch
    1.67 +	# Don't use DBUS on ARM arch
    1.68  	case "$ARCH" in
    1.69  		i?86)
    1.70 -			cat >> .config << EOT
    1.71 +			cat >> .config <<EOT
    1.72  CFLAGS += -I/usr/include/libnl3
    1.73  CONFIG_CTRL_IFACE_DBUS=y
    1.74  CONFIG_CTRL_IFACE_DBUS_NEW=y
    1.75 @@ -50,56 +45,63 @@
    1.76  EOT
    1.77  			;;
    1.78  		arm)
    1.79 -			cat >> .config << EOT
    1.80 +			cat >> .config <<EOT
    1.81  CFLAGS += -I${sysroot}/usr/include/libnl3
    1.82  CFLAGS += -I${sysroot}/usr/include/openssl
    1.83  LIBS += -L${sysroot}/usr/lib
    1.84  EOT
    1.85  			;;
    1.86  	esac
    1.87 -	make BINDIR=/usr/bin LIBDIR=/lib
    1.88 +	make BINDIR=/sbin LIBDIR=/lib || exit 1
    1.89 +
    1.90 +	# commands
    1.91 +	bindir="$install/sbin"
    1.92 +	mkdir -p $bindir
    1.93 +	install -vm755 wpa_cli        $bindir
    1.94 +	install -vm755 wpa_passphrase $bindir
    1.95 +	install -vm755 wpa_supplicant $bindir
    1.96 +
    1.97 +	cook_pick_manpages \
    1.98 +		doc/docbook/wpa_supplicant.conf.5 \
    1.99 +		doc/docbook/wpa_cli.8 \
   1.100 +		doc/docbook/wpa_passphrase.8 \
   1.101 +		doc/docbook/wpa_supplicant.8
   1.102 +
   1.103 +	mkdir -p $install/usr/share/dbus-1/system-services
   1.104 +	install -vm644 dbus/*.service $install/usr/share/dbus-1/system-services/
   1.105 +
   1.106 +	mkdir -p $install/etc/dbus-1/system.d
   1.107 +	install -vm644 dbus/dbus-wpa_supplicant.conf \
   1.108 +		$install/etc/dbus-1/system.d/wpa_supplicant.conf
   1.109 +
   1.110 +	# Startup script and cleaned up wpa_empty.conf
   1.111 +	cp -a $stuff/etc $install
   1.112 +	install -vm644 $src/wpa_supplicant/wpa_supplicant.conf $install/etc/wpa
   1.113 +	chown -R root:root $install/etc
   1.114  }
   1.115  
   1.116  # Rules to gen a SliTaz package suitable for Tazpkg.
   1.117 -genpkg_rules()
   1.118 -{
   1.119 -	# commands
   1.120 -	mkdir -p $fs/usr/bin
   1.121 -	install -v -m755 $src/$PACKAGE/wpa_cli $fs/usr/bin
   1.122 -	install -v -m755 $src/$PACKAGE/wpa_supplicant $fs/usr/bin
   1.123 -	install -v -m755 $src/$PACKAGE/wpa_passphrase $fs/usr/bin
   1.124 -
   1.125 -	# D-Bus control
   1.126 -	mkdir -p $fs/usr/share/dbus-1/system-services
   1.127 -	install -v -m644 \
   1.128 -		$src/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service \
   1.129 -		$fs/usr/share/dbus-1/system-services
   1.130 -	install -v -m644 \
   1.131 -		$src/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service \
   1.132 -		$fs/usr/share/dbus-1/system-services
   1.133 -
   1.134 -	mkdir -p $fs/etc/dbus-1/system.d
   1.135 -	install -v -m644 \
   1.136 -		$src/wpa_supplicant/dbus/dbus-wpa_supplicant.conf \
   1.137 -		$fs/etc/dbus-1/system.d/wpa_supplicant.conf
   1.138 -
   1.139 -	# Startup script and cleaned up wpa_empty.conf
   1.140 -	cp -a $stuff/etc $fs
   1.141 -	install -m644 -oroot -groot $src/$PACKAGE/wpa_supplicant.conf $fs/etc/wpa
   1.142 +genpkg_rules() {
   1.143 +	copy @std
   1.144 +	DEPENDS="dbus libcrypto libnl libssl ncurses readline"
   1.145 +	CONFIG_FILES="/etc/wpa/wpa_supplicant.conf"
   1.146 +	TAGS="wireless wifi network"
   1.147 +	case "$SLITAZ_ARCH" in
   1.148 +		arm*) DEPENDS="libssl libcrypto libnl";;
   1.149 +	esac
   1.150  }
   1.151  
   1.152  # Pre and post install commands for Tazpkg.
   1.153 -post_install()
   1.154 -{
   1.155 -	grep -qs ^WPA_OPTIONS= $1/etc/daemons.conf || cat >> "$1/etc/daemons.conf" << EOT
   1.156 +post_install() {
   1.157 +	grep -qs ^WPA_OPTIONS= $1/etc/daemons.conf || cat >> "$1/etc/daemons.conf" <<"EOT"
   1.158  
   1.159  # wpa_supplicant daemon options
   1.160 -WPA_OPTIONS="-B -u -P /var/run/wpa_supplicant.pid -c /etc/wpa/wpa.conf -i \$(. /etc/network.conf ; echo \$WIFI_INTERFACE)"
   1.161 +WPA_OPTIONS="-B -u -P /var/run/wpa_supplicant.pid -c /etc/wpa/wpa.conf -i $(. /etc/network.conf; echo $WIFI_INTERFACE)"
   1.162  
   1.163  EOT
   1.164  	# We use /etc/wpa/wpa.conf from SliTaz 5.0
   1.165 -	sed -i s'#/etc/wpa_supplicant.conf#/etc/wpa/wpa.conf#'/ "$1/etc/daemons.conf" 2> /dev/null
   1.166 -	# 'w' option dont exist anymore with < 0.6.9
   1.167 -	sed -i s/'-Bw'/'-B'/ "$1/etc/daemons.conf" 2> /dev/null
   1.168 -	sed -i s/'-B -w'/'-B'/g "$1/etc/init.d/network.sh" 2> /dev/null
   1.169 +	sed -i 's|/etc/wpa_supplicant.conf|/etc/wpa/wpa.conf|' "$1/etc/daemons.conf" 2>/dev/null
   1.170 +	# 'w' option don't exist anymore with < 0.6.9
   1.171 +	sed -i 's|-Bw|-B|' "$1/etc/daemons.conf" 2>/dev/null
   1.172 +	sed -i 's|-B -w|-B|g' "$1/etc/init.d/network.sh" 2>/dev/null
   1.173  }