liminix

commit 339c2d9873580d3aae812d88968a66aa5e18abf3
parent 3f6585f6be35598fbd719e1009bf1137a6dba10e
Author: Daniel Barlow <dan@telent.net>
Date:   Mon, 22 May 2023 23:31:57 +0100

upgrade to ppp 2.5.0

Diffstat:
M
overlay.nix
 | 
2
+-
M
pkgs/default.nix
 | 
1
+
A
pkgs/ppp/default.nix
 | 
40
++++++++++++++++++++++++++++++++++++++++

3 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/overlay.nix b/overlay.nix
@@ -174,7 +174,7 @@ extraPkgs // {
   });
 
   pppBuild = prev.ppp;
-  ppp =
+  pppOld =
     (prev.ppp.override {
       libpcap = null;
     }).overrideAttrs (o : {
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -16,6 +16,7 @@
   s6-init-bin =  callPackage ./s6-init-bin {};
   s6-rc-database = callPackage ./s6-rc-database {};
   mips-vm = callPackage ./mips-vm {};
+  ppp = callPackage ./ppp {};
   pppoe = callPackage ./pppoe {};
 
   kernel-backport = callPackage ./kernel-backport {};
diff --git a/pkgs/ppp/default.nix b/pkgs/ppp/default.nix
@@ -0,0 +1,40 @@
+{
+  fetchFromGitHub
+, stdenv
+, autoreconfHook
+, substituteAll
+# , openssl
+}: stdenv.mkDerivation {
+  pname  = "ppp";
+  version = "2.5.0";
+  nativeBuildInputs = [ autoreconfHook ];
+#  buildInputs= [ openssl ];
+
+  src = fetchFromGitHub {
+    repo = "ppp";
+    owner = "ppp-project";
+    rev = "ppp-2.5.0";
+    hash = "sha256-J7udiLiJiJ1PzNxD+XYAUPXZ+ABGXt2U3hSFUWJXe94=";
+  };
+
+  configureFlags = [
+    "--disable-eaptls"
+    "--disable-peap"
+    "--disable-openssl-engine"
+    "--without-openssl"
+  ];
+
+  postPatch = ''
+    sed -i.bak pppd/crypto_ms.c -e '/#include <openssl\/evp.h>/d'
+    sed -i.bak pppd/ppp-sha1.c -e 's/u_int32_t/uint32_t/g' -e '1i#include <stdint.h>'
+  '';
+
+  outputs = [
+    "bin"
+    "out"
+    "man"
+    "dev"
+  ];
+
+
+}