diff options
| author |   Roy Marples <uberlord@gentoo.org> | 2007-09-11 14:24:51 +0000 |
|---|---|---|
| committer | Roy Marples <uberlord@gentoo.org> | 2007-09-11 14:24:51 +0000 |
| commit | ab9bf1dee9bc541b1f2584404585e036657d63c2 (patch) | |
| tree | d57b67cf842730c3952821f8391e10514f7748e0 /net-wireless/wpa_supplicant | |
| parent | Version bump. Added src_test and longdescription in metadata.xml. Tested on a... (diff) | |
| download | gentoo-2-ab9bf1dee9bc541b1f2584404585e036657d63c2.tar.gz gentoo-2-ab9bf1dee9bc541b1f2584404585e036657d63c2.tar.bz2 gentoo-2-ab9bf1dee9bc541b1f2584404585e036657d63c2.zip | |
Default to GNUTLS if both gnutls and ssl are specified.
(Portage version: 2.1.3.7)
Diffstat (limited to 'net-wireless/wpa_supplicant')
| -rw-r--r-- | net-wireless/wpa_supplicant/ChangeLog | 6 | ||||
| -rw-r--r-- | net-wireless/wpa_supplicant/wpa_supplicant-0.5.8.ebuild | 12 | ||||
| -rw-r--r-- | net-wireless/wpa_supplicant/wpa_supplicant-0.6.0.ebuild | 12 |
3 files changed, 17 insertions, 13 deletions
diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog index b28353a8be79..02966af87a30 100644 --- a/net-wireless/wpa_supplicant/ChangeLog +++ b/net-wireless/wpa_supplicant/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-wireless/wpa_supplicant # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.98 2007/07/01 11:06:24 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.99 2007/09/11 14:24:51 uberlord Exp $ + + 11 Sep 2007; Roy Marples <uberlord@gentoo.org> + wpa_supplicant-0.5.8.ebuild, wpa_supplicant-0.6.0.ebuild: + Default to GNUTLS if both gnutls and ssl are specified. 01 Jul 2007; Roy Marples <uberlord@gentoo.org> wpa_supplicant-0.5.7.ebuild, wpa_supplicant-0.5.8.ebuild, diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.8.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.8.ebuild index 8d7c1e35c6dc..17857126a00b 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.8.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.5.8.ebuild,v 1.2 2007/07/01 11:06:24 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.5.8.ebuild,v 1.3 2007/09/11 14:24:51 uberlord Exp $ inherit eutils toolchain-funcs @@ -93,13 +93,13 @@ src_unpack() { echo "CONFIG_READLINE=y" >> .config fi - if use ssl ; then - # SSL authentication methods - echo "CONFIG_TLS=openssl" >> .config - echo "CONFIG_SMARTCARD=y" >> .config - elif use gnutls ; then + # SSL authentication methods + if use gnutls ; then echo "CONFIG_TLS=gnutls" >> .config echo "CONFIG_GNUTLS_EXTRA=y" >> .config + elif use ssl ; then + echo "CONFIG_TLS=openssl" >> .config + echo "CONFIG_SMARTCARD=y" >> .config else echo "CONFIG_TLS=internal" >> .config fi diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.0.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.0.ebuild index b4f3813245ec..ccc9ec87a62a 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.0.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.0.ebuild,v 1.4 2007/07/01 11:06:24 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.0.ebuild,v 1.5 2007/09/11 14:24:51 uberlord Exp $ inherit eutils toolchain-funcs @@ -95,13 +95,13 @@ src_unpack() { echo "CONFIG_READLINE=y" >> .config fi - if use ssl ; then - # SSL authentication methods - echo "CONFIG_TLS=openssl" >> .config - echo "CONFIG_SMARTCARD=y" >> .config - elif use gnutls ; then + # SSL authentication methods + if use gnutls ; then echo "CONFIG_TLS=gnutls" >> .config echo "CONFIG_GNUTLS_EXTRA=y" >> .config + elif use ssl ; then + echo "CONFIG_TLS=openssl" >> .config + echo "CONFIG_SMARTCARD=y" >> .config else echo "CONFIG_TLS=internal" >> .config fi |