Unverified Commit 644e10a7 authored by Georges Dubus's avatar Georges Dubus Committed by GitHub
Browse files

Merge pull request #230687 from peterhoeg/u/openfortivpn_1_20_3 

openfortivpn: 1.20.2 -> 1.20.3
parents a3721d5e c51b6e40

pkgs/tools/networking/openfortivpn/default.nix

+7 −3
Original line number Diff line number Diff line 
{ 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

pkgs/tools/networking/ppp/default.nix

+6 −5
Original line number Diff line number Diff line
@@ -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 = ''