public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #85858 from mmilata/openvpn-2.4.9 

openvpn: 2.4.7 -> 2.4.9
This commit is contained in:
Jörg Thalheim 2020-04-23 19:22:02 +01:00 committed by GitHub
parent 189d14856c f35d50c68c
commit 0ab6891b87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/tools/networking/openvpn/default.nix
View File

@ -19,11 +19,11 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "openvpn"; pname = "openvpn";
version = "2.4.7"; version = "2.4.9";
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";
sha256 = "0j7na936isk9j8nsdrrbw7wmy09inmjqvsb8mw8az7k61xbm6bx4"; sha256 = "1qpbllwlha7cffsd5dlddb8rl22g9rar5zflkz1wrcllhvfkl7v4";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
@ -33,13 +33,6 @@ in stdenv.mkDerivation rec {
++ optional useSystemd systemd ++ optional useSystemd systemd
++ optional pkcs11Support pkcs11helper; ++ optional pkcs11Support pkcs11helper;
patches = [
( fetchpatch {
url = "https://sources.debian.org/data/main/o/openvpn/2.4.7-1/debian/patches/fix-pkcs11-helper-hang.patch";
sha256 = "0c8jzbfsmb0mm9f7kkjxac1hk8q6igm267s687vx3mdqs1wys6bm";
})
];
configureFlags = optionals stdenv.isLinux [ configureFlags = optionals stdenv.isLinux [
"--enable-iproute2" "--enable-iproute2"
"IPROUTE=${iproute}/sbin/ip" ] "IPROUTE=${iproute}/sbin/ip" ]
@ -68,7 +61,7 @@ in stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A robust and highly flexible tunneling application"; description = "A robust and highly flexible tunneling application";
downloadPage = "https://openvpn.net/index.php/open-source/downloads.html"; downloadPage = "https://openvpn.net/community-downloads/";
homepage = "https://openvpn.net/"; homepage = "https://openvpn.net/";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ viric ]; maintainers = with maintainers; [ viric ];