AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'remotes/origin/dev' into feature/amnezia-wireguard-client-impl

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-09-28 00:26:26 +03:00
commit 4cb871849b
13 changed files with 21 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -6,7 +6,10 @@ project(${PROJECT} VERSION 4.0.7.1
DESCRIPTION "AmneziaVPN" DESCRIPTION "AmneziaVPN"
HOMEPAGE_URL "https://amnezia.org/" HOMEPAGE_URL "https://amnezia.org/"
) )
set(RELEASE_DATE "2023-09-21")
string(TIMESTAMP CURRENT_DATE "%Y-%m-%d")
set(RELEASE_DATE "${CURRENT_DATE}")
set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH}) set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")

11
client/CMakeLists.txt
View file

@ -324,16 +324,5 @@ if(NOT IOS AND NOT ANDROID)
endif() endif()
if(WIN32)
add_custom_command(
TARGET ${PROJECT} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E $<IF:$<CONFIG:Debug>,copy,true>
$<TARGET_FILE_DIR:${PROJECT}>/../service/wireguard-service/wireguard-service.exe
$<TARGET_FILE_DIR:${PROJECT}>/wireguard/wireguard-service.exe
COMMAND_EXPAND_LISTS
)
endif()
target_sources(${PROJECT} PRIVATE ${SOURCES} ${HEADERS} ${RESOURCES} ${QRC}) target_sources(${PROJECT} PRIVATE ${SOURCES} ${HEADERS} ${RESOURCES} ${QRC})
qt_finalize_target(${PROJECT}) qt_finalize_target(${PROJECT})

2
client/daemon/daemonlocalserverconnection.cpp
View file

@ -108,7 +108,7 @@ void DaemonLocalServerConnection::parseCommand(const QByteArray& data) {
} }
if (type == "deactivate") { if (type == "deactivate") {
Daemon::instance()->deactivate(); Daemon::instance()->deactivate(true);
return; return;
} }

1
client/mozilla/localsocketcontroller.cpp
View file

