From 22f8b53e99fe21fbd9d18bc70d8428aaf4c82dcb Mon Sep 17 00:00:00 2001
From: Christian Wiese <chris@opensde.org>
Date: Mon, 16 Aug 2010 14:26:19 +0200
Subject: [PATCH] xsupplicant: Updated (1.2.8 -> 2.2.0) (see note!)

Note:

This updates also removes an obsolete patch and adds a package .conf file
to be able to build this package!
---
 .../xsupplicant-1.2.8-linux-headers.patch     | 61 -------------------
 network/xsupplicant/xsupplicant.conf          | 19 ++++++
 network/xsupplicant/xsupplicant.desc          |  6 +-
 3 files changed, 22 insertions(+), 64 deletions(-)
 delete mode 100644 network/xsupplicant/xsupplicant-1.2.8-linux-headers.patch
 create mode 100644 network/xsupplicant/xsupplicant.conf

diff --git a/network/xsupplicant/xsupplicant-1.2.8-linux-headers.patch b/network/xsupplicant/xsupplicant-1.2.8-linux-headers.patch
deleted file mode 100644
index 33d08017d..000000000
--- a/network/xsupplicant/xsupplicant-1.2.8-linux-headers.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../xsupplicant/xsupplicant-1.2.8-linux-headers.patch
-# Copyright (C) 2009 The OpenSDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
-http://bugs.gentoo.org/attachment.cgi?id=141784&action=view
-diff -Nur ./src/cardif/linux/cardif_atmel_driver.c.orig ./src/cardif/linux/cardif_atmel_driver.c
---- ./src/cardif/linux/cardif_atmel_driver.c.orig	2006-10-08 05:42:53.000000000 +0200
-+++ ./src/cardif/linux/cardif_atmel_driver.c	2008-01-25 15:45:56.000000000 +0100
-@@ -103,7 +103,6 @@
- #include <sys/ioctl.h>
- #include <linux/types.h>
- #include <linux/socket.h>
--#include <linux/compiler.h>
- #include <iwlib.h>
- #include <stdlib.h>
- #include <string.h>
-diff -Nur ./src/cardif/linux/cardif_linux.c.orig ./src/cardif/linux/cardif_linux.c
---- ./src/cardif/linux/cardif_linux.c.orig	2006-10-08 05:42:53.000000000 +0200
-+++ ./src/cardif/linux/cardif_linux.c	2008-01-25 15:46:09.000000000 +0100
-@@ -174,7 +174,6 @@
- #include <netinet/in.h>
- #include <linux/types.h>
- #include <linux/socket.h>
--#include <linux/compiler.h>
- #include <iwlib.h>
- #include <linux/if_packet.h>
- #include <stdio.h>
-diff -Nur ./src/cardif/linux/cardif_linux_rtnetlink.c.orig ./src/cardif/linux/cardif_linux_rtnetlink.c
---- ./src/cardif/linux/cardif_linux_rtnetlink.c.orig	2006-10-08 05:42:53.000000000 +0200
-+++ ./src/cardif/linux/cardif_linux_rtnetlink.c	2008-01-25 15:46:21.000000000 +0100
-@@ -203,7 +203,6 @@
- 
- #include <unistd.h>
- #include <sys/socket.h>
--#include <linux/compiler.h>
- #include <iwlib.h>
- #include <sys/ioctl.h>
- #include "netlink.h"
-diff -Nur ./src/cardif/linux/cardif_linux_wext.c.orig ./src/cardif/linux/cardif_linux_wext.c
---- ./src/cardif/linux/cardif_linux_wext.c.orig	2006-10-08 05:42:53.000000000 +0200
-+++ ./src/cardif/linux/cardif_linux_wext.c	2008-01-25 15:46:31.000000000 +0100
-@@ -203,7 +203,6 @@
- #include <netinet/in.h>
- #include <linux/types.h>
- #include <linux/socket.h>
--#include <linux/compiler.h>
- #include <linux/wireless.h>
- #include <iwlib.h>
- #include <linux/if_packet.h>
diff --git a/network/xsupplicant/xsupplicant.conf b/network/xsupplicant/xsupplicant.conf
new file mode 100644
index 000000000..c40f9db4e
--- /dev/null
+++ b/network/xsupplicant/xsupplicant.conf
@@ -0,0 +1,19 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../xsupplicant/xsupplicant.conf
+# Copyright (C) 2010 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License. A copy of the
+# GNU General Public License can be found in the file COPYING.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+pkg_xsupplicant_preconf() {
+	cd xsupplicant
+	eval ./autoregen.sh
+}
+hook_add preconf 5 'pkg_xsupplicant_preconf'
diff --git a/network/xsupplicant/xsupplicant.desc b/network/xsupplicant/xsupplicant.desc
index 5bb1a4a43..1e2078a26 100644
--- a/network/xsupplicant/xsupplicant.desc
+++ b/network/xsupplicant/xsupplicant.desc
@@ -2,7 +2,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../xsupplicant/xsupplicant.desc
-[COPY] Copyright (C) 2006 - 2009 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project
 [COPY]
 [COPY] More information can be found in the files COPYING and README.
 [COPY]
@@ -29,8 +29,8 @@
 
 [L] GPL
 [S] Stable
-[V] 1.2.8
+[V] 2.2.0
 [P] X -----5---9 800.000
 
-[D] 3840616369 xsupplicant-1.2.8.tar.gz http://dl.sourceforge.net/open1x/
+[D] 0 XSupplicant-2.2.0-src.tar.gz http://dl.sourceforge.net/open1x/