public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openvpn: 2.3.13 -> 2.4.0

Browse Source
This commit is contained in:
Michael Raskin 2017-01-02 15:38:46 +01:00
parent 6151982f58
commit 277e7119be
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/networking/openvpn/default.nix
View File

@ -7,11 +7,12 @@ assert pkcs11Support -> (pkcs11helper != null);
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "openvpn-2.3.12"; name = "openvpn-${version}";
version = "2.4.0";
src = fetchurl { src = fetchurl {
url = "http://swupdate.openvpn.net/community/releases/${name}.tar.gz"; url = "http://swupdate.openvpn.net/community/releases/${name}.tar.xz";
sha256 = "1zqwq19xg6yf90nv35yr8r0ljas5f42v4n9hjjmhlnzpan69plzm"; sha256 = "0zpqnbhjaifdalyxwmvk5kcyd7cpxbcigbn7967nbsyvl54vl8vg";
}; };
patches = optional stdenv.isLinux ./systemd-notify.patch; patches = optional stdenv.isLinux ./systemd-notify.patch;
@ -39,8 +40,10 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A robust and highly flexible tunneling application"; description = "A robust and highly flexible tunneling application";
homepage = http://openvpn.net/; homepage = http://openvpn.net/;
downloadPage = "https://openvpn.net/index.php/open-source/downloads.html";
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.viric ]; maintainers = [ stdenv.lib.maintainers.viric ];
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
updateWalker = true;
}; };
} }

14
pkgs/tools/networking/openvpn/systemd-notify.patch
View File

@ -10,13 +10,13 @@ diff -ru -x '*~' openvpn-2.3.1-orig/src/openvpn/init.c openvpn-2.3.1/src/openvpn
static struct context *static_context; /* GLOBAL */ static struct context *static_context; /* GLOBAL */
/* /*
@@ -1241,6 +1243,9 @@ @@ -1375,6 +1375,9 @@
{ /* Reset the unsuccessful connection counter on complete initialisation */
static const char message[] = "Initialization Sequence Completed"; c->options.unsuccessful_attempts = 0;
+ /* Tell systemd we're ready. */ + /* Tell systemd we're ready. */
+ sd_notify(0, "READY=1"); + sd_notify(0, "READY=1");
+ +
/* If we delayed UID/GID downgrade or chroot, do it now */ /* If we delayed UID/GID downgrade or chroot, do it now */
do_uid_gid_chroot (c, true); do_uid_gid_chroot (c, true);