This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via 909e15a83786f929d31af9387fdc772041bf6d7a (commit) from 20bbeabf9fee1213d36428358e455f6d31ae962f (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 909e15a83786f929d31af9387fdc772041bf6d7a Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Aug 17 23:06:12 2017 +0100
wpa_supplicant: Update to 2.6
Adds support for 802.11s mesh networks and drops the configuration helper
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: wpa_supplicant/systemd/wpa_supplicant@.service | 2 -- wpa_supplicant/wpa_supplicant.config | 33 ----------------------- wpa_supplicant/wpa_supplicant.nm | 37 ++++++++++++++++++++++---- 3 files changed, 32 insertions(+), 40 deletions(-) delete mode 100644 wpa_supplicant/wpa_supplicant.config
Difference in files: diff --git a/wpa_supplicant/systemd/wpa_supplicant@.service b/wpa_supplicant/systemd/wpa_supplicant@.service index b3bd340..3c41490 100644 --- a/wpa_supplicant/systemd/wpa_supplicant@.service +++ b/wpa_supplicant/systemd/wpa_supplicant@.service @@ -2,9 +2,7 @@ Description=wpa_supplicant for %I.
[Service] -ExecStartPre=/usr/lib/network/helpers/wpa_supplicant-config-helper create %I ExecStart=/usr/lib/network/helpers/wpa_supplicant %I -ExecStopPost=/usr/lib/network/helpers/wpa_supplicant-config-helper remove %I PIDFile=/run/wpa_supplicant-%I.pid Restart=on-failure UtmpIdentifier=%I diff --git a/wpa_supplicant/wpa_supplicant.config b/wpa_supplicant/wpa_supplicant.config deleted file mode 100644 index 7b83012..0000000 --- a/wpa_supplicant/wpa_supplicant.config +++ /dev/null @@ -1,33 +0,0 @@ -CONFIG_CTRL_IFACE=y -CONFIG_CTRL_IFACE_DBUS=y -//CONFIG_DRIVER_HOSTAP=y -//CONFIG_DRIVER_HERMES=y -//CONFIG_DRIVER_MADWIFI=y -CONFIG_DRIVER_ATMEL=y -CONFIG_DRIVER_WEXT=y -CONFIG_DRIVER_NDISWRAPPER=y -//CONFIG_DRIVER_PRISM54=y -CONFIG_DRIVER_WIRED=y -//CONFIG_DRIVER_BROADCOM=y -//CONFIG_DRIVER_IPW=y -//CONFIG_DRIVER_BSD=y -//CONFIG_DRIVER_NDIS=y -CONFIG_WIRELESS_EXTENSION=y -CONFIG_IEEE8021X_EAPOL=y -CONFIG_EAP_MD5=y -CONFIG_EAP_MSCHAPV2=y -CONFIG_EAP_TLS=y -CONFIG_EAP_PEAP=y -CONFIG_EAP_TTLS=y -CONFIG_EAP_GTC=y -CONFIG_EAP_OTP=y -CONFIG_EAP_SIM=y -CONFIG_EAP_AKA=y -CONFIG_EAP_PSK=y -CONFIG_EAP_PAX=y -CONFIG_EAP_LEAP=y -//CONFIG_PCSC=y -CONFIG_PKCS12=y -CONFIG_SMARTCARD=y -CONFIG_DEBUG_FILE=y - diff --git a/wpa_supplicant/wpa_supplicant.nm b/wpa_supplicant/wpa_supplicant.nm index 90609e9..aeb5011 100644 --- a/wpa_supplicant/wpa_supplicant.nm +++ b/wpa_supplicant/wpa_supplicant.nm @@ -4,7 +4,7 @@ ###############################################################################
name = wpa_supplicant -version = 2.4 +version = 2.6 release = 1
groups = Sytem/Base @@ -24,15 +24,30 @@ source_dl = http://hostap.epitest.fi/releases/
build requires - dbus-devel + libnl3-devel + ncurses-devel openssl-devel pkg-config + readline-devel end
- build - # Copy our config file for build - cp %{DIR_SOURCE}/wpa_supplicant.config %{DIR_APP}/wpa_supplicant/.config + prepare_cmds + cp -v %{DIR_APP}/wpa_supplicant/{defconfig,.config} + + sed -i %{DIR_APP}/wpa_supplicant/.config \ + -e "s/#CONFIG_READLINE=y/CONFIG_READLINE=y/" \ + -e "s/#CONFIG_LIBNL32=y/CONFIG_LIBNL32=y/" + + ( + # Enable 802.11s mesh networking + echo "CONFIG_MESH=y" + echo "CONFIG_SAE=y" + + echo "CONFIG_IEEE80211W=y" + ) >> %{DIR_APP}/wpa_supplicant/.config + end
+ build # Build wpa_supplicant cd %{DIR_APP}/wpa_supplicant && make %{PARALLELISMFLAGS} end @@ -54,6 +69,18 @@ end packages package %{name} requires += network >= 1:005 + + script postin + /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postun + /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postup + /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : + end end
package %{name}-debuginfo
hooks/post-receive -- IPFire 3.x development tree