6 files changed, 135 insertions, 9 deletions
diff --git a/net-misc/xsupplicant/ChangeLog b/net-misc/xsupplicant/ChangeLog
index e02d7ea878ae..00b45f54de81 100644
--- a/net-misc/xsupplicant/ChangeLog
+++ b/net-misc/xsupplicant/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/xsupplicant
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/xsupplicant/ChangeLog,v 1.7 2005/02/19 11:10:36 hansmi Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xsupplicant/ChangeLog,v 1.8 2006/01/13 14:47:59 brix Exp $
+
+*xsupplicant-1.2.2 (13 Jan 2006)
+
+  13 Jan 2006; Henrik Brix Andersen <brix@gentoo.org>
+  +files/xsupplicant-1.2.2-conf.d, +files/xsupplicant-1.2.2-init.d,
+  +xsupplicant-1.2.2.ebuild:
+  Version bump, fixes bug #81338 and bug #100680 (If you use this package,
+  please consider contributing a solution to bug #98253).
 
   19 Feb 2005; Michael Hanselmann <hansmi@gentoo.org>
   xsupplicant-1.0.1.ebuild:
diff --git a/net-misc/xsupplicant/Manifest b/net-misc/xsupplicant/Manifest
index f62b3bd64004..1c20cb05fe82 100644
--- a/net-misc/xsupplicant/Manifest
+++ b/net-misc/xsupplicant/Manifest
@@ -1,10 +1,14 @@
-MD5 a7272f606860d801af53bb3e292b9352 xsupplicant-1.0.ebuild 1262
-MD5 db76d51212bff92212cb8dd316a0931d metadata.xml 222
-MD5 c49a576040df261bcd5648365763162b xsupplicant-0.8b.ebuild 809
-MD5 54cfef4ab6be3d4638b0fbac871b2b51 ChangeLog 1146
-MD5 fa581e5a6cadc7e082b8554eeffaff81 xsupplicant-1.0.1.ebuild 1286
+MD5 e3d22fa85dd10d79fe4a5ce54d2de0e8 ChangeLog 1463
 MD5 98df32cc0295a0acc372414a8a4b5c08 files/digest-xsupplicant-0.8b 68
-MD5 336133489f2fc048046f9f712010e350 files/xsupplicant.conf.d 368
-MD5 ac25b3cd354733e2f05237d0d804d1f2 files/xsupplicant.init.d 892
 MD5 e46d442b40e1d828c4a8fa3d51fab7c5 files/digest-xsupplicant-1.0 67
 MD5 8b5c0592ffed1b7f540d7c53af133cad files/digest-xsupplicant-1.0.1 69
