summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2020-10-07 12:35:53 -0700
committerMichael Forney <mforney@mforney.org>2020-10-07 13:53:01 -0700
commitd05d6928e329f5da64bf21989e783f310dc7a624 (patch)
tree742b8607638db81dec1f9e66002135ec93c700d6 /pkg
parent69b04f3be77e25e10f1e11b15d862d0cbe707c4d (diff)
wpa_supplicant: Rename from hostap and build from release tar
The release tar contains pregenerated manuals, so we don't need docbook2man.
Diffstat (limited to 'pkg')
-rw-r--r--pkg/gen.lua2
m---------pkg/hostap/src0
-rw-r--r--pkg/hostap/ver1
-rw-r--r--pkg/wpa_supplicant/.gitignore2
-rw-r--r--pkg/wpa_supplicant/config.h (renamed from pkg/hostap/config.h)0
-rw-r--r--pkg/wpa_supplicant/gen.lua (renamed from pkg/hostap/gen.lua)4
-rw-r--r--pkg/wpa_supplicant/patch/0001-eloop-Prevent-stray-semicolons-in-struct-specifier.patch (renamed from pkg/hostap/patch/0001-eloop-Prevent-stray-semicolons-in-struct-specifier.patch)0
-rw-r--r--pkg/wpa_supplicant/patch/0002-Avoid-statement-expressions-for-get_aligned_le.patch (renamed from pkg/hostap/patch/0002-Avoid-statement-expressions-for-get_aligned_le.patch)0
-rw-r--r--pkg/wpa_supplicant/patch/0003-Avoid-unnecessary-VLA.patch (renamed from pkg/hostap/patch/0003-Avoid-unnecessary-VLA.patch)0
-rw-r--r--pkg/wpa_supplicant/patch/0004-Prevent-reference-to-undefined-symbol-with-CONFIG_NO.patch (renamed from pkg/hostap/patch/0004-Prevent-reference-to-undefined-symbol-with-CONFIG_NO.patch)0
-rw-r--r--pkg/wpa_supplicant/patch/0005-Add-support-for-some-BearSSL-crypo-primitives.patch (renamed from pkg/hostap/patch/0005-Add-support-for-some-BearSSL-crypo-primitives.patch)0
-rw-r--r--pkg/wpa_supplicant/sha2561
-rw-r--r--pkg/wpa_supplicant/url1
-rw-r--r--pkg/wpa_supplicant/ver1
14 files changed, 9 insertions, 3 deletions
diff --git a/pkg/gen.lua b/pkg/gen.lua
index 281ace8a..38ba43b8 100644
--- 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/src b/pkg/hostap/src
deleted file mode 160000
-Subproject ca8c2bd28ad53f431d6ee60ef754e98cfdb4c17
diff --git a/pkg/hostap/ver b/pkg/hostap/ver
deleted file mode 100644
index 91f8f83d..00000000
--- a/pkg/hostap/ver
+++ /dev/null
@@ -1 +0,0 @@
-2.9 r1
diff --git a/pkg/wpa_supplicant/.gitignore b/pkg/wpa_supplicant/.gitignore
new file mode 100644
index 00000000..20f95570
--- /dev/null
+++ 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
index f56a77d5..f56a77d5 100644
--- a/pkg/hostap/config.h
+++ b/pkg/wpa_supplicant/config.h
diff --git a/pkg/hostap/gen.lua b/pkg/wpa_supplicant/gen.lua
index eb2568cd..f87d0e8a 100644
--- a/pkg/hostap/gen.lua
+++ b/pkg/wpa_supplicant/gen.lua
@@ -95,4 +95,6 @@ exe('bin/wpa_cli', [[
]])
file('bin/wpa_cli', '755', '$outdir/bin/wpa_cli')
-fetch 'git'
+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
index a48d3194..a48d3194 100644
--- 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
index 73484e65..73484e65 100644
--- 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
index 5c7e69c6..5c7e69c6 100644
--- 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
index b8235a57..b8235a57 100644
--- 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
index 45ce07fc..45ce07fc 100644
--- 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
new file mode 100644
index 00000000..a42dcd26
--- /dev/null
+++ 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
new file mode 100644
index 00000000..f54bb4aa
--- /dev/null
+++ 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
new file mode 100644
index 00000000..91d2b020
--- /dev/null
+++ b/pkg/wpa_supplicant/ver
@@ -0,0 +1 @@
+2.9 r0