commit: d05d6928e329f5da64bf21989e783f310dc7a624
parent 69b04f3be77e25e10f1e11b15d862d0cbe707c4d
Author: Michael Forney <mforney@mforney.org>
Date: Wed, 7 Oct 2020 12:35:53 -0700
wpa_supplicant: Rename from hostap and build from release tar
The release tar contains pregenerated manuals, so we don't need
docbook2man.
Diffstat:
17 files changed, 107 insertions(+), 106 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -104,10 +104,6 @@
path = pkg/git/src
url = https://github.com/git/git
ignore = all
-[submodule "pkg/hostap/src"]
- path = pkg/hostap/src
- url = git://w1.fi/hostap.git
- ignore = all
[submodule "pkg/hotplugd/src"]
path = pkg/hotplugd/src
url = https://github.com/oasislinux/hotplugd.git
diff --git a/pkg/gen.lua b/pkg/gen.lua
@@ -37,7 +37,6 @@ subgen 'fribidi'
subgen 'fspec-sync'
subgen 'fuse'
subgen 'git'
-subgen 'hostap'
subgen 'hotplugd'
subgen 'ii'
subgen 'iproute2'
@@ -127,6 +126,7 @@ subgen 'vis'
subgen 'wayland'
subgen 'wayland-protocols'
subgen 'wld'
+subgen 'wpa_supplicant'
subgen 'xkeyboard-config'
subgen 'xz'
subgen 'youtube-dl'
diff --git a/pkg/hostap/gen.lua b/pkg/hostap/gen.lua
@@ -1,98 +0,0 @@
-cflags{
- '-include $dir/config.h',
- '-I $srcdir/src/utils',
- '-I $srcdir/src',
- '-isystem $builddir/pkg/bearssl/include',
- '-isystem $builddir/pkg/libnl/include',
- '-isystem $builddir/pkg/linux-headers/include',
-}
-
-pkg.deps = {
- 'pkg/bearssl/headers',
- 'pkg/libnl/headers',
- 'pkg/linux-headers/headers',
-}
-
-lib('libcommon.a', 'src/utils/(common.c eloop.c os_unix.c wpabuf.c wpa_debug.c)')
-
-exe('bin/wpa_supplicant', [[
- src/ap/(
- wpa_auth.c
- wpa_auth_ie.c
- pmksa_cache_auth.c
- )
- src/common/(
- ctrl_iface_common.c
- hw_features_common.c
- ieee802_11_common.c
- wpa_common.c
- )
- src/crypto/(
- aes-internal-dec.c
- aes-internal-enc.c
- aes-internal.c
- aes-unwrap.c
- aes-wrap.c
- crypto_bearssl.c
- random.c
- rc4.c
- sha1-pbkdf2.c
- sha1-prf.c
- sha256-prf.c
- tls_none.c
- )
- src/drivers/(
- driver_common.c
- driver_nl80211.c
- driver_nl80211_capa.c
- driver_nl80211_event.c
- driver_nl80211_monitor.c
- driver_nl80211_scan.c
- drivers.c
- linux_ioctl.c
- netlink.c
- rfkill.c
- )
- src/l2_packet/l2_packet_linux.c
- src/rsn_supp/(
- pmksa_cache.c
- preauth.c
- wpa.c
- wpa_ie.c
- )
- src/utils/(bitfield.c radiotap.c)
- wpa_supplicant/(
- blacklist.c
- bss.c
- config.c
- config_file.c
- ctrl_iface.c
- ctrl_iface_unix.c
- eap_register.c
- events.c
- ibss_rsn.c
- main.c
- notify.c
- op_classes.c
- rrm.c
- scan.c
- sme.c
- wmm_ac.c
- wpa_supplicant.c
- wpas_glue.c
- )
- libcommon.a
- $builddir/pkg/bearssl/libbearssl.a
- $builddir/pkg/libnl/(libnl-3.a libnl-genl-3.a)
-]])
-file('bin/wpa_supplicant', '755', '$outdir/bin/wpa_supplicant')
-
-exe('bin/wpa_cli', [[
- src/common/(cli.c wpa_ctrl.c)
- src/utils/edit_simple.c
- wpa_supplicant/wpa_cli.c
- libcommon.a
-]])
-file('bin/wpa_cli', '755', '$outdir/bin/wpa_cli')
-
-fetch 'git'
diff --git a/pkg/hostap/src b/pkg/hostap/src
@@ -1 +0,0 @@
-Subproject commit ca8c2bd28ad53f431d6ee60ef754e98cfdb4c17b
diff --git a/pkg/hostap/ver b/pkg/hostap/ver
@@ -1 +0,0 @@
-2.9 r1
diff --git a/pkg/wpa_supplicant/.gitignore b/pkg/wpa_supplicant/.gitignore
@@ -0,0 +1,2 @@
+/src
+/wpa_supplicant-2.9.tar.gz
diff --git a/pkg/hostap/config.h b/pkg/wpa_supplicant/config.h
diff --git a/pkg/wpa_supplicant/gen.lua b/pkg/wpa_supplicant/gen.lua
@@ -0,0 +1,100 @@
+cflags{
+ '-include $dir/config.h',
+ '-I $srcdir/src/utils',
+ '-I $srcdir/src',
+ '-isystem $builddir/pkg/bearssl/include',
+ '-isystem $builddir/pkg/libnl/include',
+ '-isystem $builddir/pkg/linux-headers/include',
+}
+
+pkg.deps = {
+ 'pkg/bearssl/headers',
+ 'pkg/libnl/headers',
+ 'pkg/linux-headers/headers',
+}
+
+lib('libcommon.a', 'src/utils/(common.c eloop.c os_unix.c wpabuf.c wpa_debug.c)')
+
+exe('bin/wpa_supplicant', [[
+ src/ap/(
+ wpa_auth.c
+ wpa_auth_ie.c
+ pmksa_cache_auth.c
+ )
+ src/common/(
+ ctrl_iface_common.c
+ hw_features_common.c
+ ieee802_11_common.c
+ wpa_common.c
+ )
+ src/crypto/(
+ aes-internal-dec.c
+ aes-internal-enc.c
+ aes-internal.c
+ aes-unwrap.c
+ aes-wrap.c
+ crypto_bearssl.c
+ random.c
+ rc4.c
+ sha1-pbkdf2.c
+ sha1-prf.c
+ sha256-prf.c
+ tls_none.c
+ )
+ src/drivers/(
+ driver_common.c
+ driver_nl80211.c
+ driver_nl80211_capa.c
+ driver_nl80211_event.c
+ driver_nl80211_monitor.c
+ driver_nl80211_scan.c
+ drivers.c
+ linux_ioctl.c
+ netlink.c
+ rfkill.c
+ )
+ src/l2_packet/l2_packet_linux.c
+ src/rsn_supp/(
+ pmksa_cache.c
+ preauth.c
+ wpa.c
+ wpa_ie.c
+ )
+ src/utils/(bitfield.c radiotap.c)
+ wpa_supplicant/(
+ blacklist.c
+ bss.c
+ config.c
+ config_file.c
+ ctrl_iface.c
+ ctrl_iface_unix.c
+ eap_register.c
+ events.c
+ ibss_rsn.c
+ main.c
+ notify.c
+ op_classes.c
+ rrm.c
+ scan.c
+ sme.c
+ wmm_ac.c
+ wpa_supplicant.c
+ wpas_glue.c
+ )
+ libcommon.a
+ $builddir/pkg/bearssl/libbearssl.a
+ $builddir/pkg/libnl/(libnl-3.a libnl-genl-3.a)
+]])
+file('bin/wpa_supplicant', '755', '$outdir/bin/wpa_supplicant')
+
+exe('bin/wpa_cli', [[
+ src/common/(cli.c wpa_ctrl.c)
+ src/utils/edit_simple.c
+ wpa_supplicant/wpa_cli.c
+ libcommon.a
+]])
+file('bin/wpa_cli', '755', '$outdir/bin/wpa_cli')
+
+man(paths[[wpa_supplicant/doc/docbook/(wpa_cli.8 wpa_supplicant.8 wpa_supplicant.conf.5)]])
+
+fetch 'curl'
diff --git a/pkg/hostap/patch/0001-eloop-Prevent-stray-semicolons-in-struct-specifier.patch b/pkg/wpa_supplicant/patch/0001-eloop-Prevent-stray-semicolons-in-struct-specifier.patch
diff --git a/pkg/hostap/patch/0002-Avoid-statement-expressions-for-get_aligned_le.patch b/pkg/wpa_supplicant/patch/0002-Avoid-statement-expressions-for-get_aligned_le.patch
diff --git a/pkg/hostap/patch/0003-Avoid-unnecessary-VLA.patch b/pkg/wpa_supplicant/patch/0003-Avoid-unnecessary-VLA.patch
diff --git a/pkg/hostap/patch/0004-Prevent-reference-to-undefined-symbol-with-CONFIG_NO.patch b/pkg/wpa_supplicant/patch/0004-Prevent-reference-to-undefined-symbol-with-CONFIG_NO.patch
diff --git a/pkg/hostap/patch/0005-Add-support-for-some-BearSSL-crypo-primitives.patch b/pkg/wpa_supplicant/patch/0005-Add-support-for-some-BearSSL-crypo-primitives.patch
diff --git a/pkg/wpa_supplicant/sha256 b/pkg/wpa_supplicant/sha256
@@ -0,0 +1 @@
+fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17 wpa_supplicant-2.9.tar.gz
diff --git a/pkg/wpa_supplicant/url b/pkg/wpa_supplicant/url
@@ -0,0 +1 @@
+url = "http://w1.fi/releases/wpa_supplicant-2.9.tar.gz"
diff --git a/pkg/wpa_supplicant/ver b/pkg/wpa_supplicant/ver
@@ -0,0 +1 @@
+2.9 r0
diff --git a/sets.lua b/sets.lua
@@ -66,7 +66,6 @@ return {
net={
'acme-client',
'catgirl',
- 'hostap',
'ii',
'msmtp',
'nginx',
@@ -74,6 +73,7 @@ return {
'pounce',
'sshfs',
'transmission',
+ 'wpa_supplicant',
},
desktop={
'adobe-source-fonts',