+MD5 9e99a6486002c917cacb72919d64f5f6 files/digest-xsupplicant-1.2.2 69
+MD5 fc79eddd7a39a3ce80a9a6101f92670d files/xsupplicant-1.2.2-conf.d 374
+MD5 1c798b30dc0ed842843c120c11ac6ea9 files/xsupplicant-1.2.2-init.d 878
+MD5 336133489f2fc048046f9f712010e350 files/xsupplicant.conf.d 368
+MD5 ac25b3cd354733e2f05237d0d804d1f2 files/xsupplicant.init.d 892
+MD5 db76d51212bff92212cb8dd316a0931d metadata.xml 222
+MD5 c49a576040df261bcd5648365763162b xsupplicant-0.8b.ebuild 809
+MD5 fa581e5a6cadc7e082b8554eeffaff81 xsupplicant-1.0.1.ebuild 1286
+MD5 a7272f606860d801af53bb3e292b9352 xsupplicant-1.0.ebuild 1262
+MD5 9a3588d6f4c6e05e04899b23fcf936ad xsupplicant-1.2.2.ebuild 1499
diff --git a/net-misc/xsupplicant/files/digest-xsupplicant-1.2.2 b/net-misc/xsupplicant/files/digest-xsupplicant-1.2.2
new file mode 100644
index 000000000000..65eef4c54007
--- /dev/null
+++ b/net-misc/xsupplicant/files/digest-xsupplicant-1.2.2
@@ -0,0 +1 @@
+MD5 0e9aaf83a11f8eaff7c6564a53c25d8e xsupplicant-1.2.2.tar.gz 632562
diff --git a/net-misc/xsupplicant/files/xsupplicant-1.2.2-conf.d b/net-misc/xsupplicant/files/xsupplicant-1.2.2-conf.d
new file mode 100644
index 000000000000..0d0efc0dae32
--- /dev/null
+++ b/net-misc/xsupplicant/files/xsupplicant-1.2.2-conf.d
@@ -0,0 +1,12 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xsupplicant/files/xsupplicant-1.2.2-conf.d,v 1.1 2006/01/13 14:47:59 brix Exp $
+
+# List of interfaces
+INTERFACES="eth1"
+
+# Common arguments to all xsupplicant instances
+ARGS=""
+
+# Interface specific arguments
+#ARGS_eth1=""
diff --git a/net-misc/xsupplicant/files/xsupplicant-1.2.2-init.d b/net-misc/xsupplicant/files/xsupplicant-1.2.2-init.d
new file mode 100644
index 000000000000..873e65dbb4cf
--- /dev/null
+++ b/net-misc/xsupplicant/files/xsupplicant-1.2.2-init.d
@@ -0,0 +1,39 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xsupplicant/files/xsupplicant-1.2.2-init.d,v 1.1 2006/01/13 14:47:59 brix Exp $
+
+depend() {
+	before net
+}
+
+checkconfig() {
+	if [ ! -f /etc/xsupplicant.conf ]; then
+		eerror "Configuration file /etc/xsupplicant.conf not found"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting xsupplicant"
+
+	for IFACE in $INTERFACES; do
+		ebegin " ${IFACE}"
+
+		eval ARGS_IFACE=\"\$\{ARGS_$IFACE\}\"
+
+		start-stop-daemon --start --quiet --background --exec /usr/sbin/xsupplicant \
+			 -- -i${IFACE} -c/etc/xsupplicant.conf ${ARGS} ${ARGS_IFACE}
+		eend ${?}
+	done
+}
+
+stop() {
+        ebegin "Stopping xsupplicant"
+
+        start-stop-daemon --stop --quiet --exec /usr/sbin/xsupplicant
+        eend ${?}
+}
+
diff --git a/net-misc/xsupplicant/xsupplicant-1.2.2.ebuild b/net-misc/xsupplicant/xsupplicant-1.2.2.ebuild
new file mode 100644
index 000000000000..4e180ba9439e
--- /dev/null
+++ b/net-misc/xsupplicant/xsupplicant-1.2.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xsupplicant/xsupplicant-1.2.2.ebuild,v 1.1 2006/01/13 14:47:59 brix Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="Open Source Implementation of IEEE 802.1x"
+HOMEPAGE="http://open1x.sourceforge.net/"
+SRC_URI="mirror://sourceforge/open1x/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 BSD )"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+
+IUSE="gsm"
+
+RDEPEND=">=dev-libs/openssl-0.9.7
+		net-wireless/wireless-tools
+		gsm? ( sys-apps/pcsc-lite )"
+DEPEND="sys-devel/bison
+		sys-devel/flex
+		${RDEPEND}"
+
+src_compile() {
+	# fix compilation with recent kernels
+	# fix compilation with pcsc-lite-1.2.9_beta9 (bug #81338)
+	append-flags -DHEADERS_KERNEL -I/usr/include/PCSC
+
+	econf \
+		$(use_enable gsm eap-sim) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS README TODO \
+		doc/README.certificates doc/README.wpa
+
+	dohtml doc/Xsupplicant-wireless-cards.html
+
+	docinto examples
+	dodoc etc/*-example.conf
+
+	insinto /etc
+	newins etc/xsupplicant.conf xsupplicant.conf.example
+
+	newconfd ${FILESDIR}/${P}-conf.d ${PN}
+	newinitd ${FILESDIR}/${P}-init.d ${PN}
+}
+
+pkg_postinst() {
+	einfo
+	einfo "To use ${P} you must create the configuration file"
+	einfo "/etc/xsupplicant.conf"
+	einfo
+	einfo "An example configuration file has been installed as"
+	einfo "/etc/xsupplicant.conf.example"
+	einfo
+}