[PATCH] gnu: openvpn: Update to 2.6.7.

  • Done
  • quality assurance status badge
Details
3 participants
  • Ludovic Courtès
  • Christopher Baines
  • Sergey Trofimov
Owner
unassigned
Submitted by
Sergey Trofimov
Severity
normal
S
S
Sergey Trofimov wrote on 14 Nov 2023 16:02
(address . guix-patches@gnu.org)(name . Sergey Trofimov)(address . sarg@sarg.org.ru)
07fffc4b346f4c0c63f5e8949ccd94868023efa5.1699973900.git.sarg@sarg.org.ru
* gnu/packages/vpn.scm (openvpn): Update to 2.6.7.
---
gnu/packages/vpn.scm | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)

Toggle diff (37 lines)
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 972f9b0329..77b9924426 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -836,7 +836,7 @@ (define-public openfortivpn
(define-public openvpn
(package
(name "openvpn")
- (version "2.5.8")
+ (version "2.6.7")
(source (origin
(method url-fetch)
(uri (string-append
@@ -844,14 +844,17 @@ (define-public openvpn
version ".tar.gz"))
(sha256
(base32
- "1cixqm4gn2d1v8qkbww75j30fzvxz13gc7whcmz54i0x4fvibwx6"))))
+ "04wr0g97nmv81javym8r99mglmb86v1i49xmnmzf938x1cs7g67f"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--enable-iproute2=yes")))
(native-inputs
- (list iproute))
- (inputs
- (list lz4 lzo openssl linux-pam))
+ (append
+ (if (target-linux?) (list pkg-config) '())
+ (list iproute)))
+ (inputs (append
+ (if (target-linux?) (list libcap-ng) '())
+ (list lz4 lzo openssl linux-pam)))
(home-page "https://openvpn.net/")
(synopsis "Virtual private network daemon")
(description

base-commit: bd0f2173210416e86281c1de8789e7cdab66dd57
--
2.41.0
C
C
Christopher Baines wrote on 23 Nov 2023 15:13
(name . Sergey Trofimov)(address . sarg@sarg.org.ru)
87bkbkv9pq.fsf@cbaines.net
Sergey Trofimov <sarg@sarg.org.ru> writes:

Toggle quote (38 lines)
> * gnu/packages/vpn.scm (openvpn): Update to 2.6.7.
> ---
> gnu/packages/vpn.scm | 13 ++++++++-----
> 1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
> index 972f9b0329..77b9924426 100644
> --- a/gnu/packages/vpn.scm
> +++ b/gnu/packages/vpn.scm
> @@ -836,7 +836,7 @@ (define-public openfortivpn
> (define-public openvpn
> (package
> (name "openvpn")
> - (version "2.5.8")
> + (version "2.6.7")
> (source (origin
> (method url-fetch)
> (uri (string-append
> @@ -844,14 +844,17 @@ (define-public openvpn
> version ".tar.gz"))
> (sha256
> (base32
> - "1cixqm4gn2d1v8qkbww75j30fzvxz13gc7whcmz54i0x4fvibwx6"))))
> + "04wr0g97nmv81javym8r99mglmb86v1i49xmnmzf938x1cs7g67f"))))
> (build-system gnu-build-system)
> (arguments
> '(#:configure-flags '("--enable-iproute2=yes")))
> (native-inputs
> - (list iproute))
> - (inputs
> - (list lz4 lzo openssl linux-pam))
> + (append
> + (if (target-linux?) (list pkg-config) '())
> + (list iproute)))
> + (inputs (append
> + (if (target-linux?) (list libcap-ng) '())
> + (list lz4 lzo openssl linux-pam)))

These changes could do with mentioning in the commit message, since it's
not immediately clear what you're trying to do?
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmVfXhFfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9Xek3w/+PpJcDaYmnB7J9DeKPtTdtGQGlYYk0BQs
1hS4dD3KEY3p0GSAnMnPZPRxRozcfB4u6EQZu+OajutYyQ0TGXGUwTwRoolTl4+J
pcwffQAIhARX0WN8UbE/bKMy2tDoB4LIrZxG4j2Squ5MYeTBwRfR8QURUOg++2xo
2CQQBSn43zm+0mtDYCMMbpV0p1gxJd2zWme0qke78BQK/0q9t/t9qVtGqRLkRBu7
+P7YsMyGq/n+xz4Rj6W9fXNg4TLX1ytc+x7442EtkCJOOlLgJ7lt9qSsgSB3gU3l
VWU24IFVuES7CTYtEhQrhIJr0JNlrB2GYQ0bdbQVP3qbYBSSe7GurSyDCw87cETb
8Ed6mgZmN6nKmyGGxut+WB4L7yyJFXloHxpoIz16L2pBMMyraZ03GsxmL9TI9GJY
BKhKsbfKsefLOPcEUb+MsBf1urLTpaQ9AZtdrrExqOY6yl9pudXjsyo5FT64Xs4f
1RtvIQ7Qg+stlhYev6YVoNA6Q8ONlXNnNIhCrHRWFzQ7rc3NkosTIMhwa2PGcbiJ
FBQbfGrdKSPCXeaErM/BcDSAgmzYX2Xyc/xppryTeV3tybUimkN1BavSjTVemxBu
wMKdJI7NYk7axgT8194b788AbBquC92/hR/aHTTmiyYUUj5aoHx5JUWigD1S/o8m
suYdKySFjMA=
=K8mJ
-----END PGP SIGNATURE-----

L
L
Ludovic Courtès wrote on 2 Dec 2023 11:56
control message for bug #67176
(address . control@debbugs.gnu.org)
87jzpwhnzd.fsf@gnu.org
tags 67176 + moreinfo
quit
S
S
Sergey Trofimov wrote on 2 Dec 2023 14:47
Re: [bug#67176] [PATCH] gnu: openvpn: Update to 2.6.7.
(name . Christopher Baines)(address . mail@cbaines.net)
87h6l0iu8j.fsf@sarg.org.ru
Christopher Baines <mail@cbaines.net> writes:

... omitted
Toggle quote (18 lines)
>> (arguments
>> '(#:configure-flags '("--enable-iproute2=yes")))
>> (native-inputs
>> - (list iproute))
>> - (inputs
>> - (list lz4 lzo openssl linux-pam))
>> + (append
>> + (if (target-linux?) (list pkg-config) '())
>> + (list iproute)))
>> + (inputs (append
>> + (if (target-linux?) (list libcap-ng) '())
>> + (list lz4 lzo openssl linux-pam)))
>
> These changes could do with mentioning in the commit message,
> since it's
> not immediately clear what you're trying to do?
>

Hey, sorry for responding lately. I've just noticed your mail
ended in gmail's spam folder.

So libcap-ng is required only for linux as could be seen here:

Though pkg-config seems to be mandatory. It is present on every
platform, right? Let me fix that.
S
S
Sergey Trofimov wrote on 2 Dec 2023 18:24
[PATCH v1] gnu: openvpn: Update to 2.6.7.
(address . 67176@debbugs.gnu.org)(name . Sergey Trofimov)(address . sarg@sarg.org.ru)
03118c44f274a33c5db2f6f8a02df55bf7440f35.1701537480.git.sarg@sarg.org.ru
* gnu/packages/vpn.scm (openvpn): Update to 2.6.7.
---
gnu/packages/vpn.scm | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)

Toggle diff (34 lines)
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 489a35da42..02c1ee1043 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -838,7 +838,7 @@ (define-public openfortivpn
(define-public openvpn
(package
(name "openvpn")
- (version "2.5.8")
+ (version "2.6.7")
(source (origin
(method url-fetch)
(uri (string-append
@@ -846,14 +846,13 @@ (define-public openvpn
version ".tar.gz"))
(sha256
(base32
- "1cixqm4gn2d1v8qkbww75j30fzvxz13gc7whcmz54i0x4fvibwx6"))))
+ "04wr0g97nmv81javym8r99mglmb86v1i49xmnmzf938x1cs7g67f"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--enable-iproute2=yes")))
- (native-inputs
- (list iproute))
- (inputs
- (list lz4 lzo openssl linux-pam))
+ (native-inputs (list iproute pkg-config))
+ (inputs (append (list lz4 lzo openssl linux-pam)
+ (if (target-linux?) (list libcap-ng) '())))
(home-page "https://openvpn.net/")
(synopsis "Virtual private network daemon")
(description

base-commit: aeb494322ca9dec4a4d66a7d063239c8536bd538
--
2.41.0
L
L
Ludovic Courtès wrote on 7 Jan 16:03 +0100
control message for bug #67176
(address . control@debbugs.gnu.org)
87y1d1b2yp.fsf@gnu.org
close 67176
quit
?