ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 05:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Move content of openssl module into tls module.

Browse source 
* gnu/packages/openssl.scm (openssl, perl-net-ssleay): Move to...
* gnu/packages/tls.scm: ...here.
* gnu/packages/openssl.scm: Delete file.
* gnu-system.am (GNU_SYSTEM_MODULES): Unregister deleted file.
* gnu/packages/{admin.scm, bittorrent.scm, certs.scm, ci.scm,
  cyrus-sasl.scm, databases.scm, dns.scm, ebook.scm, enlightenment.scm,
  gnunet.scm, libreoffice.scm, links.scm, mail.scm, messaging.scm,
  networking.scm, ntp.scm, openldap.scm, package-management.scm, pdf.scm,
  python.scm, qt.scm, rdesktop.scm, rdf.scm, ruby.scm, ssh.scm,
  synergy.scm, tor.scm, version-control.scm, video.scm, vpn.scm,
  w3m.scm, web.scm, weechat.scm, xiph.scm}: Adapt module import.
This commit is contained in:
Andreas Enge 2015-07-05 18:27:24 +02:00
parent a7fd7b68a6
commit cc2b77dfc7
37 changed files with 122 additions and 160 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu-system.am
View file

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

5
gnu/packages/admin.scm
View file

@ -40,7 +40,6 @@ (define-module (gnu packages admin)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages tcl) #:use-module (gnu packages tcl)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module ((gnu packages openssl) #:prefix o:)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
@ -501,7 +500,7 @@ (define-public tcpdump
"15hb7zkzd66nag102qbv100hcnf7frglbkylmr8adwr8f5jkkaql")))) "15hb7zkzd66nag102qbv100hcnf7frglbkylmr8adwr8f5jkkaql"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("libpcap" ,libpcap) (inputs `(("libpcap" ,libpcap)
("openssl" ,o:openssl))) ("openssl" ,openssl)))
(native-inputs `(("perl" ,perl))) ; for tests (native-inputs `(("perl" ,perl))) ; for tests
(home-page "http://www.tcpdump.org/") (home-page "http://www.tcpdump.org/")
(synopsis "Network packet analyzer") (synopsis "Network packet analyzer")
@ -975,7 +974,7 @@ (define-public testdisk
(inputs (inputs
`(;; ("ntfs" ,ntfs) `(;; ("ntfs" ,ntfs)
("util-linux" ,util-linux) ("util-linux" ,util-linux)
("openssl" ,o:openssl) ("openssl" ,openssl)
("zlib" ,zlib) ("zlib" ,zlib)
("e2fsprogs" ,e2fsprogs) ("e2fsprogs" ,e2fsprogs)
("libjpeg" ,libjpeg) ("libjpeg" ,libjpeg)

4
gnu/packages/bittorrent.scm
View file

@ -23,7 +23,6 @@ (define-module (gnu packages bittorrent)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system glib-or-gtk)
#:use-module ((guix licenses) #:prefix l:) #:use-module ((guix licenses) #:prefix l:)
#:use-module (gnu packages openssl)
#:use-module (gnu packages libevent) #:use-module (gnu packages libevent)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
@ -36,7 +35,8 @@ (define-module (gnu packages bittorrent)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages curl) #: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 (define-public transmission
(package (package

4
gnu/packages/certs.scm
View file

@ -25,8 +25,8 @@ (define-module (gnu packages certs)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages gnuzilla) #: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 (define certdata2pem
(package (package

2
gnu/packages/ci.scm
View file

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

2
gnu/packages/cyrus-sasl.scm
View file

@ -21,7 +21,7 @@ (define-module (gnu packages cyrus-sasl)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages gdbm) #:use-module (gnu packages gdbm)
#:use-module (gnu packages mit-krb5) #: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 licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)

2
gnu/packages/databases.scm
View file

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

1
gnu/packages/dns.scm
View file

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

2
gnu/packages/ebook.scm
View file

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

2
gnu/packages/enlightenment.scm
View file

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

1
gnu/packages/gnunet.scm
View file

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

2
gnu/packages/libreoffice.scm
View file

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

2
gnu/packages/links.scm
View file

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

1
gnu/packages/mail.scm
View file

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

1
gnu/packages/messaging.scm
View file

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

2
gnu/packages/networking.scm
View file

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

2
gnu/packages/ntp.scm
View file

@ -23,7 +23,7 @@ (define-module (gnu packages ntp)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages pkg-config) #: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 licenses) #:prefix l:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils) #:use-module (guix utils)

2
gnu/packages/openldap.scm
View file

@ -25,7 +25,7 @@ (define-module (gnu packages openldap)
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
#:use-module (gnu packages groff) #:use-module (gnu packages groff)
#:use-module (gnu packages icu4c) #: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 licenses) #:select (openldap2.8))
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)

116
gnu/packages/openssl.scm
View file

@ -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/")))

1
gnu/packages/package-management.scm
View file

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

2
gnu/packages/pdf.scm
View file

@ -36,7 +36,6 @@ (define-module (gnu packages pdf)
#:use-module (gnu packages lesstif) #:use-module (gnu packages lesstif)
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages openssl)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
@ -45,6 +44,7 @@ (define-module (gnu packages pdf)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages pcre) #:use-module (gnu packages pcre)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages tls)
#:use-module (srfi srfi-1)) #:use-module (srfi srfi-1))
(define-public poppler (define-public poppler

2
gnu/packages/python.scm
View file

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

2
gnu/packages/qt.scm
View file

@ -42,7 +42,6 @@ (define-module (gnu packages qt)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (gnu packages ninja) #:use-module (gnu packages ninja)
#:use-module (gnu packages openssl)
#:use-module (gnu packages pciutils) #:use-module (gnu packages pciutils)
#:use-module (gnu packages pcre) #:use-module (gnu packages pcre)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
@ -50,6 +49,7 @@ (define-module (gnu packages qt)
#:use-module (gnu packages pulseaudio) #:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages ruby) #:use-module (gnu packages ruby)
#:use-module (gnu packages tls)
#:use-module (gnu packages xdisorg) #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (gnu packages xml)) #:use-module (gnu packages xml))

4
gnu/packages/rdesktop.scm
View file

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

2
gnu/packages/rdf.scm
View file

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

2
gnu/packages/ruby.scm
View file

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

2
gnu/packages/ssh.scm
View file

@ -22,7 +22,6 @@ (define-module (gnu packages ssh)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
#:use-module (gnu packages groff) #:use-module (gnu packages groff)
#:use-module (gnu packages openssl)
#:use-module (gnu packages elf) #:use-module (gnu packages elf)
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
@ -33,6 +32,7 @@ (define-module (gnu packages ssh)
#:autoload (gnu packages protobuf) (protobuf) #:autoload (gnu packages protobuf) (protobuf)
#:autoload (gnu packages boost) (boost) #:autoload (gnu packages boost) (boost)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages tls)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)

2
gnu/packages/synergy.scm
View file

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

93
gnu/packages/tls.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; 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. ;;; This file is part of GNU Guix.
;;; ;;;
@ -20,11 +20,13 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages tls) (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 packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system perl)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
@ -173,3 +175,90 @@ (define-public gnutls
protocols, as well as to parse and write X.5009, PKCS 12, OpenPGP and other protocols, as well as to parse and write X.5009, PKCS 12, OpenPGP and other
required structures.") required structures.")
(license lgpl2.1+))) (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/")))

2
gnu/packages/tor.scm
View file

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

3
gnu/packages/version-control.scm
View file

@ -46,7 +46,6 @@ (define-module (gnu packages version-control)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages nano) #:use-module (gnu packages nano)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages openssl)
#:use-module (gnu packages ssh) #:use-module (gnu packages ssh)
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
@ -59,7 +58,7 @@ (define-module (gnu packages version-control)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages swig) #:use-module (gnu packages swig)
#:use-module (gnu packages tcl) #:use-module (gnu packages tcl)
;; #:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (srfi srfi-1)) #:use-module (srfi srfi-1))

1
gnu/packages/video.scm
View file

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

1
gnu/packages/vpn.scm
View file

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

2
gnu/packages/w3m.scm
View file

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

4
gnu/packages/web.scm
View file

@ -41,7 +41,6 @@ (define-module (gnu packages web)
#:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages cyrus-sasl)
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (gnu packages mit-krb5) #:use-module (gnu packages mit-krb5)
#:use-module (gnu packages openssl)
#:use-module (gnu packages gd) #:use-module (gnu packages gd)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages icu4c) #:use-module (gnu packages icu4c)
@ -53,7 +52,8 @@ (define-module (gnu packages web)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages texinfo)) #:use-module (gnu packages texinfo)
#:use-module (gnu packages tls))
(define-public httpd (define-public httpd
(package (package

1
gnu/packages/weechat.scm
View file

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

2
gnu/packages/xiph.scm
View file

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