~ruther/guix-local: gnu: Move content of openssl module into tls module.

37 files changed, 122 insertions(+), 160 deletions(-)

M gnu-system.am
M gnu/packages/admin.scm
M gnu/packages/bittorrent.scm
M gnu/packages/certs.scm
M gnu/packages/ci.scm
M gnu/packages/cyrus-sasl.scm
M gnu/packages/databases.scm
M gnu/packages/dns.scm
M gnu/packages/ebook.scm
M gnu/packages/enlightenment.scm
M gnu/packages/gnunet.scm
M gnu/packages/libreoffice.scm
M gnu/packages/links.scm
M gnu/packages/mail.scm
M gnu/packages/messaging.scm
M gnu/packages/networking.scm
M gnu/packages/ntp.scm
M gnu/packages/openldap.scm
D gnu/packages/openssl.scm
M gnu/packages/package-management.scm
M gnu/packages/pdf.scm
M gnu/packages/python.scm
M gnu/packages/qt.scm
M gnu/packages/rdesktop.scm
M gnu/packages/rdf.scm
M gnu/packages/ruby.scm
M gnu/packages/ssh.scm
M gnu/packages/synergy.scm
M gnu/packages/tls.scm
M gnu/packages/tor.scm
M gnu/packages/version-control.scm
M gnu/packages/video.scm
M gnu/packages/vpn.scm
M gnu/packages/w3m.scm
M gnu/packages/web.scm
M gnu/packages/weechat.scm
M gnu/packages/xiph.scm

M gnu-system.am => gnu-system.am +0 -1

@@ 231,7 231,6 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/onc-rpc.scm			\
   gnu/packages/openbox.scm			\
   gnu/packages/openldap.scm			\
-  gnu/packages/openssl.scm			\
   gnu/packages/orpheus.scm			\
   gnu/packages/ots.scm				\
   gnu/packages/package-management.scm		\

M gnu/packages/admin.scm => gnu/packages/admin.scm +2 -3

@@ 40,7 40,6 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages tcl)
   #:use-module (gnu packages compression)
-  #:use-module ((gnu packages openssl) #:prefix o:)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages bison)


@@ 501,7 500,7 @@ network statistics collection, security monitoring, network debugging, etc.")
                 "15hb7zkzd66nag102qbv100hcnf7frglbkylmr8adwr8f5jkkaql"))))
     (build-system gnu-build-system)
     (inputs `(("libpcap" ,libpcap)
-              ("openssl" ,o:openssl)))
+              ("openssl" ,openssl)))
     (native-inputs `(("perl" ,perl)))        ; for tests
     (home-page "http://www.tcpdump.org/")
     (synopsis "Network packet analyzer")


