Version bump + development version. Fixes bug #44737 and bug #61981.

9 files changed, 177 insertions, 5 deletions

diff --git a/net-misc/xsupplicant/ChangeLog b/net-misc/xsupplicant/ChangeLog
index 386fc4b3ac88..4bdb496c92f5 100644
--- a/net-misc/xsupplicant/ChangeLog
+++ b/net-misc/xsupplicant/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/xsupplicant
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/xsupplicant/ChangeLog,v 1.4 2004/12/29 20:17:58 ciaranm Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xsupplicant/ChangeLog,v 1.5 2005/01/09 14:46:01 brix Exp $
+
+*xsupplicant-1.0 (09 Jan 2005)
+
+  09 Jan 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/xsupplicant.conf.d, +files/xsupplicant.init.d,
+  +xsupplicant-1.0.1.ebuild, +xsupplicant-1.0.ebuild:
+  Version bump + development version. Fixes bug #44737 and bug #61981.
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/net-misc/xsupplicant/Manifest b/net-misc/xsupplicant/Manifest
index d11940028dd3..a88728f0cb4e 100644
--- a/net-misc/xsupplicant/Manifest
+++ b/net-misc/xsupplicant/Manifest
@@ -1,4 +1,10 @@
+MD5 f8699410daf005aa13fcf1f718f80f65 xsupplicant-1.0.1.ebuild 1174
+MD5 6f9f1989d8bbee37f73f99934c2c7cc7 xsupplicant-1.0.ebuild 1159
+MD5 83fcc4a22c03d293eeebd7927a3059ff xsupplicant-0.8b.ebuild 813
 MD5 8b313ed9fc5051b0f0ef518ddd225103 ChangeLog 624
 MD5 db76d51212bff92212cb8dd316a0931d metadata.xml 222
-MD5 83fcc4a22c03d293eeebd7927a3059ff xsupplicant-0.8b.ebuild 813
+MD5 8b5c0592ffed1b7f540d7c53af133cad files/digest-xsupplicant-1.0.1 69
+MD5 221a1cb6f46f91c5198058d010f7c637 files/xsupplicant.conf.d 263
+MD5 d46d329318298e85ceac33795df9f30e files/xsupplicant.init.d 787
+MD5 e46d442b40e1d828c4a8fa3d51fab7c5 files/digest-xsupplicant-1.0 67
 MD5 98df32cc0295a0acc372414a8a4b5c08 files/digest-xsupplicant-0.8b 68
diff --git a/net-misc/xsupplicant/files/digest-xsupplicant-1.0 b/net-misc/xsupplicant/files/digest-xsupplicant-1.0
new file mode 100644
index 000000000000..31c427b739f2
--- /dev/null
+++ b/net-misc/xsupplicant/files/digest-xsupplicant-1.0
@@ -0,0 +1 @@
+MD5 7ec518a316139268827e3e4e9acaf174 xsupplicant-1.0.tar.gz 534071
diff --git a/net-misc/xsupplicant/files/digest-xsupplicant-1.0.1 b/net-misc/xsupplicant/files/digest-xsupplicant-1.0.1
new file mode 100644
index 000000000000..999b07ed11bf
--- /dev/null
+++ b/net-misc/xsupplicant/files/digest-xsupplicant-1.0.1
@@ -0,0 +1 @@
+MD5 0346ce9aaa73613d3c5acdf96f0e1ef2 xsupplicant-1.0.1.tar.gz 637728
diff --git a/net-misc/xsupplicant/files/xsupplicant.conf.d b/net-misc/xsupplicant/files/xsupplicant.conf.d
new file mode 100644
index 000000000000..b75da5cec5f4
--- /dev/null
+++ b/net-misc/xsupplicant/files/xsupplicant.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.conf.d,v 1.1 2005/01/09 14:46:01 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.init.d b/net-misc/xsupplicant/files/xsupplicant.init.d
new file mode 100755
index 000000000000..17177867e39d
--- /dev/null
+++ b/net-misc/xsupplicant/files/xsupplicant.init.d
@@ -0,0 +1,40 @@
+#!/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.init.d,v 1.1 2005/01/09 14:46:01 brix Exp $
+
+depend() {
+	use wpa_supplicant
+	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-0.8b.ebuild b/net-misc/xsupplicant/xsupplicant-0.8b.ebuild
index 66693522bdf1..6d0a7f4abb1a 100644
--- a/net-misc/xsupplicant/xsupplicant-0.8b.ebuild
+++ b/net-misc/xsupplicant/xsupplicant-0.8b.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/xsupplicant/xsupplicant-0.8b.ebuild,v 1.3 2004/07/12 01:43:40 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xsupplicant/xsupplicant-0.8b.ebuild,v 1.4 2005/01/09 14:46:01 brix Exp $
 
 S="${WORKDIR}/${PN}"
 DESCRIPTION="Open Source Implementation of IEEE 802.1x"
diff --git a/net-misc/xsupplicant/xsupplicant-1.0.1.ebuild b/net-misc/xsupplicant/xsupplicant-1.0.1.ebuild
new file mode 100644
index 000000000000..902f62dea23a
--- /dev/null
+++ b/net-misc/xsupplicant/xsupplicant-1.0.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xsupplicant/xsupplicant-1.0.1.ebuild,v 1.1 2005/01/09 14:46:01 brix Exp $
+
+DESCRIPTION="Open Source Implementation of IEEE 802.1x"
+
+HOMEPAGE="http://open1x.sourceforge.net"
+SRC_URI="mirror://sourceforge/open1x/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE=""
+
+DEPEND=">=dev-libs/openssl-0.9.7
+		sys-apps/pcsc-lite"
+
+src_compile() {
+	econf --enable-eap-sim || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die "emake install failed"
+
+	dodoc AUTHORS README README.wireless_cards \
+		doc/README.certificates \
+		doc/pdf/Open1x-UserGuide.pdf doc/txt/Open1x-UserGuide.txt
+
+	docinto examples
+	dodoc etc/*-example.conf
+
+	insinto /etc
+	newins etc/xsupplicant.conf xsupplicant.conf.example
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/xsupplicant.init.d xsupplicant
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/xsupplicant.conf.d xsupplicant
+}
+
+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
+}
diff --git a/net-misc/xsupplicant/xsupplicant-1.0.ebuild b/net-misc/xsupplicant/xsupplicant-1.0.ebuild
new file mode 100644
index 000000000000..99418ce220a2
--- /dev/null
+++ b/net-misc/xsupplicant/xsupplicant-1.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xsupplicant/xsupplicant-1.0.ebuild,v 1.1 2005/01/09 14:46:01 brix Exp $
+
+S="${WORKDIR}/${PN}"
+
+DESCRIPTION="Open Source Implementation of IEEE 802.1x"
+
+HOMEPAGE="http://open1x.sourceforge.net"
+SRC_URI="mirror://sourceforge/open1x/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE=""
+
+DEPEND=">=dev-libs/openssl-0.9.7
+		sys-apps/pcsc-lite"
+
+src_compile() {
+	econf --enable-eap-sim || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die "emake install failed"
+
+	dodoc AUTHORS README README.wireless_cards \
+		doc/README.certificates doc/Open1x-UserGuide.pdf
+
+	docinto examples
+	dodoc etc/*-example.conf
+
+	insinto /etc
+	newins etc/xsupplicant.conf xsupplicant.conf.example
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/xsupplicant.init.d xsupplicant
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/xsupplicant.conf.d xsupplicant
+}
+
+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
+}