Add support for gnutls and internal tls, #163390 thanks to

  Nikolas 'Atrus' Coukouma.
Package-Manager: portage-2.1.2-r2

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 073876453ea63029b5166c8fb64376b183dfbcd3..c6519a8a37b302b43a5a156b9880985da051bcd2 100644 (file)
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,11 @@
 # 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.89 2007/01/15 14:34:19 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.90 2007/01/23 14:08:41 uberlord Exp $
+
+  23 Jan 2007; Roy Marples <uberlord@gentoo.org>
+  +files/wpa_supplicant-0.5.7-gnutls.patch, wpa_supplicant-0.5.7.ebuild:
+  Add support for gnutls and internal tls, #163390 thanks to
+  Nikolas 'Atrus' Coukouma.
 
 *wpa_supplicant-0.5.7 (15 Jan 2007)
 

diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 673af8ac5fd777d899f3979e976fd63621042e15..03cfb17631255418f6c30fa570a5dbeab301e6b7 100644 (file)
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -22,6 +22,10 @@ AUX wpa_supplicant-0.5.6-sigpoll.patch 359 RMD160 646fc970548d021fef8756768a855f
 MD5 2f35cf8d766a1bc9944bdef5ca76afc8 files/wpa_supplicant-0.5.6-sigpoll.patch 359
 RMD160 646fc970548d021fef8756768a855f716fabe420 files/wpa_supplicant-0.5.6-sigpoll.patch 359
 SHA256 94c78c3010cb5e3a8d30d1f42368191f839ac9ef52585927ebe32d916acadfe6 files/wpa_supplicant-0.5.6-sigpoll.patch 359
+AUX wpa_supplicant-0.5.7-gnutls.patch 375 RMD160 b8868a503a71d2cc4ebd4826430654c3a6645ec0 SHA1 fdfa5fefc507fa133f7d41a7ca75c33b14d876f7 SHA256 7d4a2a6f70fd18757e139ca1d1dc2734fe854ea1879d62d378febce49feef3aa
+MD5 539bedcbef70373c3f7790da093504c1 files/wpa_supplicant-0.5.7-gnutls.patch 375
+RMD160 b8868a503a71d2cc4ebd4826430654c3a6645ec0 files/wpa_supplicant-0.5.7-gnutls.patch 375
+SHA256 7d4a2a6f70fd18757e139ca1d1dc2734fe854ea1879d62d378febce49feef3aa files/wpa_supplicant-0.5.7-gnutls.patch 375
 AUX wpa_supplicant.conf 183 RMD160 591d852e8993648793f717402c7b5c52e1f54b71 SHA1 0a7f2922ad2394f475e1485d5537d1b2c6d7cafb SHA256 15082ad37ebd98f57c3733454a0921a79dc2b41007f1b012fb7e67c09d87de3a
 MD5 e44e6d1a019f31d680b30211607fbe43 files/wpa_supplicant.conf 183
 RMD160 591d852e8993648793f717402c7b5c52e1f54b71 files/wpa_supplicant.conf 183
@@ -47,14 +51,14 @@ EBUILD wpa_supplicant-0.5.6.ebuild 5988 RMD160 9dd48ebe430ef850bb614252b2c420a40
 MD5 3cda46bea6f45c76cb9e0797bd2c2cb5 wpa_supplicant-0.5.6.ebuild 5988
 RMD160 9dd48ebe430ef850bb614252b2c420a408aaf713 wpa_supplicant-0.5.6.ebuild 5988
 SHA256 f7743d2ee46159a263c4fa31ea8b5a492dad380b8ca491f60a55dafa0bd446e3 wpa_supplicant-0.5.6.ebuild 5988
