···

       
56
       
56
       
 
       


     

       
57
       
57
       
 
       
      serviceConfig.ExecStart = "@${openvpn}/sbin/openvpn openvpn --config ${configFile}";

     

       
58
       
58
       
 
       
      serviceConfig.Restart = "always";

     

       
59
       
59
       
+
       
      serviceConfig.Type = "notify";

     

       
59
       
60
       
 
       
    };

     

       
60
       
61
       
 
       


     

       
61
       
62
       
 
       
in

     

···

       
1
       
1
       
-
       
{ stdenv, fetchurl, iproute, lzo, openssl, pam }:

     

       
1
       
1
       
+
       
{ stdenv, fetchurl, iproute, lzo, openssl, pam, systemd }:

     

       
2
       
2
       
+
       


     

       
3
       
3
       
+
       
with stdenv.lib;

     

       
2
       
4
       
 
       


     

       
3
       
5
       
 
       
stdenv.mkDerivation rec {

     

       
4
       
6
       
 
       
  name = "openvpn-2.3.3";

     
···

       
8
       
10
       
 
       
    sha256 = "04xiwim56sb1vis93k9hhm1s29jdrlq7i2fa07jncnhh653d29gh";

     

       
9
       
11
       
 
       
  };

     

       
10
       
12
       
 
       


     

       
11
       
11
       
-
       
  buildInputs = [ iproute lzo openssl pam ];

     

       
13
       
13
       
+
       
  patches = optional stdenv.isLinux ./systemd-notify.patch;

     

       
14
       
14
       
+
       


     

       
15
       
15
       
+
       
  buildInputs = [ iproute lzo openssl pam ] ++ optional stdenv.isLinux systemd;

     

       
12
       
16
       
 
       


     

       
13
       
17
       
 
       
  configureFlags = ''

     

       
14
       
18
       
 
       
    --enable-password-save

     
···

       
30
       
34
       
 
       
  '';

     

       
31
       
35
       
 
       


     

       
32
       
36
       
 
       
  enableParallelBuilding = true;

     

       
37
       
37
       
+
       


     

       
38
       
38
       
+
       
  NIX_LDFLAGS = optionalString stdenv.isLinux "-lsystemd-daemon"; # hacky

     

       
33
       
39
       
 
       


     

       
34
       
40
       
 
       
  meta = {

     

       
35
       
41
       
 
       
    description = "A robust and highly flexible tunneling application";

     

···

       
1
       
1
       
+
       
diff -ru -x '*~' openvpn-2.3.1-orig/src/openvpn/init.c openvpn-2.3.1/src/openvpn/init.c

     

       
2
       
2
       
+
       
--- openvpn-2.3.1-orig/src/openvpn/init.c	2013-03-20 09:28:14.000000000 +0100

     

       
3
       
3
       
+
       
+++ openvpn-2.3.1/src/openvpn/init.c	2014-04-22 13:02:21.351026640 +0200

     

       
4
       
4
       
+
       
@@ -48,6 +48,8 @@

     

       
5
       
5
       
+
       
 

     

       
6
       
6
       
+
       
 #include "occ-inline.h"

     

       
7
       
7
       
+
       
 

     

       
8
       
8
       
+
       
+#include <systemd/sd-daemon.h>

     

       
9
       
9
       
+
       
+

     

       
10
       
10
       
+
       
 static struct context *static_context; /* GLOBAL */

     

       
11
       
11
       
+
       
 

     

       
12
       
12
       
+
       
 /*

     

       
13
       
13
       
+
       
@@ -1241,6 +1243,9 @@

     

       
14
       
14
       
+
       
 {

     

       
15
       
15
       
+
       
   static const char message[] = "Initialization Sequence Completed";

     

       
16
       
16
       
+
       
 

     

       
17
       
17
       
+
       
+  /* Tell systemd we're ready. */

     

       
18
       
18
       
+
       
+  sd_notify(0, "READY=1");

     

       
19
       
19
       
+
       
+

     

       
20
       
20
       
+
       
   /* If we delayed UID/GID downgrade or chroot, do it now */

     

       
21
       
21
       
+
       
   do_uid_gid_chroot (c, true);

     

       
22
       
22
       
+