From ef42b9754764aaebd1ac1a6ba7b3ccf3790a582a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 8 May 2023 21:44:42 +0800
Subject: [PATCH 1/2] ppp: specify statedir for .pid file

---
 pkgs/tools/networking/ppp/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix
index 9364d10b1171..535545f42bc2 100644
--- a/pkgs/tools/networking/ppp/default.nix
+++ b/pkgs/tools/networking/ppp/default.nix
@@ -23,14 +23,16 @@ stdenv.mkDerivation rec {
   };
 
   configureFlags = [
-    "--with-openssl=${openssl.dev}"
+    "--localstatedir=/var"
     "--sysconfdir=/etc"
+    "--with-openssl=${openssl.dev}"
   ];
 
   nativeBuildInputs = [
     pkg-config
     autoreconfHook
   ];
+
   buildInputs = [
     libpcap
     libxcrypt
@@ -47,6 +49,8 @@ stdenv.mkDerivation rec {
       scripts/{pon,poff,plog}
   '';
 
+  enableParallelBuilding = true;
+
   makeFlags = [
     "CC=${stdenv.cc.targetPrefix}cc"
   ];
@@ -57,11 +61,8 @@ stdenv.mkDerivation rec {
     "sysconfdir=$(out)/etc"
   ];
 
-  preInstall = ''
-    mkdir -p $out/bin
-  '';
   postInstall = ''
-    install -D -m 755 scripts/{pon,poff,plog} $out/bin
+    install -Dm755 -t $out/bin scripts/{pon,poff,plog}
   '';
 
   postFixup = ''

From c51b6e4044dd51575bfd6888e71ddf6183ef65b9 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 8 May 2023 21:44:55 +0800
Subject: [PATCH 2/2] openfortivpn: 1.20.2 -> 1.20.3

---
 pkgs/tools/networking/openfortivpn/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix
index ac582b2f2a2e..cc394d254ada 100644
--- a/pkgs/tools/networking/openfortivpn/default.nix
+++ b/pkgs/tools/networking/openfortivpn/default.nix
@@ -1,4 +1,8 @@
-{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config
+{ stdenv
+, lib
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
 , openssl
 , ppp
 , systemd
@@ -8,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "openfortivpn";
-  version = "1.20.2";
+  version = "1.20.3";
 
   src = fetchFromGitHub {
     owner = "adrienverge";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Ml1aVvF+kqlSTuzZeHG8Ry+BA24YdWACwQNlO2K+FGo=";
+    hash = "sha256-3HKVHH9S409t07TgiZtw58AhQH6W+Ch8chsSmof1Jkk=";
   };
 
   # we cannot write the config file to /etc and as we don't need the file, so drop it