-EBUILD wpa_supplicant-0.5.7.ebuild 5994 RMD160 1cf71c33f2ab9cabdebdede09020c5f1cf5ee07c SHA1 000ee5f89a04be2841c108a62833718a9d920c3e SHA256 1c8be2a454185510124f9e951dfee254369beb5cdbca82a05e7ab92fe3151417
-MD5 37f6c59e5c6375ec1f49a502ad0f3678 wpa_supplicant-0.5.7.ebuild 5994
-RMD160 1cf71c33f2ab9cabdebdede09020c5f1cf5ee07c wpa_supplicant-0.5.7.ebuild 5994
-SHA256 1c8be2a454185510124f9e951dfee254369beb5cdbca82a05e7ab92fe3151417 wpa_supplicant-0.5.7.ebuild 5994
-MISC ChangeLog 20215 RMD160 7ad4a7d197a30c72bc746d0da66c4ae41804d977 SHA1 53b9cedcdc0b9c0ec5b9bc4006056c5f9c5c9728 SHA256 52d73519432becba05d97a256d1ef3e8b4bac8f9460849c8fd9dd88aa81abca5
-MD5 5f1b60c0d0a166859e43104a7a1a7e6a ChangeLog 20215
-RMD160 7ad4a7d197a30c72bc746d0da66c4ae41804d977 ChangeLog 20215
-SHA256 52d73519432becba05d97a256d1ef3e8b4bac8f9460849c8fd9dd88aa81abca5 ChangeLog 20215
+EBUILD wpa_supplicant-0.5.7.ebuild 6186 RMD160 48d67cf8e8ff689d6186a069b8c4e9f394323879 SHA1 6b5f33cf9da513b0089902c4f95c49c58fb4333f SHA256 d36ac97d399babfb0c5bf969ac3c713c09ed172b43b2d285ef9e81bbbdf54b2d
+MD5 1358f297f5550d1bb54905e64e1da415 wpa_supplicant-0.5.7.ebuild 6186
+RMD160 48d67cf8e8ff689d6186a069b8c4e9f394323879 wpa_supplicant-0.5.7.ebuild 6186
+SHA256 d36ac97d399babfb0c5bf969ac3c713c09ed172b43b2d285ef9e81bbbdf54b2d wpa_supplicant-0.5.7.ebuild 6186
+MISC ChangeLog 20427 RMD160 6965dbf63582d5d841bf7aa1397f28edc83af576 SHA1 a1e4d8a66152bb929df7db93e7da16bbc1d6e5bd SHA256 0bc4b854c5c383b12852468824ba162c16dbb0cf0f32d8174de597c4baa2ba72
+MD5 e0bc90389b3669a3e0e3d7493355a6d4 ChangeLog 20427
+RMD160 6965dbf63582d5d841bf7aa1397f28edc83af576 ChangeLog 20427
+SHA256 0bc4b854c5c383b12852468824ba162c16dbb0cf0f32d8174de597c4baa2ba72 ChangeLog 20427
 MISC metadata.xml 250 RMD160 876c64d1767e4bdd32723fa285a7dabf15f1e82e SHA1 60f90e59de723ec974b5e2d8c3a952c3ea378f6f SHA256 fd3c97233444ca2664cd393f484f4cba1ace7b76c686112b098ab45a4cebbe0e
 MD5 672d42771a5a69fdbc5ba1648d133812 metadata.xml 250
 RMD160 876c64d1767e4bdd32723fa285a7dabf15f1e82e metadata.xml 250

diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.7-gnutls.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.7-gnutls.patch
new file mode 100644 (file)
index 0000000..9278e7a
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.7-gnutls.patch
@@ -0,0 +1,15 @@
+--- tls_gnutls.c.orig  2006-09-09 03:47:28 +0100
++++ tls_gnutls.c       2007-01-23 13:39:44 +0000
+@@ -1029,8 +1029,11 @@
+                                    const u8 *in_data, size_t in_len,
+                                    size_t *out_len)
+ {
++      u8 *appl_data = NULL;
++      size_t appl_data_len = 0;
++  
+       return tls_connection_handshake(ssl_ctx, conn, in_data, in_len,
+-                                      out_len);
++                                      out_len, appl_data, appl_data_len);
+ }
+ 
+ 

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.7.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.7.ebuild
index d3ddf55a58b8b4d95c603e68166dcf4efced9b3d..49969548901a9d093ee7579c3ec0caf27abfda96 100644 (file)
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.7.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.7.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.7.ebuild,v 1.1 2007/01/15 14:34:19 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.5.7.ebuild,v 1.2 2007/01/23 14:08:41 uberlord Exp $
 
 inherit eutils toolchain-funcs
 
