From f6536f4e827cd982cc390648ddc1ba85f00cc54c Mon Sep 17 00:00:00 2001
From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Mon, 28 Apr 2008 12:07:26 +0000
Subject: wpa_supplicant: only keep version 0.5.10 for 0.5.x (stable) branch

---
 packages/wpa-supplicant/wpa-supplicant-0.5.inc     | 61 ---------------------
 .../wpa-supplicant/wpa-supplicant/.mtn2git_empty   |  0
 .../wpa-supplicant/wpa-supplicant/gnutlsfix.patch  | 19 -------
 packages/wpa-supplicant/wpa-supplicant_0.5.10.bb   | 62 +++++++++++++++++++++-
 packages/wpa-supplicant/wpa-supplicant_0.5.5.bb    |  5 --
 packages/wpa-supplicant/wpa-supplicant_0.5.7.bb    |  5 --
 6 files changed, 61 insertions(+), 91 deletions(-)
 delete mode 100644 packages/wpa-supplicant/wpa-supplicant-0.5.inc
 delete mode 100644 packages/wpa-supplicant/wpa-supplicant/.mtn2git_empty
 delete mode 100644 packages/wpa-supplicant/wpa-supplicant/gnutlsfix.patch
 delete mode 100644 packages/wpa-supplicant/wpa-supplicant_0.5.5.bb
 delete mode 100644 packages/wpa-supplicant/wpa-supplicant_0.5.7.bb

diff --git a/packages/wpa-supplicant/wpa-supplicant-0.5.inc b/packages/wpa-supplicant/wpa-supplicant-0.5.inc
deleted file mode 100644
index ccded27ffb..0000000000
--- a/packages/wpa-supplicant/wpa-supplicant-0.5.inc
+++ /dev/null
@@ -1,61 +0,0 @@
-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)}"
-
-#we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds
-MY_ARCH := "${PACKAGE_ARCH}"
-PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}', d)}"
-
-SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
-	file://defconfig-gnutls \
-	file://ifupdown.sh \
-	file://functions.sh"
-
-S = "${WORKDIR}/wpa_supplicant-${PV}"
-
-PACKAGES_prepend = "wpa-supplicant-passphrase "
-FILES_wpa-supplicant-passphrase = "/usr/sbin/wpa_passphrase"
-
-RREPLACES = "wpa-supplicant-cli"
-
-RRECOMMENDS_${PN} = "wpa-supplicant-passphrase"
-
-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
-                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 ${D}${docdir}/wpa_supplicant
-
-	install -d ${D}${sysconfdir}/network/if-pre-up.d/
-	install -d ${D}${sysconfdir}/network/if-post-down.d/
-	install -d ${D}${sysconfdir}/network/if-down.d/
-
-	install -d ${D}${sysconfdir}/wpa_supplicant
-	install -m 755 ${WORKDIR}/ifupdown.sh ${D}${sysconfdir}/wpa_supplicant/
-	install -m 755 ${WORKDIR}/functions.sh ${D}${sysconfdir}/wpa_supplicant
-	
-	ln -s /etc/wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-pre-up.d/wpasupplicant
-	ln -s /etc/wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-post-down.d/wpasupplicant
-}
diff --git a/packages/wpa-supplicant/wpa-supplicant/.mtn2git_empty b/packages/wpa-supplicant/wpa-supplicant/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/wpa-supplicant/wpa-supplicant/gnutlsfix.patch b/packages/wpa-supplicant/wpa-supplicant/gnutlsfix.patch
deleted file mode 100644
index 795306bb35..0000000000
--- a/packages/wpa-supplicant/wpa-supplicant/gnutlsfix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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);
- }
- 
- 
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.10.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.10.bb
index 6594bbfdbe..ccded27ffb 100644
--- a/packages/wpa-supplicant/wpa-supplicant_0.5.10.bb
+++ b/packages/wpa-supplicant/wpa-supplicant_0.5.10.bb
@@ -1 +1,61 @@
-require wpa-supplicant-0.5.inc
+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)}"
+
+#we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds
+MY_ARCH := "${PACKAGE_ARCH}"
+PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}', d)}"
+
+SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
+	file://defconfig-gnutls \
+	file://ifupdown.sh \
+	file://functions.sh"
+
+S = "${WORKDIR}/wpa_supplicant-${PV}"
+
+PACKAGES_prepend = "wpa-supplicant-passphrase "
+FILES_wpa-supplicant-passphrase = "/usr/sbin/wpa_passphrase"
+
+RREPLACES = "wpa-supplicant-cli"
+
+RRECOMMENDS_${PN} = "wpa-supplicant-passphrase"
+
+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
+                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 ${D}${docdir}/wpa_supplicant
+
+	install -d ${D}${sysconfdir}/network/if-pre-up.d/
+	install -d ${D}${sysconfdir}/network/if-post-down.d/
+	install -d ${D}${sysconfdir}/network/if-down.d/
+
+	install -d ${D}${sysconfdir}/wpa_supplicant
+	install -m 755 ${WORKDIR}/ifupdown.sh ${D}${sysconfdir}/wpa_supplicant/
+	install -m 755 ${WORKDIR}/functions.sh ${D}${sysconfdir}/wpa_supplicant
+	
+	ln -s /etc/wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-pre-up.d/wpasupplicant
+	ln -s /etc/wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-post-down.d/wpasupplicant
+}
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb
deleted file mode 100644
index 2b45ce9389..0000000000
--- a/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require wpa-supplicant-0.5.inc
-
-SRC_URI += "file://gnutlsfix.patch;patch=1"
-
-PR = "r3"
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.7.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.7.bb
deleted file mode 100644
index 5dc49302c9..0000000000
--- a/packages/wpa-supplicant/wpa-supplicant_0.5.7.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require wpa-supplicant-0.5.inc
-
-SRC_URI += "file://gnutlsfix.patch;patch=1"
-
-PR = "r1"
-- 
cgit v1.2.3