openvpn: 2.4.9 -> 2.5.0

This commit is contained in:
Peter Hoeg 2020-11-06 22:19:57 +08:00
parent 938335142e
commit 31cf796be6
2 changed files with 76 additions and 46 deletions

View file

@ -1,14 +1,23 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, makeWrapper { stdenv
, iproute, lzo, openssl, pam , fetchurl
, useSystemd ? stdenv.isLinux, systemd ? null, utillinux ? null , pkg-config
, pkcs11Support ? false, pkcs11helper ? null, , makeWrapper
, runtimeShell
, iproute ? null
, lzo
, openssl
, pam
, useSystemd ? stdenv.isLinux
, systemd ? null
, utillinux ? null
, pkcs11Support ? false
, pkcs11helper ? null
}: }:
assert useSystemd -> (systemd != null); assert useSystemd -> (systemd != null);
assert pkcs11Support -> (pkcs11helper != null); assert pkcs11Support -> (pkcs11helper != null);
with stdenv.lib; with stdenv.lib;
let let
# Check if the script needs to have other binaries wrapped when changing this. # Check if the script needs to have other binaries wrapped when changing this.
update-resolved = fetchurl { update-resolved = fetchurl {
@ -16,49 +25,68 @@ let
sha256 = "021qzv1k0zxgv1rmyfpqj3zlzqr28xa7zff1n7vrbjk36ijylpsc"; sha256 = "021qzv1k0zxgv1rmyfpqj3zlzqr28xa7zff1n7vrbjk36ijylpsc";
}; };
in stdenv.mkDerivation rec { generic = { version, sha256 }:
pname = "openvpn"; let
version = "2.4.9"; withIpRoute = stdenv.isLinux && (versionOlder version "2.5");
in
stdenv.mkDerivation
rec {
pname = "openvpn";
inherit version;
src = fetchurl { src = fetchurl {
url = "https://swupdate.openvpn.net/community/releases/${pname}-${version}.tar.xz"; url = "https://swupdate.openvpn.net/community/releases/${pname}-${version}.tar.xz";
inherit sha256;
};
nativeBuildInputs = [ makeWrapper pkg-config ];
buildInputs = [ lzo openssl ]
++ optional stdenv.isLinux pam
++ optional withIpRoute iproute
++ optional useSystemd systemd
++ optional pkcs11Support pkcs11helper;
configureFlags = optionals withIpRoute [
"--enable-iproute2"
"IPROUTE=${iproute}/sbin/ip"
]
++ optional useSystemd "--enable-systemd"
++ optional pkcs11Support "--enable-pkcs11"
++ optional stdenv.isDarwin "--disable-plugin-auth-pam";
postInstall = ''
mkdir -p $out/share/doc/openvpn/examples
cp -r sample/sample-config-files/ $out/share/doc/openvpn/examples
cp -r sample/sample-keys/ $out/share/doc/openvpn/examples
cp -r sample/sample-scripts/ $out/share/doc/openvpn/examples
'' + optionalString useSystemd ''
install -Dm555 ${update-resolved} $out/libexec/update-systemd-resolved
wrapProgram $out/libexec/update-systemd-resolved \
--prefix PATH : ${makeBinPath [ runtimeShell iproute systemd utillinux ]}
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "A robust and highly flexible tunneling application";
downloadPage = "https://openvpn.net/community-downloads/";
homepage = "https://openvpn.net/";
license = licenses.gpl2;
maintainers = with maintainers; [ viric peterhoeg ];
platforms = platforms.unix;
};
};
in
{
openvpn_24 = generic {
version = "2.4.9";
sha256 = "1qpbllwlha7cffsd5dlddb8rl22g9rar5zflkz1wrcllhvfkl7v4"; sha256 = "1qpbllwlha7cffsd5dlddb8rl22g9rar5zflkz1wrcllhvfkl7v4";
}; };
nativeBuildInputs = [ makeWrapper pkgconfig ]; openvpn = generic {
version = "2.5.0";
buildInputs = [ lzo openssl ] sha256 = "sha256-AppCbkTWVstOEYkxnJX+b8mGQkdyT1WZ2Z35xMNHj70=";
++ optionals stdenv.isLinux [ pam iproute ]
++ optional useSystemd systemd
++ optional pkcs11Support pkcs11helper;
configureFlags = optionals stdenv.isLinux [
"--enable-iproute2"
"IPROUTE=${iproute}/sbin/ip" ]
++ optional useSystemd "--enable-systemd"
++ optional pkcs11Support "--enable-pkcs11"
++ optional stdenv.isDarwin "--disable-plugin-auth-pam";
postInstall = ''
mkdir -p $out/share/doc/openvpn/examples
cp -r sample/sample-config-files/ $out/share/doc/openvpn/examples
cp -r sample/sample-keys/ $out/share/doc/openvpn/examples
cp -r sample/sample-scripts/ $out/share/doc/openvpn/examples
'' + optionalString useSystemd ''
install -Dm555 ${update-resolved} $out/libexec/update-systemd-resolved
wrapProgram $out/libexec/update-systemd-resolved \
--prefix PATH : ${makeBinPath [ stdenv.shell iproute systemd utillinux ]}
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "A robust and highly flexible tunneling application";
downloadPage = "https://openvpn.net/community-downloads/";
homepage = "https://openvpn.net/";
license = licenses.gpl2;
maintainers = with maintainers; [ viric ];
platforms = platforms.unix;
updateWalker = true;
}; };
} }

View file

@ -6209,7 +6209,9 @@ in
opentsdb = callPackage ../tools/misc/opentsdb {}; opentsdb = callPackage ../tools/misc/opentsdb {};
openvpn = callPackage ../tools/networking/openvpn {}; inherit (callPackages ../tools/networking/openvpn {})
openvpn_24
openvpn;
openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { }; openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { };