From 0fd3b422cf964157b1d2ea08233676351af1f10a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 4 Oct 2021 00:51:59 +0200 Subject: gnu: wireguard-tools: Update to 1.0.20210914. * gnu/packages/vpn.scm (wireguard-tools): Update to 1.0.20210914. [arguments]: Don't explicitly return #t from phases. Re-indent not to exceed 80 columns. --- gnu/packages/vpn.scm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'gnu/packages/vpn.scm') diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 330a3271b4..6d0d10d60f 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -1016,7 +1016,7 @@ WireGuard was added to Linux 5.6.") (define-public wireguard-tools (package (name "wireguard-tools") - (version "1.0.20210424") + (version "1.0.20210914") (source (origin (method git-fetch) @@ -1025,7 +1025,7 @@ WireGuard was added to Linux 5.6.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "12v0ykaz7phv1gqin35wf6ndgb9819vai17ynjxssq00xwcbsq43")))) + (base32 "1nafrb2naif0z7z3vijnlyp81z89ywzlagc64k4sqa3ayzn95sm0")))) (build-system gnu-build-system) (arguments `(#:make-flags @@ -1043,27 +1043,27 @@ WireGuard was added to Linux 5.6.") #:tests? #f #:phases (modify-phases %standard-phases - ;; No configure script - (delete 'configure) + (delete 'configure) ; no configure script (add-after 'install 'install-contrib-docs (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (copy-recursively "contrib/" - (string-append out "/share/doc/wireguard-tools")) - #t))) + (let ((out (assoc-ref outputs "out")) + (doc "/share/doc/wireguard-tools")) + (copy-recursively "contrib/" doc)))) (add-after 'install 'wrap-wg-quick (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (inputs-sbin (map (lambda (input) - (string-append (assoc-ref inputs input) "/sbin")) - (list "resolvconf" "iproute" "procps" - "iptables"))) - (coreutils (string-append (assoc-ref inputs "coreutils") - "/bin"))) + (string-append (assoc-ref inputs input) + "/sbin")) + (list "iproute" + "iptables" + "procps" + "resolvconf"))) + (coreutils (string-append (assoc-ref inputs "coreutils") + "/bin"))) (wrap-program (string-append out "/bin/wg-quick") `("PATH" ":" prefix ,(append inputs-sbin - (list coreutils)))) - #t)))))) + (list coreutils)))))))))) (inputs `(("resolvconf" ,openresolv) ("coreutils" ,coreutils) -- cgit v1.2.3 From 226221df6fd93c29960b43243cf881c65e3baad5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 4 Oct 2021 21:19:54 +0200 Subject: gnu: wireguard-tools: Fix doc installation. * gnu/packages/vpn.scm (wireguard-tools)[arguments]: Add missing out. --- gnu/packages/vpn.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/vpn.scm') diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 6d0d10d60f..d707d07ce8 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -1046,8 +1046,8 @@ WireGuard was added to Linux 5.6.") (delete 'configure) ; no configure script (add-after 'install 'install-contrib-docs (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc "/share/doc/wireguard-tools")) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/wireguard-tools"))) (copy-recursively "contrib/" doc)))) (add-after 'install 'wrap-wg-quick (lambda* (#:key inputs outputs #:allow-other-keys) -- cgit v1.2.3 From ea5d464247b35e50c16a70845b9e935e18f05b2a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 5 Oct 2021 20:51:50 +0200 Subject: gnu: openvpn: Update to 2.5.4. * gnu/packages/vpn.scm (openvpn): Update to 2.5.4. --- gnu/packages/vpn.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/vpn.scm') diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index d707d07ce8..4624e2be3f 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -721,7 +721,7 @@ this process. It is compatible with Fortinet VPNs.") (define-public openvpn (package (name "openvpn") - (version "2.5.3") + (version "2.5.4") (source (origin (method url-fetch) (uri (string-append @@ -729,7 +729,7 @@ this process. It is compatible with Fortinet VPNs.") version ".tar.xz")) (sha256 (base32 - "0zlski66mw10klmwvg445z051mld7xjng4iyl4f9b883qr1rjspv")))) + "0di4g48kzh5qgm4ri3z6qdjfy23ligmqd7260ynw8f5rgb9drh2n")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-iproute2=yes"))) -- cgit v1.2.3