From be67eb614b1e2d0db71f8c30546cdfc75a5dc320 Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Thu, 28 Sep 2006 02:26:33 +0000 Subject: [PATCH] Stefan Fiedler: add wpa_supplicant [2006092216192843230] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7927 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- .../wpa_supplicant/non-local-install.patch | 130 ++++++++++++++++++ .../stf/wpa_supplicant/wpa_supplicant.conf | 34 +++++ .../stf/wpa_supplicant/wpa_supplicant.desc | 52 +++++++ 3 files changed, 216 insertions(+) create mode 100644 package/stf/wpa_supplicant/non-local-install.patch create mode 100644 package/stf/wpa_supplicant/wpa_supplicant.conf create mode 100644 package/stf/wpa_supplicant/wpa_supplicant.desc diff --git a/package/stf/wpa_supplicant/non-local-install.patch b/package/stf/wpa_supplicant/non-local-install.patch new file mode 100644 index 000000000..f7635664d --- /dev/null +++ b/package/stf/wpa_supplicant/non-local-install.patch @@ -0,0 +1,130 @@ +diff -dur wpa_supplicant-0.4.9/defconfig wpa_supplicant-0.4.9-p/defconfig +--- wpa_supplicant-0.4.9/defconfig 2006-04-29 05:25:43.000000000 +0200 ++++ wpa_supplicant-0.4.9-p/defconfig 2006-08-12 04:46:34.000000000 +0200 +@@ -12,8 +12,8 @@ + + # Uncomment following two lines and fix the paths if you have installed openssl + # in non-default location +-#CFLAGS += -I/usr/local/openssl/include +-#LIBS += -L/usr/local/openssl/lib ++#CFLAGS += -I/usr/openssl/include ++#LIBS += -L/usr/openssl/lib + + # Some Red Hat versions seem to include kerberos header files from OpenSSL, but + # the kerberos files are not in the default include path. Following line can be +@@ -78,13 +78,13 @@ + + # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) + #CONFIG_DRIVER_BSD=y +-#CFLAGS += -I/usr/local/include +-#LIBS += -L/usr/local/lib ++#CFLAGS += -I/usr/include ++#LIBS += -L/usr/lib + + # Driver interface for Windows NDIS + #CONFIG_DRIVER_NDIS=y + #CFLAGS += -I/usr/include/w32api/ddk +-#LIBS += -L/usr/local/lib ++#LIBS += -L/usr/lib + # For native build using mingw + #CONFIG_NATIVE_WINDOWS=y + # Additional directories for cross-compilation on Linux host for mingw target +diff -dur wpa_supplicant-0.4.9/doc/docbook/wpa_supplicant.8 wpa_supplicant-0.4.9-p/doc/docbook/wpa_supplicant.8 +--- wpa_supplicant-0.4.9/doc/docbook/wpa_supplicant.8 2006-05-07 06:05:38.000000000 +0200 ++++ wpa_supplicant-0.4.9-p/doc/docbook/wpa_supplicant.8 2006-08-12 04:46:34.000000000 +0200 +@@ -500,8 +500,8 @@ + .RS + + .nf +-if [ "$WPA" = "y" -a -x /usr/local/bin/wpa_supplicant ]; then +- /usr/local/bin/wpa_supplicant -Bw -c/etc/wpa_supplicant.conf -i$DEVICE ++if [ "$WPA" = "y" -a -x /usr/bin/wpa_supplicant ]; then ++ /usr/bin/wpa_supplicant -Bw -c/etc/wpa_supplicant.conf -i$DEVICE + fi + + .fi +@@ -514,7 +514,7 @@ + .RS + + .nf +-if [ "$WPA" = "y" -a -x /usr/local/bin/wpa_supplicant ]; then ++if [ "$WPA" = "y" -a -x /usr/bin/wpa_supplicant ]; then + killall wpa_supplicant + fi + +diff -dur wpa_supplicant-0.4.9/doc/docbook/wpa_supplicant.sgml wpa_supplicant-0.4.9-p/doc/docbook/wpa_supplicant.sgml +--- wpa_supplicant-0.4.9/doc/docbook/wpa_supplicant.sgml 2005-08-27 07:02:15.000000000 +0200 ++++ wpa_supplicant-0.4.9-p/doc/docbook/wpa_supplicant.sgml 2006-08-12 04:46:34.000000000 +0200 +@@ -703,8 +703,8 @@ + in /etc/pcmcia/wireless: + +
+-if [ "$WPA" = "y" -a -x /usr/local/bin/wpa_supplicant ]; then +- /usr/local/bin/wpa_supplicant -Bw -c/etc/wpa_supplicant.conf -i$DEVICE ++if [ "$WPA" = "y" -a -x /usr/bin/wpa_supplicant ]; then ++ /usr/bin/wpa_supplicant -Bw -c/etc/wpa_supplicant.conf -i$DEVICE + fi +
+ +@@ -714,7 +714,7 @@ + /etc/pcmcia/wireless: + +
+-if [ "$WPA" = "y" -a -x /usr/local/bin/wpa_supplicant ]; then ++if [ "$WPA" = "y" -a -x /usr/bin/wpa_supplicant ]; then + killall wpa_supplicant + fi +
+diff -dur wpa_supplicant-0.4.9/Makefile wpa_supplicant-0.4.9-p/Makefile +--- wpa_supplicant-0.4.9/Makefile 2006-05-07 06:05:36.000000000 +0200 ++++ wpa_supplicant-0.4.9-p/Makefile 2006-08-12 04:46:34.000000000 +0200 +@@ -32,8 +32,8 @@ + echo CONFIG_WIRELESS_EXTENSION=y >> .config + + install: all +- mkdir -p $(DESTDIR)/usr/local/sbin/ +- for i in $(ALL); do cp $$i $(DESTDIR)/usr/local/sbin/$$i; done ++ mkdir -p $(DESTDIR)/usr/sbin/ ++ for i in $(ALL); do cp $$i $(DESTDIR)/usr/sbin/$$i; done + + OBJS = config.o \ + eloop.o common.o md5.o \ +diff -dur wpa_supplicant-0.4.9/README wpa_supplicant-0.4.9-p/README +--- wpa_supplicant-0.4.9/README 2006-01-30 05:39:54.000000000 +0100 ++++ wpa_supplicant-0.4.9-p/README 2006-08-12 04:46:34.000000000 +0200 +@@ -412,14 +412,14 @@ + + After you have created a configuration file, you can build + wpa_supplicant and wpa_cli with 'make' command. You may then install +-the binaries to a suitable system directory, e.g., /usr/local/bin. ++the binaries to a suitable system directory, e.g., /usr/bin. + + Example commands: + + # build wpa_supplicant and wpa_cli + make + # install binaries (this may need root privileges) +-cp wpa_cli wpa_supplicant /usr/local/bin ++cp wpa_cli wpa_supplicant /usr/bin + + + You will need to make a configuration file, e.g., +@@ -863,15 +863,15 @@ + Add the following block to the end of 'start' action handler in + /etc/pcmcia/wireless: + +- if [ "$WPA" = "y" -a -x /usr/local/bin/wpa_supplicant ]; then +- /usr/local/bin/wpa_supplicant -Bw -c/etc/wpa_supplicant.conf \ ++ if [ "$WPA" = "y" -a -x /usr/bin/wpa_supplicant ]; then ++ /usr/bin/wpa_supplicant -Bw -c/etc/wpa_supplicant.conf \ + -i$DEVICE + fi + + Add the following block to the end of 'stop' action handler (may need + to be separated from other actions) in /etc/pcmcia/wireless: + +- if [ "$WPA" = "y" -a -x /usr/local/bin/wpa_supplicant ]; then ++ if [ "$WPA" = "y" -a -x /usr/bin/wpa_supplicant ]; then + killall wpa_supplicant + fi + diff --git a/package/stf/wpa_supplicant/wpa_supplicant.conf b/package/stf/wpa_supplicant/wpa_supplicant.conf new file mode 100644 index 000000000..836fe3267 --- /dev/null +++ b/package/stf/wpa_supplicant/wpa_supplicant.conf @@ -0,0 +1,34 @@ +wpa_supplicant_preconf() +{ + cp defconfig .config + if pkginstalled openssl ; then + sed -i -e 's,^#\(CONFIG_EAP_TLS=y\),\1,' \ + -e 's,^#\(CONFIG_EAP_PEAP=y\),\1,' \ + -e 's,^#\(CONFIG_EAP_TTLS=y\),\1,' .config + fi + if pkginstalled pcsc-lite ; then + sed -i -e 's,^#\(CONFIG_EAP_PCSC=y\),\1,' \ + -e 's,^#\(CONFIG_EAP_SIM=y\),\1,' \ + -e 's,^#\(CONFIG_EAP_AKA=y\),\1,' .config + fi + if pkginstalled atmelwlandriver ; then + sed -i -e 's,^#\(CONFIG_DRIVER_ATMEL=y\),\1,' .config + fi +} + +wpa_supplicant_postmake() +{ + if pkginstalled qt3* ; then + make wpa_gui + cp -a wpa_gui/wpa_gui $root/$bindir/ + fi + if pkginstalled qt4* ; then + make wpa_gui-qt4 + cp -a wpa_gui/wpa_gui $root/$bindir/wpa_gui-qt4 + fi + [ ! -f $root/etc/wpa_supplicant.conf ] && \ + cp -a wpa_supplicant.conf $root/etc +} + +hook_add preconf 5 wpa_supplicant_preconf +hook_add postmake 5 wpa_supplicant_postmake diff --git a/package/stf/wpa_supplicant/wpa_supplicant.desc b/package/stf/wpa_supplicant/wpa_supplicant.desc new file mode 100644 index 000000000..e25bfe823 --- /dev/null +++ b/package/stf/wpa_supplicant/wpa_supplicant.desc @@ -0,0 +1,52 @@ + +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/stf/wpa_supplicant/wpa_supplicant.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] Linux WPA/WPA2/IEEE 802.1X Supplicant + +[T] wpa_supplicant is a WPA Supplicant for Linux, BSD and Windows with support +[T] for WPA and WPA2 (IEEE 802.11i / RSN). It is suitable for both +[T] desktop/laptop computers and embedded systems. Supplicant is the IEEE +[T] 802.1X/WPA component that is used in the client stations. It implements key +[T] negotiation with a WPA Authenticator and it controls the roaming and IEEE +[T] 802.11 authentication/association of the wlan driver. +[T] +[T] wpa_supplicant is designed to be a "daemon" program that runs in the +[T] background and acts as the backend component controlling the wireless +[T] connection. wpa_supplicant supports separate frontend programs and a +[T] text-based frontend (wpa_cli) and a GUI (wpa_gui) are included with +[T] wpa_supplicant. + +[U] http://hostap.epitest.fi/wpa_supplicant/ + +[A] Jouni Malinen +[M] Stefan Fiedler + +[C] extra/security + +[L] GPL +[S] Stable +[V] 0.4.9 +[P] X -----5---9 800.000 + +[D] 3849383913 wpa_supplicant-0.4.9.tar.gz http://hostap.epitest.fi/releases/ +