rms/DefaultVPN
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/DefaultVPN.git synced 2026-05-17 08:36:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

change to ObscurifyVPN

Browse Source
This commit is contained in:
Macbook
2024-12-08 17:20:33 +07:00
parent 54bd293aa1
commit fee8d4b1dc
13 changed files with 66 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
.github/workflows/deploy.yml vendored
View File

@@ -53,26 +53,26 @@ jobs:
bash deploy/build_linux.sh
- name: 'Pack installer'
run: cd deploy && tar -cf AmneziaVPN_Linux_Installer.tar AmneziaVPN_Linux_Installer.bin
run: cd deploy && tar -cf ObscurifyVPN_Linux_Installer.tar ObscurifyVPN_Linux_Installer.bin
- name: 'Upload installer artifact'
uses: actions/upload-artifact@v4
with:
name: AmneziaVPN_Linux_installer.tar
path: deploy/AmneziaVPN_Linux_Installer.tar
name: ObscurifyVPN_Linux_installer.tar
path: deploy/ObscurifyVPN_Linux_Installer.tar
retention-days: 7
- name: 'Upload unpacked artifact'
uses: actions/upload-artifact@v4
with:
name: AmneziaVPN_Linux_unpacked
name: ObscurifyVPN_Linux_unpacked
path: deploy/AppDir
retention-days: 7
- name: 'Upload translations artifact'
uses: actions/upload-artifact@v4
with:
name: AmneziaVPN_translations
name: ObscurifyVPN_translations
path: client/translations
retention-days: 7
@@ -131,14 +131,14 @@ jobs:
- name: 'Upload installer artifact'
uses: actions/upload-artifact@v4
with:
name: AmneziaVPN_Windows_installer
path: AmneziaVPN_x${{ env.BUILD_ARCH }}.exe
name: ObscurifyVPN_Windows_installer
path: ObscurifyVPN_x${{ env.BUILD_ARCH }}.exe
retention-days: 7
- name: 'Upload unpacked artifact'
uses: actions/upload-artifact@v4
with:
name: AmneziaVPN_Windows_unpacked
name: ObscurifyVPN_Windows_unpacked
path: deploy\\build_${{ env.BUILD_ARCH }}\\client\\Release
retention-days: 7
@@ -237,7 +237,7 @@ jobs:
# with:
# name: app-store ipa & dsyms
# path: |
# ${{ github.workspace }}/AmneziaVPN-iOS.ipa
# ${{ github.workspace }}/ObscurifyVPN-iOS.ipa
# ${{ github.workspace }}/*.app.dSYM.zip
# retention-days: 7
@@ -299,15 +299,15 @@ jobs:
- name: 'Upload installer artifact'
uses: actions/upload-artifact@v4
with:
name: AmneziaVPN_MacOS_installer
path: AmneziaVPN.dmg
name: ObscurifyVPN_MacOS_installer
path: ObscurifyVPN.dmg
retention-days: 7
- name: 'Upload unpacked artifact'
uses: actions/upload-artifact@v4
with:
name: AmneziaVPN_MacOS_unpacked
path: deploy/build/client/AmneziaVPN.app
name: ObscurifyVPN_MacOS_unpacked
path: deploy/build/client/ObscurifyVPN.app
retention-days: 7
# ------------------------------------------------------
@@ -427,40 +427,40 @@ jobs:
- name: 'Upload x86_64 apk'
uses: actions/upload-artifact@v4
with:
name: AmneziaVPN-android-x86_64
path: deploy/build/AmneziaVPN-x86_64-release.apk
name: ObscurifyVPN-android-x86_64
path: deploy/build/ObscurifyVPN-x86_64-release.apk
compression-level: 0
retention-days: 7
- name: 'Upload x86 apk'
uses: actions/upload-artifact@v4
with:
name: AmneziaVPN-android-x86
path: deploy/build/AmneziaVPN-x86-release.apk
name: ObscurifyVPN-android-x86
path: deploy/build/ObscurifyVPN-x86-release.apk
compression-level: 0
retention-days: 7
- name: 'Upload arm64-v8a apk'
uses: actions/upload-artifact@v4
with:
name: AmneziaVPN-android-arm64-v8a
path: deploy/build/AmneziaVPN-arm64-v8a-release.apk
name: ObscurifyVPN-android-arm64-v8a
path: deploy/build/ObscurifyVPN-arm64-v8a-release.apk
compression-level: 0
retention-days: 7
- name: 'Upload armeabi-v7a apk'
uses: actions/upload-artifact@v4
with:
name: AmneziaVPN-android-armeabi-v7a
path: deploy/build/AmneziaVPN-armeabi-v7a-release.apk
name: ObscurifyVPN-android-armeabi-v7a
path: deploy/build/ObscurifyVPN-armeabi-v7a-release.apk
compression-level: 0
retention-days: 7
- name: 'Upload aab'
uses: actions/upload-artifact@v4
with:
name: AmneziaVPN-android
path: deploy/build/AmneziaVPN-release.aab
name: ObscurifyVPN-android
path: deploy/build/ObscurifyVPN-release.aab
compression-level: 0
retention-days: 7