@@ -11,7 +11,7 @@ LICENSE="|| ( GPL-2 BSD )"
 
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dbus gsm madwifi qt3 qt4 readline ssl kernel_linux kernel_FreeBSD"
+IUSE="dbus gnutls gsm madwifi qt3 qt4 readline ssl kernel_linux kernel_FreeBSD"
 
 RDEPEND="dbus? ( sys-apps/dbus )
                kernel_linux? (
@@ -24,15 +24,11 @@ RDEPEND="dbus? ( sys-apps/dbus )
                qt4? ( =x11-libs/qt-4* )
                !qt4? ( qt3? ( =x11-libs/qt-3* ) )
                readline? ( sys-libs/ncurses sys-libs/readline )
-               ssl? ( dev-libs/openssl )"
+               ssl? ( dev-libs/openssl )
+               gnutls? ( net-libs/gnutls )
+               !ssl? ( !gnutls? ( dev-libs/libtommath ) )"
 
 pkg_setup() {
-       if use kernel_linux ; then
-               ewarn
-               ewarn "${PN} requires kernel support for Packet Socket (CONFIG_PACKET)."
-               ewarn
-       fi
-
        if use qt3 && use qt4; then
                einfo "You have USE=\"qt3 qt4\" selected, defaulting to USE=\"qt4\""
        fi
@@ -49,6 +45,8 @@ src_unpack() {
        unpack ${A}
        cd "${S}"
 
+       epatch "${FILESDIR}/${P}"-gnutls.patch
+
        # net/bpf.h needed for net-libs/libpcap on Gentoo FreeBSD
        sed -i \
                -e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
@@ -73,6 +71,11 @@ src_unpack() {
        echo "CONFIG_IEEE8021X_EAPOL=y" >> .config
        echo "CONFIG_PKCS12=y"          >> .config
        echo "CONFIG_PEERKEY=y"         >> .config
+       echo "CONFIG_EAP_LEAP=y"        >> .config
+       echo "CONFIG_EAP_MSCHAPV2=y"    >> .config
+       echo "CONFIG_EAP_PEAP=y"        >> .config
+       echo "CONFIG_EAP_TLS=y"         >> .config
+       echo "CONFIG_EAP_TTLS=y"        >> .config
 
        if use dbus ; then
                echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config
@@ -92,12 +95,13 @@ src_unpack() {
 
        if use ssl ; then
                # SSL authentication methods
-               echo "CONFIG_EAP_LEAP=y"     >> .config
-               echo "CONFIG_EAP_MSCHAPV2=y" >> .config
-               echo "CONFIG_EAP_PEAP=y"     >> .config
-               echo "CONFIG_EAP_TLS=y"      >> .config
-               echo "CONFIG_EAP_TTLS=y"     >> .config
-               echo "CONFIG_SMARTCARD=y"    >> .config
+               echo "CONFIG_TLS=openssl" >> .config
+               echo "CONFIG_SMARTCARD=y" >> .config
+       elif use gnutls ; then
+               echo "CONFIG_TLS=gnutls" >> .config
+               echo "CONFIG_GNUTLS_EXTRA=y" >> .config
+       else
+               echo "CONFIG_TLS=internal" >> .config
        fi
 
        if use kernel_linux ; then
@@ -117,9 +121,7 @@ src_unpack() {
                        echo "CFLAGS += -I${ROOT}/usr/include/madwifi" >> .config
                        echo "CONFIG_DRIVER_MADWIFI=y"                 >> .config
                fi
-       fi
-
-       if use kernel_FreeBSD ; then
+       elif use kernel_FreeBSD ; then
                # FreeBSD specific driver
                echo "CONFIG_DRIVER_BSD=y" >> .config
        fi