@ -190,6 +190,7 @@ void LocalSocketController::deactivate() {
QJsonObject json; QJsonObject json;
json.insert("type", "deactivate"); json.insert("type", "deactivate");
write(json); write(json);
emit disconnected();
} }
void LocalSocketController::checkStatus() { void LocalSocketController::checkStatus() {

1
deploy/build_windows.bat
View file

@ -68,7 +68,6 @@ signtool sign /v /n "Privacy Technologies OU" /fd sha256 /tr http://timestamp.co
echo "Copying deploy data..." echo "Copying deploy data..."
xcopy %DEPLOY_DATA_DIR% %OUT_APP_DIR% /s /e /y /i /f xcopy %DEPLOY_DATA_DIR% %OUT_APP_DIR% /s /e /y /i /f
xcopy %PREBILT_DEPLOY_DATA_DIR% %OUT_APP_DIR% /s /e /y /i /f xcopy %PREBILT_DEPLOY_DATA_DIR% %OUT_APP_DIR% /s /e /y /i /f
copy "%WORK_DIR:"=%\service\wireguard-service\release\wireguard-service.exe" %OUT_APP_DIR%\wireguard\
cd %SCRIPT_DIR% cd %SCRIPT_DIR%
xcopy %SCRIPT_DIR:"=%\installer %WORK_DIR:"=%\installer /s /e /y /i /f xcopy %SCRIPT_DIR:"=%\installer %WORK_DIR:"=%\installer /s /e /y /i /f

BIN
deploy/data/linux/AmneziaVPN.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 28 KiB

10
deploy/data/linux/client/share/applications/AmneziaVPN.desktop
View file

@ -1,10 +0,0 @@
#!/usr/bin/env xdg-open
[Desktop Entry]
Type=Application
Name=AmneziaVPN client
Version=2.0.10
Comment=Client of your self-hosted VPN
Exec=AmneziaVPN
Icon=/usr/share/pixmaps/AmneziaVPN_Logo.png
Categories=Network;Qt;Security;
Terminal=false

BIN
deploy/data/linux/client/share/icons/AmneziaVPN_Logo.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 55 KiB

1
deploy/data/linux/post_install.sh
View file

@ -37,6 +37,7 @@ sudo ln -s $APP_PATH/client/$APP_NAME.sh /usr/local/bin/$APP_NAME >> $LOG_FILE
echo "user desktop creation loop started" >> $LOG_FILE echo "user desktop creation loop started" >> $LOG_FILE
sudo cp $APP_PATH/$APP_NAME.desktop /usr/share/applications/ >> $LOG_FILE sudo cp $APP_PATH/$APP_NAME.desktop /usr/share/applications/ >> $LOG_FILE
sudo cp $APP_PATH/$APP_NAME.png /usr/share/pixmaps/ >> $LOG_FILE
sudo chmod 555 /usr/share/applications/$APP_NAME.desktop >> $LOG_FILE sudo chmod 555 /usr/share/applications/$APP_NAME.desktop >> $LOG_FILE
echo "user desktop creation loop ended" >> $LOG_FILE echo "user desktop creation loop ended" >> $LOG_FILE

5
deploy/data/linux/post_uninstall.sh
View file

@ -54,6 +54,11 @@ if test -f /usr/share/applications/$APP_NAME.desktop; then
fi fi
if test -f /usr/share/pixmaps/$APP_NAME.png; then
sudo rm -f /usr/share/pixmaps/$APP_NAME.png >> $LOG_FILE
fi
date >> $LOG_FILE date >> $LOG_FILE
echo "Service after uninstall status:" >> $LOG_FILE echo "Service after uninstall status:" >> $LOG_FILE
sudo systemctl status $APP_NAME >> $LOG_FILE sudo systemctl status $APP_NAME >> $LOG_FILE

5
deploy/installer/config.cmake
View file

@ -15,6 +15,11 @@ elseif(LINUX)
${CMAKE_CURRENT_LIST_DIR}/config/linux.xml.in ${CMAKE_CURRENT_LIST_DIR}/config/linux.xml.in
${CMAKE_BINARY_DIR}/installer/config/linux.xml ${CMAKE_BINARY_DIR}/installer/config/linux.xml
) )
configure_file(
${CMAKE_CURRENT_LIST_DIR}/config/AmneziaVPN.desktop.in
${CMAKE_BINARY_DIR}/../AppDir/AmneziaVPN.desktop
)
endif() endif()
configure_file( configure_file(

6
deploy/data/linux/AmneziaVPN.desktop → deploy/installer/config/AmneziaVPN.desktop.in
View file

@ -1,10 +1,10 @@
#!/usr/bin/env xdg-open #!/usr/bin/env xdg-open
[Desktop Entry] [Desktop Entry]
Type=Application Type=Application
Name=AmneziaVPN client Name=AmneziaVPN
Version=2.0.10 Version=@CMAKE_PROJECT_VERSION@
Comment=Client of your self-hosted VPN Comment=Client of your self-hosted VPN
Exec=AmneziaVPN Exec=AmneziaVPN
Icon=/usr/share/pixmaps/AmneziaVPN_Logo.png Icon=/usr/share/pixmaps/AmneziaVPN.png
Categories=Network;Qt;Security; Categories=Network;Qt;Security;
Terminal=false Terminal=false

2
deploy/installer/config/linux.xml.in
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Installer> <Installer>
<Name>AmneziaVPN</Name> <Name>AmneziaVPN</Name>
<Version>1.6.0.0</Version> <Version>@CMAKE_PROJECT_VERSION@</Version>
<Title>AmneziaVPN</Title> <Title>AmneziaVPN</Title>
<Publisher>AmneziaVPN</Publisher> <Publisher>AmneziaVPN</Publisher>
<StartMenuDir>AmneziaVPN</StartMenuDir> <StartMenuDir>AmneziaVPN</StartMenuDir>