From a348576b5f215c87cf471d4340713e0773f4edf8 Mon Sep 17 00:00:00 2001
From: gobo72 <gobo72@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Thu, 10 Mar 2011 05:47:01 +0000
Subject: [PATCH] =?utf8?q?R=C3=A9gl=C3=A9=20bugs=20pour=20installation=20o?=
 =?utf8?q?utils=20wireless?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 config/packages-list      |  1 +
 stage2/hv-install-2       |  3 ++-
 stage2/packages-update    |  1 +
 stage2/pkg/wireless-tools |  6 +++---
 stage2/pkg/wpa_supplicant | 14 ++++++++++++++
 5 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/config/packages-list b/config/packages-list
index 1e72de8..4ec3513 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -88,6 +88,7 @@ FONTCONFIG="fontconfig-2.7.3"
 FREETYPE="freetype-2.3.11"
 FRIBIDI="fribidi-0.10.9"
 FUSE="fuse-2.8.3"
+B43_FWCUTTER="b43-fwcutter-013"
 
 GAWK="gawk-3.1.8"
 GC="gc6.8"
diff --git a/stage2/hv-install-2 b/stage2/hv-install-2
index 53184b9..12de7aa 100755
--- a/stage2/hv-install-2
+++ b/stage2/hv-install-2
@@ -36,8 +36,9 @@ ipkg ${UDEV}
 ipkg -m noac ${UDEV_CONFIG}
 ipkg ${GRUB}
 ipkg -m acnb ${DHCP}
-ipkg -m noac -s wireless-tools ${WIRELESS_TOOLS}
+PREFIX=/usr ipkg -m noac -s wireless-tools ${WIRELESS_TOOLS}
 ipkg -m noac ${WPA_SUPPLICANT}
+PREFIX=/usr ipkg -m noac ${B43_FWCUTTER}
 ipkg ${NANO}
 
 rscr once "Installing HV-utilities" install-hv-utilities
diff --git a/stage2/packages-update b/stage2/packages-update
index b12affe..bfe5154 100755
--- a/stage2/packages-update
+++ b/stage2/packages-update
@@ -69,6 +69,7 @@ fpkg ${IPROUTE2} \
 fpkg -e "tar.gz" ${WIRELESS_TOOLS} \
     "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux"
 fpkg -e "tar.gz" ${WPA_SUPPLICANT} "http://hostap.epitest.fi/releases"
+fpkg ${B43_FWCUTTER} "http://bu3sch.de/b43/fwcutter"
 
 fpkg -s "linux/utils/kbd" ${KBD} ${KERNEL_URL}
 fpkg -e "tar.gz" ${LESS} "http://www.greenwoodsoftware.com/less"
diff --git a/stage2/pkg/wireless-tools b/stage2/pkg/wireless-tools
index ce6b039..0d1821a 100644
--- a/stage2/pkg/wireless-tools
+++ b/stage2/pkg/wireless-tools
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-hvbuild()
+hvconfig_pre()
 {
-    make
-    make PREFIX=/usr install
+    sed -e "s!^\(INSTALL_DIR=\).*!\1/sbin!" \
+        -e "s!^\(INSTALL_LIB=\).*!\1/lib!" -i ${LFS_TMP}/${PACKAGE}/Makefile
 }
 
 hvbuild_post()
diff --git a/stage2/pkg/wpa_supplicant b/stage2/pkg/wpa_supplicant
index 5fb368b..e404fae 100644
--- a/stage2/pkg/wpa_supplicant
+++ b/stage2/pkg/wpa_supplicant
@@ -8,6 +8,20 @@ hvbuild()
 CONFIG_DRIVER_WEXT=y
 CONFIG_CTRL_IFACE=y
 CONFIG_BACKEND=file
+
+CONFIG_TLS=internal
+
+# If CONFIG_TLS=internal is used, additional library and include paths are
+# needed for LibTomMath. Alternatively, an integrated, minimal version of
+# LibTomMath can be used. See beginning of libtommath.c for details on benefits
+# and drawbacks of this option.
+CONFIG_INTERNAL_LIBTOMMATH=y
+
+# At the cost of about 4 kB of additional binary size, the internal LibTomMath
+# can be configured to include faster routines for exptmod, sqr, and div to
+# speed up DH and RSA calculation considerably
+CONFIG_INTERNAL_LIBTOMMATH_FAST=y
+
 EOF
 
     make
-- 
2.20.1