;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013, 2016, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015 Jeff Mickey <j@codemac.net>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2018 Pierre Langlois <pierre.langlois@gmx.com>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

(define-module (gnu packages vpn)
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (guix packages)
  #:use-module (guix download)
  #:use-module (guix git-download)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system python)
  #:use-module (gnu packages)
  #:use-module (gnu packages base)
  #:use-module (gnu packages check)
  #:use-module (gnu packages autotools)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages gettext)
  #:use-module (gnu packages gnupg)
  #:use-module (gnu packages libevent)
  #:use-module (gnu packages linux)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages python)
  #:use-module (gnu packages tls)
  #:use-module (gnu packages xml))

(define-public gvpe
  (package
    (name "gvpe")
    (version "3.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/gvpe/gvpe-"
                                  version ".tar.gz"))
              (sha256
               (base32
                "1v61mj25iyd91z0ir7cmradkkcm1ffbk52c96v293ibsvjs2s2hf"))
              (modules '((guix build utils)))
              (snippet
               '(begin
                  ;; Remove the outdated bundled copy of glibc's getopt, which
 <tr class='logheader'><td><span title='2019-04-05 15:39:35 +0200'>2019-04-05</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=b68f65007f50175a68cd174ad7c1036cf622556d'>services: dbus: Add 'wrapped-dbus-service'.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/services/desktop.scm (wrapped-dbus-service): Move to...
* gnu/services/dbus.scm (wrapped-dbus-service): ... here.  New
procedure.


</td></tr>
<tr class='logheader'><td><span title='2019-04-05 14:06:03 +0200'>2019-04-05</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=208946e1f3ac76bf64ce625e059614c87f9cee4c'>gnu: emacs-cider: Update to 0.21.0.</a></td><td>Jelle Licht</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/emacs-xyz.scm (emacs-cider): Update to 0.21.0.


</td></tr>
<tr class='logheader'><td><span title='2019-04-05 09:50:12 +0300'>2019-04-05</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=4354569dd8af5ebd8c7d62babde366366b0c479d'>gnu: subversion: Update to 1.10.4 (fixes CVE-2018-11803).</a></td><td>Efraim Flashner</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/version-control.scm (subversion): Update to 1.10.4.


</td></tr>
<tr class='logheader'><td><span title='2019-04-05 09:50:07 +0300'>2019-04-05</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=2beca2a55c76ed56bcc6b718bd807126e904dee1'>gnu: flac: Fix CVE-2017-6888.</a></td><td>Efraim Flashner</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/xiph.scm (flac)[replacement]: New field.
(flac/fixed): New variable.
* gnu/packages/patches/flac-CVE-2017-6888.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.


</td></tr>
<tr class='logheader'><td><span title='2019-04-05 01:05:50 -0400'>2019-04-05</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=6e5ecbfbae4121d9865d5b503f6f29111c15156c'>gnu: linux-libre: Update to 5.0.6.</a></td><td>Mark H Weaver</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/linux.scm (%linux-libre-version): Update to 5.0.6.
(%linux-libre-hash): Update hash.


</td></tr>
<tr class='logheader'><td><span title='2019-04-05 01:04:46 -0400'>2019-04-05</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=68bf7997ebdf69f949487ccfd1582cbd83635f39'>gnu: linux-libre@4.19: Update to 4.19.33.</a></td><td>Mark H Weaver</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/linux.scm (%linux-libre-4.19-version): Update to 4.19.33.
(%linux-libre-4.19-hash): Update hash.


</td></tr>
<tr class='logheader'><td><span title='2019-04-05 01:02:49 -0400'>2019-04-05</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=aba41c05d960e0187fae0cc03741a0a17db5b85d'>gnu: linux-libre@4.14: Update to 4.14.110.</a></td><td>Mark H Weaver</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.110.
(%linux-libre-4.14-hash): Update hash.


</td></tr>
<tr class='logheader'><td><span title='2019-04-05 01:01:55 -0400'>2019-04-05</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=e22c31d37611a8d13e7e857e0fd36f8ad9fc01b4'>gnu: linux-libre@4.9: Update to 4.9.167.</a></td><td>Mark H Weaver</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.167.


</td></tr>
<tr class='logheader'><td><span title='2019-04-05 01:00:28 -0400'>2019-04-05</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=21c6c52bc6125e77ea503d6d96a60edccad37726'>gnu: linux-libre@4.4: Update to 4.4.178.</a></td><td>Mark H Weaver</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.178.


</td></tr>
<tr class='logheader'><td><span title='2019-04-05 06:25:24 +0200'>2019-04-05</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=17499793b180f29e4040efc96ce06cdc2653c42e'>gnu: flashrom: Update to 1.0.1.</a></td><td>Tobias Geerinckx-Rice</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/flashing-tools.scm (flashrom): Update to 1.0.1.
[arguments]: Remove CFLAGS work-around.


</td></tr>
<tr class='logheader'><td><span title='2019-04-05 06:25:24 +0200'>2019-04-05</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=06effaf6a123f06ee1f4322214acf9c2bd7d67ac'>gnu: entr: Update to 4.2.</a></td><td>Tobias Geerinckx-Rice</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/entr.scm (entr): Update to 4.2.


</td></tr>
<tr class='logheader'><td><span title='2019-04-05 06:25:24 +0200'>2019-04-05</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=9859800f5df8827ad7dba6acf32888fa5dc41442'>gnu: ledger: Update to 3.1.3.</a></td><td>Tobias Geerinckx-Rice</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
The patch applies but has been unnecessary since 3.1.2.

* gnu/packages/finance.scm (ledger): Update to 3.1.3.
[source]: Remove obsolete patch.
* gnu/packages/patches/ledger-fix-uninitialized.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.


</td></tr>
<tr class='logheader'><td><span title='2019-04-04 21:46:45 +0200'>2019-04-04</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=54c9d7bb69847c89a7193347f858bb4e9476f7df'>gnu: emacs-matrix-client: Add missing require.</a></td><td>Nicolas Goaziou</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/emacs-xyz.scm (emacs-matrix-client): Add a missing require to
  prevent a runtime error.


</td></tr>
<tr class='logheader'><td><span title='2019-04-04 21:39:01 +0200'>2019-04-04</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=a779689714173877916c1c4a732f8db2c0045ff8'>gnu: php: Update to 7.3.4.</a></td><td>Julien Lepiller</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/php.scm (php): Update to 7.3.4.


</td></tr>
<tr class='logheader'><td><span title='2019-04-04 14:58:31 -0400'>2019-04-04</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=9fa29103b5c2cba84f5d691bc218c2495e6d61bb'>gnu: certbot, python-acme: Update to 0.33.0.</a></td><td>Leo Famulari</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/tls.scm (certbot, python-acme): Update to 0.33.0.


</td></tr>
<tr class='logheader'><td><span title='2019-04-04 14:58:28 -0400'>2019-04-04</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=60e1668076bb7c4b98adc901be8da47ef73f3d71'>gnu: MPD: Update to 0.21.7.</a></td><td>Leo Famulari</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/mpd.scm (mpd): Update to 0.21.7.


</td></tr>
<tr class='logheader'><td><span title='2019-04-04 20:16:40 +0200'>2019-04-04</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=325a2e35dcccb37498fed1c211aa4120103056ba'>gnu: asymptote: Fix direntry in info file.</a></td><td>Nicolas Goaziou</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/plotutils.scm (asymptote): Fix direntry in info file.


</td></tr>
<tr class='logheader'><td><span title='2019-04-04 19:53:57 +0200'>2019-04-04</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=d320f25e0c37dc1f1e63a3772852d1af80c7653b'>gnu: Update copyright line.</a></td><td>Nicolas Goaziou</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/plotutils.scm: Update copyright line.


</td></tr>
<tr class='logheader'><td><span title='2019-04-04 19:50:57 +0200'>2019-04-04</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=55a604db4ee55ae25166df6f83e222c3caf33273'>gnu: asymptote: Fix info file location.</a></td><td>Nicolas Goaziou</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/plotutils.scm (asymptote): Fix info file location so it appears
  in the top-level directory.


</td></tr>
<tr class='logheader'><td><span title='2019-04-04 17:47:02 +0200'>2019-04-04</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=c1ef50ac79ff56bebe81a173a858d83a1bee6a36'>gexp: Remove workarounds for &lt;https://bugs.gnu.org/15602&gt;.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/services/base.scm (hydra-key-authorization)[aaa]: Remove.
[default-acl]: Don't import it.
* guix/scripts/pack.scm (store-database)[build]: Don't import
(gnu build install).


</td></tr>
<tr class='logheader'><td><span title='2019-04-04 17:47:02 +0200'>2019-04-04</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=aff0cce9175aaf836dd78941eb17549e3bfa7188'>gnu: Move nss &amp; co. to nss.scm.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/gnuzilla.scm (nspr, nss): Move to...
* gnu/packages/nss.scm: ... here.  New file.
* gnu/packages/chromium.scm, gnu/packages/disk.scm,
gnu/packages/freedesktop.scm, gnu/packages/gnome.scm,
gnu/packages/gnunet.scm, gnu/packages/java.scm,
gnu/packages/libreoffice.scm, gnu/packages/linux.scm,
gnu/packages/mate.scm, gnu/packages/openldap.scm,
gnu/packages/package-management.scm, gnu/packages/password-utils.scm,
gnu/packages/polkit.scm, gnu/packages/qt.scm,
gnu/packages/sssd.scm, gnu/packages/storage.scm,
gnu/packages/vpn.scm, gnu/packages/web.scm, gnu/packages/xml.scm: Adjust
accordingly.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add nss.scm.


</td></tr>
<tr class='logheader'><td><span title='2019-04-04 17:47:02 +0200'>2019-04-04</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=b48a7e4ea50d11148c88025f630dcfa01353b2de'>gnu: Mov ghc-sdl2 &amp; co. to haskell-apps.scm.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/sdl.scm (ghc-sdl2, ghc-sdl2-mixer, ghc-sdl2-image): Move to...
* gnu/packages/haskell-apps.scm: ... here.


</td></tr>
<tr class='logheader'><td><span title='2019-04-04 17:47:02 +0200'>2019-04-04</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=bfccae4e713f1a45884c09e728b90ba62138a7f1'>gnu: raincat: Move to haskell-apps.scm.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/games.scm (raincat): Move to...
* gnu/packages/haskell-apps.scm (raincat): ... here.


</td></tr>
<tr class='logheader'><td><span title='2019-04-04 17:47:01 +0200'>2019-04-04</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=c44667ccae7581cb2a18a8f25d8e867bd352194d'>gnu: ghc-tls: Move to haskell-crypto.scm.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/tls.scm (ghc-tls): Move to...
* gnu/packages/haskell-crypto.scm (ghc-tls): ... here.
* gnu/packages/haskell-web.scm: Remove now unneeded import.


</td></tr>
<tr class='logheader'><td><span title='2019-04-04 17:47:01 +0200'>2019-04-04</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=aea505a928d1274bc2186ce3c95f707b9c982757'>gnu: Move ghc-hxt &amp; co. to haskell-web.scm.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/xml.scm (ghc-hxt-charproperties, ghc-hxt-unicode)
(ghc-hxt-regex-xmlschema, ghc-hxt): Move to...
* gnu/packages/haskell-web.scm: ... here.


</td></tr>
<tr class='logheader'><td><span title='2019-04-04 17:47:01 +0200'>2019-04-04</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=c786dff09933e898254eff9ee17d6ce345dba327'>gnu: java-jgit: Move to java.scm.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/version-control.scm (java-jgit, java-jgit-4.2): Move to...
* gnu/packages/java.scm (java-jgit, java-jgit-4.2): ... here.


</td></tr>
<tr class='logheader'><td><span title='2019-04-04 17:47:01 +0200'>2019-04-04</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=804744b338455b0ab8775351f757427047314139'>gnu: Add (gnu packages haskell-apps).</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/version-control.scm (darcs, git-annex): Move to...
* gnu/packages/haskell-apps.scm: ... here.  New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.


</td></tr>
<tr class='logheader'><td><span title='2019-04-04 17:47:01 +0200'>2019-04-04</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=a7ad4505b7a09f32e2727a333e11716739efb713'>build: Always ship the (gnu installer …) modules.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Fixes &lt;https://bugs.gnu.org/35138&gt;.
Reported by Jonathan Brielmaier &lt;jonathan.brielmaier@web.de&gt;.

* gnu/local.mk (INSTALLER_MODULES): New variable.
(GNU_SYSTEM_MODULES, MODULES_NOT_COMPILED): Append $(INSTALLER_MODULES)
conditionally.


</td></tr>
<tr class='logheader'><td><span title='2019-04-04 14:42:47 +0200'>2019-04-04</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=660e00507e308cdfe0bab681d95dc2cc07000b80'>gnu: Add meritous.</a></td><td>Nicolas Goaziou</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/packages/games.scm (meritous): New variable.


</td></tr>
<tr class='logheader'><td><span title='2019-04-04 14:31:44 +0200'>2019-04-04</span></td><td class='logsubject'><a href='/guix/commit/gnu?id=d7a86128274220481b2a248488246376a5c893ac'>gnu: httpd: Update to 2.4.39 [security fixes].</a></td><td>Marius Bakke</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
This release fixes CVE-2019-0196,