nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: sslh: Update to 1.20. 

* gnu/packages/networking.scm (sslh): Update to 1.20.
[native-inputs]: Add perl-conf-libconfig. Remove valgrind.
[arguments]: Re-indent.
This commit is contained in:
Tobias Geerinckx-Rice 2019-03-14 16:26:10 +01:00
parent 98580bd93a
commit 2fe29c8490
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
gnu/packages/networking.scm
View File

@ -1226,7 +1226,7 @@ library remains flexible, portable, and easily embeddable.")
(define-public sslh (define-public sslh
(package (package
(name "sslh") (name "sslh")
(version "1.19c") (version "1.20")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1235,16 +1235,16 @@ library remains flexible, portable, and easily embeddable.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "14x3n25n9md0sw8cda9m5bd8r96xpw1vdkapklw4mxgfcz1k2kxq")))) (base32 "18zhkqlwfh6f5dg1a41a4p7p9g94dgb9nwls1ksy9r5yz174i2fx"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(;; Test dependencies. `(;; Test dependencies.
("lcov" ,lcov) ("lcov" ,lcov)
("perl" ,perl) ("perl" ,perl)
("perl-conf-libconfig" ,perl-conf-libconfig)
("perl-io-socket-inet6" ,perl-io-socket-inet6) ("perl-io-socket-inet6" ,perl-io-socket-inet6)
("perl-socket6" ,perl-socket6) ("perl-socket6" ,perl-socket6)
("psmisc" ,psmisc) ("psmisc" ,psmisc))) ; for ‘killall’
("valgrind" ,valgrind)))
(inputs (inputs
`(("libcap" ,libcap) `(("libcap" ,libcap)
("libconfig" ,libconfig) ("libconfig" ,libconfig)
@ -1255,24 +1255,24 @@ library remains flexible, portable, and easily embeddable.")
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) ; no configure script (delete 'configure) ; no configure script
(add-before 'check 'fix-tests (add-before 'check 'fix-tests
(lambda _ (lambda _
(substitute* "./t" (substitute* "./t"
(("\"/tmp") "$ENV{\"TMPDIR\"} . \"") (("\"/tmp") "$ENV{\"TMPDIR\"} . \"")
;; The Guix build environment lacks ‘ip6-localhost’. ;; The Guix build environment lacks ‘ip6-localhost’.
(("ip6-localhost") "localhost")) (("ip6-localhost") "localhost"))
#t)) #t))
;; Many of these files are mentioned in the man page. Install them. ;; Many of these files are mentioned in the man page. Install them.
(add-after 'install 'install-documentation (add-after 'install 'install-documentation
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(doc (string-append out "/share/doc/sslh"))) (doc (string-append out "/share/doc/sslh")))
(install-file "README.md" doc) (install-file "README.md" doc)
(for-each (for-each
(lambda (file) (lambda (file)
(install-file file (string-append doc "/examples"))) (install-file file (string-append doc "/examples")))
(append (find-files "." "\\.cfg") (append (find-files "." "\\.cfg")
(find-files "scripts")))) (find-files "scripts"))))
#t))) #t)))
#:make-flags (list "CC=gcc" #:make-flags (list "CC=gcc"
"USELIBCAP=1" "USELIBCAP=1"
"USELIBWRAP=1" "USELIBWRAP=1"