diff options
| author | Markus Pettersson <markus.pettersson@mullvad.net> | 2025-02-19 09:35:12 +0100 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2025-02-19 09:35:12 +0100 |
| commit | 0b00536d33aad4eea1e85cde4c01d44739cd1013 (patch) | |
| tree | 2300628975c96891d433d5def8782529d6b28209 | |
| parent | 1c07d5980724df08b3b0fc3b7aaa09f197dc113d (diff) | |
| parent | 53c9b6defd4dd9ccb48730c19da413e0c2dbe786 (diff) | |
| download | mullvadvpn-0b00536d33aad4eea1e85cde4c01d44739cd1013.tar.xz mullvadvpn-0b00536d33aad4eea1e85cde4c01d44739cd1013.zip | |
Merge branch 'remove-apisocks5-binary-from-app-des-1582'
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | desktop/packages/mullvad-vpn/tasks/distribution.js | 6 | ||||
| m--------- | dist-assets/binaries | 0 |
3 files changed, 3 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fc3fa6efc..34a0fd93cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,9 @@ Line wrap the file at 100 chars. Th - Add support for DAITA V2. - Add back wireguard-go (userspace WireGuard) support. +### Removed +- Stop bundling https://github.com/mullvad/apisocks5 as a standalone binary. + ## [2025.4] - 2025-02-12 This release is identical to 2025.4-beta1 diff --git a/desktop/packages/mullvad-vpn/tasks/distribution.js b/desktop/packages/mullvad-vpn/tasks/distribution.js index fda712d77c..56a007d103 100644 --- a/desktop/packages/mullvad-vpn/tasks/distribution.js +++ b/desktop/packages/mullvad-vpn/tasks/distribution.js @@ -108,7 +108,6 @@ function newConfig() { to: '.', }, { from: distAssets(path.join('binaries', '${env.TARGET_TRIPLE}', 'openvpn')), to: '.' }, - { from: distAssets(path.join('binaries', '${env.TARGET_TRIPLE}', 'apisocks5')), to: '.' }, { from: distAssets('uninstall_macos.sh'), to: './uninstall.sh' }, { from: buildAssets('shell-completions/_mullvad'), to: '.' }, { from: buildAssets('shell-completions/mullvad.fish'), to: '.' }, @@ -159,10 +158,6 @@ function newConfig() { // TODO: OpenVPN does not have an ARM64 build yet. { from: distAssets('binaries/x86_64-pc-windows-msvc/openvpn.exe'), to: '.' }, { - from: distAssets(path.join('binaries', '${env.TARGET_SUBDIR}', 'apisocks5.exe')), - to: '.', - }, - { from: distAssets(path.join('binaries', '${env.TARGET_SUBDIR}', 'wintun/wintun.dll')), to: '.', }, @@ -207,7 +202,6 @@ function newConfig() { }, { from: distAssets(path.join('linux', 'apparmor_mullvad')), to: '.' }, { from: distAssets(path.join('binaries', '${env.TARGET_TRIPLE}', 'openvpn')), to: '.' }, - { from: distAssets(path.join('binaries', '${env.TARGET_TRIPLE}', 'apisocks5')), to: '.' }, ], }, diff --git a/dist-assets/binaries b/dist-assets/binaries -Subproject 049d5d3bc0c86c29c20f2073460186a83c1d709 +Subproject 14c3ea62ef5e51cfc0cac8c54042199660062d4 |