diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6c57edb074b..4b3361f0816 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -762,6 +762,11 @@ github = "ChengCat"; name = "Yucheng Zhang"; }; + chessai = { + email = "chessai1996@gmail.com"; + github = "chessai"; + name = "Daniel Cartwright"; + }; chiiruno = { email = "okinan@protonmail.com"; github = "chiiruno"; diff --git a/pkgs/tools/networking/openconnect_pa/default.nix b/pkgs/tools/networking/openconnect_pa/default.nix new file mode 100644 index 00000000000..d261e571705 --- /dev/null +++ b/pkgs/tools/networking/openconnect_pa/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, pkgconfig, vpnc, openssl ? null, gnutls ? null, gmp, libxml2, stoken, zlib, autoreconfHook } : + +assert (openssl != null) == (gnutls == null); + +stdenv.mkDerivation rec { + version = "unstable-2018-10-08"; + name = "openconnect_pa-${version}"; + + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "dlenski"; + repo = "openconnect"; + rev = "e5fe063a087385c5b157ad7a9a3fa874181f6e3b"; + sha256 = "0ywacqs3nncr2gpjjcz2yc9c6v4ifjssh0vb07h0qff06whqhdax"; + }; + + preConfigure = '' + export PKG_CONFIG=${pkgconfig}/bin/pkg-config + export LIBXML2_CFLAGS="-I ${libxml2.dev}/include/libxml2" + export LIBXML2_LIBS="-L${libxml2.out}/lib -lxml2" + ''; + + configureFlags = [ + "--with-vpnc-script=${vpnc}/etc/vpnc/vpnc-script" + "--disable-nls" + "--without-openssl-version-check" + ]; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + propagatedBuildInputs = [ vpnc openssl gnutls gmp libxml2 stoken zlib ]; + + meta = with stdenv.lib; { + description = "OpenConnect client extended to support Palo Alto Networks' GlobalProtect VPN"; + homepage = https://github.com/dlenski/openconnect/; + license = licenses.lgpl21; + maintainers = with maintainers; [ chessai ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef266154c07..b99289fb88e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5976,6 +5976,10 @@ with pkgs; SDL = SDL_sixel; }; + openconnect_pa = callPackage ../tools/networking/openconnect_pa { + openssl = null; + }; + openconnect = openconnect_gnutls; openconnect_openssl = callPackage ../tools/networking/openconnect {