ivpn{,-service}: 3.10.0 -> 3.10.15, fix packaging.
This commit is contained in:
parent
3a6205d9f7
commit
c2f7d50aa9
|
@ -2,17 +2,26 @@
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, lib
|
, lib
|
||||||
, wirelesstools
|
, wirelesstools
|
||||||
|
, makeWrapper
|
||||||
|
, wireguard-tools
|
||||||
|
, openvpn
|
||||||
|
, obfs4
|
||||||
|
, iproute2
|
||||||
|
, dnscrypt-proxy2
|
||||||
|
, iptables
|
||||||
|
, gawk
|
||||||
|
, util-linux
|
||||||
}:
|
}:
|
||||||
|
|
||||||
builtins.mapAttrs (pname: attrs: buildGoModule (attrs // rec {
|
builtins.mapAttrs (pname: attrs: buildGoModule (attrs // rec {
|
||||||
inherit pname;
|
inherit pname;
|
||||||
version = "3.10.0";
|
version = "3.10.15";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ivpn";
|
owner = "ivpn";
|
||||||
repo = "desktop-app";
|
repo = "desktop-app";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-oX1PWIBPDcvBTxstEiN2WosiVUNXJoloppkpcABSi7Y=";
|
hash = "sha256-3yVRVM98tVjot3gIkUb/CDwmwKdOOBjBjzGL6htDtpk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
|
@ -31,16 +40,52 @@ builtins.mapAttrs (pname: attrs: buildGoModule (attrs // rec {
|
||||||
homepage = "https://www.ivpn.net/apps";
|
homepage = "https://www.ivpn.net/apps";
|
||||||
changelog = "https://github.com/ivpn/desktop-app/releases/tag/v${version}";
|
changelog = "https://github.com/ivpn/desktop-app/releases/tag/v${version}";
|
||||||
license = licenses.gpl3Only;
|
license = licenses.gpl3Only;
|
||||||
maintainers = with maintainers; [ urandom ];
|
maintainers = with maintainers; [ urandom ataraxiasjel ];
|
||||||
};
|
};
|
||||||
})) {
|
})) {
|
||||||
ivpn = {
|
ivpn = {
|
||||||
modRoot = "cli";
|
modRoot = "cli";
|
||||||
vendorHash = "sha256-5FvKR1Kz91Yi/uILVFyJRnwFZSmZ5qnotXqOI4fKLbY=";
|
vendorHash = "sha256-T49AE3SUmdP3Tu9Sp5C/QryKDto/NzEqRuUQ3+aJFL0=";
|
||||||
};
|
};
|
||||||
ivpn-service = {
|
ivpn-service = {
|
||||||
modRoot = "daemon";
|
modRoot = "daemon";
|
||||||
vendorHash = "sha256-9Rk6ruMpyWtQe+90kw4F8OLq7/JcDSrG6ufkfcrS4W8=";
|
vendorHash = "sha256-9Rk6ruMpyWtQe+90kw4F8OLq7/JcDSrG6ufkfcrS4W8=";
|
||||||
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
buildInputs = [ wirelesstools ];
|
buildInputs = [ wirelesstools ];
|
||||||
|
|
||||||
|
patches = [ ./permissions.patch ];
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace daemon/service/platform/platform_linux.go \
|
||||||
|
--replace 'openVpnBinaryPath = "/usr/sbin/openvpn"' \
|
||||||
|
'openVpnBinaryPath = "${openvpn}/bin/openvpn"' \
|
||||||
|
--replace 'routeCommand = "/sbin/ip route"' \
|
||||||
|
'routeCommand = "${iproute2}/bin/ip route"'
|
||||||
|
|
||||||
|
substituteInPlace daemon/netinfo/netinfo_linux.go \
|
||||||
|
--replace 'retErr := shell.ExecAndProcessOutput(log, outParse, "", "/sbin/ip", "route")' \
|
||||||
|
'retErr := shell.ExecAndProcessOutput(log, outParse, "", "${iproute2}/bin/ip", "route")'
|
||||||
|
|
||||||
|
substituteInPlace daemon/service/platform/platform_linux_release.go \
|
||||||
|
--replace 'installDir := "/opt/ivpn"' "installDir := \"$out\"" \
|
||||||
|
--replace 'obfsproxyStartScript = path.Join(installDir, "obfsproxy/obfs4proxy")' \
|
||||||
|
'obfsproxyStartScript = "${obfs4}/bin/obfs4proxy"' \
|
||||||
|
--replace 'wgBinaryPath = path.Join(installDir, "wireguard-tools/wg-quick")' \
|
||||||
|
'wgBinaryPath = "${wireguard-tools}/bin/wg-quick"' \
|
||||||
|
--replace 'wgToolBinaryPath = path.Join(installDir, "wireguard-tools/wg")' \
|
||||||
|
'wgToolBinaryPath = "${wireguard-tools}/bin/wg"' \
|
||||||
|
--replace 'dnscryptproxyBinPath = path.Join(installDir, "dnscrypt-proxy/dnscrypt-proxy")' \
|
||||||
|
'dnscryptproxyBinPath = "${dnscrypt-proxy2}/bin/dnscrypt-proxy"'
|
||||||
|
'';
|
||||||
|
|
||||||
|
postFixup = ''
|
||||||
|
mkdir -p $out/etc
|
||||||
|
cp -r $src/daemon/References/Linux/etc/* $out/etc/
|
||||||
|
cp -r $src/daemon/References/common/etc/* $out/etc/
|
||||||
|
|
||||||
|
patchShebangs --build $out/etc/firewall.sh $out/etc/splittun.sh $out/etc/client.down $out/etc/client.up
|
||||||
|
|
||||||
|
wrapProgram "$out/bin/ivpn-service" \
|
||||||
|
--suffix PATH : ${lib.makeBinPath [ iptables gawk util-linux ]}
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
27
pkgs/tools/networking/ivpn/permissions.patch
Normal file
27
pkgs/tools/networking/ivpn/permissions.patch
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
diff --git a/daemon/service/platform/platform.go b/daemon/service/platform/platform.go
|
||||||
|
index 941a99a7..df821c4d 100644
|
||||||
|
--- a/daemon/service/platform/platform.go
|
||||||
|
+++ b/daemon/service/platform/platform.go
|
||||||
|
@@ -111,12 +111,6 @@ func Init() (warnings []string, errors []error, logInfo []string) {
|
||||||
|
}
|
||||||
|
|
||||||
|
// checking file permissions
|
||||||
|
- if err := checkFileAccessRightsStaticConfig("openvpnCaKeyFile", openvpnCaKeyFile); err != nil {
|
||||||
|
- errors = append(errors, err)
|
||||||
|
- }
|
||||||
|
- if err := checkFileAccessRightsStaticConfig("openvpnTaKeyFile", openvpnTaKeyFile); err != nil {
|
||||||
|
- errors = append(errors, err)
|
||||||
|
- }
|
||||||
|
|
||||||
|
if len(openvpnUpScript) > 0 {
|
||||||
|
if err := checkFileAccessRightsExecutable("openvpnUpScript", openvpnUpScript); err != nil {
|
||||||
|
@@ -149,9 +143,6 @@ func Init() (warnings []string, errors []error, logInfo []string) {
|
||||||
|
if err := checkFileAccessRightsExecutable("dnscryptproxyBinPath", dnscryptproxyBinPath); err != nil {
|
||||||
|
errors = append(errors, err)
|
||||||
|
}
|
||||||
|
- if err := checkFileAccessRightsStaticConfig("dnscryptproxyConfigTemplate", dnscryptproxyConfigTemplate); err != nil {
|
||||||
|
- errors = append(errors, err)
|
||||||
|
- }
|
||||||
|
|
||||||
|
if len(routeCommand) > 0 {
|
||||||
|
routeBinary := strings.Split(routeCommand, " ")[0]
|
Loading…
Reference in a new issue