mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-30 22:36:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: sslh: Update to 2.1.2.

Browse source 
* gnu/packages/networking.scm (sslh): Update to 2.1.2.
[native-inputs]: Add pcre2.
[inputs]: Remove tcp-wrappers and libcap.  Add libev.
[arguments]<phases>: Patch tests; disable a failing test.
<make-flags>: Disable USELIBCAP as it leads to "permission denied" errors.
Disable USELIBWRAP as it leads to linker errors.  Add USELIBCONFIG.

Change-Id: I20ba6e5ec1af4c7666d2b1f9870c850207e9c2c9
This commit is contained in:
Artyom V. Poptsov 2024-11-17 11:24:31 +03:00
parent 72bbab16f2
commit 0ba2136df7
No known key found for this signature in database
GPG key ID: 935EBE0736DC857E
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gnu/packages/networking.scm
View file

@ -147,6 +147,7 @@ (define-module (gnu packages networking)
#:use-module (gnu packages libidn) #:use-module (gnu packages libidn)
#:use-module (gnu packages libusb) #:use-module (gnu packages libusb)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages logging)
#:use-module (gnu packages lua) #:use-module (gnu packages lua)
#:use-module (gnu packages kerberos) #:use-module (gnu packages kerberos)
#:use-module (gnu packages man) #:use-module (gnu packages man)
@ -2716,7 +2717,7 @@ (define-public enet-moonlight
(define-public sslh (define-public sslh
(package (package
(name "sslh") (name "sslh")
(version "1.21c") (version "2.1.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2725,28 +2726,36 @@ (define-public sslh
(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 "19h32dn0076p3s7dn35qi5yp2xvnxw9sqphppmn72vyb8caxvw1z")))) (base32 "0v4wmwcjqlpiagq2q30v7459ffvxb7i6kvjq1av6ajdd5iib2vpq"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list ;; Test dependencies. (list ;; Test dependencies.
lcov lcov
pcre2
perl perl
perl-conf-libconfig perl-conf-libconfig
perl-io-socket-inet6 perl-io-socket-inet6
perl-socket6 perl-socket6
psmisc)) ; for ‘killall’ psmisc)) ; for ‘killall’
(inputs (inputs
(list libcap libconfig pcre tcp-wrappers)) (list libev libconfig pcre))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) ; no configure script
(add-before 'check 'fix-tests (add-before 'check 'fix-tests
(lambda _ (lambda _
(substitute* "./t" (substitute* "t"
(("\"/tmp") "$ENV{\"TMPDIR\"} . \"") ;; XXX: Disable a failing test.
;; The Guix build environment lacks ‘ip6-localhost’. (("my \\$DROP_CNX = 1;")
(("ip6-localhost") "localhost")) "my $DROP_CNX = 0;")
;; XXX: "sslh-select" seems to not support this option for some
;; reason. According to "sslhconf.cfg" this option just overrides the
;; verbosity configuration so it seems that we can safely drop it.
(("-v 4")
""))
(substitute* "test.cfg"
;; The Guix build environment lacks ‘ip4-localhost’.
(("ip4-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
@ -2761,8 +2770,7 @@ (define-public sslh
(find-files "scripts")))) (find-files "scripts"))))
#t))) #t)))
#:make-flags (list ,(string-append "CC=" (cc-for-target)) #:make-flags (list ,(string-append "CC=" (cc-for-target))
"USELIBCAP=1" "USELIBCONFIG=1"
"USELIBWRAP=1"
(string-append "PREFIX=" (assoc-ref %outputs "out"))) (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:test-target "test")) #:test-target "test"))
(home-page "https://www.rutschle.net/tech/sslh/README.html") (home-page "https://www.rutschle.net/tech/sslh/README.html")