[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/06: gnu: wpa-supplicant: Use GnuTLS instead of OpenSSL.
From: |
Ludovic Courtès |
Subject: |
02/06: gnu: wpa-supplicant: Use GnuTLS instead of OpenSSL. |
Date: |
Wed, 04 Feb 2015 21:49:50 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit 61bdd0d89f1e8851df890ce1f09c6969e2ee16fd
Author: Ludovic Courtès <address@hidden>
Date: Wed Feb 4 09:50:22 2015 +0100
gnu: wpa-supplicant: Use GnuTLS instead of OpenSSL.
* gnu/packages/admin.scm (wpa-supplicant)[arguments] <configure phase>:
Set CONFIG_TLS.
[inputs]: Add GNUTLS and LIBGCRYPT.
---
gnu/packages/admin.scm | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index cadd3c4..aa1f8d1 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <address@hidden>
+;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <address@hidden>
;;; Copyright © 2013 Cyril Roelandt <address@hidden>
;;; Copyright © 2014, 2015 Mark H Weaver <address@hidden>
;;; Copyright © 2014 Eric Bavier <address@hidden>
@@ -38,6 +38,8 @@
#:use-module (gnu packages tcl)
#:use-module ((gnu packages compression) #:prefix c:)
#:use-module ((gnu packages openssl) #:prefix o:)
+ #:use-module (gnu packages gnutls)
+ #:use-module (gnu packages gnupg)
#:use-module (gnu packages bison)
#:use-module (gnu packages flex)
#:use-module (gnu packages glib)
@@ -699,6 +701,9 @@ commands and their arguments.")
(display "
CONFIG_DEBUG_SYSLOG=y
+ # Choose GnuTLS (the default is OpenSSL.)
+ CONFIG_TLS=gnutls
+
# TODO: Add a variant of this package with DBus support.
#CONFIG_CTRL_IFACE_DBUS=y
#CONFIG_CTRL_IFACE_DBUS_NEW=y
@@ -723,7 +728,8 @@ commands and their arguments.")
;; TODO: Add a variant with DBus support. This significantly increases
;; the size of its closure since DBus depends on libx11.
;; ("dbus" ,dbus)
- ("openssl" ,o:openssl)))
+ ("gnutls" ,gnutls)
+ ("libgcrypt" ,libgcrypt))) ;needed by crypto_gnutls.c
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://w1.fi/wpa_supplicant/")
- branch master updated (6a07070 -> 6987615), Ludovic Courtès, 2015/02/04
- 01/06: build: Make 'chroot' a hard requirement., Ludovic Courtès, 2015/02/04
- 02/06: gnu: wpa-supplicant: Use GnuTLS instead of OpenSSL.,
Ludovic Courtès <=
- 03/06: gnu: wpa-supplicant: Install man pages., Ludovic Courtès, 2015/02/04
- 06/06: gnu: nss-mdns: Allow the daemon's socket to be found., Ludovic Courtès, 2015/02/04
- 04/06: system: Add bindings to configure libc's NSS., Ludovic Courtès, 2015/02/04
- 05/06: services: nscd-service: Add #:name-services parameter., Ludovic Courtès, 2015/02/04