@@ 975,7 974,7 @@ characters can be replaced as well, as can UTF-8 characters.")
     (inputs
      `(;; ("ntfs" ,ntfs)
        ("util-linux" ,util-linux)
-       ("openssl" ,o:openssl)
+       ("openssl" ,openssl)
        ("zlib" ,zlib)
        ("e2fsprogs" ,e2fsprogs)
        ("libjpeg" ,libjpeg)

M gnu/packages/bittorrent.scm => gnu/packages/bittorrent.scm +2 -2

@@ 23,7 23,6 @@
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system glib-or-gtk)
   #:use-module ((guix licenses) #:prefix l:)
-  #:use-module (gnu packages openssl)
   #:use-module (gnu packages libevent)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages pkg-config)


@@ 36,7 35,8 @@
   #:use-module (gnu packages check)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages curl)
-  #:use-module (gnu packages cyrus-sasl))
+  #:use-module (gnu packages cyrus-sasl)
+  #:use-module (gnu packages tls))
 
 (define-public transmission
   (package

M gnu/packages/certs.scm => gnu/packages/certs.scm +2 -2

@@ 25,8 25,8 @@
   #:use-module (guix build-system trivial)
   #:use-module (gnu packages)
   #:use-module (gnu packages gnuzilla)
-  #:use-module (gnu packages openssl)
-  #:use-module (gnu packages python))
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages tls))
 
 (define certdata2pem
   (package

M gnu/packages/ci.scm => gnu/packages/ci.scm +1 -1

@@ 28,10 28,10 @@
   #:use-module (gnu packages databases)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages mail)
-  #:use-module (gnu packages openssl)
   #:use-module (gnu packages package-management)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages tls)
   #:use-module (gnu packages version-control)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xml)

M gnu/packages/cyrus-sasl.scm => gnu/packages/cyrus-sasl.scm +1 -1

@@ 21,7 21,7 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages gdbm)
   #:use-module (gnu packages mit-krb5)
-  #:use-module (gnu packages openssl)
+  #:use-module (gnu packages tls)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)

M gnu/packages/databases.scm => gnu/packages/databases.scm +1 -1

@@ 27,7 27,7 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages language)
   #:use-module (gnu packages linux)
-  #:use-module (gnu packages openssl)
+  #:use-module (gnu packages tls)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages readline)

M gnu/packages/dns.scm => gnu/packages/dns.scm +0 -1

@@ 19,7 19,6 @@
 (define-module (gnu packages dns)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages linux)
-  #:use-module (gnu packages openssl)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages xml)

M gnu/packages/ebook.scm => gnu/packages/ebook.scm +1 -1

@@ 32,11 32,11 @@
   #:use-module (gnu packages image)
   #:use-module (gnu packages imagemagick)
   #:use-module (gnu packages libusb)
-  #:use-module (gnu packages openssl)
   #:use-module (gnu packages pdf)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages qt)
+  #:use-module (gnu packages tls)
   #:use-module (gnu packages xorg))
 
 (define-public chmlib

M gnu/packages/enlightenment.scm => gnu/packages/enlightenment.scm +1 -1

@@ 38,11 38,11 @@
   #:use-module (gnu packages image)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages lua)
-  #:use-module (gnu packages openssl)
   #:use-module (gnu packages pdf)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages photo)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages tls)
   #:use-module (gnu packages valgrind)
   #:use-module (gnu packages video)
   #:use-module (gnu packages xorg))

M gnu/packages/gnunet.scm => gnu/packages/gnunet.scm +0 -1

@@ 34,7 34,6 @@
   #:use-module (gnu packages image)
   #:use-module (gnu packages libunistring)
   #:use-module (gnu packages maths)
-  #:use-module (gnu packages openssl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pulseaudio)

M gnu/packages/libreoffice.scm => gnu/packages/libreoffice.scm +1 -1

@@ 52,13 52,13 @@
   #:use-module (gnu packages linux)
   #:use-module (gnu packages maths)
   #:use-module (gnu packages openldap)
-  #:use-module (gnu packages openssl)
   #:use-module (gnu packages pdf)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages rdf)
   #:use-module (gnu packages scanner)
+  #:use-module (gnu packages tls)
   #:use-module (gnu packages version-control)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)

M gnu/packages/links.scm => gnu/packages/links.scm +1 -1

@@ 23,7 23,7 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages image)
-  #:use-module (gnu packages openssl)
+  #:use-module (gnu packages tls)
   #:use-module (gnu packages xorg)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))

M gnu/packages/mail.scm => gnu/packages/mail.scm +0 -1

@@ 50,7 50,6 @@
   #:use-module (gnu packages m4)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages ncurses)
-  #:use-module (gnu packages openssl)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages python)

M gnu/packages/messaging.scm => gnu/packages/messaging.scm +0 -1

@@ 30,7 30,6 @@
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages libcanberra)
-  #:use-module (gnu packages openssl)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages pkg-config)

M gnu/packages/networking.scm => gnu/packages/networking.scm +1 -1

@@ 22,7 22,7 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
-  #:use-module (gnu packages openssl))
+  #:use-module (gnu packages tls))
 
 (define-public miredo
   (package

M gnu/packages/ntp.scm => gnu/packages/ntp.scm +1 -1

@@ 23,7 23,7 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages openssl)
+  #:use-module (gnu packages tls)
   #:use-module ((guix licenses) #:prefix l:)
   #:use-module (guix packages)
   #:use-module (guix utils)

M gnu/packages/openldap.scm => gnu/packages/openldap.scm +1 -1

@@ 25,7 25,7 @@
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages groff)
   #:use-module (gnu packages icu4c)
-  #:use-module (gnu packages openssl)
+  #:use-module (gnu packages tls)
   #:use-module ((guix licenses) #:select (openldap2.8))
   #:use-module (guix packages)
   #:use-module (guix download)

D gnu/packages/openssl.scm => gnu/packages/openssl.scm +0 -116

@@ 1,116 0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (gnu packages openssl)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages perl)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system perl))
-
-(define-public openssl
-  (package
-   (name "openssl")
-   (version "1.0.2c")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append "ftp://ftp.openssl.org/source/openssl-" version
-                                ".tar.gz"))
-            (sha256
-             (base32
-              "10vasdg52qiyqvgbp14n9z7ghglmhzvag9qpiz2nfqssycvvlf00"))
-            (patches (list (search-patch "openssl-runpath.patch")))))
-   (build-system gnu-build-system)
-   (native-inputs `(("perl" ,perl)))
-   (arguments
-    '(#:parallel-build? #f
-      #:parallel-tests? #f
-      #:test-target "test"
-      #:phases
-      (alist-replace
-       'configure
-       (lambda* (#:key outputs #:allow-other-keys)
-         (let ((out (assoc-ref outputs "out")))
-           (zero?
-            (system* "./config"
-                     "shared"                   ; build shared libraries
-                     "--libdir=lib"
-                     (string-append "--prefix=" out)))))
-       (alist-cons-before
-        'patch-source-shebangs 'patch-tests
-        (lambda* (#:key inputs native-inputs #:allow-other-keys)
-          (let ((bash (assoc-ref (or native-inputs inputs) "bash")))
-            (substitute* (find-files "test" ".*")
-              (("/bin/sh")
-               (string-append bash "/bin/bash"))
-              (("/bin/rm")
-               "rm"))))
-        %standard-phases))))
-   (native-search-paths
-    ;; FIXME: These two variables must designate a single file or directory
-    ;; and are not actually "search paths."  In practice it works OK in user
-    ;; profiles because there's always just one item that matches the
-    ;; specification.
-    (list (search-path-specification
-           (variable "SSL_CERT_DIR")
-           (files '("etc/ssl/certs")))
-          (search-path-specification
-           (variable "SSL_CERT_FILE")
-           (files '("etc/ssl/certs/ca-certificates.crt")))))
-   (synopsis "SSL/TLS implementation")
-   (description
-    "OpenSSL is an implementation of SSL/TLS")
-   (license license:openssl)
-   (home-page "http://www.openssl.org/")))
-
-(define-public perl-net-ssleay
-  (package
-    (name "perl-net-ssleay")
-    (version "1.68")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://cpan/authors/id/M/MI/MIKEM/"
-                                  "Net-SSLeay-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1m2wwzhjwsg0drlhp9w12fl6bsgj69v8gdz72jqrqll3qr7f408p"))
-              (patches
-               ;; XXX Try removing this patch for perl-net-ssleay > 1.68
-               (list (search-patch "perl-net-ssleay-disable-ede-test.patch")))))
-    (build-system perl-build-system)
-    (inputs `(("openssl" ,openssl)))
-    (arguments
-     `(#:phases (alist-cons-before
-                 'configure 'set-ssl-prefix
-                 (lambda* (#:key inputs #:allow-other-keys)
-                   (setenv "OPENSSL_PREFIX" (assoc-ref inputs "openssl")))
-                 %standard-phases)))
-    (synopsis "Perl extension for using OpenSSL")
-    (description
-     "This module offers some high level convenience functions for accessing
-web pages on SSL servers (for symmetry, the same API is offered for accessing
-http servers, too), an sslcat() function for writing your own clients, and
-finally access to the SSL api of the SSLeay/OpenSSL package so you can write
-servers or clients for more complicated applications.")
-    (license (package-license perl))
-    (home-page "http://search.cpan.org/~mikem/Net-SSLeay-1.66/")))
-
-

M gnu/packages/package-management.scm => gnu/packages/package-management.scm +0 -1

@@ 39,7 39,6 @@
   #:use-module (gnu packages web)
   #:use-module (gnu packages man)
   #:use-module (gnu packages emacs)
-  #:use-module (gnu packages openssl)
   #:use-module (gnu packages bdw-gc)
   #:use-module (gnu packages tls))

M gnu/packages/pdf.scm => gnu/packages/pdf.scm +1 -1

@@ 36,7 36,6 @@
   #:use-module (gnu packages lesstif)
   #:use-module (gnu packages image)
   #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages openssl)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages glib)


@@ 45,6 44,7 @@
   #:use-module (gnu packages curl)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages perl)
+  #:use-module (gnu packages tls)
   #:use-module (srfi srfi-1))
 
 (define-public poppler

M gnu/packages/python.scm => gnu/packages/python.scm +1 -1

@@ 47,12 47,12 @@
   #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages networking)
   #:use-module (gnu packages ncurses)
-  #:use-module (gnu packages openssl)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages texlive)
   #:use-module (gnu packages texinfo)
+  #:use-module (gnu packages tls)
   #:use-module (gnu packages web)
   #:use-module (gnu packages base)
   #:use-module (gnu packages xml)

M gnu/packages/qt.scm => gnu/packages/qt.scm +1 -1

@@ 42,7 42,6 @@
   #:use-module (gnu packages linux)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages ninja)
-  #:use-module (gnu packages openssl)
   #:use-module (gnu packages pciutils)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages perl)


@@ 50,6 49,7 @@
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
   #:use-module (gnu packages ruby)
+  #:use-module (gnu packages tls)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages xml))

M gnu/packages/rdesktop.scm => gnu/packages/rdesktop.scm +2 -2

@@ 21,8 21,8 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
-  #:use-module (gnu packages xorg)
-  #:use-module (gnu packages openssl))
+  #:use-module (gnu packages tls)
+  #:use-module (gnu packages xorg))
 
 (define-public rdesktop
   (package

M gnu/packages/rdf.scm => gnu/packages/rdf.scm +1 -1

@@ 37,12 37,12 @@
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages multiprecision)
-  #:use-module (gnu packages openssl)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages qt)
+  #:use-module (gnu packages tls)
   #:use-module (gnu packages xml))
 
 (define-public raptor2

M gnu/packages/ruby.scm => gnu/packages/ruby.scm +1 -1

@@ 24,10 24,10 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages readline)
-  #:use-module (gnu packages openssl)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages libffi)
   #:use-module (gnu packages gdbm)
+  #:use-module (gnu packages tls)
   #:use-module (gnu packages version-control)
   #:use-module (guix packages)
   #:use-module (guix download)

M gnu/packages/ssh.scm => gnu/packages/ssh.scm +1 -1

@@ 22,7 22,6 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages groff)
-  #:use-module (gnu packages openssl)
   #:use-module (gnu packages elf)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages pkg-config)


@@ 33,6 32,7 @@
   #:autoload   (gnu packages protobuf) (protobuf)
   #:autoload   (gnu packages boost) (boost)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages tls)
   #:use-module (gnu packages)
   #:use-module (guix packages)
   #:use-module (guix download)

M gnu/packages/synergy.scm => gnu/packages/synergy.scm +1 -1

@@ 23,8 23,8 @@
   #:use-module (guix build-system cmake)
   #:use-module (gnu packages)
   #:use-module (gnu packages curl)
-  #:use-module (gnu packages openssl)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages tls)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages zip)
   #:use-module (srfi srfi-26))

M gnu/packages/tls.scm => gnu/packages/tls.scm +91 -2

@@ 2,7 2,7 @@
 ;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
-;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;


@@ 20,11 20,13 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages tls)
-  #:use-module ((guix licenses) #:select (lgpl2.0+ lgpl2.1+ bsd-3))
+  #:use-module ((guix licenses)
+                #:select (lgpl2.0+ lgpl2.1+ bsd-3 openssl))
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix utils)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system perl)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages)
   #:use-module (gnu packages guile)


