[oe-commits] org.oe.dev wpa-supplicant: add 0.5.5 with optional madwifi-ng support

[hrw commit]

wpa-supplicant: add 0.5.5 with optional madwifi-ng support
- machines with PCI feature will get madwifi-ng support and package will be
  MACHINE specific
- this is result of my RFC [1] and Koen's solution [2]
1. http://lists.linuxtogo.org/pipermail/openembedded-devel/2006-October/000698.html
2. http://lists.linuxtogo.org/pipermail/openembedded-devel/2006-November/000848.html

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: e70383b55949b039b5065c1acbb5765453930273
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e70383b55949b039b5065c1acbb5765453930273
Files:
1
packages/wpa-supplicant/wpa-supplicant-0.5.5
packages/wpa-supplicant/wpa-supplicant-0.5.5/gnutlsfix.patch
packages/wpa-supplicant/wpa-supplicant_0.5.5.bb
Diffs:

#
# mt diff -r8aa660d3eb0e838cd756b20d345990a5f35bb899 -re70383b55949b039b5065c1acbb5765453930273
#
# 
# 
# add_dir "packages/wpa-supplicant/wpa-supplicant-0.5.5"
# 
# add_file "packages/wpa-supplicant/wpa-supplicant-0.5.5/gnutlsfix.patch"
#  content [06458cbb22d3a400d5ee95a7922f78291b2348de]
# 
# add_file "packages/wpa-supplicant/wpa-supplicant_0.5.5.bb"
#  content [679abd02afbbdf3ac8ff43a435eb4b3ec8a45ab0]
# 
============================================================
--- packages/wpa-supplicant/wpa-supplicant-0.5.5/gnutlsfix.patch	06458cbb22d3a400d5ee95a7922f78291b2348de
+++ packages/wpa-supplicant/wpa-supplicant-0.5.5/gnutlsfix.patch	06458cbb22d3a400d5ee95a7922f78291b2348de
@@ -0,0 +1,19 @@
+Index: wpa_supplicant-0.5.5/tls_gnutls.c
+===================================================================
+--- wpa_supplicant-0.5.5.orig/tls_gnutls.c	2006-06-25 03:05:07.000000000 +0200
++++ wpa_supplicant-0.5.5/tls_gnutls.c	2006-10-29 15:12:21.000000000 +0100
+@@ -1029,8 +1029,13 @@
+ 				     const u8 *in_data, size_t in_len,
+ 				     size_t *out_len)
+ {
++	u8 *appl_data;
++	size_t appl_data_len;
++
++	appl_data = NULL;
++
+ 	return tls_connection_handshake(ssl_ctx, conn, in_data, in_len,
+-					out_len);
++					out_len, appl_data, appl_data_len);
+ }
+ 
+ 
============================================================
--- packages/wpa-supplicant/wpa-supplicant_0.5.5.bb	679abd02afbbdf3ac8ff43a435eb4b3ec8a45ab0
+++ packages/wpa-supplicant/wpa-supplicant_0.5.5.bb	679abd02afbbdf3ac8ff43a435eb4b3ec8a45ab0
@@ -0,0 +1,62 @@
+DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)."
+SECTION = "network"
+LICENSE = "GPL"
+HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
+DEPENDS = "gnutls ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}"
+PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'pci', ${MACHINE}, ${TARGET_ARCH}, d)}"
+
+DEFAULT_PREFERENCE = "-2"
+
+SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
+	file://defconfig-gnutls \
+	file://init.sh \
+	file://gnutlsfix.patch;patch=1 \
+	file://defaults-sane \
+	file://wpa_supplicant.conf \
+	file://wpa_supplicant.conf-sane"
+
+S = "${WORKDIR}/wpa_supplicant-${PV}"
+
+PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli "
+FILES_wpa-supplicant-passphrase = "/usr/sbin/wpa_passphrase"
+FILES_wpa-supplicant-cli = "/usr/sbin/wpa_cli"
+
+RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"
+
+INITSCRIPT_NAME = "wpa"
+INITSCRIPT_PARAMS = "defaults 10"
+inherit update-rc.d
+
+export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}"
+
+do_configure () {
+        install -m 0755 ${WORKDIR}/defconfig-gnutls  .config
+ 
+        if [ "x$HAS_PCI" == "x1" ] then; do
+                echo "CONFIG_DRIVER_MADWIFI=y" >> .config
+                echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config
+        fi
+}
+
+do_compile () {
+	make
+}
+
+do_install () {
+	install -d ${D}${sbindir}
+	install -m 755 wpa_supplicant ${D}${sbindir}
+	install -m 755 wpa_passphrase ${D}${sbindir}
+	install -m 755 wpa_cli        ${D}${sbindir}
+
+	install -d ${D}${localstatedir}/run/wpa_supplicant
+
+	install -d ${D}${docdir}/wpa_supplicant
+	install -m 644 README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant
+
+	install -d ${D}${sysconfdir}/init.d
+	install -m 700 ${WORKDIR}/init.sh ${D}${sysconfdir}/init.d/wpa
+
+	install -d ${D}${sysconfdir}/default
+	install -m 600 ${WORKDIR}/defaults-sane ${D}${sysconfdir}/default/wpa
+	install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf
+}