diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2017-04-11 08:46:58 +0200 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2017-04-11 08:51:56 +0200 |
| commit | e09b950f5423904562c98e31417683a2b5560ea7 (patch) | |
| tree | c60c69d40defa22a2b1f83d2e8b7111ab3c963a9 /pkgs/tools/networking | |
| parent | 9ae8ce813e7ed78c138e432c2f04995d5f56dd62 (diff) | |
| download | nixlib-e09b950f5423904562c98e31417683a2b5560ea7.tar nixlib-e09b950f5423904562c98e31417683a2b5560ea7.tar.gz nixlib-e09b950f5423904562c98e31417683a2b5560ea7.tar.bz2 nixlib-e09b950f5423904562c98e31417683a2b5560ea7.tar.lz nixlib-e09b950f5423904562c98e31417683a2b5560ea7.tar.xz nixlib-e09b950f5423904562c98e31417683a2b5560ea7.tar.zst nixlib-e09b950f5423904562c98e31417683a2b5560ea7.zip | |
openvpn: remove no longer correct systemd-notify.patch
This patch was only necessary for 2.3.x, while 2.4.0 improved its own systemd notify support. See: https://github.com/NixOS/nixpkgs/issues/24817
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/openvpn/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/openvpn/systemd-notify.patch | 22 |
2 files changed, 0 insertions, 24 deletions
diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index f609c90ad504..a8f3a5a19ae7 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { sha256 = "0zpqnbhjaifdalyxwmvk5kcyd7cpxbcigbn7967nbsyvl54vl8vg"; }; - patches = optional stdenv.isLinux ./systemd-notify.patch; - buildInputs = [ lzo openssl pkgconfig ] ++ optionals stdenv.isLinux [ pam systemd iproute ] ++ optional pkcs11Support pkcs11helper; diff --git a/pkgs/tools/networking/openvpn/systemd-notify.patch b/pkgs/tools/networking/openvpn/systemd-notify.patch deleted file mode 100644 index c0ac8ae89d3c..000000000000 --- a/pkgs/tools/networking/openvpn/systemd-notify.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ru -x '*~' openvpn-2.3.1-orig/src/openvpn/init.c openvpn-2.3.1/src/openvpn/init.c ---- openvpn-2.3.1-orig/src/openvpn/init.c 2013-03-20 09:28:14.000000000 +0100 -+++ openvpn-2.3.1/src/openvpn/init.c 2014-04-22 13:02:21.351026640 +0200 -@@ -48,6 +48,8 @@ - - #include "occ-inline.h" - -+#include <systemd/sd-daemon.h> -+ - static struct context *static_context; /* GLOBAL */ - - /* -@@ -1375,6 +1375,9 @@ - /* Reset the unsuccessful connection counter on complete initialisation */ - c->options.unsuccessful_attempts = 0; - -+ /* Tell systemd we're ready. */ -+ sd_notify(0, "READY=1"); -+ - /* If we delayed UID/GID downgrade or chroot, do it now */ - do_uid_gid_chroot (c, true); - |