@@ 173,3 175,90 @@ and DTLS protocols.  It is provided in the form of a C library to support the
 protocols, as well as to parse and write X.5009, PKCS 12, OpenPGP and other
 required structures.")
     (license lgpl2.1+)))
+
+(define-public openssl
+  (package
+   (name "openssl")
+   (version "1.0.2c")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append "ftp://ftp.openssl.org/source/openssl-" version
+                                ".tar.gz"))
+            (sha256
+             (base32
+              "10vasdg52qiyqvgbp14n9z7ghglmhzvag9qpiz2nfqssycvvlf00"))
+            (patches (list (search-patch "openssl-runpath.patch")))))
+   (build-system gnu-build-system)
+   (native-inputs `(("perl" ,perl)))
+   (arguments
+    '(#:parallel-build? #f
+      #:parallel-tests? #f
+      #:test-target "test"
+      #:phases
+      (alist-replace
+       'configure
+       (lambda* (#:key outputs #:allow-other-keys)
+         (let ((out (assoc-ref outputs "out")))
+           (zero?
+            (system* "./config"
+                     "shared"                   ; build shared libraries
+                     "--libdir=lib"
+                     (string-append "--prefix=" out)))))
+       (alist-cons-before
+        'patch-source-shebangs 'patch-tests
+        (lambda* (#:key inputs native-inputs #:allow-other-keys)
+          (let ((bash (assoc-ref (or native-inputs inputs) "bash")))
+            (substitute* (find-files "test" ".*")
+              (("/bin/sh")
+               (string-append bash "/bin/bash"))
+              (("/bin/rm")
+               "rm"))))
+        %standard-phases))))
+   (native-search-paths
+    ;; FIXME: These two variables must designate a single file or directory
+    ;; and are not actually "search paths."  In practice it works OK in user
+    ;; profiles because there's always just one item that matches the
+    ;; specification.
+    (list (search-path-specification
+           (variable "SSL_CERT_DIR")
+           (files '("etc/ssl/certs")))
+          (search-path-specification
+           (variable "SSL_CERT_FILE")
+           (files '("etc/ssl/certs/ca-certificates.crt")))))
+   (synopsis "SSL/TLS implementation")
+   (description
+    "OpenSSL is an implementation of SSL/TLS")
+   (license openssl)
+   (home-page "http://www.openssl.org/")))
+
+(define-public perl-net-ssleay
+  (package
+    (name "perl-net-ssleay")
+    (version "1.68")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://cpan/authors/id/M/MI/MIKEM/"
+                                  "Net-SSLeay-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1m2wwzhjwsg0drlhp9w12fl6bsgj69v8gdz72jqrqll3qr7f408p"))
+              (patches
+               ;; XXX Try removing this patch for perl-net-ssleay > 1.68
+               (list (search-patch "perl-net-ssleay-disable-ede-test.patch")))))
+    (build-system perl-build-system)
+    (inputs `(("openssl" ,openssl)))
+    (arguments
+     `(#:phases (alist-cons-before
+                 'configure 'set-ssl-prefix
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   (setenv "OPENSSL_PREFIX" (assoc-ref inputs "openssl")))
+                 %standard-phases)))
+    (synopsis "Perl extension for using OpenSSL")
+    (description
+     "This module offers some high level convenience functions for accessing
+web pages on SSL servers (for symmetry, the same API is offered for accessing
+http servers, too), an sslcat() function for writing your own clients, and
+finally access to the SSL api of the SSLeay/OpenSSL package so you can write
+servers or clients for more complicated applications.")
+    (license (package-license perl))
+    (home-page "http://search.cpan.org/~mikem/Net-SSLeay-1.66/")))

M gnu/packages/tor.scm => gnu/packages/tor.scm +1 -1

@@ 24,10 24,10 @@
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages libevent)
   #:use-module (gnu packages compression)
-  #:use-module (gnu packages openssl)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages python)
   #:use-module (gnu packages autotools)
+  #:use-module (gnu packages tls)
   #:use-module (gnu packages w3m))
 
 (define-public tor

M gnu/packages/version-control.scm => gnu/packages/version-control.scm +1 -2

@@ 46,7 46,6 @@
   #:use-module (gnu packages linux)
   #:use-module (gnu packages nano)
   #:use-module (gnu packages ncurses)
-  #:use-module (gnu packages openssl)
   #:use-module (gnu packages ssh)
   #:use-module (gnu packages web)
   #:use-module (gnu packages perl)


@@ 59,7 58,7 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages swig)
   #:use-module (gnu packages tcl)
-;;   #:use-module (gnu packages tls)
+  #:use-module (gnu packages tls)
   #:use-module (gnu packages)
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-1))

M gnu/packages/video.scm => gnu/packages/video.scm +0 -1

@@ 56,7 56,6 @@
   #:use-module (gnu packages mp3)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages ocr)
-  #:use-module (gnu packages openssl)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pulseaudio)

M gnu/packages/vpn.scm => gnu/packages/vpn.scm +0 -1

@@ 28,7 28,6 @@
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages linux)
-  #:use-module (gnu packages openssl)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages tls)

M gnu/packages/w3m.scm => gnu/packages/w3m.scm +1 -1

@@ 22,9 22,9 @@
   #:use-module (gnu packages bdw-gc)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages ncurses)
-  #:use-module (gnu packages openssl)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages tls)
   #:use-module (gnu packages)
   #:use-module (guix packages)
   #:use-module (guix download)

M gnu/packages/web.scm => gnu/packages/web.scm +2 -2

@@ 41,7 41,6 @@
   #:use-module (gnu packages cyrus-sasl)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages mit-krb5)
-  #:use-module (gnu packages openssl)
   #:use-module (gnu packages gd)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages icu4c)


@@ 53,7 52,8 @@
   #:use-module (gnu packages xml)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages perl)
-  #:use-module (gnu packages texinfo))
+  #:use-module (gnu packages texinfo)
+  #:use-module (gnu packages tls))
 
 (define-public httpd
   (package

M gnu/packages/weechat.scm => gnu/packages/weechat.scm +0 -1

@@ 32,7 32,6 @@
   #:use-module (gnu packages aspell)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages guile)
-  #:use-module (gnu packages openssl)
   #:use-module (gnu packages cyrus-sasl)
   #:use-module (gnu packages autogen)
   #:use-module (gnu packages autotools)

M gnu/packages/xiph.scm => gnu/packages/xiph.scm +1 -1

@@ 27,11 27,11 @@
   #:use-module (gnu packages curl)
   #:use-module (gnu packages doxygen)
   #:use-module (gnu packages image)
-  #:use-module (gnu packages openssl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages pulseaudio)
+  #:use-module (gnu packages tls)
   #:use-module (gnu packages xml)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)