6
.gitignore vendored
View File

@@ -1,9 +1,9 @@
# User settings
*.user
macOSPackage/
AmneziaVPN.dmg
AmneziaVPN.exe
AmneziaVPN_*.exe
ObscurifyVPN.dmg
ObscurifyVPN.exe
ObscurifyVPN_*.exe
deploy/build/*
deploy/build_32/*
deploy/build_64/*

2
client/CMakeLists.txt
View File

@@ -305,7 +305,7 @@ if(APPLE)
set(BUILD_IOS_GROUP_IDENTIFIER group.org.obscurify.ObscurifyVPN CACHE STRING "iOS Group identifier")
endif()
if(NOT BUILD_VPN_DEVELOPMENT_TEAM)
set(BUILD_VPN_DEVELOPMENT_TEAM X7UJ388FXK CACHE STRING "Obscurify VPN Development Team")
set(BUILD_VPN_DEVELOPMENT_TEAM KU5NAU9B7H CACHE STRING "Obscurify VPN Development Team")
endif()
set(CMAKE_XCODE_GENERATE_SCHEME FALSE)

13
client/cmake/ios.cmake
View File

@@ -76,11 +76,12 @@ set_target_properties(${PROJECT} PROPERTIES
XCODE_LINK_BUILD_PHASE_MODE KNOWN_LOCATION
XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/Frameworks"
XCODE_EMBED_APP_EXTENSIONS networkextension
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Apple Distribution"
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY[variant=Debug] "Apple Development"
XCODE_ATTRIBUTE_CODE_SIGN_STYLE Manual
XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER "match AppStore org.amnezia.AmneziaVPN"
XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER[variant=Debug] "match Development org.amnezia.AmneziaVPN"
XCODE_ATTRIBUTE_CODE_SIGN_STYLE Automatic
# XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Apple Distribution"
# XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY[variant=Debug] "Apple Development"
# XCODE_ATTRIBUTE_CODE_SIGN_STYLE Manual
# XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER "match AppStore org.obscurify.ObscurifyVPN"
# XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER[variant=Debug] "match Development org.obscurify.ObscurifyVPN"
)
set_target_properties(${PROJECT} PROPERTIES
XCODE_ATTRIBUTE_SWIFT_VERSION "5.0"
@@ -90,7 +91,7 @@ set_target_properties(${PROJECT} PROPERTIES
XCODE_ATTRIBUTE_SWIFT_OBJC_INTEROP_MODE "objcxx"
)
set_target_properties(${PROJECT} PROPERTIES
XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "X7UJ388FXK"
XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "KU5NAU9B7H"
)
target_include_directories(${PROJECT} PRIVATE ${CMAKE_CURRENT_LIST_DIR})
target_compile_options(${PROJECT} PRIVATE

20
client/ios/app/Info.plist.in
View File

@@ -46,7 +46,7 @@
<key>UIUserInterfaceStyle</key>
<string>Light</string>
<key>com.wireguard.ios.app_group_id</key>
<string>group.org.amnezia.AmneziaVPN</string>
<string>group.org.obscurify.ObscurifyVPN</string>
<key>UIViewControllerBasedStatusBarAppearance</key>
<true/>
<key>NSCameraUsageDescription</key>
@@ -74,7 +74,7 @@
<key>UTTypeIconFiles</key>
<array/>
<key>UTTypeIdentifier</key>
<string>org.amnezia.AmneziaVPN.amnezia-config</string>
<string>org.obscurify.ObscurifyVPN.amnezia-config</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.filename-extension</key>
@@ -97,7 +97,7 @@
<key>UTTypeIconFiles</key>
<array/>
<key>UTTypeIdentifier</key>
<string>org.amnezia.AmneziaVPN.wireguard-config</string>
<string>org.obscurify.ObscurifyVPN.wireguard-config</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.filename-extension</key>
@@ -121,7 +121,7 @@
<key>UTTypeIconFiles</key>
<array/>
<key>UTTypeIdentifier</key>
<string>org.amnezia.AmneziaVPN.openvpn-config</string>
<string>org.obscurify.ObscurifyVPN.openvpn-config</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.filename-extension</key>
@@ -140,11 +140,11 @@
<string>public.data</string>
</array>
<key>UTTypeDescription</key>
<string>AmneziaVPN backup file</string>
<string>ObscurifyVPN backup file</string>
<key>UTTypeIconFiles</key>
<array/>
<key>UTTypeIdentifier</key>
<string>org.amnezia.AmneziaVPN.backup-config</string>
<string>org.obscurify.ObscurifyVPN.backup-config</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.filename-extension</key>
@@ -167,10 +167,10 @@
<string>Alternate</string>
<key>LSItemContentTypes</key>
<array>
<string>org.amnezia.AmneziaVPN.amnezia-config</string>
<string>org.amnezia.AmneziaVPN.wireguard-config</string>
<string>org.amnezia.AmneziaVPN.openvpn-config</string>
<string>org.amnezia.AmneziaVPN.backup-config</string>
<string>org.obscurify.ObscurifyVPN.amnezia-config</string>
<string>org.obscurify.ObscurifyVPN.wireguard-config</string>
<string>org.obscurify.ObscurifyVPN.openvpn-config</string>
<string>org.obscurify.ObscurifyVPN.backup-config</string>
</array>
</dict>
</array>

6
client/ios/app/main.entitlements
View File

@@ -7,14 +7,12 @@
<string>packet-tunnel-provider</string>
</array>
<key>com.apple.security.application-groups</key>
<array>
<string>group.org.amnezia.AmneziaVPN</string>
</array>
<array/>
<key>com.apple.security.files.user-selected.read-write</key>
<true/>
<key>keychain-access-groups</key>
<array>
<string>$(AppIdentifierPrefix)group.org.amnezia.AmneziaVPN</string>
<string>$(AppIdentifierPrefix)group.org.obscurify.ObscurifyVPN</string>
</array>
</dict>
</plist>

6
client/ios/networkextension/AmneziaVPNNetworkExtension.entitlements
View File

@@ -7,12 +7,10 @@
<string>packet-tunnel-provider</string>
</array>
<key>com.apple.security.application-groups</key>
<array>
<string>group.org.amnezia.AmneziaVPN</string>
</array>
<array/>
<key>keychain-access-groups</key>
<array>
<string>$(AppIdentifierPrefix)group.org.amnezia.AmneziaVPN</string>
<string>$(AppIdentifierPrefix)group.org.obscurify.ObscurifyVPN</string>
</array>
</dict>
</plist>

13
client/ios/networkextension/CMakeLists.txt
View File

@@ -27,12 +27,13 @@ set_target_properties(networkextension PROPERTIES
XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/../../Frameworks"
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Apple Distribution"
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY[variant=Debug] "Apple Development"
XCODE_ATTRIBUTE_CODE_SIGN_STYLE Automatic
# XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Apple Distribution"
# XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY[variant=Debug] "Apple Development"
XCODE_ATTRIBUTE_CODE_SIGN_STYLE Manual
XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER "match AppStore org.amnezia.AmneziaVPN.network-extension"
XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER[variant=Debug] "match Development org.amnezia.AmneziaVPN.network-extension"
# XCODE_ATTRIBUTE_CODE_SIGN_STYLE Manual
# XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER "match AppStore org.obscurify.ObscurifyVPN.network-extension"
# XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER[variant=Debug] "match Development org.obscurify.ObscurifyVPN.network-extension"
)
set_target_properties(networkextension PROPERTIES
@@ -44,7 +45,7 @@ set_target_properties(networkextension PROPERTIES
)
set_target_properties("networkextension" PROPERTIES
XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "X7UJ388FXK"
XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "KU5NAU9B7H"
)
find_library(FW_ASSETS_LIBRARY AssetsLibrary)

2
client/main.cpp
View File

@@ -21,7 +21,7 @@ bool isAnotherInstanceRunning()
QLocalSocket socket;
socket.connectToServer("AmneziaVPNInstance");
if (socket.waitForConnected(500)) {
qWarning() << "AmneziaVPN is already running";
qWarning() << "ObscurifyVPN is already running";
return true;
}
return false;

2
client/platforms/ios/Log.swift
View File

@@ -14,7 +14,7 @@ struct Log {
}
}
private static let appGroupID = "group.org.amnezia.AmneziaVPN"
private static let appGroupID = "group.org.obscurify.ObscurifyVPN"
static let appLogURL = {
let sharedContainerURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroupID)!

2
client/platforms/macos/macosutils.mm
View File

@@ -21,7 +21,7 @@ NSString* MacOSUtils::appId() {
if (!appId) {
// Fallback. When an unsigned/un-notarized app is executed in
// command-line mode, it could fail the fetching of its own bundle id.
appId = @"org.amnezia.AmneziaVPN";
appId = @"org.obscurify.ObscurifyVPN";
}
return appId;

4
deploy/data/macos/AmneziaVPN.plist
View File

@@ -3,10 +3,10 @@
<plist version="1.0">
<dict>
<key>Label</key>
<string>AmneziaVPN-service</string>
<string>ObscurifyVPN-service</string>
<key>ProgramArguments</key>
<array>
<string>/Applications/AmneziaVPN.app/Contents/MacOS/AmneziaVPN-service</string>
<string>/Applications/ObscurifyVPN.app/Contents/MacOS/ObscurifyVPN-service</string>
</array>
<key>KeepAlive</key>
<true/>

12
deploy/installer/config/macos.xml.in
View File

@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<Installer>
<Name>AmneziaVPN</Name>
<Name>ObscurifyVPN</Name>
<Version>@CMAKE_PROJECT_VERSION@</Version>
<Title>AmneziaVPN</Title>
<Publisher>AmneziaVPN</Publisher>
<StartMenuDir>AmneziaVPN</StartMenuDir>
<TargetDir>/Applications/AmneziaVPN.app</TargetDir>
<Title>ObscurifyVPN</Title>
<Publisher>ObscurifyVPN</Publisher>
<StartMenuDir>ObscurifyVPN</StartMenuDir>
<TargetDir>/Applications/ObscurifyVPN.app</TargetDir>
<WizardDefaultWidth>600</WizardDefaultWidth>
<WizardDefaultHeight>380</WizardDefaultHeight>
<WizardStyle>Mac</WizardStyle>
@@ -21,7 +21,7 @@
<Repository>
<Url>https://amneziavpn.org/updates/macos</Url>
<Enabled>true</Enabled>
<DisplayName>AmneziaVPN - repository for macOS</DisplayName>
<DisplayName>ObscurifyVPN - repository for macOS</DisplayName>
</Repository>
</RemoteRepositories>
</Installer>