[PATCH] gnu: Add network-manager-openconnect.

  • Done
  • quality assurance status badge
Details
2 participants
  • Efraim Flashner
  • Ricardo Wurmus
Owner
unassigned
Submitted by
Efraim Flashner
Severity
normal
E
E
Efraim Flashner wrote on 7 Aug 2019 19:04
(address . guix-patches@gnu.org)(name . Efraim Flashner)(address . efraim@flashner.co.il)
20190807170450.2996-1-efraim@flashner.co.il
* gnu/packages/gnome.scm (network-manager-openconnect): New variable.
---
gnu/packages/gnome.scm | 51 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)

Toggle diff (64 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 601248b7f5..5c4085751f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5535,6 +5535,57 @@ Compatible with Cisco VPN concentrators configured to use IPsec.")
(license license:gpl2+)
(properties `((upstream-name . "NetworkManager-vpnc")))))
+(define-public network-manager-openconnect
+ (package
+ (name "network-manager-openconnect")
+ (version "1.2.6")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://gnome/sources/NetworkManager-openconnect/"
+ (version-major+minor version)
+ "/NetworkManager-openconnect-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0nlp290nkawc4wqm978n4vhzg3xdqi8kpjjx19l855vab41rh44m"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:configure-flags '("--enable-absolute-paths" "--localstatedir=/var")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'configure 'patch-path
+ (lambda* (#:key inputs outputs #:allow-other-keys #:rest args)
+ (let* ((openconnect (string-append (assoc-ref inputs "openconnect")
+ "/sbin/openconnect"))
+ (modprobe (string-append (assoc-ref inputs "kmod")
+ "/bin/modprobe"))
+ (pretty-ovpn (string-append "\"" openconnect "\"")))
+ (substitute* "src/nm-openconnect-service.c"
+ (("\"/usr/local/sbin/openconnect\"") pretty-ovpn)
+ (("\"/usr/sbin/openconnect\"") pretty-ovpn)
+ (("/sbin/modprobe") modprobe)))
+ #t)))))
+ (native-inputs
+ `(("intltool" ,intltool)
+ ("network-manager-applet" ,network-manager-applet) ;for libnma
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("gcr" ,gcr)
+ ("gtk+" ,gtk+)
+ ("kmod" ,kmod)
+ ("libsecret" ,libsecret)
+ ("libxml2" ,libxml2)
+ ("network-manager" ,network-manager)
+ ("openconnect" ,openconnect)))
+ (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN")
+ (synopsis "OpenConnect plug-in for NetworkManager")
+ (description
+ "This extension of NetworkManager allows it to take care of connections
+to @acronym{VPNs, virtual private networks} via OpenConnect, an open client for
+Cisco's AnyConnect SSL VPN.")
+ (license license:gpl2+)
+ (properties `((upstream-name . "NetworkManager-openconnect")))))
+
(define-public mobile-broadband-provider-info
(package
(name "mobile-broadband-provider-info")
--
2.22.0
R
R
Ricardo Wurmus wrote on 7 Aug 2019 20:37
(name . Efraim Flashner)(address . efraim@flashner.co.il)(address . 36962@debbugs.gnu.org)
877e7oyg80.fsf@elephly.net
Hi Efraim,

Toggle quote (2 lines)
> * gnu/packages/gnome.scm (network-manager-openconnect): New variable.

This looks good to me.

Why is this in gnome.scm and not in, say, networking?

Toggle quote (5 lines)
> + (substitute* "src/nm-openconnect-service.c"
> + (("\"/usr/local/sbin/openconnect\"") pretty-ovpn)
> + (("\"/usr/sbin/openconnect\"") pretty-ovpn)
> + (("/sbin/modprobe") modprobe)))

The indentation looks wrong.

--
Ricardo
E
E
Efraim Flashner wrote on 8 Aug 2019 09:09
(name . Ricardo Wurmus)(address . rekado@elephly.net)(address . 36962-done@debbugs.gnu.org)
20190808070902.GA5507@E2140
On Wed, Aug 07, 2019 at 08:37:19PM +0200, Ricardo Wurmus wrote:
Toggle quote (9 lines)
>
> Hi Efraim,
>
> > * gnu/packages/gnome.scm (network-manager-openconnect): New variable.
>
> This looks good to me.
>
> Why is this in gnome.scm and not in, say, networking?

The other network-manager VPN addons are also in gnome so I stuck it
with the others.

Toggle quote (8 lines)
>
> > + (substitute* "src/nm-openconnect-service.c"
> > + (("\"/usr/local/sbin/openconnect\"") pretty-ovpn)
> > + (("\"/usr/sbin/openconnect\"") pretty-ovpn)
> > + (("/sbin/modprobe") modprobe)))
>
> The indentation looks wrong.

I actually just copied it from one of the other ones, I'll go ahead and
fix it.

Thanks


--
Efraim Flashner <efraim@flashner.co.il> ????? ?????
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAl1Lyo4ACgkQQarn3Mo9
g1GicA//fGITpDrPoPfpmKvWtFAQcLURO+2aNlru91twXR9EVHKNGvCNTRF8gyCN
pyK3EqfWGaJuAv7rmkkK77CsiVobZ8V5aPZufwzdHYuWrUMhxMjUYrRFD06HeuIq
f+BYHJBc8ECTH44MLmTTkRL5sv24PEFaKDmLKsMq+M+LekNEsk7JsS/ID17DhGVJ
sfSCYKhw3OrMhV+a7AZXvIAtYrqe+RStNIOmZVo25T9WtGgBWCor1UkgJydvSMRo
JpLWw2SNYh8Zy6267ARmb/jajdy4CDxX4iFDrYeaB2jZTXCwFs+HODyFlE2UnfHs
OGzl4fZwHcJzUc+rnlelt89/vrdwcVsFoMbOraguuwInC+F7gS3hxWNZqpU6SbTW
QT7JLTh82tkXv1FqXqENFPwbeNpDPXMGZzeojQhysqFMO3rtfwJzOwwyHbJWwhqx
vsVi1kWRyMaISD4hvch6ULTZRtlpQN5s6s3nj8XMkyLlkgAy2pzUDiHoQGJse2gZ
MBc7QgfxSpTJ/soaUtX3Kk0UqtTtGp1BRXIe8l9zsyKoGY9vxwLjS8i9l7CWDJiZ
ChLxlQ2Q7ky00BbjKEv1UGjIKMhO2zUoMOnhSjHLN+rdtm4BRzff+w4mUkHXQvht
D9+wpg2QnjjspEDLtbz4TbVAilbiXgp44TXL3Yc+ihTE//WlZRA=
=L9fz
-----END PGP SIGNATURE-----


Closed
?