gnu: stunnel: Update to 5.47.

* gnu/packages/web.scm (stunnel): Update to 5.47.
[native-inputs]: Add iproute, netcat, and procps.
[arguments]: Add ‘patch-output-directories’ and ‘patch-tests’ phases.
This commit is contained in:
Tobias Geerinckx-Rice 2018-06-26 04:09:58 +02:00
parent e049827ea7
commit 8d07936aa6
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79

View file

@ -61,6 +61,7 @@ (define-module (gnu packages web)
#:use-module (guix build-system ant) #:use-module (guix build-system ant)
#:use-module (guix build-system scons) #:use-module (guix build-system scons)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages admin)
#:use-module (gnu packages adns) #:use-module (gnu packages adns)
#:use-module (gnu packages apr) #:use-module (gnu packages apr)
#:use-module (gnu packages check) #:use-module (gnu packages check)
@ -93,6 +94,7 @@ (define-module (gnu packages web)
#:use-module (gnu packages libevent) #:use-module (gnu packages libevent)
#:use-module (gnu packages libidn) #:use-module (gnu packages libidn)
#:use-module (gnu packages libunistring) #:use-module (gnu packages libunistring)
#:use-module (gnu packages linux)
#:use-module (gnu packages lisp) #:use-module (gnu packages lisp)
#:use-module (gnu packages lua) #:use-module (gnu packages lua)
#:use-module (gnu packages markup) #:use-module (gnu packages markup)
@ -4923,7 +4925,7 @@ (define-public httptunnel
(define-public stunnel (define-public stunnel
(package (package
(name "stunnel") (name "stunnel")
(version "5.46") (version "5.47")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -4931,12 +4933,34 @@ (define-public stunnel
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1iw4gap9ysag8iww2ik029scmdllk7jdzcpnnbj7hgbl526b9akn")))) "02qx0b0dd38rfcl9vfd6zq1pcg5gv0z2mxw5z3p2pfbfk7dpbrn4"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs
;; For tests.
`(("iproute" ,iproute)
("netcat" ,netcat)
("procps" ,procps)))
(inputs `(("openssl" ,openssl))) (inputs `(("openssl" ,openssl)))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list (string-append "--with-ssl=" (assoc-ref %build-inputs "openssl"))))) (list (string-append "--with-ssl=" (assoc-ref %build-inputs "openssl")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-output-directories
(lambda _
;; Some (not all) Makefiles have a hard-coded incorrect docdir.
(substitute* (list "Makefile.in"
"doc/Makefile.in"
"tools/Makefile.in")
(("/doc/stunnel")
(string-append "/doc/" ,name "-" ,version)))
#t))
(add-before 'check 'patch-tests
(lambda _
(substitute* "tests/make_test"
(("/bin/sh ")
(string-append (which "sh") " ")))
#t)))))
(home-page "https://www.stunnel.org") (home-page "https://www.stunnel.org")
(synopsis "TLS proxy for clients or servers") (synopsis "TLS proxy for clients or servers")
(description "Stunnel is a proxy designed to add TLS encryption (description "Stunnel is a proxy designed to add TLS encryption