From 5a91363f4deba7eb414bfbae2cd2b08116a6e1f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Tue, 8 Aug 2017 22:15:42 +0200 Subject: [PATCH 001/129] Drop QtCreator workaround for header files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ľubomír Carik --- src/CMakeLists.txt | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b3adebbb..e9a06815 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,54 +1,34 @@ set(${PROJECT_NAME}_SRCS ${PROJECT_NAME}.cpp - ${PROJECT_NAME}.h ${PROJECT_NAME}.qrc cert.cpp - cert.h - common.h - config.h config.h.in cryptdata.cpp - cryptdata.h dialog/MyCertMsgBox.cpp - dialog/MyCertMsgBox.h dialog/MyInputDialog.cpp - dialog/MyInputDialog.h dialog/MyMsgBox.cpp - dialog/MyMsgBox.h dialog/editdialog.cpp - dialog/editdialog.h dialog/editdialog.ui dialog/NewProfileDialog.cpp - dialog/NewProfileDialog.h dialog/NewProfileDialog.ui dialog/logdialog.cpp - dialog/logdialog.h dialog/logdialog.ui dialog/mainwindow.cpp - dialog/mainwindow.h dialog/mainwindow.ui gtdb.cpp - gtdb.h key.cpp - key.h keypair.cpp - keypair.h main.cpp server_storage.cpp - server_storage.h - timestamp.h timestamp.cpp vpninfo.cpp - vpninfo.h logger.cpp - logger.h FileLogger.cpp - FileLogger.h ) set_source_files_properties( From 88897e9bb6313d3734ab2df345b73bb4c025e25d Mon Sep 17 00:00:00 2001 From: Michael Lyons Date: Thu, 10 Aug 2017 12:10:28 -0400 Subject: [PATCH 002/129] Tray icons to Qt masks On MacOS and perhaps other platforms, this allows the system tray icons to behave like default tray icons. They dim for inactive desktops and invert for Dark Mode. https://codereview.qt-project.org/#/c/115120/ --- src/dialog/mainwindow.cpp | 2 ++ src/images/network-connected.png | Bin 6511 -> 1137 bytes src/images/network-disconnected.png | Bin 4492 -> 800 bytes 3 files changed, 2 insertions(+) diff --git a/src/dialog/mainwindow.cpp b/src/dialog/mainwindow.cpp index c3744da0..40f78dd8 100644 --- a/src/dialog/mainwindow.cpp +++ b/src/dialog/mainwindow.cpp @@ -105,6 +105,7 @@ MainWindow::MainWindow(QWidget* parent, const QString profileName) QIcon icon; icon.addPixmap(TRAY_OFF_ICON, QIcon::Normal, QIcon::Off); + icon.setIsMask(true); m_trayIcon->setIcon(icon); m_trayIcon->show(); } else { @@ -419,6 +420,7 @@ void MainWindow::changeStatus(int val) ui->connectionButton->setText(tr("Disconnect")); QIcon icon(TRAY_ON_ICON); + icon.setIsMask(true); m_trayIcon->setIcon(icon); this->ui->ipV4Label->setText(ip); diff --git a/src/images/network-connected.png b/src/images/network-connected.png index 14423ec840d7703f81aaf6f5e557f909a4fc2eee..027d9eee31850f3ad6bdc46c5b123959bafdd0e7 100644 GIT binary patch delta 1108 zcmV-a1grb+GVutI7&QR{0000hbek>!000J1OjJex|Nj6009C@%egFUf0d!JMQvg8b z*k%9#00Cl4M??UK1szC{AsBxLbV*G`2jK_`4ImXe0C+mn!0et$m0xaqKaG|XDN z!ztWS98TE`mf^TVO3xTDC-91OawqT&>l9AlC)O!lS7gk3ULzYsN-um6%u-nia2GH$ zIlHoH7mfgJ!b+bxt?_@>pz?Pyp!4H-=oga%v`|Tt7Xe%H`YJZH%QsgLC^-wYE;$nF>1~_3`|!vGhYcUSk5Yt0f3bNR~AVFL)5(u18WIq1wt-7(A-P|s;v?2IV}OE z*?Y&|T{shUg!o$9uy zfKJVYKqp=Q8EBnarSNo=?cBA;`6Y7I%Fyj@t3X-;6b*DGiawmU_O&1ZbiMOUT`K|T z7sk5*x}=5%1ORm2npi+d065(=z}x|hEMVy~TI(LcaHIiV0>JE}Jp(wa_Q1>nK*$E5 zV`2q>kb8e{f1VF$!#Hr*tpJ)4bpSeF#R0b-=dB~FQ_UP%h;p2KA a*Dn|{4)-oHNvV>r+A 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 From 2c3bd390c133fdcedbaf5e13f052f0775e4090b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Wed, 9 Aug 2017 22:09:30 +0200 Subject: [PATCH 003/129] Small help for clang-modernize/clang-tidy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ľubomír Carik --- CMake/Includes/ProjectSettings.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMake/Includes/ProjectSettings.cmake b/CMake/Includes/ProjectSettings.cmake index 0235a0b4..ec8a56bd 100644 --- a/CMake/Includes/ProjectSettings.cmake +++ b/CMake/Includes/ProjectSettings.cmake @@ -11,6 +11,8 @@ endif() option(PROJ_PKCS11 "Enable PKCS11" ON) option(PROJ_INI_SETTINGS "Store the settings in INI files." OFF) +set(CMAKE_EXPORT_COMPILE_COMMANDS ON) + set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) From cc7a41907fb48f69a35e16adcb53ef86768057a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Thu, 10 Aug 2017 23:56:31 +0200 Subject: [PATCH 004/129] We don't need resource prefix at this time MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ľubomír Carik --- src/common.h | 12 ++++++------ src/dialog/editdialog.ui | 12 ++++++------ src/dialog/mainwindow.cpp | 8 ++++---- src/dialog/mainwindow.ui | 18 +++++++++--------- src/openconnect-gui.qrc | 2 +- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/common.h b/src/common.h index 2ab4a8f8..9166dc46 100644 --- a/src/common.h +++ b/src/common.h @@ -25,13 +25,13 @@ #define TMP_CERT_PREFIX "tmp-certXXXXXX" #define TMP_KEY_PREFIX "tmp-keyXXXXXX" -#define OFF_ICON QPixmap(QString::fromLatin1(":/new/resource/images/traffic_light_red.png")) -#define ON_ICON QPixmap(QString::fromLatin1(":/new/resource/images/traffic_light_green.png")) -#define CONNECTING_ICON QPixmap(QString::fromLatin1(":/new/resource/images/traffic_light_yellow.png")) -#define CONNECTING_ICON2 QPixmap(QString::fromLatin1(":/new/resource/images/traffic_light_off.png")) +#define OFF_ICON QPixmap(QString::fromLatin1(":/images/traffic_light_red.png")) +#define ON_ICON QPixmap(QString::fromLatin1(":/images/traffic_light_green.png")) +#define CONNECTING_ICON QPixmap(QString::fromLatin1(":/images/traffic_light_yellow.png")) +#define CONNECTING_ICON2 QPixmap(QString::fromLatin1(":/images/traffic_light_off.png")) -#define TRAY_OFF_ICON QPixmap(QString::fromLatin1(":/new/resource/images/network-disconnected.png")) -#define TRAY_ON_ICON QPixmap(QString::fromLatin1(":/new/resource/images/network-connected.png")) +#define TRAY_OFF_ICON QPixmap(QString::fromLatin1(":/images/network-disconnected.png")) +#define TRAY_ON_ICON QPixmap(QString::fromLatin1(":/images/network-connected.png")) #define UPDATE_TIMER 10000 diff --git a/src/dialog/editdialog.ui b/src/dialog/editdialog.ui index b2c064b5..8e061616 100644 --- a/src/dialog/editdialog.ui +++ b/src/dialog/editdialog.ui @@ -105,7 +105,7 @@ - :/new/resource/images/trashcan.png:/new/resource/images/trashcan.png + :/images/trashcan.png:/images/trashcan.png @@ -147,7 +147,7 @@ - :/new/resource/images/trashcan.png:/new/resource/images/trashcan.png + :/images/trashcan.png:/images/trashcan.png @@ -185,7 +185,7 @@ - :/new/resource/images/trashcan.png:/new/resource/images/trashcan.png + :/images/trashcan.png:/images/trashcan.png @@ -248,7 +248,7 @@ - :/new/resource/images/trashcan.png:/new/resource/images/trashcan.png + :/images/trashcan.png:/images/trashcan.png @@ -347,7 +347,7 @@ - :/new/resource/images/trashcan.png:/new/resource/images/trashcan.png + :/images/trashcan.png:/images/trashcan.png @@ -408,7 +408,7 @@ - :/new/resource/images/trashcan.png:/new/resource/images/trashcan.png + :/images/trashcan.png:/images/trashcan.png diff --git a/src/dialog/mainwindow.cpp b/src/dialog/mainwindow.cpp index 40f78dd8..f7bbe194 100644 --- a/src/dialog/mainwindow.cpp +++ b/src/dialog/mainwindow.cpp @@ -416,7 +416,7 @@ void MainWindow::changeStatus(int val) m_disconnectAction->setEnabled(true); ui->iconLabel->setPixmap(ON_ICON); - ui->connectionButton->setIcon(QIcon(":/new/resource/images/process-stop.png")); + ui->connectionButton->setIcon(QIcon(":/images/process-stop.png")); ui->connectionButton->setText(tr("Disconnect")); QIcon icon(TRAY_ON_ICON); @@ -454,7 +454,7 @@ void MainWindow::changeStatus(int val) m_disconnectAction->setEnabled(true); ui->iconLabel->setPixmap(CONNECTING_ICON); - ui->connectionButton->setIcon(QIcon(":/new/resource/images/process-stop.png")); + ui->connectionButton->setIcon(QIcon(":/images/process-stop.png")); ui->connectionButton->setText(tr("Cancel")); blink_timer->start(1500); @@ -486,7 +486,7 @@ void MainWindow::changeStatus(int val) ui->iconLabel->setPixmap(OFF_ICON); ui->connectionButton->setEnabled(true); - ui->connectionButton->setIcon(QIcon(":/new/resource/images/network-wired.png")); + ui->connectionButton->setIcon(QIcon(":/images/network-wired.png")); ui->connectionButton->setText(tr("Connect")); if (m_trayIcon) { @@ -505,7 +505,7 @@ void MainWindow::changeStatus(int val) Qt::QueuedConnection); } else if (val == STATUS_DISCONNECTING) { ui->iconLabel->setPixmap(CONNECTING_ICON); - ui->connectionButton->setIcon(QIcon(":/new/resource/images/process-stop.png")); + ui->connectionButton->setIcon(QIcon(":/images/process-stop.png")); ui->connectionButton->setEnabled(false); blink_timer->start(1500); } else { diff --git a/src/dialog/mainwindow.ui b/src/dialog/mainwindow.ui index d6dd0659..e78271c4 100644 --- a/src/dialog/mainwindow.ui +++ b/src/dialog/mainwindow.ui @@ -33,7 +33,7 @@ - :/new/resource/Resources/mono_lock.png:/new/resource/Resources/mono_lock.png + :/Resources/mono_lock.png:/Resources/mono_lock.png false @@ -123,7 +123,7 @@ - :/new/resource/images/profiles.png:/new/resource/images/profiles.png + :/images/profiles.png:/images/profiles.png QToolButton::InstantPopup @@ -141,7 +141,7 @@ - :/new/resource/images/network-wired.png:/new/resource/images/network-wired.png + :/images/network-wired.png:/images/network-wired.png @@ -152,7 +152,7 @@ - :/new/resource/images/edit-find.png:/new/resource/images/edit-find.png + :/images/edit-find.png:/images/edit-find.png @@ -399,7 +399,7 @@ - :/new/resource/images/text-new.png:/new/resource/images/text-new.png + :/images/text-new.png:/images/text-new.png &New profile @@ -414,7 +414,7 @@ - :/new/resource/images/text-editor.png:/new/resource/images/text-editor.png + :/images/text-editor.png:/images/text-editor.png &Edit selected profile @@ -426,7 +426,7 @@ - :/new/resource/images/trashcan.png:/new/resource/images/trashcan.png + :/images/trashcan.png:/images/trashcan.png &Remove selected profile @@ -438,7 +438,7 @@ - :/new/resource/images/edit-find.png:/new/resource/images/edit-find.png + :/images/edit-find.png:/images/edit-find.png &Log window @@ -496,7 +496,7 @@ - :/new/resource/images/text-new.png:/new/resource/images/text-new.png + :/images/text-new.png:/images/text-new.png New profile (&advanced) diff --git a/src/openconnect-gui.qrc b/src/openconnect-gui.qrc index 827e7d1a..a000673a 100644 --- a/src/openconnect-gui.qrc +++ b/src/openconnect-gui.qrc @@ -1,5 +1,5 @@ - + images/trashcan.png images/text-editor.png images/network-wired.png From b33effceb2ab956b8b5fe889e1d2319881487437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Fri, 11 Aug 2017 00:00:38 +0200 Subject: [PATCH 005/129] Guess, we should set mask on icon here too MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ľubomír Carik --- src/dialog/mainwindow.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/dialog/mainwindow.cpp b/src/dialog/mainwindow.cpp index f7bbe194..0c2a9d1a 100644 --- a/src/dialog/mainwindow.cpp +++ b/src/dialog/mainwindow.cpp @@ -445,6 +445,7 @@ void MainWindow::changeStatus(int val) if (m_trayIcon) { QIcon icon(TRAY_OFF_ICON); + icon.setIsMask(true); m_trayIcon->setIcon(icon); } @@ -491,6 +492,7 @@ void MainWindow::changeStatus(int val) if (m_trayIcon) { QIcon icon(TRAY_OFF_ICON); + icon.setIsMask(true); m_trayIcon->setIcon(icon); if (this->isHidden() == true) From 53ef4b6a1a43882de928879293505c1f8b5be683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Fri, 11 Aug 2017 00:03:22 +0200 Subject: [PATCH 006/129] Using file selector we can use right icons on windows/macOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The 'mask' icon works fine on macOS but it break windows notification bar icons (at least Windows 10 looks ugly). Signed-off-by: Ľubomír Carik --- src/common.h | 3 --- src/dialog/mainwindow.cpp | 14 +++++++++----- src/images/+windows/network-connected.png | Bin 0 -> 6511 bytes src/images/+windows/network-disconnected.png | Bin 0 -> 4492 bytes src/openconnect-gui.qrc | 2 ++ 5 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 src/images/+windows/network-connected.png create mode 100644 src/images/+windows/network-disconnected.png diff --git a/src/common.h b/src/common.h index 9166dc46..376ff357 100644 --- a/src/common.h +++ b/src/common.h @@ -30,9 +30,6 @@ #define CONNECTING_ICON QPixmap(QString::fromLatin1(":/images/traffic_light_yellow.png")) #define CONNECTING_ICON2 QPixmap(QString::fromLatin1(":/images/traffic_light_off.png")) -#define TRAY_OFF_ICON QPixmap(QString::fromLatin1(":/images/network-disconnected.png")) -#define TRAY_ON_ICON QPixmap(QString::fromLatin1(":/images/network-connected.png")) - #define UPDATE_TIMER 10000 #ifdef _WIN32 diff --git a/src/dialog/mainwindow.cpp b/src/dialog/mainwindow.cpp index 0c2a9d1a..2d9d0f90 100644 --- a/src/dialog/mainwindow.cpp +++ b/src/dialog/mainwindow.cpp @@ -51,6 +51,7 @@ extern "C" { #include #include #include +#include #include #include @@ -103,8 +104,8 @@ MainWindow::MainWindow(QWidget* parent, const QString profileName) connect(m_trayIcon, &QSystemTrayIcon::activated, this, &MainWindow::iconActivated); - QIcon icon; - icon.addPixmap(TRAY_OFF_ICON, QIcon::Normal, QIcon::Off); + QFileSelector selector; + QIcon icon(selector.select(QStringLiteral(":/images/network-disconnected.png"))); icon.setIsMask(true); m_trayIcon->setIcon(icon); m_trayIcon->show(); @@ -419,7 +420,8 @@ void MainWindow::changeStatus(int val) ui->connectionButton->setIcon(QIcon(":/images/process-stop.png")); ui->connectionButton->setText(tr("Disconnect")); - QIcon icon(TRAY_ON_ICON); + QFileSelector selector; + QIcon icon(selector.select(QStringLiteral(":/images/network-connected.png"))); icon.setIsMask(true); m_trayIcon->setIcon(icon); @@ -444,7 +446,8 @@ void MainWindow::changeStatus(int val) } else if (val == STATUS_CONNECTING) { if (m_trayIcon) { - QIcon icon(TRAY_OFF_ICON); + QFileSelector selector; + QIcon icon(selector.select(QStringLiteral(":/images/network-disconnected.png"))); icon.setIsMask(true); m_trayIcon->setIcon(icon); } @@ -491,7 +494,8 @@ void MainWindow::changeStatus(int val) ui->connectionButton->setText(tr("Connect")); if (m_trayIcon) { - QIcon icon(TRAY_OFF_ICON); + QFileSelector selector; + QIcon icon(selector.select(QStringLiteral(":/images/network-disconnected.png"))); icon.setIsMask(true); m_trayIcon->setIcon(icon); diff --git a/src/images/+windows/network-connected.png b/src/images/+windows/network-connected.png new file mode 100644 index 0000000000000000000000000000000000000000..14423ec840d7703f81aaf6f5e557f909a4fc2eee GIT binary patch literal 6511 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 VwG%ysC0+mk002ovPDHLkV1nsJfEy|V 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 literal 0 HcmV?d00001 diff --git a/src/openconnect-gui.qrc b/src/openconnect-gui.qrc index a000673a..4fc0517a 100644 --- a/src/openconnect-gui.qrc +++ b/src/openconnect-gui.qrc @@ -11,6 +11,8 @@ images/traffic_light_off.png images/network-connected.png images/network-disconnected.png + images/+windows/network-connected.png + images/+windows/network-disconnected.png images/profiles.png images/text-new.png Resources/mono_lock.png From cb02831a061ae442f51f5a0687ea62df76d970fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Fri, 11 Aug 2017 00:07:31 +0200 Subject: [PATCH 007/129] Actually macOS is a customization and 'everything' else is default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ľubomír Carik --- src/images/+mac/network-connected.png | Bin 0 -> 1137 bytes src/images/+mac/network-disconnected.png | Bin 0 -> 800 bytes src/images/+windows/network-connected.png | Bin 6511 -> 0 bytes src/images/+windows/network-disconnected.png | Bin 4492 -> 0 bytes src/images/network-connected.png | Bin 1137 -> 6511 bytes src/images/network-disconnected.png | Bin 800 -> 4492 bytes src/openconnect-gui.qrc | 4 ++-- 7 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 src/images/+mac/network-connected.png create mode 100644 src/images/+mac/network-disconnected.png delete mode 100644 src/images/+windows/network-connected.png delete mode 100644 src/images/+windows/network-disconnected.png diff --git a/src/images/+mac/network-connected.png b/src/images/+mac/network-connected.png new file mode 100644 index 0000000000000000000000000000000000000000..027d9eee31850f3ad6bdc46c5b123959bafdd0e7 GIT binary patch literal 1137 zcmV-%1djWOP)W#U423Odp{0(Xqv&D*WT1;2 ztJ-ywLm0>bYM_f6sB6`>te;N#$U&w>fgoN5nQzAC)1yey!|-vvk4tR=V3Po(G_s%T zlp+f_2?!}o!Xxm2k^n6M<{ltE3~);7=N({m{GJlKntuO*Sr9r&LNAigkr#Rk1Fym+ z`B4Cz1o(%6kX9)tmO;>ImXe0C+mn!0et$m0xaqKaG|XDN!ztWS98TE`mf^TVO3xTD zC-91OawqT&>l9AlC)O!lS7gk3ULzYsN-um6%u-nia2GH$IlHoH7mfgJ!b+bxt?|~N z@^>+y^W%Bw7n1|DP)U;)0bBC=DmJytH&+lSISaKeIU5jAH1=RIYR)zDVI{deaqLa<{i#IkZ$kv0XVN zfm|^c-0Jxg*lv^bwsADkJ^DR>Y&|T{shUg!o$9uyfKJVYKqp=Q8EBnarSNo=?cBA; z`6Y7I%Fyj@t3X-;6b*DGiawmU_O&1ZbiMOUT`K|T7sk5*x}=5%1ORm2npi+d065(= zz}x|hEMVy~TI(LcaHIiV0>JE}Jp(wa_Q1>nK*$E5V`2q>kb7`{o)2ilIB?jl0GbhX z06JgA0kb%`7DWaEMg$4e3<(2Y6yHTaZOVfzoHgX`JC&wCm~lVVh=Jw0<+k z!?x=aX4sa0+u|WoE@Tc5k;3^=z<@vQu9(TIJF0|bX1nejlrbY9+qIi4Fu!@yWrSf{ zZFxsw8n;P5z>E|>^Fi43Nt(t*_8E`l_1q)u>wL^rnc;584J|i1j(a3CH#&~e=r{@^ zcHxbUl>jHaCin{z^dL;oWk4FS57Jwur@#xTQs8wm((4o_ys%NM*YZkzU3it!>%@!j zuV0<%|NrVtUI`-z-49>hn089ai9s^#5XRx-dLP#>^)~eXvZ|`Y00000NkvXXu0mjf DtLE(U literal 0 HcmV?d00001 diff --git a/src/images/+mac/network-disconnected.png b/src/images/+mac/network-disconnected.png new file mode 100644 index 0000000000000000000000000000000000000000..3aec537e8c63cb9c437a7084e9cca029ae3d4f82 GIT binary patch literal 800 zcmV+*1K<3KP)exd(MXZ98Fu};W$IOxp?X=q*Z)~X#w*C&DBMC6`SwNb6z&xs6b_(h zfueOPyePVdqO~hpS<%XhR?>BMS=W$I-BER`mL+PHb*=5Bsfo662P6fMwx;WWqyVyO zx&cTEVDGvl)ehkBRg0Fu1Ds8Z@&Ik|(hP11@Az!{7ot^H*E)z+U0rJ@T6J};Otk9C zjJwWL+dpAmtuEb&b&GG@Fx|toeYw_QTbx{LH_dBfT6t}GAiB2g+49D9V@qk|y1g`+ zYxOTbnAX`J_M2&yk!z}T*M{oucP*)IzIuh}rn?AS>na-6ig%HT7L2AyOzR4iR&g|A zBvl+uow!!tCrf<8@vq}&7W z;S1ugV=!Qz#FO&H9p+KwuUo<^JYc?vaemHMl%H_2$`Ni+{wLoQ?ofSa6L{1QZ~lId z=5qq-tI2U6K73U;F8j=b#r^+qtcCa@afgqGr@mNg@}O{XY>fUPT6Mc5bnR>=!;Xzz zsN&>A_c^Q`&^xmTRh;iB(R$wNK*o@94iK#oH>uX+Zv}p^m;HM1$qtSCcwvXn%`-i$ z?qjF4EEF~;!MK+fe)|HOu0G?5&286;3TNXV0KcQ=&v}?Z49CF_F`U|;(zdNXJ@D+b zvCz^h?J7&E-<`s=n`*3yPqp%RX+fT*H-$T8n)b>x9h7NWPk+lrS zS{uk(9>nlhki)M@`?-rrfL}>|Oje@&3b!C<;cq-DTenMXC7` ezW>|*yY&ZY#{ObBA>2*?0000|{4)-oHNvV>r+A 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 VwG%ysC0+mk002ovPDHLkV1nsJfEy|V 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 diff --git a/src/images/network-connected.png b/src/images/network-connected.png index 027d9eee31850f3ad6bdc46c5b123959bafdd0e7..14423ec840d7703f81aaf6f5e557f909a4fc2eee 100644 GIT binary patch literal 6511 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 delta 768 zcmV+b1ONPtBcKM57&QR{0002*rN$uu000J1OjJex|Nj6009C@%egFUf0d!JMQvg8b z*k%9#00Cl4M??UK1szC{AsBxLbV*G`2jK_`4<`he_4s1|00NUqL_t(o!|j(#j@%#+ zKy9&L=_7Cyjs{XL#!Z5h3wU;xf?NS?jO&-tNRhG`cKy0#>Q$AYdRe~L|5-)GE6Cg^ z+(H!j_C@X#?iC&s4xng(qID{~D7uHDwJTa#(aMTe(sg%P*N{-%QFVW-mL+PHb*=5B zsfo662P6fMwx;WWqyVyOx&cTEVDGvl)ehkBRg0Fu1Ds8Z@&Ik|(hP11@Az!{7ot^H z*E)z+U0rJ@T6J};Otk9CjJwWL+dpAmtuEb&b&GG@Fx|toeYw_QTbx{LH_dBfT6t}G zAiB2g+49D9V@qk|y1joinQQegKbY3pANHGRm62885~TRX8sD%!9@K|8T5@_#$zKkB6teSZng2 zaB^&n{vld*yCih&Y$n5wja{hXA$H5OVoZ6q#wyi%s@a(j)(9$dIDod*0ox-%6YOIM*weomrL7t{Jg*#=M_R2IJ zlxbSypiJ4IOxd7J(~549wG7Bw8^~H7#PC;;!>>vExr;zafL}>|Oje@&3b!C<;cq-D yTenMXC7`zW>|*yY&ZY#{ObBA>2*?0000images/traffic_light_off.png images/network-connected.png images/network-disconnected.png - images/+windows/network-connected.png - images/+windows/network-disconnected.png + images/+mac/network-connected.png + images/+mac/network-disconnected.png images/profiles.png images/text-new.png Resources/mono_lock.png From b45af489ec78ce7d64e54366024b39792932664b Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Sun, 6 Aug 2017 13:42:25 -0700 Subject: [PATCH 008/129] Prevent rearranging the tabs on the main window --- src/dialog/mainwindow.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dialog/mainwindow.ui b/src/dialog/mainwindow.ui index e78271c4..3831da2a 100644 --- a/src/dialog/mainwindow.ui +++ b/src/dialog/mainwindow.ui @@ -67,7 +67,7 @@ false - true + false From 46af487bf2bc3d1ddd3400c5a82c83d58e9b5ed2 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Sun, 6 Aug 2017 12:28:57 -0700 Subject: [PATCH 009/129] Use proper boolean value for NSHighResolutionCapable key --- src/Resources/openconnect-gui.plist.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Resources/openconnect-gui.plist.in b/src/Resources/openconnect-gui.plist.in index 8dc07f78..9ccf853f 100644 --- a/src/Resources/openconnect-gui.plist.in +++ b/src/Resources/openconnect-gui.plist.in @@ -33,7 +33,7 @@ NSPrincipalClass NSApplication NSHighResolutionCapable - True + LSMinimumSystemVersion ${CMAKE_OSX_DEPLOYMENT_TARGET} From ed96a483c10451568505a9b720c96c0aa61d6769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Tue, 15 Aug 2017 01:04:13 +0200 Subject: [PATCH 010/129] Don't try setup username/password for proxy when not defined (resolve #187) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ľubomír Carik --- CHANGELOG.md | 2 +- src/dialog/mainwindow.cpp | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 39996160..715d07b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ History of user-visible changes. ## [v1.5.3](https://github.com/openconnect/openconnect-gui/tree/v1.5.3) (unreleased) -- TBD +- Unable to use socks5 proxy built by ssh tunneling (#187) [Full Changelog](https://github.com/openconnect/openconnect-gui/compare/v1.5.2...v1.5.3) diff --git a/src/dialog/mainwindow.cpp b/src/dialog/mainwindow.cpp index 2d9d0f90..5bb213fd 100644 --- a/src/dialog/mainwindow.cpp +++ b/src/dialog/mainwindow.cpp @@ -599,7 +599,7 @@ void MainWindow::on_connectClicked() VpnInfo* vpninfo = nullptr; StoredServer* ss = new StoredServer(); QFuture future; - QString name, str, url; + QString name, url; QList proxies; QUrl turl; QNetworkProxyQuery query; @@ -662,12 +662,17 @@ void MainWindow::on_connectClicked() if (url.isEmpty() == false) { - str = proxies.at(0).user() + ":" + proxies.at(0).password() + "@" + proxies.at(0).hostName(); + QString str; + if (proxies.at(0).user() != 0) { + str = proxies.at(0).user() + ":" + proxies.at(0).password() + "@"; + } + str += proxies.at(0).hostName(); if (proxies.at(0).port() != 0) { str += ":" + QString::number(proxies.at(0).port()); } Logger::instance().addMessage(tr("Setting proxy to: ") + str); - openconnect_set_http_proxy(vpninfo->vpninfo, str.toLatin1().data()); + // FIXME: ... + int ret = openconnect_set_http_proxy(vpninfo->vpninfo, str.toLatin1().data()); } } From 6973e817e7b4403e576c1a77937e8e6d9b93f30e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Sat, 19 Aug 2017 21:16:05 +0200 Subject: [PATCH 011/129] Update spdlog to v0.14.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ľubomír Carik --- CHANGELOG.md | 1 + CMake/Includes/ProjectExternals.cmake | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 715d07b8..d20a11e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ History of user-visible changes. ## [v1.5.3](https://github.com/openconnect/openconnect-gui/tree/v1.5.3) (unreleased) - Unable to use socks5 proxy built by ssh tunneling (#187) +- update spdlog (0.14.0) [Full Changelog](https://github.com/openconnect/openconnect-gui/compare/v1.5.2...v1.5.3) diff --git a/CMake/Includes/ProjectExternals.cmake b/CMake/Includes/ProjectExternals.cmake index 4700e9a8..b61b3192 100644 --- a/CMake/Includes/ProjectExternals.cmake +++ b/CMake/Includes/ProjectExternals.cmake @@ -1,6 +1,6 @@ set(openconnect-TAG v7.08) set(vpnc-scripts-TAG master) -set(spdlog-TAG v0.13.0) +set(spdlog-TAG v0.14.0) set(qt-solutions-TAG master) set(tap-driver-TAG 9.21.2) From c88f1a944b3b6bd83ba058a81a2b6f7db22a162c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Mon, 21 Aug 2017 23:08:31 +0200 Subject: [PATCH 012/129] Update installers' application strings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ľubomír Carik --- CMake/Includes/ProjectPackage.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMake/Includes/ProjectPackage.cmake b/CMake/Includes/ProjectPackage.cmake index 107c09a5..524bc872 100644 --- a/CMake/Includes/ProjectPackage.cmake +++ b/CMake/Includes/ProjectPackage.cmake @@ -51,7 +51,7 @@ if(WIN32 AND MINGW) set(CPACK_COMPONENTS_ALL App App_Console vpnc_script TAP_drivers VcRedist_libs) set(CPACK_COMPONENT_APP_REQUIRED on) - set(CPACK_COMPONENT_APP_DISPLAY_NAME "${PRODUCT_NAME_SHORT}") + set(CPACK_COMPONENT_APP_DISPLAY_NAME "GUI") set(CPACK_COMPONENT_APP_DESCRIPTION "${PRODUCT_NAME_LONG} GUI") set(CPACK_COMPONENT_APP_GROUP "Application") set(CPACK_COMPONENT_APP_INSTALL_TYPES Full AppOnly Standard) @@ -77,7 +77,7 @@ if(WIN32 AND MINGW) set(CPACK_COMPONENT_APP_CONSOLE_DISABLED on) set(CPACK_COMPONENT_APP_CONSOLE_REQUIRED off) - set(CPACK_COMPONENT_APP_CONSOLE_DISPLAY_NAME "${PRODUCT_NAME_SHORT}") + set(CPACK_COMPONENT_APP_CONSOLE_DISPLAY_NAME "console") set(CPACK_COMPONENT_APP_CONSOLE_DESCRIPTION "${PRODUCT_NAME_LONG} (console)") set(CPACK_COMPONENT_APP_CONSOLE_GROUP "Application") set(CPACK_COMPONENT_APP_CONSOLE_INSTALL_TYPES Full) From 30d60d62cc040443c21482f6c2d0d49f1d29ad91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Thu, 19 Oct 2017 15:26:28 +0200 Subject: [PATCH 013/129] Upate default SDK path for recent version of Xcode on High Sierra --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 185eaa2a..56a2269e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) if(APPLE) if(NOT CMAKE_OSX_SYSROOT) - set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk" CACHE STRING "" FORCE) + set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk" CACHE STRING "" FORCE) endif() if(NOT CMAKE_OSX_DEPLOYMENT_TARGET) From 4c085e773d297634a3e360b1a6dc0e8509556719 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Fri, 15 Dec 2017 17:47:01 +0100 Subject: [PATCH 014/129] Update Qt to version 5.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ľubomír Carik --- CHANGELOG.md | 1 + CMake/Includes/ProjectDependencies.cmake | 2 +- CMakeLists.txt | 2 +- docs/sw_requirements.md | 6 +++--- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d20a11e7..9a2fe3b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ History of user-visible changes. ## [v1.5.3](https://github.com/openconnect/openconnect-gui/tree/v1.5.3) (unreleased) +- update Qt (5.10.0) - Unable to use socks5 proxy built by ssh tunneling (#187) - update spdlog (0.14.0) diff --git a/CMake/Includes/ProjectDependencies.cmake b/CMake/Includes/ProjectDependencies.cmake index f29bf456..662a55ac 100644 --- a/CMake/Includes/ProjectDependencies.cmake +++ b/CMake/Includes/ProjectDependencies.cmake @@ -3,7 +3,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) -find_package(Qt5 5.6 REQUIRED COMPONENTS Core Gui Widgets Network) +find_package(Qt5 5.10 REQUIRED COMPONENTS Core Gui Widgets Network) if(MINGW) get_target_property(_qwindows_dll Qt5::QWindowsIntegrationPlugin LOCATION) endif() diff --git a/CMakeLists.txt b/CMakeLists.txt index 56a2269e..85ee525c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ if(APPLE) endif() if(NOT CMAKE_OSX_DEPLOYMENT_TARGET) - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10" CACHE STRING "" FORCE) + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.11" CACHE STRING "" FORCE) endif() endif() diff --git a/docs/sw_requirements.md b/docs/sw_requirements.md index c4a9f794..1c141227 100644 --- a/docs/sw_requirements.md +++ b/docs/sw_requirements.md @@ -5,7 +5,7 @@ This chapter summarize actual development environment. Newer or older versions m This is target platform for the product. - [Qt 5 (incl. mingw32) & QtCreator 4+](http://download.qt.io/official_releases/online_installers/qt-unified-windows-x86-online.exe) and choose: - - 5.9.1/MinGW 5.3.0 (32-bit) + - 5.10.0/MinGW 5.3.0 (32-bit) - Tools/MinGW 5.3.0 component - Tools/QtCreator component - Tools/QtCreator CDB Debugger support @@ -42,7 +42,7 @@ This is not main target platform, because openconnect is used by other projects #### MacOS - MacOS 10.10+ -- Xcode 8.2.1+ incl. command line tools +- Xcode 9.2+ incl. command line tools - [Qt online installer](http://download.qt.io/official_releases/online_installers/qt-unified-mac-x64-online.dmg) and choose: - - 5.9.1/"OS X" component + - 5.10.0/"OS X" component - Tools/QtCreator component From f1bd29c0d682c0d3caea2ecd0b77fc28c6f7b911 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Fri, 15 Dec 2017 17:48:02 +0100 Subject: [PATCH 015/129] Re-create clang-format config file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ľubomír Carik --- .clang-format | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/.clang-format b/.clang-format index a792fee3..86596eda 100644 --- a/.clang-format +++ b/.clang-format @@ -5,7 +5,7 @@ AccessModifierOffset: -4 AlignAfterOpenBracket: DontAlign AlignConsecutiveAssignments: false AlignConsecutiveDeclarations: false -AlignEscapedNewlinesLeft: false +AlignEscapedNewlines: Right AlignOperands: false AlignTrailingComments: false AllowAllParametersOfDeclarationOnNextLine: true @@ -29,17 +29,24 @@ BraceWrapping: AfterObjCDeclaration: false AfterStruct: false AfterUnion: false + AfterExternBlock: false BeforeCatch: false BeforeElse: false IndentBraces: false + SplitEmptyFunction: true + SplitEmptyRecord: true + SplitEmptyNamespace: true BreakBeforeBinaryOperators: All BreakBeforeBraces: WebKit +BreakBeforeInheritanceComma: false BreakBeforeTernaryOperators: true -BreakConstructorInitializersBeforeComma: true +BreakConstructorInitializersBeforeComma: false +BreakConstructorInitializers: BeforeComma BreakAfterJavaFieldAnnotations: false BreakStringLiterals: true ColumnLimit: 0 CommentPragmas: '^ IWYU pragma:' +CompactNamespaces: false ConstructorInitializerAllOnOneLineOrOnePerLine: false ConstructorInitializerIndentWidth: 4 ContinuationIndentWidth: 4 @@ -47,17 +54,25 @@ Cpp11BracedListStyle: false DerivePointerAlignment: false DisableFormat: false ExperimentalAutoDetectBinPacking: false -ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ] +FixNamespaceComments: false +ForEachMacros: + - foreach + - Q_FOREACH + - BOOST_FOREACH IncludeCategories: - Regex: '^"(llvm|llvm-c|clang|clang-c)/' Priority: 2 - - Regex: '^(<|"(gtest|isl|json)/)' + - Regex: '^(<|"(gtest|gmock|isl|json)/)' Priority: 3 - Regex: '.*' Priority: 1 +IncludeIsMainRegex: '(Test)?$' IndentCaseLabels: false +IndentPPDirectives: None IndentWidth: 4 IndentWrappedFunctionNames: false +JavaScriptQuotes: Leave +JavaScriptWrapImports: true KeepEmptyLinesAtTheStartOfBlocks: true MacroBlockBegin: '' MacroBlockEnd: '' @@ -66,6 +81,7 @@ NamespaceIndentation: Inner ObjCBlockIndentWidth: 4 ObjCSpaceAfterProperty: true ObjCSpaceBeforeProtocolList: true +PenaltyBreakAssignment: 2 PenaltyBreakBeforeFirstCallParameter: 19 PenaltyBreakComment: 300 PenaltyBreakFirstLessLess: 120 @@ -73,9 +89,15 @@ PenaltyBreakString: 1000 PenaltyExcessCharacter: 1000000 PenaltyReturnTypeOnItsOwnLine: 60 PointerAlignment: Left +RawStringFormats: + - Delimiter: pb + Language: TextProto + BasedOnStyle: google ReflowComments: true SortIncludes: true +SortUsingDeclarations: true SpaceAfterCStyleCast: false +SpaceAfterTemplateKeyword: true SpaceBeforeAssignmentOperators: true SpaceBeforeParens: ControlStatements SpaceInEmptyParentheses: false @@ -85,9 +107,8 @@ SpacesInContainerLiterals: true SpacesInCStyleCastParentheses: false SpacesInParentheses: false SpacesInSquareBrackets: false -Standard: Cpp03 +Standard: Cpp11 TabWidth: 8 UseTab: Never -JavaScriptQuotes: Leave ... From 39d0a805ffbae9062f602f3cbf86bcce4a8c0213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Fri, 15 Dec 2017 17:53:23 +0100 Subject: [PATCH 016/129] Use CMake 3.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previous 3.x version works fine, just it hangs on macOS 10.13 when create installation package. Signed-off-by: Ľubomír Carik --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 85ee525c..db913607 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5 FATAL_ERROR) +cmake_minimum_required(VERSION 3.10 FATAL_ERROR) if(APPLE) if(NOT CMAKE_OSX_SYSROOT) From 0bacd497f52f95e596530e0214a696a704c10273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Fri, 15 Dec 2017 17:57:36 +0100 Subject: [PATCH 017/129] Don't use system proxy when disabled in VPN profile (resolve #208) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ľubomír Carik --- CHANGELOG.md | 1 + src/dialog/mainwindow.cpp | 42 ++++++++++++++++++++------------------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a2fe3b9..dc6fe626 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ History of user-visible changes. ## [v1.5.3](https://github.com/openconnect/openconnect-gui/tree/v1.5.3) (unreleased) +- Don't use system wide defined proxy when disabled in profile (#208) - update Qt (5.10.0) - Unable to use socks5 proxy built by ssh tunneling (#187) - update spdlog (0.14.0) diff --git a/src/dialog/mainwindow.cpp b/src/dialog/mainwindow.cpp index 5bb213fd..0291d591 100644 --- a/src/dialog/mainwindow.cpp +++ b/src/dialog/mainwindow.cpp @@ -652,27 +652,29 @@ void MainWindow::on_connectClicked() goto fail; } - proxies = QNetworkProxyFactory::systemProxyForQuery(query); - if (proxies.size() > 0 && proxies.at(0).type() != QNetworkProxy::NoProxy) { - if (proxies.at(0).type() == QNetworkProxy::Socks5Proxy) - url = "socks5://"; - else if (proxies.at(0).type() == QNetworkProxy::HttpCachingProxy - || proxies.at(0).type() == QNetworkProxy::HttpProxy) - url = "http://"; - - if (url.isEmpty() == false) { - - QString str; - if (proxies.at(0).user() != 0) { - str = proxies.at(0).user() + ":" + proxies.at(0).password() + "@"; - } - str += proxies.at(0).hostName(); - if (proxies.at(0).port() != 0) { - str += ":" + QString::number(proxies.at(0).port()); + if (ss->get_proxy()) { + proxies = QNetworkProxyFactory::systemProxyForQuery(query); + if (proxies.size() > 0 && proxies.at(0).type() != QNetworkProxy::NoProxy) { + if (proxies.at(0).type() == QNetworkProxy::Socks5Proxy) + url = "socks5://"; + else if (proxies.at(0).type() == QNetworkProxy::HttpCachingProxy + || proxies.at(0).type() == QNetworkProxy::HttpProxy) + url = "http://"; + + if (url.isEmpty() == false) { + + QString str; + if (proxies.at(0).user() != 0) { + str = proxies.at(0).user() + ":" + proxies.at(0).password() + "@"; + } + str += proxies.at(0).hostName(); + if (proxies.at(0).port() != 0) { + str += ":" + QString::number(proxies.at(0).port()); + } + Logger::instance().addMessage(tr("Setting proxy to: ") + str); + // FIXME: ... + int ret = openconnect_set_http_proxy(vpninfo->vpninfo, str.toLatin1().data()); } - Logger::instance().addMessage(tr("Setting proxy to: ") + str); - // FIXME: ... - int ret = openconnect_set_http_proxy(vpninfo->vpninfo, str.toLatin1().data()); } } From aca1c1c8590d90e49594fa884103bf31af70e893 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Fri, 15 Dec 2017 18:38:33 +0100 Subject: [PATCH 018/129] Reformat source code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ľubomír Carik --- .clang-format | 2 +- src/FileLogger.cpp | 32 ++++----- src/FileLogger.h | 13 ++-- src/cryptdata.cpp | 2 +- src/dialog/NewProfileDialog.cpp | 35 +++++----- src/dialog/NewProfileDialog.h | 15 ++--- src/dialog/editdialog.cpp | 14 ++-- src/dialog/editdialog.h | 12 ++-- src/dialog/logdialog.cpp | 15 ++--- src/dialog/mainwindow.cpp | 116 ++++++++++++++++++-------------- src/dialog/mainwindow.h | 1 - src/logger.cpp | 26 +++---- src/logger.h | 16 ++--- src/main.cpp | 43 ++++++------ src/server_storage.cpp | 8 +-- src/vpninfo.cpp | 42 ++++++------ src/vpninfo.h | 1 + 17 files changed, 198 insertions(+), 195 deletions(-) diff --git a/.clang-format b/.clang-format index 86596eda..e400fea6 100644 --- a/.clang-format +++ b/.clang-format @@ -108,7 +108,7 @@ SpacesInCStyleCastParentheses: false SpacesInParentheses: false SpacesInSquareBrackets: false Standard: Cpp11 -TabWidth: 8 +TabWidth: 4 UseTab: Never ... diff --git a/src/FileLogger.cpp b/src/FileLogger.cpp index 6ac1a10a..ce2736d0 100644 --- a/src/FileLogger.cpp +++ b/src/FileLogger.cpp @@ -1,17 +1,17 @@ #include "FileLogger.h" -#include #include #include +#include #include namespace spd = spdlog; -FileLogger::FileLogger(QObject *parent, const QString& logPath, const size_t logSize, const size_t logCount) : - QObject(parent), - m_logPath{logPath}, - m_logSize{logSize}, - m_logCount{logCount} +FileLogger::FileLogger(QObject* parent, const QString& logPath, const size_t logSize, const size_t logCount) + : QObject(parent) + , m_logPath{ logPath } + , m_logSize{ logSize } + , m_logCount{ logCount } { QDir dir; @@ -19,17 +19,17 @@ FileLogger::FileLogger(QObject *parent, const QString& logPath, const size_t log try { m_logger = spd::rotating_logger_mt("openconnect-logger", #ifdef Q_OS_WIN - QString("%1/%2").arg(m_logPath).arg(qApp->applicationName()).toStdWString(), + QString("%1/%2").arg(m_logPath).arg(qApp->applicationName()).toStdWString(), #else - QString("%1/%2").arg(m_logPath).arg(qApp->applicationName()).toStdString(), + QString("%1/%2").arg(m_logPath).arg(qApp->applicationName()).toStdString(), #endif - logSize, - logCount); + logSize, + logCount); spd::set_pattern("%v"); } catch (const spd::spdlog_ex& ex) { QMessageBox::critical(nullptr, - QString("Log file init failed"), - QString(ex.what())); + QString("Log file init failed"), + QString(ex.what())); } connect(&Logger::instance(), &Logger::newLogMessage, this, &FileLogger::addLogMessage); @@ -46,9 +46,9 @@ void FileLogger::addLogMessage(const Logger::Message& message) dt.setMSecsSinceEpoch(message.timeStamp); m_logger->log(spdlog::level::off, - "{:<24} | {:>4} | {}", - dt.toString("yyyy-MM-dd hh:mm:ss.ms").toStdString(), - QString::number((long long)message.threadId, 16).toStdString(), - message.text.toStdString()); + "{:<24} | {:>4} | {}", + dt.toString("yyyy-MM-dd hh:mm:ss.ms").toStdString(), + QString::number((long long)message.threadId, 16).toStdString(), + message.text.toStdString()); m_logger->flush(); } diff --git a/src/FileLogger.h b/src/FileLogger.h index 600cf6ad..e8e3468b 100644 --- a/src/FileLogger.h +++ b/src/FileLogger.h @@ -1,6 +1,5 @@ #pragma once - #include "spdlog/spdlog.h" #include @@ -8,15 +7,13 @@ #include "logger.h" - -class FileLogger : public QObject -{ +class FileLogger : public QObject { Q_OBJECT public: - explicit FileLogger(QObject *parent = nullptr, - const QString& logPath = QString("%1/%2").arg(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation)).arg("logs"), - const size_t logSize = 1024*1024, - const size_t logCount = 5); + explicit FileLogger(QObject* parent = nullptr, + const QString& logPath = QString("%1/%2").arg(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation)).arg("logs"), + const size_t logSize = 1024 * 1024, + const size_t logCount = 5); ~FileLogger(); FileLogger(const FileLogger&) = delete; FileLogger& operator=(const FileLogger&) = delete; diff --git a/src/cryptdata.cpp b/src/cryptdata.cpp index b6f9127d..66f22f8d 100644 --- a/src/cryptdata.cpp +++ b/src/cryptdata.cpp @@ -21,8 +21,8 @@ #if defined(_WIN32) // FIXME: these 2 files have to be in this order: windows.h, winbsae.h ??? -#include #include +#include typedef WINBOOL(WINAPI* CryptProtectDataFunc)(DATA_BLOB* pDataIn, LPCWSTR szDataDescr, diff --git a/src/dialog/NewProfileDialog.cpp b/src/dialog/NewProfileDialog.cpp index c04c09fa..2e6ee81e 100644 --- a/src/dialog/NewProfileDialog.cpp +++ b/src/dialog/NewProfileDialog.cpp @@ -4,14 +4,14 @@ #include "server_storage.h" #include -#include #include +#include #include -NewProfileDialog::NewProfileDialog(QWidget *parent) : - QDialog(parent), - ui(new Ui::NewProfileDialog) +NewProfileDialog::NewProfileDialog(QWidget* parent) + : QDialog(parent) + , ui(new Ui::NewProfileDialog) { ui->setupUi(this); @@ -32,15 +32,15 @@ QString NewProfileDialog::getNewProfileName() const return ui->lineEditName->text(); } -void NewProfileDialog::changeEvent(QEvent *e) +void NewProfileDialog::changeEvent(QEvent* e) { QDialog::changeEvent(e); switch (e->type()) { - case QEvent::LanguageChange: - ui->retranslateUi(this); - break; - default: - break; + case QEvent::LanguageChange: + ui->retranslateUi(this); + break; + default: + break; } } @@ -58,12 +58,12 @@ void NewProfileDialog::on_checkBoxCustomize_toggled(bool checked) } } -void NewProfileDialog::on_lineEditName_textChanged(const QString &) +void NewProfileDialog::on_lineEditName_textChanged(const QString&) { updateButtons(); } -void NewProfileDialog::on_lineEditGateway_textChanged(const QString &text) +void NewProfileDialog::on_lineEditGateway_textChanged(const QString& text) { QUrl url(text, QUrl::StrictMode); if (ui->checkBoxCustomize->isChecked() == false && (url.isValid() || text.isEmpty())) { @@ -76,9 +76,8 @@ void NewProfileDialog::on_lineEditGateway_textChanged(const QString &text) #define PREFIX "server:" void NewProfileDialog::updateButtons() { - bool enableButtons{false}; - if (ui->lineEditName->text().isEmpty() == false && - ui->lineEditGateway->text().isEmpty() == false) { + bool enableButtons{ false }; + if (ui->lineEditName->text().isEmpty() == false && ui->lineEditGateway->text().isEmpty() == false) { enableButtons = true; @@ -86,7 +85,7 @@ void NewProfileDialog::updateButtons() QSettings settings; for (const auto& key : settings.allKeys()) { if (key.startsWith(PREFIX) && key.endsWith("/server")) { - QString str{key}; + QString str{ key }; str.remove(0, sizeof(PREFIX) - 1); /* remove prefix */ str.remove(str.size() - 7, 7); /* remove /server suffix */ if (str == ui->lineEditName->text()) { @@ -101,7 +100,7 @@ void NewProfileDialog::updateButtons() ui->buttonBox->button(QDialogButtonBox::SaveAll)->setEnabled(enableButtons); } -void NewProfileDialog::on_buttonBox_clicked(QAbstractButton *button) +void NewProfileDialog::on_buttonBox_clicked(QAbstractButton* button) { if (ui->buttonBox->standardButton(button) == QDialogButtonBox::SaveAll) { emit connect(); @@ -110,7 +109,7 @@ void NewProfileDialog::on_buttonBox_clicked(QAbstractButton *button) void NewProfileDialog::on_buttonBox_accepted() { - auto ss{std::make_unique()}; + auto ss{ std::make_unique() }; ss->set_label(ui->lineEditName->text()); ss->set_servername(ui->lineEditGateway->text()); ss->save(); diff --git a/src/dialog/NewProfileDialog.h b/src/dialog/NewProfileDialog.h index 6e52c181..3654b220 100644 --- a/src/dialog/NewProfileDialog.h +++ b/src/dialog/NewProfileDialog.h @@ -7,12 +7,11 @@ namespace Ui { class NewProfileDialog; } -class NewProfileDialog : public QDialog -{ +class NewProfileDialog : public QDialog { Q_OBJECT public: - explicit NewProfileDialog(QWidget *parent = 0); + explicit NewProfileDialog(QWidget* parent = 0); ~NewProfileDialog(); QString getNewProfileName() const; @@ -21,18 +20,18 @@ class NewProfileDialog : public QDialog void connect(); protected: - void changeEvent(QEvent *e); + void changeEvent(QEvent* e); private slots: void on_checkBoxCustomize_toggled(bool checked); - void on_lineEditName_textChanged(const QString &); - void on_lineEditGateway_textChanged(const QString &text); + void on_lineEditName_textChanged(const QString&); + void on_lineEditGateway_textChanged(const QString& text); - void on_buttonBox_clicked(QAbstractButton *button); + void on_buttonBox_clicked(QAbstractButton* button); void on_buttonBox_accepted(); private: void updateButtons(); - Ui::NewProfileDialog *ui; + Ui::NewProfileDialog* ui; }; diff --git a/src/dialog/editdialog.cpp b/src/dialog/editdialog.cpp index 3acad422..2b04c779 100644 --- a/src/dialog/editdialog.cpp +++ b/src/dialog/editdialog.cpp @@ -56,7 +56,7 @@ static int token_tab(int mode) } static int token_rtab[] = { - [0] = OC_TOKEN_MODE_HOTP, + [0] = OC_TOKEN_MODE_HOTP, [1] = OC_TOKEN_MODE_TOTP, [2] = OC_TOKEN_MODE_STOKEN }; @@ -336,32 +336,32 @@ void EditDialog::on_loadWinCert_clicked() ui->userKeyEdit->setText(st.key_url); } -void EditDialog::on_groupnameEdit_textChanged(const QString &arg1) +void EditDialog::on_groupnameEdit_textChanged(const QString& arg1) { ui->groupnameClear->setEnabled(!arg1.isEmpty()); } -void EditDialog::on_caCertEdit_textChanged(const QString &arg1) +void EditDialog::on_caCertEdit_textChanged(const QString& arg1) { ui->caCertClear->setEnabled(!arg1.isEmpty()); } -void EditDialog::on_serverCertHash_textChanged(const QString &arg1) +void EditDialog::on_serverCertHash_textChanged(const QString& arg1) { ui->serverCertClear->setEnabled(!arg1.isEmpty()); } -void EditDialog::on_tokenEdit_textChanged(const QString &arg1) +void EditDialog::on_tokenEdit_textChanged(const QString& arg1) { ui->tokenClear->setEnabled(!arg1.isEmpty()); } -void EditDialog::on_userCertEdit_textChanged(const QString &arg1) +void EditDialog::on_userCertEdit_textChanged(const QString& arg1) { ui->userCertClear->setEnabled(!arg1.isEmpty()); } -void EditDialog::on_userKeyEdit_textChanged(const QString &arg1) +void EditDialog::on_userKeyEdit_textChanged(const QString& arg1) { ui->userKeyClear->setEnabled(!arg1.isEmpty()); } diff --git a/src/dialog/editdialog.h b/src/dialog/editdialog.h index 791bb769..5cf8405e 100644 --- a/src/dialog/editdialog.h +++ b/src/dialog/editdialog.h @@ -50,12 +50,12 @@ private slots: void on_groupnameClear_clicked(); void on_loadWinCert_clicked(); - void on_groupnameEdit_textChanged(const QString &arg1); - void on_caCertEdit_textChanged(const QString &arg1); - void on_serverCertHash_textChanged(const QString &arg1); - void on_tokenEdit_textChanged(const QString &arg1); - void on_userCertEdit_textChanged(const QString &arg1); - void on_userKeyEdit_textChanged(const QString &arg1); + void on_groupnameEdit_textChanged(const QString& arg1); + void on_caCertEdit_textChanged(const QString& arg1); + void on_serverCertHash_textChanged(const QString& arg1); + void on_tokenEdit_textChanged(const QString& arg1); + void on_userCertEdit_textChanged(const QString& arg1); + void on_userKeyEdit_textChanged(const QString& arg1); private: void load_win_certs(); diff --git a/src/dialog/logdialog.cpp b/src/dialog/logdialog.cpp index 3caf93fe..a4f2d283 100644 --- a/src/dialog/logdialog.cpp +++ b/src/dialog/logdialog.cpp @@ -21,9 +21,9 @@ #include "ui_logdialog.h" #include +#include #include #include -#include #include LogDialog::LogDialog(QWidget* parent) @@ -45,18 +45,18 @@ LogDialog::LogDialog(QWidget* parent) } connect(&Logger::instance(), &Logger::newLogMessage, - this, &LogDialog::append, Qt::QueuedConnection); + this, &LogDialog::append, Qt::QueuedConnection); m_timer->setSingleShot(true); m_timer->setInterval(100); connect(m_timer.get(), &QTimer::timeout, - ui->listWidget, &QListWidget::scrollToBottom); + ui->listWidget, &QListWidget::scrollToBottom); } LogDialog::~LogDialog() { disconnect(&Logger::instance(), &Logger::newLogMessage, - this, &LogDialog::append); + this, &LogDialog::append); delete ui; } @@ -71,10 +71,9 @@ void LogDialog::append(const Logger::Message& message) QDateTime dt; dt.setMSecsSinceEpoch(message.timeStamp); ui->listWidget->addItem(QString("%1 | %2 | %3") - .arg(dt.toString("yyyy-MM-dd hh:mm:ss")) - .arg(QString::number((long long)message.threadId, 16), 4) - .arg(message.text) - ); + .arg(dt.toString("yyyy-MM-dd hh:mm:ss")) + .arg(QString::number((long long)message.threadId, 16), 4) + .arg(message.text)); if (ui->checkBox_autoScroll->checkState() == Qt::Checked) { m_timer->start(); } diff --git a/src/dialog/mainwindow.cpp b/src/dialog/mainwindow.cpp index 0291d591..27859cf4 100644 --- a/src/dialog/mainwindow.cpp +++ b/src/dialog/mainwindow.cpp @@ -18,14 +18,14 @@ */ #include "mainwindow.h" -#include "ui_mainwindow.h" -#include "config.h" #include "NewProfileDialog.h" +#include "config.h" #include "editdialog.h" #include "logdialog.h" #include "openconnect-gui.h" -#include "timestamp.h" #include "server_storage.h" +#include "timestamp.h" +#include "ui_mainwindow.h" #include "vpninfo.h" #include "logger.h" @@ -37,25 +37,25 @@ extern "C" { #include #include +#include #include +#include +#include #include #include #include #include +#include +#include #include #include #include #include #include -#include -#include -#include -#include -#include +#include #include #include -#include #ifdef _WIN32 #define pipe_write(x, y, z) send(x, y, z, 0) @@ -70,7 +70,7 @@ MainWindow::MainWindow(QWidget* parent, const QString profileName) ui->setupUi(this); connect(ui->viewLogButton, &QPushButton::clicked, - this, &MainWindow::createLogDialog); + this, &MainWindow::createLogDialog); timer = new QTimer(this); blink_timer = new QTimer(this); @@ -137,17 +137,21 @@ MainWindow::MainWindow(QWidget* parent, const QString profileName) s2_connectionReady->assignProperty(m_trayIconMenuConnections, "enabled", true); machine->addState(s2_connectionReady); - class ServerListTransition : public QSignalTransition - { + class ServerListTransition : public QSignalTransition { public: - ServerListTransition(QComboBox *cb, bool hasServers) - : QSignalTransition(cb, SIGNAL(currentIndexChanged(int))), hasServers(hasServers) {} + ServerListTransition(QComboBox* cb, bool hasServers) + : QSignalTransition(cb, SIGNAL(currentIndexChanged(int))) + , hasServers(hasServers) + { + } + protected: - bool eventTest(QEvent *e) { + bool eventTest(QEvent* e) + { if (!QSignalTransition::eventTest(e)) { return false; } - QStateMachine::SignalEvent *se = static_cast(e); + QStateMachine::SignalEvent* se = static_cast(e); bool isEmpty = se->arguments().at(0).toInt() == -1; return (hasServers ? !isEmpty : isEmpty); } @@ -179,8 +183,8 @@ MainWindow::MainWindow(QWidget* parent, const QString profileName) return; } else { QMessageBox::warning(this, - tr("Connection failed"), - tr("Selected VPN profile '%1' does not exists.").arg(profileName)); + tr("Connection failed"), + tr("Selected VPN profile '%1' does not exists.").arg(profileName)); } } @@ -233,43 +237,55 @@ MainWindow::MainWindow(QWidget* parent, const QString profileName) } // TODO: move outside... - class MinimizeEventTransition : public QEventTransition - { + class MinimizeEventTransition : public QEventTransition { public: - MinimizeEventTransition(QMainWindow* mw, Qt::WindowState state) - : QEventTransition(mw, QEvent::WindowStateChange), m_mw(mw), m_state(state) {} + MinimizeEventTransition(QMainWindow* mw, Qt::WindowState state) + : QEventTransition(mw, QEvent::WindowStateChange) + , m_mw(mw) + , m_state(state) + { + } + protected: - bool eventTest(QEvent *e) override { + bool eventTest(QEvent* e) override + { if (!QEventTransition::eventTest(e)) { return false; } - QStateMachine::WrappedEvent *we = static_cast(e); - if(we->event()->type() == QEvent::WindowStateChange) { + QStateMachine::WrappedEvent* we = static_cast(e); + if (we->event()->type() == QEvent::WindowStateChange) { return (m_mw->windowState() == m_state); } return false; } + private: QMainWindow* m_mw; Qt::WindowState m_state; }; // TODO: move outside... - class RestoreEventTransition : public QEventTransition - { + class RestoreEventTransition : public QEventTransition { public: - RestoreEventTransition(QMainWindow* mw, Qt::WindowState state) - : QEventTransition(mw, QEvent::WindowStateChange), m_mw(mw), m_state(state) {} + RestoreEventTransition(QMainWindow* mw, Qt::WindowState state) + : QEventTransition(mw, QEvent::WindowStateChange) + , m_mw(mw) + , m_state(state) + { + } + protected: - bool eventTest(QEvent *e) override { + bool eventTest(QEvent* e) override + { if (!QEventTransition::eventTest(e)) { return false; } - QStateMachine::WrappedEvent *we = static_cast(e); - if(we->event()->type() == QEvent::WindowStateChange) { + QStateMachine::WrappedEvent* we = static_cast(e); + if (we->event()->type() == QEvent::WindowStateChange) { return (m_mw->windowState() == m_state); } return false; } + private: QMainWindow* m_mw; Qt::WindowState m_state; @@ -343,13 +359,13 @@ void MainWindow::vpn_status_changed(int connected, QString& dns, QString& ip, QS QString MainWindow::normalize_byte_size(uint64_t bytes) { - const unsigned unit = 1024;// TODO: add support for SI units? (optional) + const unsigned unit = 1024; // TODO: add support for SI units? (optional) if (bytes < unit) { return QString("%1 B").arg(QString::number(bytes)); } const int exp = static_cast(std::log(bytes) / std::log(unit)); static const char suffixChar[] = "KMGTPE"; - return QString("%1 %2B").arg(QString::number(bytes / std::pow(unit, exp), 'f', 3)).arg(suffixChar[exp-1]); + return QString("%1 %2B").arg(QString::number(bytes / std::pow(unit, exp), 'f', 3)).arg(suffixChar[exp - 1]); } void MainWindow::statsChanged(QString tx, QString rx, QString dtls) @@ -635,8 +651,8 @@ void MainWindow::on_connectClicked() vpninfo = new VpnInfo(QString("%1 %2").arg(qApp->applicationName()).arg(qApp->applicationVersion()), ss, this); } catch (std::exception& ex) { QMessageBox::information(this, - qApp->applicationName(), - tr("There was an issue initializing the VPN ") + "(" + ex.what() + ")."); + qApp->applicationName(), + tr("There was an issue initializing the VPN ") + "(" + ex.what() + ")."); goto fail; } @@ -760,25 +776,25 @@ void MainWindow::writeSettings() void MainWindow::createLogDialog() { - auto dialog{new LogDialog()}; + auto dialog{ new LogDialog() }; disconnect(ui->viewLogButton, &QPushButton::clicked, - this, &MainWindow::createLogDialog); + this, &MainWindow::createLogDialog); connect(ui->viewLogButton, &QPushButton::clicked, - dialog, &QDialog::show); + dialog, &QDialog::show); connect(ui->viewLogButton, &QPushButton::clicked, - dialog, &QDialog::raise); + dialog, &QDialog::raise); connect(ui->viewLogButton, &QPushButton::clicked, - dialog, &QDialog::activateWindow); + dialog, &QDialog::activateWindow); connect(dialog, &QDialog::finished, - [this]() { - connect(ui->viewLogButton, &QPushButton::clicked, + [this]() { + connect(ui->viewLogButton, &QPushButton::clicked, this, &MainWindow::createLogDialog); - }); + }); connect(dialog, &QDialog::finished, - dialog, &QDialog::deleteLater); + dialog, &QDialog::deleteLater); dialog->show(); dialog->raise(); @@ -794,7 +810,7 @@ void MainWindow::createTrayIcon() m_disconnectAction = new QAction(tr("Disconnect"), this); m_trayIconMenu->addAction(m_disconnectAction); connect(m_disconnectAction, &QAction::triggered, - this, &MainWindow::on_disconnectClicked); + this, &MainWindow::on_disconnectClicked); m_trayIconMenu->addSeparator(); m_trayIconMenu->addAction(ui->actionLogWindow); @@ -831,8 +847,8 @@ void MainWindow::on_actionNewProfile_triggered() { NewProfileDialog dialog(this); connect(&dialog, &NewProfileDialog::connect, - this, &MainWindow::on_connectClicked, - Qt::QueuedConnection); + this, &MainWindow::on_connectClicked, + Qt::QueuedConnection); if (dialog.exec() != QDialog::Accepted) { return; } @@ -906,10 +922,10 @@ void MainWindow::on_actionAbout_triggered() txt += tr("

%1
").arg(appCopyright); txt += tr("
%1 comes with ABSOLUTELY NO WARRANTY. This is free software, " "and you are welcome to redistribute it under the conditions " - "of the GNU General Public License version 2.").arg(appDescriptionLong); + "of the GNU General Public License version 2.") + .arg(appDescriptionLong); QMessageBox::about(this, "", txt); - } void MainWindow::on_actionAboutQt_triggered() diff --git a/src/dialog/mainwindow.h b/src/dialog/mainwindow.h index 45aab555..53b2017c 100644 --- a/src/dialog/mainwindow.h +++ b/src/dialog/mainwindow.h @@ -80,7 +80,6 @@ public slots: void request_update_stats(); - void on_connectClicked(); void on_disconnectClicked(); diff --git a/src/logger.cpp b/src/logger.cpp index 547d989b..82343e8b 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -7,16 +7,15 @@ void Logger::addMessage(const QString& message, const MessageType& messageType, { QWriteLocker lock(&m_lock); - Message tmp{QDateTime::currentMSecsSinceEpoch(), - messageType, - componentType, - message, - ++m_messageCounter, - QThread::currentThreadId() - }; + Message tmp{ QDateTime::currentMSecsSinceEpoch(), + messageType, + componentType, + message, + ++m_messageCounter, + QThread::currentThreadId() }; m_messages.push_back(tmp); - if (m_messages.size() >= 20000) {// TODO: magic constant + if (m_messages.size() >= 20000) { // TODO: magic constant m_messages.pop_front(); } @@ -27,8 +26,8 @@ QVector Logger::getMessages(int lastKnownId) const { QReadLocker lock(&m_lock); - int diff{m_messageCounter - lastKnownId}; - int size{m_messages.size()}; + int diff{ m_messageCounter - lastKnownId }; + int size{ m_messages.size() }; if (lastKnownId == -1 || diff >= size) { return m_messages; @@ -47,8 +46,9 @@ void Logger::clear() m_messages.clear(); } -Logger::Logger(QObject *parent) : QObject(parent), - m_messageCounter{-1}, - m_lock{QReadWriteLock::Recursive} +Logger::Logger(QObject* parent) + : QObject(parent) + , m_messageCounter{ -1 } + , m_lock{ QReadWriteLock::Recursive } { } diff --git a/src/logger.h b/src/logger.h index e1805679..1417561d 100644 --- a/src/logger.h +++ b/src/logger.h @@ -1,12 +1,11 @@ #pragma once #include +#include #include #include -#include -class Logger : public QObject -{ +class Logger : public QObject { Q_OBJECT public: @@ -36,25 +35,25 @@ class Logger : public QObject Qt::HANDLE threadId; }; - static Logger& instance() { + static Logger& instance() + { static Logger logger; return logger; } void addMessage(const QString& message, - const MessageType& type = MessageType::NORMAL, - const ComponentType& componentType = ComponentType::UNKNOWN); + const MessageType& type = MessageType::NORMAL, + const ComponentType& componentType = ComponentType::UNKNOWN); QVector getMessages(int lastKnownId = -1) const; void clear(); - signals: void newLogMessage(const Logger::Message& message); public slots: private: - explicit Logger(QObject *parent = nullptr); + explicit Logger(QObject* parent = nullptr); ~Logger() = default; Logger(const Logger&) = delete; Logger& operator=(const Logger&) = delete; @@ -76,4 +75,3 @@ Q_DECLARE_METATYPE(Logger::Message) // os << static_cast::type>(msgType); // return os; //}; - diff --git a/src/main.cpp b/src/main.cpp index 6f7a4445..b2e121a9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -24,8 +24,8 @@ #include "dialog/mainwindow.h" #include "openconnect-gui.h" -#include "logger.h" #include "FileLogger.h" +#include "logger.h" extern "C" { #include @@ -36,13 +36,13 @@ extern "C" { #if !defined(_WIN32) && !defined(PROJ_GNUTLS_DEBUG) #include #endif -#include #include +#include #include #ifdef __MACH__ -#include #include +#include #endif #include @@ -51,9 +51,8 @@ extern "C" { static void log_callback(int level, const char* str) { Logger::instance().addMessage(QString(str).trimmed(), - Logger::MessageType::DEBUG, - Logger::ComponentType::GNUTLS - ); + Logger::MessageType::DEBUG, + Logger::ComponentType::GNUTLS); } #ifdef __MACH__ @@ -67,8 +66,7 @@ bool relaunch_as_root() /* Get the path of the current program */ if (_NSGetExecutablePath(appPath, &size) != 0) { - msgBox.setText(QObject::tr - ("Could not get program path to elevate privileges.")); + msgBox.setText(QObject::tr("Could not get program path to elevate privileges.")); return false; } @@ -76,8 +74,7 @@ bool relaunch_as_root() kAuthorizationFlagDefaults, &authRef); if (status != errAuthorizationSuccess) { - msgBox.setText(QObject::tr - ("Failed to create authorization reference.")); + msgBox.setText(QObject::tr("Failed to create authorization reference.")); return false; } status = AuthorizationExecuteWithPrivileges(authRef, appPath, @@ -148,7 +145,7 @@ int main(int argc, char* argv[]) QCoreApplication::setOrganizationName(appOrganizationName); QCoreApplication::setOrganizationDomain(appOrganizationDomain); - QtSingleApplication app(argc, argv); + QtSingleApplication app(argc, argv); if (app.isRunning()) { QSettings settings; if (settings.value(QLatin1Literal("Settings/singleInstanceMode"), true).toBool()) { @@ -185,21 +182,20 @@ int main(int argc, char* argv[]) QCommandLineParser parser; parser.setApplicationDescription( - QObject::tr("OpenConnect is a VPN client, that utilizes TLS and DTLS " - "for secure session establishment, and is compatible " - "with the CISCO AnyConnect SSL VPN protocol.")); + QObject::tr("OpenConnect is a VPN client, that utilizes TLS and DTLS " + "for secure session establishment, and is compatible " + "with the CISCO AnyConnect SSL VPN protocol.")); parser.addHelpOption(); parser.addVersionOption(); - parser.addOption({ - {"s", "server"}, - QObject::tr("auto-connect to existing profile "), - QObject::tr("name") + parser.addOption({ { "s", "server" }, + QObject::tr("auto-connect to existing profile "), + QObject::tr("name") - }); + }); parser.process(app); - const QString profileName{parser.value(QLatin1String("server"))}; + const QString profileName{ parser.value(QLatin1String("server")) }; MainWindow mainWindow(nullptr, profileName); app.setActivationWindow(&mainWindow); #ifdef PROJ_PKCS11 @@ -212,9 +208,8 @@ int main(int argc, char* argv[]) mainWindow.show(); QObject::connect(&app, &QtSingleApplication::messageReceived, - [&mainWindow](const QString &message) { - Logger::instance().addMessage(message); - } - ); + [&mainWindow](const QString& message) { + Logger::instance().addMessage(message); + }); return app.exec(); } diff --git a/src/server_storage.cpp b/src/server_storage.cpp index e96701ef..bbdff05f 100644 --- a/src/server_storage.cpp +++ b/src/server_storage.cpp @@ -22,15 +22,15 @@ #include #include -const char* const StoredServer::m_vpnProtocol[] = {"anyconnect", "nc"}; +const char* const StoredServer::m_vpnProtocol[] = { "anyconnect", "nc" }; StoredServer::~StoredServer(void) { } -StoredServer::StoredServer() : - m_protocol_id(0), - m_server_hash_algo(0) +StoredServer::StoredServer() + : m_protocol_id(0) + , m_server_hash_algo(0) { set_window(nullptr); } diff --git a/src/vpninfo.cpp b/src/vpninfo.cpp index b8358345..ead139e0 100644 --- a/src/vpninfo.cpp +++ b/src/vpninfo.cpp @@ -20,12 +20,12 @@ #include "vpninfo.h" #include "config.h" #include "dialog/MyCertMsgBox.h" -#include "dialog/MyMsgBox.h" #include "dialog/MyInputDialog.h" +#include "dialog/MyMsgBox.h" #include "dialog/mainwindow.h" #include "gtdb.h" -#include "server_storage.h" #include "logger.h" +#include "server_storage.h" #include @@ -103,10 +103,10 @@ static int process_auth_form(void* privdata, struct oc_auth_form* form) if (select_opt->nr_choices == 1) { openconnect_set_option_value(&select_opt->form, - select_opt->choices[0]->name); + select_opt->choices[0]->name); } else if (gitems.contains(vpn->ss->get_groupname())) { openconnect_set_option_value(&select_opt->form, - vpn->ss->get_groupname().toLatin1().data()); + vpn->ss->get_groupname().toLatin1().data()); } else { { MyInputDialog dialog(vpn->m, @@ -285,15 +285,15 @@ static int validate_peer_cert(void* privdata, const char* reason) QString hostInfoStr = QObject::tr("Host: ") + vpn->ss->get_servername() + QObject::tr("\n") + hash; MyCertMsgBox msgBox( - vpn->m, - QObject::tr("You are connecting for the first time to this peer.\n" - "You have no guarantee that the server is the computer you think it is.\n\n" - "If the information provided bellow is valid and you trust this host, " - "hit 'Accurate information' to remember it and to carry on connecting.\n" - "If you do not trust this host, hit Cancel to abandon the connection."), - hostInfoStr, - QObject::tr("Accurate information"), - dstr); + vpn->m, + QObject::tr("You are connecting for the first time to this peer.\n" + "You have no guarantee that the server is the computer you think it is.\n\n" + "If the information provided bellow is valid and you trust this host, " + "hit 'Accurate information' to remember it and to carry on connecting.\n" + "If you do not trust this host, hit Cancel to abandon the connection."), + hostInfoStr, + QObject::tr("Accurate information"), + dstr); msgBox.show(); if (msgBox.result() == false) { return -1; @@ -361,7 +361,7 @@ static int unlock_token_vfn(void* privdata, const char* newtok) return 0; } -static void setup_tun_vfn(void *privdata) +static void setup_tun_vfn(void* privdata) { VpnInfo* vpn = static_cast(privdata); @@ -372,7 +372,7 @@ static void setup_tun_vfn(void *privdata) int ret = openconnect_setup_tun_device(vpn->vpninfo, vpncScriptFullPath.constData(), NULL); if (ret != 0) { vpn->last_err = QObject::tr("Error setting up the TUN device"); -//FIXME: ??? return ret; + //FIXME: ??? return ret; } vpn->logVpncScriptOutput(); @@ -463,9 +463,9 @@ int VpnInfo::connect() } #ifdef Q_OS_WIN32 - const QString osName{"win"}; + const QString osName{ "win" }; #elif defined Q_OS_OSX - const QString osName{"mac-intel"}; + const QString osName{ "mac-intel" }; #elif defined Q_OS_LINUX const QString osName = QString("linux%1").arg(QSysInfo::buildCpuArchitecture() == "i386" ? "" : "-64").toStdString().c_str(); #elif defined Q_OS_FREEBSD @@ -494,7 +494,7 @@ int VpnInfo::dtls_connect() { if (this->ss->get_disable_udp() != true) { int ret = openconnect_setup_dtls(vpninfo, - ss->get_dtls_reconnect_timeout()); + ss->get_dtls_reconnect_timeout()); if (ret != 0) { this->last_err = QObject::tr("Error setting up DTLS"); return ret; @@ -508,8 +508,8 @@ void VpnInfo::mainloop() { while (true) { int ret = openconnect_mainloop(vpninfo, - ss->get_reconnect_timeout(), - RECONNECT_INTERVAL_MIN); + ss->get_reconnect_timeout(), + RECONNECT_INTERVAL_MIN); if (ret != 0) { this->last_err = QObject::tr("Disconnected"); logVpncScriptOutput(); @@ -594,7 +594,7 @@ void VpnInfo::logVpncScriptOutput() bool processBannerMessage = false; while (!in.atEnd()) { - const QString line{in.readLine()}; + const QString line{ in.readLine() }; Logger::instance().addMessage(line); if (line == QLatin1String("--------------------- BANNER ---------------------")) { diff --git a/src/vpninfo.h b/src/vpninfo.h index 27cb1665..49d7dede 100644 --- a/src/vpninfo.h +++ b/src/vpninfo.h @@ -57,6 +57,7 @@ class VpnInfo { unsigned int form_pass_attempt; void logVpncScriptOutput(); + private: SOCKET cmd_fd; }; From 9e33c70cc4201c06aba9a86e37a977c007b81a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Wed, 20 Dec 2017 03:21:13 +0100 Subject: [PATCH 019/129] Bump spdlog version to 0.16.0 --- CHANGELOG.md | 2 +- CMake/Includes/ProjectExternals.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc6fe626..11a1c5ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ History of user-visible changes. - Don't use system wide defined proxy when disabled in profile (#208) - update Qt (5.10.0) - Unable to use socks5 proxy built by ssh tunneling (#187) -- update spdlog (0.14.0) +- update spdlog (0.16.0) [Full Changelog](https://github.com/openconnect/openconnect-gui/compare/v1.5.2...v1.5.3) diff --git a/CMake/Includes/ProjectExternals.cmake b/CMake/Includes/ProjectExternals.cmake index b61b3192..5471fadf 100644 --- a/CMake/Includes/ProjectExternals.cmake +++ b/CMake/Includes/ProjectExternals.cmake @@ -1,6 +1,6 @@ set(openconnect-TAG v7.08) set(vpnc-scripts-TAG master) -set(spdlog-TAG v0.14.0) +set(spdlog-TAG v0.16.0) set(qt-solutions-TAG master) set(tap-driver-TAG 9.21.2) From 168153d7e9bd56b52c34b095734c33fa4c46b234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Wed, 20 Dec 2017 15:54:42 +0100 Subject: [PATCH 020/129] Bump spdlog version to 0.16.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ľubomír Carik --- CHANGELOG.md | 2 +- CMake/Includes/ProjectExternals.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11a1c5ad..3632e99c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ History of user-visible changes. - Don't use system wide defined proxy when disabled in profile (#208) - update Qt (5.10.0) - Unable to use socks5 proxy built by ssh tunneling (#187) -- update spdlog (0.16.0) +- update spdlog (0.16.1) [Full Changelog](https://github.com/openconnect/openconnect-gui/compare/v1.5.2...v1.5.3) diff --git a/CMake/Includes/ProjectExternals.cmake b/CMake/Includes/ProjectExternals.cmake index 5471fadf..8f87cf69 100644 --- a/CMake/Includes/ProjectExternals.cmake +++ b/CMake/Includes/ProjectExternals.cmake @@ -1,6 +1,6 @@ set(openconnect-TAG v7.08) set(vpnc-scripts-TAG master) -set(spdlog-TAG v0.16.0) +set(spdlog-TAG v0.16.1) set(qt-solutions-TAG master) set(tap-driver-TAG 9.21.2) From c78216b2728f2b9ed04bfd7eb0f6562f782753db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Wed, 20 Dec 2017 16:49:05 +0100 Subject: [PATCH 021/129] macOS style plugin need to be added into installer package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ľubomír Carik --- CMake/Includes/ProjectDependencies.cmake | 3 +++ src/CMakeLists.txt | 15 +++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/CMake/Includes/ProjectDependencies.cmake b/CMake/Includes/ProjectDependencies.cmake index 662a55ac..b0e6ac07 100644 --- a/CMake/Includes/ProjectDependencies.cmake +++ b/CMake/Includes/ProjectDependencies.cmake @@ -9,6 +9,9 @@ if(MINGW) endif() if(APPLE) get_target_property(_qcocoa_dylib Qt5::QCocoaIntegrationPlugin LOCATION) + if(NOT Qt5Core_VERSION STRLESS "5.10") + get_target_property(_qmacstyle_dylib Qt5::QMacStylePlugin LOCATION) + endif() endif() # macOS & GNU/Linux dependencies diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e9a06815..d43c2d54 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -141,6 +141,7 @@ target_link_libraries (${PROJECT_NAME} Qt5::Gui Qt5::Widgets Qt5::Network + #??? Qt5::QMacStylePlugin ) if(UNIX) @@ -198,13 +199,23 @@ elseif(APPLE) DESTINATION ${PROJECT_NAME}.app/Contents/PlugIns/platforms COMPONENT App ) + set(additionalLib \${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}.app/Contents/PlugIns/platforms/libqcocoa.dylib) + if(NOT Qt5Core_VERSION STRLESS "5.10") + install(FILES + ${_qmacstyle_dylib} + DESTINATION ${PROJECT_NAME}.app/Contents/PlugIns/styles + COMPONENT App + ) + set(additionalLib + ${additionalLib} + \${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}.app/Contents/PlugIns/styles/libqmacstyle.dylib + ) + endif() install(FILES ${CMAKE_SOURCE_DIR}/bundle/qt.conf DESTINATION ${PROJECT_NAME}.app/Contents/Resources COMPONENT App ) - - set(additionalLib \${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}.app/Contents/PlugIns/platforms/libqcocoa.dylib) else() message(STATUS "Nothing to bundle...") endif() From 3e8f842138ad600a4a6374435126f0ee4252ec22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Tue, 9 Jan 2018 23:05:08 +0100 Subject: [PATCH 022/129] Typos.. --- docs/sw_requirements.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sw_requirements.md b/docs/sw_requirements.md index 1c141227..c77b1117 100644 --- a/docs/sw_requirements.md +++ b/docs/sw_requirements.md @@ -15,7 +15,7 @@ This is target platform for the product. ##### Externals -These project will by downloaded automatically by CMake. +These projects will be downloaded automatically by CMake. - [OpenConnect 7.08 for MinGW32](https://github.com/horar/openconnect/releases/tag/v7.08) - [TAP-windoes 9.21.2](https://openvpn.net/index.php/open-source/downloads.html) From da4784909f11b95a66b66083e51f5605474ac2ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Wed, 20 Dec 2017 19:16:36 +0100 Subject: [PATCH 023/129] Forward CMake agruments to spdlog build process MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ľubomír Carik --- CMake/Includes/ProjectExternals_spdlog.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMake/Includes/ProjectExternals_spdlog.cmake b/CMake/Includes/ProjectExternals_spdlog.cmake index 2374838a..d752d713 100644 --- a/CMake/Includes/ProjectExternals_spdlog.cmake +++ b/CMake/Includes/ProjectExternals_spdlog.cmake @@ -13,7 +13,7 @@ ExternalProject_Add(spdlog-${spdlog-TAG} GIT_TAG ${spdlog-TAG} GIT_SHALLOW 1 - CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH= -DBUILD_TESTING=off -DSPDLOG_BUILD_TESTING=off + CMAKE_ARGS "${CMAKE_ARGS};-DCMAKE_BUILD_TYPE=Release;-DCMAKE_INSTALL_PREFIX:PATH=;-DBUILD_TESTING=off;-DSPDLOG_BUILD_TESTING=off" CMAKE_COMMAND ${CMAKE_CROSS_COMMAND} ) From a66280987686c21bb1d1088c015918c70687f029 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Sun, 14 Jan 2018 20:31:48 +0100 Subject: [PATCH 024/129] Bump spdlog version to 0.16.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ľubomír Carik --- CHANGELOG.md | 2 +- CMake/Includes/ProjectExternals.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3632e99c..3b9bb896 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ History of user-visible changes. - Don't use system wide defined proxy when disabled in profile (#208) - update Qt (5.10.0) - Unable to use socks5 proxy built by ssh tunneling (#187) -- update spdlog (0.16.1) +- update spdlog (0.16.3) [Full Changelog](https://github.com/openconnect/openconnect-gui/compare/v1.5.2...v1.5.3) diff --git a/CMake/Includes/ProjectExternals.cmake b/CMake/Includes/ProjectExternals.cmake index 8f87cf69..5f016c38 100644 --- a/CMake/Includes/ProjectExternals.cmake +++ b/CMake/Includes/ProjectExternals.cmake @@ -1,6 +1,6 @@ set(openconnect-TAG v7.08) set(vpnc-scripts-TAG master) -set(spdlog-TAG v0.16.1) +set(spdlog-TAG v0.16.3) set(qt-solutions-TAG master) set(tap-driver-TAG 9.21.2) From c64bf085c6bdcf6d3cb58158ccbcd1d150c01c7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Sun, 14 Jan 2018 21:19:49 +0100 Subject: [PATCH 025/129] Download count badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 983755fa..00257d33 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # OpenConnect GUI [![Last Release:](https://img.shields.io/github/release/openconnect/openconnect-gui.svg)](https://github.com/openconnect/openconnect-gui/releases) +[![Downloades](https://img.shields.io/github/downloads/openconnect/openconnect-gui/latest/total.svg)](https://github.com/openconnect/openconnect-gui/releases) [![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](https://img.shields.io/badge/License-GPL%20v2-blue.svg) [![Join the chat at https://gitter.im/openconnect-gui/Lobby](https://badges.gitter.im/openconnect-gui/Lobby.svg)](https://gitter.im/openconnect-gui/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://travis-ci.org/openconnect/openconnect-gui.svg?branch=master)](https://travis-ci.org/openconnect/openconnect-gui) From 37d1e7959f2eb367796435f8eaf563dc96f6f4de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Sun, 14 Jan 2018 21:53:02 +0100 Subject: [PATCH 026/129] Update copyright year MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ľubomír Carik --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index db913607..d9718b70 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,8 +21,8 @@ set(PRODUCT_NAME_SHORT "OpenConnect-GUI") set(PRODUCT_NAME_LONG "OpenConnect-GUI VPN client") set(PRODUCT_NAME_COMPANY "OpenConnect-GUI Team") set(PRODUCT_NAME_COMPANY_DOMAIN "openconnect.github.io") -set(PRODUCT_NAME_COPYRIGHT_SHORT "Copyright (C) 2016-2017 OpenConnect-GUI Team") -set(PRODUCT_NAME_COPYRIGHT_FULL "Copyright (C) 2014-2015 Red Hat Inc.
Copyright (C) 2016-2017 OpenConnect-GUI Team") +set(PRODUCT_NAME_COPYRIGHT_SHORT "Copyright (C) 2016-2018 OpenConnect-GUI Team") +set(PRODUCT_NAME_COPYRIGHT_FULL "Copyright (C) 2014-2015 Red Hat Inc.
${PRODUCT_NAME_COPYRIGHT_SHORT}") list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake/Modules/") list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake/Includes/") From 1f22ed488246684829d0d35851cdc70b1f756a48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Sun, 14 Jan 2018 23:44:01 +0100 Subject: [PATCH 027/129] Trigger disconnect from VPN before application quit (resolve #202) --- CHANGELOG.md | 1 + src/dialog/mainwindow.cpp | 21 +++++++++++++++++++-- src/dialog/mainwindow.h | 1 + 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b9bb896..381e7d55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ History of user-visible changes. ## [v1.5.3](https://github.com/openconnect/openconnect-gui/tree/v1.5.3) (unreleased) +- No disconnection triggered before quit (#202) - Don't use system wide defined proxy when disabled in profile (#208) - update Qt (5.10.0) - Unable to use socks5 proxy built by ssh tunneling (#187) diff --git a/src/dialog/mainwindow.cpp b/src/dialog/mainwindow.cpp index 27859cf4..d90707dd 100644 --- a/src/dialog/mainwindow.cpp +++ b/src/dialog/mainwindow.cpp @@ -77,7 +77,15 @@ MainWindow::MainWindow(QWidget* parent, const QString profileName) this->cmd_fd = INVALID_SOCKET; connect(ui->actionQuit, &QAction::triggered, - qApp, &QApplication::quit); + [=]() { + if (m_disconnectAction->isEnabled()) { + connect(this, &MainWindow::readyToShutdown, + qApp, &QApplication::quit); + on_disconnectClicked(); + } else { + qApp->quit(); + } + }); connect(blink_timer, &QTimer::timeout, this, &MainWindow::blink_ui, @@ -525,6 +533,8 @@ void MainWindow::changeStatus(int val) connect(ui->connectionButton, &QPushButton::clicked, this, &MainWindow::on_connectClicked, Qt::QueuedConnection); + + emit readyToShutdown(); } else if (val == STATUS_DISCONNECTING) { ui->iconLabel->setPixmap(CONNECTING_ICON); ui->connectionButton->setIcon(QIcon(":/images/process-stop.png")); @@ -712,7 +722,14 @@ void MainWindow::closeEvent(QCloseEvent* event) event->ignore(); } else { event->accept(); - qApp->quit(); + + if (m_disconnectAction->isEnabled()) { + connect(this, &MainWindow::readyToShutdown, + qApp, &QApplication::quit); + on_disconnectClicked(); + } else { + qApp->quit(); + } } QMainWindow::closeEvent(event); } diff --git a/src/dialog/mainwindow.h b/src/dialog/mainwindow.h index 53b2017c..89756fb9 100644 --- a/src/dialog/mainwindow.h +++ b/src/dialog/mainwindow.h @@ -99,6 +99,7 @@ public slots: void stats_changed_sig(QString, QString, QString); void vpn_status_changed_sig(int); void timeout(void); + void readyToShutdown(); private slots: void createLogDialog(); From 9592ec75983da1e7e3cda32149d1bd3c7b038d4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Mon, 15 Jan 2018 00:53:07 +0100 Subject: [PATCH 028/129] Reorder includes... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Will be fixed later :/ Signed-off-by: Ľubomír Carik --- src/cryptdata.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cryptdata.cpp b/src/cryptdata.cpp index 66f22f8d..b6f9127d 100644 --- a/src/cryptdata.cpp +++ b/src/cryptdata.cpp @@ -21,8 +21,8 @@ #if defined(_WIN32) // FIXME: these 2 files have to be in this order: windows.h, winbsae.h ??? -#include #include +#include typedef WINBOOL(WINAPI* CryptProtectDataFunc)(DATA_BLOB* pDataIn, LPCWSTR szDataDescr, From 84ba578e4644d6c1c714215ee5d7d4e61f5b067b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Mon, 15 Jan 2018 00:53:56 +0100 Subject: [PATCH 029/129] Windows style plugin need to be added into installer package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ľubomír Carik --- CMake/Includes/ProjectDependencies.cmake | 3 +++ src/CMakeLists.txt | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/CMake/Includes/ProjectDependencies.cmake b/CMake/Includes/ProjectDependencies.cmake index b0e6ac07..1ee14fbf 100644 --- a/CMake/Includes/ProjectDependencies.cmake +++ b/CMake/Includes/ProjectDependencies.cmake @@ -6,6 +6,9 @@ set(CMAKE_AUTORCC ON) find_package(Qt5 5.10 REQUIRED COMPONENTS Core Gui Widgets Network) if(MINGW) get_target_property(_qwindows_dll Qt5::QWindowsIntegrationPlugin LOCATION) + if(NOT Qt5Core_VERSION STRLESS "5.10") + get_target_property(_qwinstyle_dylib Qt5::QWindowsVistaStylePlugin LOCATION) + endif() endif() if(APPLE) get_target_property(_qcocoa_dylib Qt5::QCocoaIntegrationPlugin LOCATION) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d43c2d54..d29a9a92 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -189,6 +189,13 @@ if(MINGW) ) set(additionalLib ${_qwindows_dll}) + if(NOT Qt5Core_VERSION STRLESS "5.10") + install(FILES + ${_qwinstyle_dylib} + DESTINATION plugins/styles + COMPONENT App + ) + endif() elseif(APPLE) set(APPS "\${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}.app") list(APPEND libSearchDirs "") From 76f17c7f66b86100f2cc72440b272c2f29457f0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Mon, 15 Jan 2018 00:54:45 +0100 Subject: [PATCH 030/129] Update Qt version path in sample build script for Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ľubomír Carik --- build_mingw@win.cmd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build_mingw@win.cmd b/build_mingw@win.cmd index d0643a9d..62767485 100644 --- a/build_mingw@win.cmd +++ b/build_mingw@win.cmd @@ -5,16 +5,16 @@ REM REM It should be used only as illustration how to build application REM and create an installer package REM -REM (c) 2016-2017, Lubomir Carik +REM (c) 2016-2018, Lubomir Carik REM echo "=======================================================================" echo " Preparing environment..." echo "=======================================================================" -REM look for "Qt 5.9.1 for Desktop (MinGW 5.3.0 32 bit)" StartMenu item +REM look for "Qt 5.10.0 for Desktop (MinGW 5.3.0 32 bit)" StartMenu item REM and check 'qtenv2.bat' echo Setting up environment for Qt usage... -set PATH=C:\Dev\Qt\5.9.1\mingw53_32\bin\;%PATH% +set PATH=C:\Dev\Qt\5.10.0\mingw53_32\bin\;%PATH% echo Setting up environment for 'mingw32' usage... set PATH=c:\Dev\Qt\Tools\mingw530_32\bin\;%PATH% From 8efe95bd9241b479c219e2cbeb5477b937ff21b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Mon, 15 Jan 2018 02:09:30 +0100 Subject: [PATCH 031/129] Use stoken v0.9.2 with prebuild openconnect MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ľubomír Carik --- contrib/build_mingw-openconnect-w32@fedora26.sh | 2 +- contrib/build_mingw-openconnect-w64@fedora26.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/build_mingw-openconnect-w32@fedora26.sh b/contrib/build_mingw-openconnect-w32@fedora26.sh index 0e69ee56..3b27ae63 100644 --- a/contrib/build_mingw-openconnect-w32@fedora26.sh +++ b/contrib/build_mingw-openconnect-w32@fedora26.sh @@ -4,7 +4,7 @@ # export OC_TAG=v7.08 -export STOKEN_TAG=v0.91 +export STOKEN_TAG=v0.92 dnf -y install mingw32-gnutls mingw32-libxml2 mingw32-gettext dnf -y install gcc libtool diff --git a/contrib/build_mingw-openconnect-w64@fedora26.sh b/contrib/build_mingw-openconnect-w64@fedora26.sh index a443951c..3b22b180 100644 --- a/contrib/build_mingw-openconnect-w64@fedora26.sh +++ b/contrib/build_mingw-openconnect-w64@fedora26.sh @@ -4,7 +4,7 @@ # export OC_TAG=v7.08 -export STOKEN_TAG=v0.91 +export STOKEN_TAG=v0.92 dnf -y install mingw64-gnutls mingw64-libxml2 mingw64-gettext dnf -y install gcc libtool From 25edf66a31306b0e55ddb7924fe617a8fedd3130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Mon, 15 Jan 2018 22:22:12 +0100 Subject: [PATCH 032/129] Update sample openconnect build scripts for Fedora 27 and small cosmetic fix --- ...2@fedora26.sh => build_mingw-openconnect-w32@fedora27.sh} | 3 ++- ...4@fedora26.sh => build_mingw-openconnect-w64@fedora27.sh} | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) rename contrib/{build_mingw-openconnect-w32@fedora26.sh => build_mingw-openconnect-w32@fedora27.sh} (98%) rename contrib/{build_mingw-openconnect-w64@fedora26.sh => build_mingw-openconnect-w64@fedora27.sh} (98%) diff --git a/contrib/build_mingw-openconnect-w32@fedora26.sh b/contrib/build_mingw-openconnect-w32@fedora27.sh similarity index 98% rename from contrib/build_mingw-openconnect-w32@fedora26.sh rename to contrib/build_mingw-openconnect-w32@fedora27.sh index 3b27ae63..861d8fd0 100644 --- a/contrib/build_mingw-openconnect-w32@fedora26.sh +++ b/contrib/build_mingw-openconnect-w32@fedora27.sh @@ -122,4 +122,5 @@ rpm -qv \ mingw32-p11-kit \ mingw32-zlib \ mingw32-libxml2 \ - >> openconnect-${OC_TAG}_mingw32.txt + >> openconnect-${OC_TAG}_mingw32.txt + diff --git a/contrib/build_mingw-openconnect-w64@fedora26.sh b/contrib/build_mingw-openconnect-w64@fedora27.sh similarity index 98% rename from contrib/build_mingw-openconnect-w64@fedora26.sh rename to contrib/build_mingw-openconnect-w64@fedora27.sh index 3b22b180..d0f48d26 100644 --- a/contrib/build_mingw-openconnect-w64@fedora26.sh +++ b/contrib/build_mingw-openconnect-w64@fedora27.sh @@ -116,7 +116,7 @@ cd ../ echo "List of system-wide used packages versions:" \ > openconnect-${OC_TAG}_mingw64.txt echo "stoken-${STOKEN_TAG}" \ - >> openconnect-${OC_TAG}_mingw32.txt + >> openconnect-${OC_TAG}_mingw64.txt rpm -qv \ mingw64-gnutls \ mingw64-gmp \ @@ -124,4 +124,5 @@ rpm -qv \ mingw64-p11-kit \ mingw64-zlib \ mingw64-libxml2 \ - >> openconnect-${OC_TAG}_mingw64.txt + >> openconnect-${OC_TAG}_mingw64.txt + From 9afccabeffa57bc227d070292a89a60d3f4dd218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Tue, 16 Jan 2018 02:47:52 +0100 Subject: [PATCH 033/129] Bundle original VPNC script into demo package --- contrib/build_mingw-openconnect-w32@fedora27.sh | 3 ++- contrib/build_mingw-openconnect-w64@fedora27.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/contrib/build_mingw-openconnect-w32@fedora27.sh b/contrib/build_mingw-openconnect-w32@fedora27.sh index 861d8fd0..359b7f5a 100644 --- a/contrib/build_mingw-openconnect-w32@fedora27.sh +++ b/contrib/build_mingw-openconnect-w32@fedora27.sh @@ -32,7 +32,7 @@ git checkout ${OC_TAG} ./autogen.sh mkdir build32 cd build32 -mingw32-configure --with-vpnc-script=vpnc-script.js +mingw32-configure --with-vpnc-script=vpnc-script-win.js mingw32-make -j4 cd ../../ @@ -62,6 +62,7 @@ cp ${MINGW_PREFIX}/bin/zlib1.dll . cp ${MINGW_PREFIX}/bin/libstoken-1.dll . cp ../../openconnect/build32/.libs/libopenconnect-5.dll . cp ../../openconnect/build32/.libs/openconnect.exe . +curl -o vpnc-script-win.js http://git.infradead.org/users/dwmw2/vpnc-scripts.git/blob_plain/HEAD:/vpnc-script-win.js cd ../../ mkdir -p pkg/lib && cd pkg/lib diff --git a/contrib/build_mingw-openconnect-w64@fedora27.sh b/contrib/build_mingw-openconnect-w64@fedora27.sh index d0f48d26..0500ae61 100644 --- a/contrib/build_mingw-openconnect-w64@fedora27.sh +++ b/contrib/build_mingw-openconnect-w64@fedora27.sh @@ -31,10 +31,9 @@ cd openconnect git reset --hard git checkout ${OC_TAG} ./autogen.sh - mkdir build64 cd build64 -mingw64-configure --with-vpnc-script=vpnc-script.js +mingw64-configure --with-vpnc-script=vpnc-script-win.js mingw64-make -j4 cd ../../ @@ -64,6 +63,7 @@ cp ${MINGW_PREFIX}/bin/zlib1.dll . cp ${MINGW_PREFIX}/bin/libstoken-1.dll . cp ../../openconnect/build64/.libs/libopenconnect-5.dll . cp ../../openconnect/build64/.libs/openconnect.exe . +curl -o vpnc-script-win.js http://git.infradead.org/users/dwmw2/vpnc-scripts.git/blob_plain/HEAD:/vpnc-script-win.js cd ../../ mkdir -p pkg/lib && cd pkg/lib From 2281b0dd4a5e1e3b7360b37eb6cb0dfb9fab76e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Tue, 16 Jan 2018 02:48:56 +0100 Subject: [PATCH 034/129] Update OpenConnect sample build script file permissions --- contrib/build_mingw-openconnect-w32@fedora27.sh | 0 contrib/build_mingw-openconnect-w64@fedora27.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 contrib/build_mingw-openconnect-w32@fedora27.sh mode change 100644 => 100755 contrib/build_mingw-openconnect-w64@fedora27.sh diff --git a/contrib/build_mingw-openconnect-w32@fedora27.sh b/contrib/build_mingw-openconnect-w32@fedora27.sh old mode 100644 new mode 100755 diff --git a/contrib/build_mingw-openconnect-w64@fedora27.sh b/contrib/build_mingw-openconnect-w64@fedora27.sh old mode 100644 new mode 100755 From 98b4cadce3360f24e36f71d2e97381622354f329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Wed, 17 Jan 2018 22:11:03 +0100 Subject: [PATCH 035/129] Link to occasional app snapshots --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 00257d33..c9345842 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,10 @@ Look to [OpenConnect-GUI](http://openconnect.github.io/openconnect-gui/) project - [OpenConnect library compilation and dependencies](docs/openconnect.md) - [Web page maintenance](docs/webpage.md) +If you are brave and you would like to try [upcoming development snapshots](https://goo.gl/P88mTi) of OpenConnect-GUI or [OpenConnect](infradead.org/openconnect/) for Windows. (I'm not developer on second mentioned project, but this GUI is based on this great project). + +These are unofficial builds, without warranty, please don't complain... ;-) + # License The content of this project itself is licensed under the [GNU General Public License v2](LICENSE.txt) From ac8852f1024dcf31a83e094bf0a6c49eff6263bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Wed, 17 Jan 2018 22:29:21 +0100 Subject: [PATCH 036/129] URL typo... --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c9345842..f32f79a3 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Look to [OpenConnect-GUI](http://openconnect.github.io/openconnect-gui/) project - [OpenConnect library compilation and dependencies](docs/openconnect.md) - [Web page maintenance](docs/webpage.md) -If you are brave and you would like to try [upcoming development snapshots](https://goo.gl/P88mTi) of OpenConnect-GUI or [OpenConnect](infradead.org/openconnect/) for Windows. (I'm not developer on second mentioned project, but this GUI is based on this great project). +If you are brave and you would like to try [upcoming development snapshots](https://goo.gl/P88mTi) of OpenConnect-GUI or [OpenConnect](https://www.infradead.org/openconnect/) for Windows. (I'm not developer on second mentioned project, but this GUI is based on this great project). These are unofficial builds, without warranty, please don't complain... ;-) From faf4906b51d0d27717429e7725e0521086fec90b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Wed, 24 Jan 2018 00:22:44 +0100 Subject: [PATCH 037/129] AppVeyor badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f32f79a3..ea27a96b 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ [![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](https://img.shields.io/badge/License-GPL%20v2-blue.svg) [![Join the chat at https://gitter.im/openconnect-gui/Lobby](https://badges.gitter.im/openconnect-gui/Lobby.svg)](https://gitter.im/openconnect-gui/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://travis-ci.org/openconnect/openconnect-gui.svg?branch=master)](https://travis-ci.org/openconnect/openconnect-gui) +[![Build status](https://ci.appveyor.com/api/projects/status/4unu5vfusvxu0dvk/branch/develop?svg=true)](https://ci.appveyor.com/project/horar/openconnect-gui/branch/develop) This is the GUI client for openconnect VPN. This client is in beta testing phase. It cannot be assumed to provide From cead4556f12412624a1e1cd4a70465ed47969c22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Wed, 24 Jan 2018 01:40:27 +0100 Subject: [PATCH 038/129] First try to make a build via AppVeyor service --- appveyor.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 00000000..843ab7c6 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,30 @@ +version: 1.5.2.{build} +branches: + only: + - develop +skip_tags: true +image: Visual Studio 2017 +environment: + matrix: + - GENERATOR: '"MinGW Makefiles"' + BUILD_TYPE: Debug + - GENERATOR: '"MinGW Makefiles"' + BUILD_TYPE: Release +before_build: +- cmd: >- + set + + set PATH=%PATH%;C:\MinGW\bin + + set PATH=C:\Qt\5.9.2\mingw53_32\bin;%PATH% + + mkdir build + + cd build + + cmake -G %GENERATOR% -DCMAKE_BUILD_TYPE=%BUILD_TYPE% .. + + cmake --build . --config %BUILD_TYPE% +build: + verbosity: minimal +test: off \ No newline at end of file From e9bf50ab92fe83d2e90ec3e822b722f49a661ad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Wed, 24 Jan 2018 01:53:10 +0100 Subject: [PATCH 039/129] Reformat & try drop sh.exe from path --- appveyor.yml | 63 +++++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 843ab7c6..4875460c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,30 +1,33 @@ -version: 1.5.2.{build} -branches: - only: - - develop -skip_tags: true -image: Visual Studio 2017 -environment: - matrix: - - GENERATOR: '"MinGW Makefiles"' - BUILD_TYPE: Debug - - GENERATOR: '"MinGW Makefiles"' - BUILD_TYPE: Release -before_build: -- cmd: >- - set - - set PATH=%PATH%;C:\MinGW\bin - - set PATH=C:\Qt\5.9.2\mingw53_32\bin;%PATH% - - mkdir build - - cd build - - cmake -G %GENERATOR% -DCMAKE_BUILD_TYPE=%BUILD_TYPE% .. - - cmake --build . --config %BUILD_TYPE% -build: - verbosity: minimal -test: off \ No newline at end of file +version: 1.5.2.{build} +branches: + only: + - develop +skip_tags: true +image: Visual Studio 2017 +environment: + matrix: + - GENERATOR: '"MinGW Makefiles"' + BUILD_TYPE: Debug + - GENERATOR: '"MinGW Makefiles"' + BUILD_TYPE: Release +before_build: +- cmd: >- + set + + set PATH=%PATH:C:\Program Files\Git\usr\bin;=% + + set PATH=%PATH%;C:\MinGW\bin + + set PATH=C:\Qt\5.9.2\mingw53_32\bin;%PATH% + + mkdir build + + cd build + + cmake -G %GENERATOR% -DCMAKE_BUILD_TYPE=%BUILD_TYPE% .. + + cmake --build . --config %BUILD_TYPE% +build: + verbosity: minimal +test: off + From aed763998e7d89354cd5ba3b1fb43c20bd9a1d40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Wed, 24 Jan 2018 02:03:01 +0100 Subject: [PATCH 040/129] Update paths --- appveyor.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 4875460c..813811fe 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,6 +5,8 @@ branches: skip_tags: true image: Visual Studio 2017 environment: + QT5: C:\Qt\5.9.2\mingw53_32 + MINGW: C:\Qt\Tools\mingw530_32 matrix: - GENERATOR: '"MinGW Makefiles"' BUILD_TYPE: Debug @@ -16,13 +18,11 @@ before_build: set PATH=%PATH:C:\Program Files\Git\usr\bin;=% - set PATH=%PATH%;C:\MinGW\bin + set PATH=%MINGW%\bin;%QT5%\bin;%PATH% - set PATH=C:\Qt\5.9.2\mingw53_32\bin;%PATH% + mkdir .\build - mkdir build - - cd build + cd .\build cmake -G %GENERATOR% -DCMAKE_BUILD_TYPE=%BUILD_TYPE% .. From 2537062bc32aca13633e297270cef85d794421ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Wed, 24 Jan 2018 02:17:48 +0100 Subject: [PATCH 041/129] Try VC 2015 with Qt5 setup --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 813811fe..e3ba2de5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ branches: only: - develop skip_tags: true -image: Visual Studio 2017 +image: Visual Studio 2015 environment: QT5: C:\Qt\5.9.2\mingw53_32 MINGW: C:\Qt\Tools\mingw530_32 From 867d0b2475af7ee56e07054e63549232acd2dd87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Wed, 24 Jan 2018 02:20:39 +0100 Subject: [PATCH 042/129] Revert "Try VC 2015 with Qt5 setup" This reverts commit 2537062bc32aca13633e297270cef85d794421ea. --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index e3ba2de5..813811fe 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ branches: only: - develop skip_tags: true -image: Visual Studio 2015 +image: Visual Studio 2017 environment: QT5: C:\Qt\5.9.2\mingw53_32 MINGW: C:\Qt\Tools\mingw530_32 From ec2a73e51a36e07a0031c527ce97ededda967650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Wed, 24 Jan 2018 02:21:20 +0100 Subject: [PATCH 043/129] Require Qt 5.9 due AppVeyor --- CMake/Includes/ProjectDependencies.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMake/Includes/ProjectDependencies.cmake b/CMake/Includes/ProjectDependencies.cmake index 1ee14fbf..29f4ca39 100644 --- a/CMake/Includes/ProjectDependencies.cmake +++ b/CMake/Includes/ProjectDependencies.cmake @@ -3,7 +3,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) -find_package(Qt5 5.10 REQUIRED COMPONENTS Core Gui Widgets Network) +find_package(Qt5 5.9 REQUIRED COMPONENTS Core Gui Widgets Network) if(MINGW) get_target_property(_qwindows_dll Qt5::QWindowsIntegrationPlugin LOCATION) if(NOT Qt5Core_VERSION STRLESS "5.10") From 74e3217073819348433e3152feffaad3e3d57def Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Wed, 24 Jan 2018 02:28:15 +0100 Subject: [PATCH 044/129] We don't need msbuild script here --- appveyor.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 813811fe..6c26e938 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,7 @@ environment: BUILD_TYPE: Debug - GENERATOR: '"MinGW Makefiles"' BUILD_TYPE: Release -before_build: +build_script: - cmd: >- set @@ -27,7 +27,5 @@ before_build: cmake -G %GENERATOR% -DCMAKE_BUILD_TYPE=%BUILD_TYPE% .. cmake --build . --config %BUILD_TYPE% -build: - verbosity: minimal test: off From e04880389fe422b1ac2bc7a855c9cd3e500b9946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Wed, 24 Jan 2018 02:37:54 +0100 Subject: [PATCH 045/129] Link corrected --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ea27a96b..07411e91 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](https://img.shields.io/badge/License-GPL%20v2-blue.svg) [![Join the chat at https://gitter.im/openconnect-gui/Lobby](https://badges.gitter.im/openconnect-gui/Lobby.svg)](https://gitter.im/openconnect-gui/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://travis-ci.org/openconnect/openconnect-gui.svg?branch=master)](https://travis-ci.org/openconnect/openconnect-gui) -[![Build status](https://ci.appveyor.com/api/projects/status/4unu5vfusvxu0dvk/branch/develop?svg=true)](https://ci.appveyor.com/project/horar/openconnect-gui/branch/develop) +[![Build status](https://ci.appveyor.com/api/projects/status/4unu5vfusvxu0dvk/branch/develop?svg=true)](https://ci.appveyor.com/project/openconnect/openconnect-gui/branch/develop) This is the GUI client for openconnect VPN. This client is in beta testing phase. It cannot be assumed to provide From e64bb9d8ae8d75dff27eca4acb491c957dc414bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Wed, 24 Jan 2018 02:52:39 +0100 Subject: [PATCH 046/129] Don't increment counter for pull requests --- appveyor.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 6c26e938..8484b37c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,6 @@ version: 1.5.2.{build} -branches: - only: - - develop +pull_requests: + do_not_increment_build_number: true skip_tags: true image: Visual Studio 2017 environment: From 18e51f75377e187d1222fe781930eb7e871b76e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Thu, 25 Jan 2018 01:31:02 +0100 Subject: [PATCH 047/129] AppVeyor service got Qt 5.10.0 --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 8484b37c..5e54cad8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,7 @@ pull_requests: skip_tags: true image: Visual Studio 2017 environment: - QT5: C:\Qt\5.9.2\mingw53_32 + QT5: C:\Qt\5.10.0\mingw53_32 MINGW: C:\Qt\Tools\mingw530_32 matrix: - GENERATOR: '"MinGW Makefiles"' From d35487710bd6391dc83e51b2f8ba15331f0449c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Thu, 25 Jan 2018 01:31:15 +0100 Subject: [PATCH 048/129] Revert "Require Qt 5.9 due AppVeyor" This reverts commit ec2a73e51a36e07a0031c527ce97ededda967650. --- CMake/Includes/ProjectDependencies.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMake/Includes/ProjectDependencies.cmake b/CMake/Includes/ProjectDependencies.cmake index 29f4ca39..1ee14fbf 100644 --- a/CMake/Includes/ProjectDependencies.cmake +++ b/CMake/Includes/ProjectDependencies.cmake @@ -3,7 +3,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) -find_package(Qt5 5.9 REQUIRED COMPONENTS Core Gui Widgets Network) +find_package(Qt5 5.10 REQUIRED COMPONENTS Core Gui Widgets Network) if(MINGW) get_target_property(_qwindows_dll Qt5::QWindowsIntegrationPlugin LOCATION) if(NOT Qt5Core_VERSION STRLESS "5.10") From 0ec813156cb7de09c1a958b7b61d20542fa1843d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Thu, 25 Jan 2018 01:41:29 +0100 Subject: [PATCH 049/129] AppVeyor badge link corrected --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 07411e91..0831182d 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](https://img.shields.io/badge/License-GPL%20v2-blue.svg) [![Join the chat at https://gitter.im/openconnect-gui/Lobby](https://badges.gitter.im/openconnect-gui/Lobby.svg)](https://gitter.im/openconnect-gui/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://travis-ci.org/openconnect/openconnect-gui.svg?branch=master)](https://travis-ci.org/openconnect/openconnect-gui) -[![Build status](https://ci.appveyor.com/api/projects/status/4unu5vfusvxu0dvk/branch/develop?svg=true)](https://ci.appveyor.com/project/openconnect/openconnect-gui/branch/develop) +[![Build status](https://ci.appveyor.com/api/projects/status/frib67a4pa10e3ae/branch/develop?svg=true)](https://ci.appveyor.com/project/horar/openconnect-gui-58r26/branch/develop) This is the GUI client for openconnect VPN. This client is in beta testing phase. It cannot be assumed to provide From 2103452b936bd15bc3606fca90a3569d78005deb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Thu, 25 Jan 2018 21:35:00 +0100 Subject: [PATCH 050/129] Sample script link corrected. --- docs/openconnect.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/openconnect.md b/docs/openconnect.md index 9104cfc4..f504497f 100644 --- a/docs/openconnect.md +++ b/docs/openconnect.md @@ -2,7 +2,7 @@ The 'openconnect' binary and libraries incl. dependent libraries used in this project are actually build and packaged -incl. library/header dependencies on Fedora 26 -via [this script](../contrib/build_mingw-openconnect-w32@fedora26.sh). +incl. library/header dependencies on Fedora 27 +via [this script](../contrib/build_mingw-openconnect-w32@fedora27.sh). These commands and paths may vary... From 7d66b2eec66631ee04f3468d6ba6651b72f7e549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Fri, 26 Jan 2018 19:28:36 +0100 Subject: [PATCH 051/129] Change the version string format --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 5e54cad8..9b5cf89c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 1.5.2.{build} +version: 1.5.2-{build} pull_requests: do_not_increment_build_number: true skip_tags: true From 2f940c169c165c02397fcb01a9435c39a49fbf48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Fri, 26 Jan 2018 19:29:06 +0100 Subject: [PATCH 052/129] Clone only last 100 commits to AppVeyor CI --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 9b5cf89c..c8a70c8f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,6 +3,7 @@ pull_requests: do_not_increment_build_number: true skip_tags: true image: Visual Studio 2017 +clone_depth: 100 environment: QT5: C:\Qt\5.10.0\mingw53_32 MINGW: C:\Qt\Tools\mingw530_32 From 0d0d1f653ebff2b6eee006ead6c839d67f434f01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Fri, 26 Jan 2018 19:29:34 +0100 Subject: [PATCH 053/129] Try cache build folder on CI --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index c8a70c8f..67afdd16 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,6 +12,7 @@ environment: BUILD_TYPE: Debug - GENERATOR: '"MinGW Makefiles"' BUILD_TYPE: Release +cache: .\build build_script: - cmd: >- set From a2bf91042eb0e1d7725bea9d86c1bc5b1f31902e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Fri, 26 Jan 2018 19:47:09 +0100 Subject: [PATCH 054/129] Try use branch patch count in version string --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 67afdd16..bc5b6efb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 1.5.2-{build} +version: 1.5.2-{branch}.{build} pull_requests: do_not_increment_build_number: true skip_tags: true From 8e2c404d151455a203087b9013e633a677c1553d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Fri, 26 Jan 2018 19:47:44 +0100 Subject: [PATCH 055/129] Create a NSIS installer package for release build on AppVeyor CI --- appveyor.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index bc5b6efb..ce5f1ba8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,11 +7,14 @@ clone_depth: 100 environment: QT5: C:\Qt\5.10.0\mingw53_32 MINGW: C:\Qt\Tools\mingw530_32 + NSIS: C:\Program Files (x86)\NSIS matrix: - GENERATOR: '"MinGW Makefiles"' BUILD_TYPE: Debug + TARGET: all - GENERATOR: '"MinGW Makefiles"' BUILD_TYPE: Release + TARGET: package cache: .\build build_script: - cmd: >- @@ -21,12 +24,14 @@ build_script: set PATH=%MINGW%\bin;%QT5%\bin;%PATH% + set PATH="%NSIS%";%PATH% + mkdir .\build cd .\build cmake -G %GENERATOR% -DCMAKE_BUILD_TYPE=%BUILD_TYPE% .. - cmake --build . --config %BUILD_TYPE% + cmake --build . --config %BUILD_TYPE% --target %TARGET% test: off From f7c415ef95fb93de9180b8fa9604ff33c95b2245 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Fri, 26 Jan 2018 21:52:08 +0100 Subject: [PATCH 056/129] Drop branch name from version string --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index ce5f1ba8..198ade0f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 1.5.2-{branch}.{build} +version: 1.5.2-{build} pull_requests: do_not_increment_build_number: true skip_tags: true From bd9c5fcaa5ce98aba74a476f0b1cd2873013db73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Fri, 26 Jan 2018 21:54:31 +0100 Subject: [PATCH 057/129] Create build folder only if doesn't exists The 'build' folder has to be created just for first run. Later it comes with cached data. --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 198ade0f..087be976 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,7 +26,7 @@ build_script: set PATH="%NSIS%";%PATH% - mkdir .\build + if not exist build md build cd .\build From 29406958e3e4356f53cb33b3487e3da35c3e6151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Fri, 26 Jan 2018 22:38:16 +0100 Subject: [PATCH 058/129] No submodules here --- docs/dev_commandLine.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/dev_commandLine.md b/docs/dev_commandLine.md index f79765aa..d85413f2 100644 --- a/docs/dev_commandLine.md +++ b/docs/dev_commandLine.md @@ -12,10 +12,6 @@ brew install openconnect cd openconnect-gui -# Make sure all git submodules are up-to-date -git submodule init -git submodule update - # Build it mkdir build-release cd build-release From 6ba284c5394eea7186f368b8c62448a5a33c44a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Fri, 26 Jan 2018 22:47:30 +0100 Subject: [PATCH 059/129] Update macOS Homebrew build hints --- docs/dev_commandLine.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/dev_commandLine.md b/docs/dev_commandLine.md index d85413f2..da9055fa 100644 --- a/docs/dev_commandLine.md +++ b/docs/dev_commandLine.md @@ -5,6 +5,17 @@ may be found in [shell script](../build_mingw@win.cmd) in project root. #### Hints For macOS +Install [Homebrew](https://docs.brew.sh/) system-wide: +``` +/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" + +``` +or localy: +``` +mkdir homebrew && curl -L https://github.com/Homebrew/brew/tarball/master | tar xz --strip 1 -C homebrew +``` +and continue: + ``` # Install dependencies brew install qt5 From 7f369e839d35fe36bb249cdcc209699a648e24a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Tue, 6 Feb 2018 21:18:05 +0100 Subject: [PATCH 060/129] Store build artefact - installer --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 087be976..787fce6b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -34,4 +34,5 @@ build_script: cmake --build . --config %BUILD_TYPE% --target %TARGET% test: off - +artifacts: + - path: build\openconnect-gui*.exe From 6288f17e71f8e3aa0ee2b59d0b1ff4d9b0cb30e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Tue, 6 Feb 2018 21:28:24 +0100 Subject: [PATCH 061/129] List branches to be used for AppVeyor CI --- appveyor.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 787fce6b..d00d40aa 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,6 +4,14 @@ pull_requests: skip_tags: true image: Visual Studio 2017 clone_depth: 100 +branches: + # whitelist + only: + - master + - develop + - /feature\/.*/ + except: + - gh-pages environment: QT5: C:\Qt\5.10.0\mingw53_32 MINGW: C:\Qt\Tools\mingw530_32 From 22f59693061496f000ab96cc2233b53533bf8d9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Tue, 6 Feb 2018 21:40:46 +0100 Subject: [PATCH 062/129] Add build number counter to artefact archive name --- appveyor.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index d00d40aa..85ec2926 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -43,4 +43,6 @@ build_script: cmake --build . --config %BUILD_TYPE% --target %TARGET% test: off artifacts: - - path: build\openconnect-gui*.exe +- path: build\openconnect-gui*.exe + name: openconnect-gui-1.5.2-{build}-win32.exe + From 90ed2a54195db5b0f0ca1a073ffde595ad55e8c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Wed, 7 Feb 2018 23:21:41 +0100 Subject: [PATCH 063/129] Update doc hitns for Fedora 27 --- docs/sw_requirements.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/sw_requirements.md b/docs/sw_requirements.md index c77b1117..80ba07a3 100644 --- a/docs/sw_requirements.md +++ b/docs/sw_requirements.md @@ -24,14 +24,14 @@ These projects will be downloaded automatically by CMake. #### GNU/Linux -##### Fedora 26 (MinGW) +##### Fedora 27 (MinGW) Just try install following packages: sudo dnf install cmake sudo dnf install mingw32-qt5-qtbase sudo dnf install mingw32-nsis -##### Fedora 26 +##### Fedora 27 This is not main target platform, because openconnect is used by other projects integrated into desktop environments. On the other side - the minimum of required packages to build this GUI should be installed by following commands: sudo dnf install git gitflow From bf4b6db0161b7eaea81bfc4170525b809a221643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Wed, 7 Feb 2018 23:22:20 +0100 Subject: [PATCH 064/129] We will need to use git tool --- docs/sw_requirements.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/sw_requirements.md b/docs/sw_requirements.md index 80ba07a3..e33274ec 100644 --- a/docs/sw_requirements.md +++ b/docs/sw_requirements.md @@ -27,6 +27,7 @@ These projects will be downloaded automatically by CMake. ##### Fedora 27 (MinGW) Just try install following packages: + sudo dnf install git sudo dnf install cmake sudo dnf install mingw32-qt5-qtbase sudo dnf install mingw32-nsis From 962fdc2bd93271e7aa48cd71ca71a3bf596daddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Wed, 7 Feb 2018 23:24:55 +0100 Subject: [PATCH 065/129] We are building MinGW32 version --- docs/sw_requirements.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sw_requirements.md b/docs/sw_requirements.md index e33274ec..2704e169 100644 --- a/docs/sw_requirements.md +++ b/docs/sw_requirements.md @@ -24,7 +24,7 @@ These projects will be downloaded automatically by CMake. #### GNU/Linux -##### Fedora 27 (MinGW) +##### Fedora 27 (MinGW32) Just try install following packages: sudo dnf install git From aaff53ad41f05761679323e2e5ce66103a88863b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Wed, 7 Feb 2018 23:25:13 +0100 Subject: [PATCH 066/129] Install rpm packages without confirmation --- docs/sw_requirements.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/sw_requirements.md b/docs/sw_requirements.md index 2704e169..809b7388 100644 --- a/docs/sw_requirements.md +++ b/docs/sw_requirements.md @@ -27,19 +27,19 @@ These projects will be downloaded automatically by CMake. ##### Fedora 27 (MinGW32) Just try install following packages: - sudo dnf install git - sudo dnf install cmake - sudo dnf install mingw32-qt5-qtbase - sudo dnf install mingw32-nsis + sudo dnf install -y git + sudo dnf install -y cmake + sudo dnf install -y mingw32-qt5-qtbase + sudo dnf install -y mingw32-nsis ##### Fedora 27 This is not main target platform, because openconnect is used by other projects integrated into desktop environments. On the other side - the minimum of required packages to build this GUI should be installed by following commands: - sudo dnf install git gitflow - sudo dnf install cmake - sudo dnf install qt5-qtbase-devel gcc-c++ - sudo dnf install gnutls-devel openconnect-devel - ~~sudo dnf install spdlog-devel~~ + sudo dnf install -y git gitflow + sudo dnf install -y cmake + sudo dnf install -y qt5-qtbase-devel gcc-c++ + sudo dnf install -y gnutls-devel openconnect-devel + ~~sudo dnf install -y spdlog-devel~~ #### MacOS - MacOS 10.10+ From aaa0556e83e247362af28c8205bbf18f2bf55c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Wed, 7 Feb 2018 23:55:11 +0100 Subject: [PATCH 067/129] Refer to 3rd party thingy downloaded automatically without version strings The build tool download the right version, no need to specify version strings here. --- docs/sw_requirements.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/sw_requirements.md b/docs/sw_requirements.md index 809b7388..3711f702 100644 --- a/docs/sw_requirements.md +++ b/docs/sw_requirements.md @@ -17,9 +17,9 @@ This is target platform for the product. These projects will be downloaded automatically by CMake. -- [OpenConnect 7.08 for MinGW32](https://github.com/horar/openconnect/releases/tag/v7.08) -- [TAP-windoes 9.21.2](https://openvpn.net/index.php/open-source/downloads.html) -- [spdlog 0.13.0](https://github.com/gabime/spdlog) +- [OpenConnect for MinGW32](https://github.com/horar/openconnect/releases) +- [TAP-windoes](https://openvpn.net/index.php/open-source/downloads.html) +- [spdlog](https://github.com/gabime/spdlog) - [qt-solutions](https://github.com/qtproject/qt-solutions.git) From abd45f6d31c0fadc77c88b0dda82f9db92a8a442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Thu, 15 Feb 2018 21:17:54 +0100 Subject: [PATCH 068/129] Hint how to insert correctly rendered log text --- .github/ISSUE_TEMPLATE.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index c8259ca6..1a250bfb 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -37,4 +37,10 @@ possible. Thank you! ### Other Information - + From fc40726ef75c8fe8e7cef3b8c318a0b0cdc03a29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Mon, 19 Feb 2018 01:11:40 +0100 Subject: [PATCH 069/129] Bump Qt version string path to 5.10.1 in demo build script --- build_mingw@win.cmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build_mingw@win.cmd b/build_mingw@win.cmd index 62767485..108fa2eb 100644 --- a/build_mingw@win.cmd +++ b/build_mingw@win.cmd @@ -11,10 +11,10 @@ REM echo "=======================================================================" echo " Preparing environment..." echo "=======================================================================" -REM look for "Qt 5.10.0 for Desktop (MinGW 5.3.0 32 bit)" StartMenu item +REM look for "Qt 5.10.1 for Desktop (MinGW 5.3.0 32 bit)" StartMenu item REM and check 'qtenv2.bat' echo Setting up environment for Qt usage... -set PATH=C:\Dev\Qt\5.10.0\mingw53_32\bin\;%PATH% +set PATH=C:\Dev\Qt\5.10.1\mingw53_32\bin\;%PATH% echo Setting up environment for 'mingw32' usage... set PATH=c:\Dev\Qt\Tools\mingw530_32\bin\;%PATH% From 6895e42cacc7455f106dc18a1cba9fbddb2dc8d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Mon, 19 Feb 2018 02:19:18 +0100 Subject: [PATCH 070/129] Sample mingw@msys build script --- build_msys2@win.sh | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 build_msys2@win.sh diff --git a/build_msys2@win.sh b/build_msys2@win.sh new file mode 100644 index 00000000..ac3bcf4e --- /dev/null +++ b/build_msys2@win.sh @@ -0,0 +1,50 @@ +# +# Sample build script & release package preapration +# +# It should be used only as illustration how to build application +# and create an installer package +# +# (c) 2016-2018, Lubomir Carik +# + +echo "=======================================================================" +echo " Preparing sandbox..." +echo "=======================================================================" +mkdir -pv build-release + +echo "=======================================================================" +echo " Generating project..." +echo "=======================================================================" +cd build-release +cmake -G "MSYS Makefiles" \ + -DCMAKE_BUILD_TYPE=Release \ + .. + +echo "=======================================================================" +echo " Compiling..." +echo "=======================================================================" +make -j5 + +# echo "=======================================================================" +# echo " LC: Bundling... (dynamic Qt only)" +# echo "=======================================================================" +# rd /s /q out +# md out +# windeployqt ^ +# src\openconnect-gui.exe ^ +# --verbose 1 ^ +# --compiler-runtime ^ +# --release ^ +# --force ^ +# --no-webkit2 ^ +# --no-quick-import ^ +# --no-translations + +echo "=======================================================================" +echo " Packaging..." +echo "=======================================================================" +cmake . +make package VERBOSE=1 +# make package_source VERBOSE=1 + +cd .. From dcf63812a781e9d7f508b1b9892534406ea4191e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Mon, 19 Feb 2018 02:19:48 +0100 Subject: [PATCH 071/129] Use different build folders for mingw64 and mingw32 --- build_msys2@win.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build_msys2@win.sh b/build_msys2@win.sh index ac3bcf4e..9ad2de1a 100644 --- a/build_msys2@win.sh +++ b/build_msys2@win.sh @@ -10,12 +10,12 @@ echo "=======================================================================" echo " Preparing sandbox..." echo "=======================================================================" -mkdir -pv build-release +mkdir -pv build-release-$MSYSTEM echo "=======================================================================" echo " Generating project..." echo "=======================================================================" -cd build-release +cd build-release-$MSYSTEM cmake -G "MSYS Makefiles" \ -DCMAKE_BUILD_TYPE=Release \ .. From 8701fb3751f8ab41cf6616ad77f1246799c1c8a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Mon, 19 Feb 2018 02:19:54 +0100 Subject: [PATCH 072/129] Download different 'openconnect' artifact archive The version depend on build environment i.e. mingw64/mingw32... --- CMake/Includes/ProjectExternals_openconnect.cmake | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/CMake/Includes/ProjectExternals_openconnect.cmake b/CMake/Includes/ProjectExternals_openconnect.cmake index 38c33be4..9938b88a 100644 --- a/CMake/Includes/ProjectExternals_openconnect.cmake +++ b/CMake/Includes/ProjectExternals_openconnect.cmake @@ -1,7 +1,13 @@ +if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(MINGW_VARIANT mingw64) +else() + set(MINGW_VARIANT mingw32) +endif() + # -------------------------------------------------------------------------------------------------- # openconnect (libs, headers, etc.) # -------------------------------------------------------------------------------------------------- -if(NOT EXISTS ${CMAKE_SOURCE_DIR}/external/openconnect-devel-${openconnect-TAG}_mingw32.zip) +if(NOT EXISTS ${CMAKE_SOURCE_DIR}/external/openconnect-devel-${openconnect-TAG}_${MINGW_VARIANT}.zip) set(OPENCONNECT_DEV_URL https://github.com/horar/openconnect/releases/download/${openconnect-TAG}) else() message(STATUS "Using local openconnect-devel packages...") @@ -14,7 +20,7 @@ ExternalProject_Add(openconnect-devel-${openconnect-TAG} DOWNLOAD_NO_PROGRESS 1 - URL ${OPENCONNECT_DEV_URL}/openconnect-devel-${openconnect-TAG}_mingw32.zip + URL ${OPENCONNECT_DEV_URL}/openconnect-devel-${openconnect-TAG}_${MINGW_VARIANT}.zip CONFIGURE_COMMAND "" BUILD_COMMAND "" @@ -37,7 +43,7 @@ ExternalProject_Add_Step(openconnect-devel-${openconnect-TAG} deploy_libraries # -------------------------------------------------------------------------------------------------- # openconnect (util & libs) # -------------------------------------------------------------------------------------------------- -if(NOT EXISTS ${CMAKE_SOURCE_DIR}/external/openconnect-${openconnect-TAG}_mingw32.zip) +if(NOT EXISTS ${CMAKE_SOURCE_DIR}/external/openconnect-${openconnect-TAG}_${MINGW_VARIANT}.zip) set(OPENCONNECT_URL https://github.com/horar/openconnect/releases/download/${openconnect-TAG}) else() message(STATUS "Using local openconnect-devel packages...") @@ -50,7 +56,7 @@ ExternalProject_Add(openconnect-${openconnect-TAG} DOWNLOAD_NO_PROGRESS 1 - URL ${OPENCONNECT_URL}/openconnect-${openconnect-TAG}_mingw32.zip + URL ${OPENCONNECT_URL}/openconnect-${openconnect-TAG}_${MINGW_VARIANT}.zip CONFIGURE_COMMAND "" BUILD_COMMAND "" From e027a0b976578ca3fd0634f8b2b25abc742a2963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Mon, 19 Feb 2018 02:20:11 +0100 Subject: [PATCH 073/129] Fix wrong/duplicate message and update with environment type string --- CMake/Includes/ProjectExternals_openconnect.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMake/Includes/ProjectExternals_openconnect.cmake b/CMake/Includes/ProjectExternals_openconnect.cmake index 9938b88a..adbae6be 100644 --- a/CMake/Includes/ProjectExternals_openconnect.cmake +++ b/CMake/Includes/ProjectExternals_openconnect.cmake @@ -10,7 +10,7 @@ endif() if(NOT EXISTS ${CMAKE_SOURCE_DIR}/external/openconnect-devel-${openconnect-TAG}_${MINGW_VARIANT}.zip) set(OPENCONNECT_DEV_URL https://github.com/horar/openconnect/releases/download/${openconnect-TAG}) else() - message(STATUS "Using local openconnect-devel packages...") + message(STATUS "Using local openconnect-devel packages... (${MINGW_VARIANT})") set(OPENCONNECT_DEV_URL ${CMAKE_SOURCE_DIR}/external) endif() @@ -46,7 +46,7 @@ ExternalProject_Add_Step(openconnect-devel-${openconnect-TAG} deploy_libraries if(NOT EXISTS ${CMAKE_SOURCE_DIR}/external/openconnect-${openconnect-TAG}_${MINGW_VARIANT}.zip) set(OPENCONNECT_URL https://github.com/horar/openconnect/releases/download/${openconnect-TAG}) else() - message(STATUS "Using local openconnect-devel packages...") + message(STATUS "Using local openconnect packages... ${MINGW_VARIANT}") set(OPENCONNECT_URL ${CMAKE_SOURCE_DIR}/external) endif() From 57ca1606b062b9f2ace85cf568739c8bc7ab1326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Mon, 19 Feb 2018 02:25:37 +0100 Subject: [PATCH 074/129] Sample openconnect build script for mingw32@msys2 environment --- contrib/build_mingw-openconnect-w32@msys2.sh | 161 +++++++++++++++++++ 1 file changed, 161 insertions(+) create mode 100644 contrib/build_mingw-openconnect-w32@msys2.sh diff --git a/contrib/build_mingw-openconnect-w32@msys2.sh b/contrib/build_mingw-openconnect-w32@msys2.sh new file mode 100644 index 00000000..0700ac10 --- /dev/null +++ b/contrib/build_mingw-openconnect-w32@msys2.sh @@ -0,0 +1,161 @@ +# +# Sample script to checkout & build 'openconnect' project +# with mingw32 on MSYS2 toolchain +# + +export OC_TAG=v7.08 +export STOKEN_TAG=v0.92 + +#dnf -y install mingw64-gnutls mingw64-libxml2 mingw64-gettext +#dnf -y install gcc libtool +#dnf -y install gettext +#dnf -y install git p7zip +#dnf -y install patch + +pacman --needed -S \ + mingw-w64-i686-gnutls \ + mingw-w64-i686-libidn2 \ + mingw-w64-i686-libunistring \ + mingw-w64-i686-nettle \ + mingw-w64-i686-gmp \ + mingw-w64-i686-p11-kit \ + mingw-w64-i686-zlib \ + mingw-w64-i686-libxml2 \ + mingw-w64-i686-zlib \ + mingw-w64-i686-libxml2 \ + mingw-w64-i686-lz4 \ + mingw-w64-i686-libproxy + +mkdir work +cd work + +git clone https://github.com/cernekee/stoken +cd stoken +git checkout ${STOKEN_TAG} +./autogen.sh +mkdir build32 +cd build32 +../configure .. +mingw32-make -j4 +mingw32-make install +cd ../../ + +git clone git://git.infradead.org/users/dwmw2/openconnect.git +cd openconnect +git reset --hard +git checkout ${OC_TAG} +./autogen.sh +mkdir build32 +cd build32 +../configure --with-vpnc-script=vpnc-script-win.js +mingw32-make -j4 +cd ../../ + + +# +# Sample script to create a package from build 'openconnect' project +# incl. all dependencies (hardcoded paths!) +# + +export MINGW_PREFIX=/mingw32 + +rm -rf pkg +mkdir -p pkg/nsis && cd pkg/nsis +#cp ${MINGW_PREFIX}/bin/iconv.dll . +cp ${MINGW_PREFIX}/bin/libffi-6.dll . +cp ${MINGW_PREFIX}/bin/libgcc_*-1.dll . +cp ${MINGW_PREFIX}/bin/libgmp-10.dll . +cp ${MINGW_PREFIX}/bin/libgnutls-30.dll . +cp ${MINGW_PREFIX}/bin/libhogweed-4.dll . +cp ${MINGW_PREFIX}/bin/libintl-8.dll . +cp ${MINGW_PREFIX}/bin/libnettle-6.dll . +cp ${MINGW_PREFIX}/bin/libp11-kit-0.dll . +cp ${MINGW_PREFIX}/bin/libtasn1-6.dll . +cp ${MINGW_PREFIX}/bin/libwinpthread-1.dll . +cp ${MINGW_PREFIX}/bin/libxml2-2.dll . +cp ${MINGW_PREFIX}/bin/zlib1.dll . +cp ${MINGW_PREFIX}/bin/libstoken-1.dll . +cp ${MINGW_PREFIX}/bin/libproxy-1.dll . +cp ${MINGW_PREFIX}/bin/liblz4.dll . +cp ${MINGW_PREFIX}/bin/libiconv-2.dll . +cp ${MINGW_PREFIX}/bin/libunistring-2.dll . +cp ${MINGW_PREFIX}/bin/libidn2-0.dll . +cp ${MINGW_PREFIX}/bin/libstdc++-6.dll . +cp ${MINGW_PREFIX}/bin/liblzma-5.dll . +cp ../../openconnect/build32/.libs/libopenconnect-5.dll . +cp ../../openconnect/build32/.libs/openconnect.exe . +curl -o vpnc-script-win.js http://git.infradead.org/users/dwmw2/vpnc-scripts.git/blob_plain/HEAD:/vpnc-script-win.js +cd ../../ + +mkdir -p pkg/lib && cd pkg/lib +cp ${MINGW_PREFIX}/lib/libgmp.dll.a . +cp ${MINGW_PREFIX}/lib/libgnutls.dll.a . +cp ${MINGW_PREFIX}/lib/libhogweed.dll.a . +cp ${MINGW_PREFIX}/lib/libnettle.dll.a . +cp ${MINGW_PREFIX}/lib/libp11-kit.dll.a . +cp ${MINGW_PREFIX}/lib/libxml2.dll.a . +cp ${MINGW_PREFIX}/lib/libz.dll.a . +cp ${MINGW_PREFIX}/lib/libstoken.dll.a . +cp ${MINGW_PREFIX}/lib/libproxy.dll.a . +cp ${MINGW_PREFIX}/lib/liblz4.dll.a . +cp ${MINGW_PREFIX}/lib/libiconv.dll.a . +cp ${MINGW_PREFIX}/lib/libunistring.dll.a . +cp ${MINGW_PREFIX}/lib/libidn2.dll.a . +cp ${MINGW_PREFIX}/lib/liblzma.dll.a . +cp ../../openconnect/build32/.libs/libopenconnect.dll.a . +cd ../../ + +mkdir -p pkg/lib/pkgconfig && cd pkg/lib/pkgconfig +cp ${MINGW_PREFIX}/lib/pkgconfig/gnutls.pc . +cp ${MINGW_PREFIX}/lib/pkgconfig/hogweed.pc . +cp ${MINGW_PREFIX}/lib/pkgconfig/libxml-2.0.pc . +cp ${MINGW_PREFIX}/lib/pkgconfig/nettle.pc . +cp ${MINGW_PREFIX}/lib/pkgconfig/zlib.pc . +cp ${MINGW_PREFIX}/lib/pkgconfig/stoken.pc . +cp ../../../openconnect/build32/openconnect.pc . +cd ../../../ + +mkdir -p pkg/include && cd pkg/include +cp -R ${MINGW_PREFIX}/include/gnutls/ . +cp -R ${MINGW_PREFIX}/include/libxml2/ . +cp -R ${MINGW_PREFIX}/include/nettle/ . +cp -R ${MINGW_PREFIX}/include/p11-kit-1/p11-kit/ . +cp ${MINGW_PREFIX}/include/gmp.h . +cp ${MINGW_PREFIX}/include/zconf.h . +cp ${MINGW_PREFIX}/include/zlib.h . +cp ${MINGW_PREFIX}/include/stoken.h . +cp ../../openconnect/openconnect.h . +cd ../../ + +export MINGW_PREFIX= + +cd pkg/nsis +7za a -tzip -mx=9 -sdel ../../openconnect-${OC_TAG}_mingw32.zip * +cd ../ +rmdir -v nsis +7za a -tzip -mx=9 -sdel ../openconnect-devel-${OC_TAG}_mingw32.zip * +cd ../ + + +#cd stoken/build32 +#sudo mingw32-make uninstall + +echo "List of system-wide used packages versions:" \ + > openconnect-${OC_TAG}_mingw64.txt +echo "stoken-${STOKEN_TAG}" \ + >> openconnect-${OC_TAG}_mingw64.txt +pacman -Q \ + mingw-w64-i686-gnutls \ + mingw-w64-i686-libidn2 \ + mingw-w64-i686-libunistring \ + mingw-w64-i686-nettle \ + mingw-w64-i686-gmp \ + mingw-w64-i686-p11-kit \ + mingw-w64-i686-zlib \ + mingw-w64-i686-libxml2 \ + mingw-w64-i686-zlib \ + mingw-w64-i686-libxml2 \ + mingw-w64-i686-lz4 \ + mingw-w64-i686-libproxy \ + >> openconnect-${OC_TAG}_mingw32.txt + From 958a729fa6ebde3281ef298081c0c989fa7fe053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Mon, 19 Feb 2018 02:26:57 +0100 Subject: [PATCH 075/129] Sample openconnect build script for mingw64@msys2 environment --- contrib/build_mingw-openconnect-w64@msys2.sh | 161 +++++++++++++++++++ 1 file changed, 161 insertions(+) create mode 100644 contrib/build_mingw-openconnect-w64@msys2.sh diff --git a/contrib/build_mingw-openconnect-w64@msys2.sh b/contrib/build_mingw-openconnect-w64@msys2.sh new file mode 100644 index 00000000..25967f49 --- /dev/null +++ b/contrib/build_mingw-openconnect-w64@msys2.sh @@ -0,0 +1,161 @@ +# +# Sample script to checkout & build 'openconnect' project +# with mingw64 on MSYS2 toolchain +# + +export OC_TAG=v7.08 +export STOKEN_TAG=v0.92 + +#dnf -y install mingw64-gnutls mingw64-libxml2 mingw64-gettext +#dnf -y install gcc libtool +#dnf -y install gettext +#dnf -y install git p7zip +#dnf -y install patch + +pacman --needed -S \ + mingw-w64-x86_64-gnutls \ + mingw-w64-x86_64-libidn2 \ + mingw-w64-x86_64-libunistring \ + mingw-w64-x86_64-nettle \ + mingw-w64-x86_64-gmp \ + mingw-w64-x86_64-p11-kit \ + mingw-w64-x86_64-zlib \ + mingw-w64-x86_64-libxml2 \ + mingw-w64-x86_64-zlib \ + mingw-w64-x86_64-libxml2 \ + mingw-w64-x86_64-lz4 \ + mingw-w64-x86_64-libproxy + +mkdir work +cd work + +git clone https://github.com/cernekee/stoken +cd stoken +git checkout ${STOKEN_TAG} +./autogen.sh +mkdir build64 +cd build64 +../configure .. +mingw32-make -j4 +mingw32-make install +cd ../../ + +git clone git://git.infradead.org/users/dwmw2/openconnect.git +cd openconnect +git reset --hard +git checkout ${OC_TAG} +./autogen.sh +mkdir build64 +cd build64 +../configure --with-vpnc-script=vpnc-script-win.js +mingw32-make -j4 +cd ../../ + + +# +# Sample script to create a package from build 'openconnect' project +# incl. all dependencies (hardcoded paths!) +# + +export MINGW_PREFIX=/mingw64 + +rm -rf pkg +mkdir -p pkg/nsis && cd pkg/nsis +#cp ${MINGW_PREFIX}/bin/iconv.dll . +cp ${MINGW_PREFIX}/bin/libffi-6.dll . +cp ${MINGW_PREFIX}/bin/libgcc_*-1.dll . +cp ${MINGW_PREFIX}/bin/libgmp-10.dll . +cp ${MINGW_PREFIX}/bin/libgnutls-30.dll . +cp ${MINGW_PREFIX}/bin/libhogweed-4.dll . +cp ${MINGW_PREFIX}/bin/libintl-8.dll . +cp ${MINGW_PREFIX}/bin/libnettle-6.dll . +cp ${MINGW_PREFIX}/bin/libp11-kit-0.dll . +cp ${MINGW_PREFIX}/bin/libtasn1-6.dll . +cp ${MINGW_PREFIX}/bin/libwinpthread-1.dll . +cp ${MINGW_PREFIX}/bin/libxml2-2.dll . +cp ${MINGW_PREFIX}/bin/zlib1.dll . +cp ${MINGW_PREFIX}/bin/libstoken-1.dll . +cp ${MINGW_PREFIX}/bin/libproxy-1.dll . +cp ${MINGW_PREFIX}/bin/liblz4.dll . +cp ${MINGW_PREFIX}/bin/libiconv-2.dll . +cp ${MINGW_PREFIX}/bin/libunistring-2.dll . +cp ${MINGW_PREFIX}/bin/libidn2-0.dll . +cp ${MINGW_PREFIX}/bin/libstdc++-6.dll . +cp ${MINGW_PREFIX}/bin/liblzma-5.dll . +cp ../../openconnect/build64/.libs/libopenconnect-5.dll . +cp ../../openconnect/build64/.libs/openconnect.exe . +curl -o vpnc-script-win.js http://git.infradead.org/users/dwmw2/vpnc-scripts.git/blob_plain/HEAD:/vpnc-script-win.js +cd ../../ + +mkdir -p pkg/lib && cd pkg/lib +cp ${MINGW_PREFIX}/lib/libgmp.dll.a . +cp ${MINGW_PREFIX}/lib/libgnutls.dll.a . +cp ${MINGW_PREFIX}/lib/libhogweed.dll.a . +cp ${MINGW_PREFIX}/lib/libnettle.dll.a . +cp ${MINGW_PREFIX}/lib/libp11-kit.dll.a . +cp ${MINGW_PREFIX}/lib/libxml2.dll.a . +cp ${MINGW_PREFIX}/lib/libz.dll.a . +cp ${MINGW_PREFIX}/lib/libstoken.dll.a . +cp ${MINGW_PREFIX}/lib/libproxy.dll.a . +cp ${MINGW_PREFIX}/lib/liblz4.dll.a . +cp ${MINGW_PREFIX}/lib/libiconv.dll.a . +cp ${MINGW_PREFIX}/lib/libunistring.dll.a . +cp ${MINGW_PREFIX}/lib/libidn2.dll.a . +cp ${MINGW_PREFIX}/lib/liblzma.dll.a . +cp ../../openconnect/build64/.libs/libopenconnect.dll.a . +cd ../../ + +mkdir -p pkg/lib/pkgconfig && cd pkg/lib/pkgconfig +cp ${MINGW_PREFIX}/lib/pkgconfig/gnutls.pc . +cp ${MINGW_PREFIX}/lib/pkgconfig/hogweed.pc . +cp ${MINGW_PREFIX}/lib/pkgconfig/libxml-2.0.pc . +cp ${MINGW_PREFIX}/lib/pkgconfig/nettle.pc . +cp ${MINGW_PREFIX}/lib/pkgconfig/zlib.pc . +cp ${MINGW_PREFIX}/lib/pkgconfig/stoken.pc . +cp ../../../openconnect/build64/openconnect.pc . +cd ../../../ + +mkdir -p pkg/include && cd pkg/include +cp -R ${MINGW_PREFIX}/include/gnutls/ . +cp -R ${MINGW_PREFIX}/include/libxml2/ . +cp -R ${MINGW_PREFIX}/include/nettle/ . +cp -R ${MINGW_PREFIX}/include/p11-kit-1/p11-kit/ . +cp ${MINGW_PREFIX}/include/gmp.h . +cp ${MINGW_PREFIX}/include/zconf.h . +cp ${MINGW_PREFIX}/include/zlib.h . +cp ${MINGW_PREFIX}/include/stoken.h . +cp ../../openconnect/openconnect.h . +cd ../../ + +export MINGW_PREFIX= + +cd pkg/nsis +7za a -tzip -mx=9 -sdel ../../openconnect-${OC_TAG}_mingw64.zip * +cd ../ +rmdir -v nsis +7za a -tzip -mx=9 -sdel ../openconnect-devel-${OC_TAG}_mingw64.zip * +cd ../ + + +#cd stoken/build64 +#sudo mingw64-make uninstall + +echo "List of system-wide used packages versions:" \ + > openconnect-${OC_TAG}_mingw64.txt +echo "stoken-${STOKEN_TAG}" \ + >> openconnect-${OC_TAG}_mingw64.txt +pacman -Q \ + mingw-w64-x86_64-gnutls \ + mingw-w64-x86_64-libidn2 \ + mingw-w64-x86_64-libunistring \ + mingw-w64-x86_64-nettle \ + mingw-w64-x86_64-gmp \ + mingw-w64-x86_64-p11-kit \ + mingw-w64-x86_64-zlib \ + mingw-w64-x86_64-libxml2 \ + mingw-w64-x86_64-zlib \ + mingw-w64-x86_64-libxml2 \ + mingw-w64-x86_64-lz4 \ + mingw-w64-x86_64-libproxy \ + >> openconnect-${OC_TAG}_mingw64.txt + From 3e310c24c5dd51d6ae74d82ca2eaa5e2ef7c16b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Mon, 19 Feb 2018 02:50:34 +0100 Subject: [PATCH 076/129] Install original vpnc script used by upstream openconnect tool The GUI is using modified version, at least for now... --- CMake/Includes/ProjectExternals_openconnect.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMake/Includes/ProjectExternals_openconnect.cmake b/CMake/Includes/ProjectExternals_openconnect.cmake index 38c33be4..28062e44 100644 --- a/CMake/Includes/ProjectExternals_openconnect.cmake +++ b/CMake/Includes/ProjectExternals_openconnect.cmake @@ -99,7 +99,10 @@ set_property(TARGET openconnect::xml2 PROPERTY IMPORTED_LOCATION ${CMAKE_BINARY_ set_property(TARGET openconnect::xml2 PROPERTY IMPORTED_IMPLIB ${CMAKE_BINARY_DIR}/external/lib/libxml2.dll.a) -install(FILES ${CMAKE_BINARY_DIR}/external/lib/openconnect.exe +install( + FILES + ${CMAKE_BINARY_DIR}/external/lib/openconnect.exe + ${CMAKE_BINARY_DIR}/external/lib/vpnc-script-win.js DESTINATION . COMPONENT App_Console ) From 40bb7bb834bbf7cef87395363be8102bdefea854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Mon, 19 Feb 2018 21:36:33 +0100 Subject: [PATCH 077/129] Wrong configure argument removed --- contrib/build_mingw-openconnect-w32@msys2.sh | 2 +- contrib/build_mingw-openconnect-w64@msys2.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/build_mingw-openconnect-w32@msys2.sh b/contrib/build_mingw-openconnect-w32@msys2.sh index 0700ac10..8c8f002f 100644 --- a/contrib/build_mingw-openconnect-w32@msys2.sh +++ b/contrib/build_mingw-openconnect-w32@msys2.sh @@ -35,7 +35,7 @@ git checkout ${STOKEN_TAG} ./autogen.sh mkdir build32 cd build32 -../configure .. +../configure mingw32-make -j4 mingw32-make install cd ../../ diff --git a/contrib/build_mingw-openconnect-w64@msys2.sh b/contrib/build_mingw-openconnect-w64@msys2.sh index 25967f49..768185d0 100644 --- a/contrib/build_mingw-openconnect-w64@msys2.sh +++ b/contrib/build_mingw-openconnect-w64@msys2.sh @@ -35,7 +35,7 @@ git checkout ${STOKEN_TAG} ./autogen.sh mkdir build64 cd build64 -../configure .. +../configure mingw32-make -j4 mingw32-make install cd ../../ From 3f292fff451a921c1f9e2ef35e24104d4a3e593c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Mon, 19 Feb 2018 22:54:33 +0100 Subject: [PATCH 078/129] Move artifacts outside temporary working folder --- contrib/build_mingw-openconnect-w32@fedora27.sh | 1 + contrib/build_mingw-openconnect-w32@msys2.sh | 1 + contrib/build_mingw-openconnect-w64@fedora27.sh | 1 + contrib/build_mingw-openconnect-w64@msys2.sh | 1 + 4 files changed, 4 insertions(+) diff --git a/contrib/build_mingw-openconnect-w32@fedora27.sh b/contrib/build_mingw-openconnect-w32@fedora27.sh index 359b7f5a..a9402e24 100755 --- a/contrib/build_mingw-openconnect-w32@fedora27.sh +++ b/contrib/build_mingw-openconnect-w32@fedora27.sh @@ -125,3 +125,4 @@ rpm -qv \ mingw32-libxml2 \ >> openconnect-${OC_TAG}_mingw32.txt +mv -v openconnect-*.zip openconnect-*.txt .. diff --git a/contrib/build_mingw-openconnect-w32@msys2.sh b/contrib/build_mingw-openconnect-w32@msys2.sh index 8c8f002f..8941facd 100644 --- a/contrib/build_mingw-openconnect-w32@msys2.sh +++ b/contrib/build_mingw-openconnect-w32@msys2.sh @@ -159,3 +159,4 @@ pacman -Q \ mingw-w64-i686-libproxy \ >> openconnect-${OC_TAG}_mingw32.txt +mv -v openconnect-*.zip openconnect-*.txt .. diff --git a/contrib/build_mingw-openconnect-w64@fedora27.sh b/contrib/build_mingw-openconnect-w64@fedora27.sh index 0500ae61..3713b31f 100755 --- a/contrib/build_mingw-openconnect-w64@fedora27.sh +++ b/contrib/build_mingw-openconnect-w64@fedora27.sh @@ -126,3 +126,4 @@ rpm -qv \ mingw64-libxml2 \ >> openconnect-${OC_TAG}_mingw64.txt +mv openconnect-*.zip openconnect-*.txt .. diff --git a/contrib/build_mingw-openconnect-w64@msys2.sh b/contrib/build_mingw-openconnect-w64@msys2.sh index 768185d0..8c183b2b 100644 --- a/contrib/build_mingw-openconnect-w64@msys2.sh +++ b/contrib/build_mingw-openconnect-w64@msys2.sh @@ -159,3 +159,4 @@ pacman -Q \ mingw-w64-x86_64-libproxy \ >> openconnect-${OC_TAG}_mingw64.txt +mv openconnect-*.zip openconnect-*.txt .. From d904b3b4fedd97902fb8aec16a7786ef00b76491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Mon, 19 Feb 2018 22:55:28 +0100 Subject: [PATCH 079/129] Update openconnect artefacts details with openconnect version info --- contrib/build_mingw-openconnect-w32@fedora27.sh | 2 ++ contrib/build_mingw-openconnect-w32@msys2.sh | 6 ++++-- contrib/build_mingw-openconnect-w64@fedora27.sh | 2 ++ contrib/build_mingw-openconnect-w64@msys2.sh | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/contrib/build_mingw-openconnect-w32@fedora27.sh b/contrib/build_mingw-openconnect-w32@fedora27.sh index a9402e24..f17fc113 100755 --- a/contrib/build_mingw-openconnect-w32@fedora27.sh +++ b/contrib/build_mingw-openconnect-w32@fedora27.sh @@ -114,6 +114,8 @@ cd ../ echo "List of system-wide used packages versions:" \ > openconnect-${OC_TAG}_mingw32.txt +echo "openconnect-${OC_TAG}" \ + >> openconnect-${OC_TAG}_mingw32.txt echo "stoken-${STOKEN_TAG}" \ >> openconnect-${OC_TAG}_mingw32.txt rpm -qv \ diff --git a/contrib/build_mingw-openconnect-w32@msys2.sh b/contrib/build_mingw-openconnect-w32@msys2.sh index 8941facd..c5152c30 100644 --- a/contrib/build_mingw-openconnect-w32@msys2.sh +++ b/contrib/build_mingw-openconnect-w32@msys2.sh @@ -141,9 +141,11 @@ cd ../ #sudo mingw32-make uninstall echo "List of system-wide used packages versions:" \ - > openconnect-${OC_TAG}_mingw64.txt + > openconnect-${OC_TAG}_mingw32.txt +echo "openconnect-${OC_TAG}" \ + >> openconnect-${OC_TAG}_mingw32.txt echo "stoken-${STOKEN_TAG}" \ - >> openconnect-${OC_TAG}_mingw64.txt + >> openconnect-${OC_TAG}_mingw32.txt pacman -Q \ mingw-w64-i686-gnutls \ mingw-w64-i686-libidn2 \ diff --git a/contrib/build_mingw-openconnect-w64@fedora27.sh b/contrib/build_mingw-openconnect-w64@fedora27.sh index 3713b31f..e050390f 100755 --- a/contrib/build_mingw-openconnect-w64@fedora27.sh +++ b/contrib/build_mingw-openconnect-w64@fedora27.sh @@ -115,6 +115,8 @@ cd ../ echo "List of system-wide used packages versions:" \ > openconnect-${OC_TAG}_mingw64.txt +echo "openconnect-${OC_TAG}" \ + >> openconnect-${OC_TAG}_mingw64.txt echo "stoken-${STOKEN_TAG}" \ >> openconnect-${OC_TAG}_mingw64.txt rpm -qv \ diff --git a/contrib/build_mingw-openconnect-w64@msys2.sh b/contrib/build_mingw-openconnect-w64@msys2.sh index 8c183b2b..d5d38457 100644 --- a/contrib/build_mingw-openconnect-w64@msys2.sh +++ b/contrib/build_mingw-openconnect-w64@msys2.sh @@ -142,6 +142,8 @@ cd ../ echo "List of system-wide used packages versions:" \ > openconnect-${OC_TAG}_mingw64.txt +echo "openconnect-${OC_TAG}" \ + >> openconnect-${OC_TAG}_mingw64.txt echo "stoken-${STOKEN_TAG}" \ >> openconnect-${OC_TAG}_mingw64.txt pacman -Q \ From 8ab4b0764233de60ab949081d7b6fe175ec76c07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Mon, 19 Feb 2018 22:58:16 +0100 Subject: [PATCH 080/129] Small speedup of openconnect artefact build process --- contrib/build_mingw-openconnect-w32@fedora27.sh | 4 ++-- contrib/build_mingw-openconnect-w32@msys2.sh | 4 ++-- contrib/build_mingw-openconnect-w64@fedora27.sh | 4 ++-- contrib/build_mingw-openconnect-w64@msys2.sh | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/contrib/build_mingw-openconnect-w32@fedora27.sh b/contrib/build_mingw-openconnect-w32@fedora27.sh index f17fc113..0ef51191 100755 --- a/contrib/build_mingw-openconnect-w32@fedora27.sh +++ b/contrib/build_mingw-openconnect-w32@fedora27.sh @@ -20,7 +20,7 @@ git checkout ${STOKEN_TAG} ./autogen.sh mkdir build32 cd build32 -mingw32-configure +mingw32-configure --disable-dependency-tracking --without-tomcrypt --without-gtk mingw32-make -j4 mingw32-make install cd ../../ @@ -32,7 +32,7 @@ git checkout ${OC_TAG} ./autogen.sh mkdir build32 cd build32 -mingw32-configure --with-vpnc-script=vpnc-script-win.js +mingw32-configure --disable-dependency-tracking --with-gnutls --without-openssl --without-libpskc --with-vpnc-script=vpnc-script-win.js mingw32-make -j4 cd ../../ diff --git a/contrib/build_mingw-openconnect-w32@msys2.sh b/contrib/build_mingw-openconnect-w32@msys2.sh index c5152c30..d0f93ce1 100644 --- a/contrib/build_mingw-openconnect-w32@msys2.sh +++ b/contrib/build_mingw-openconnect-w32@msys2.sh @@ -35,7 +35,7 @@ git checkout ${STOKEN_TAG} ./autogen.sh mkdir build32 cd build32 -../configure +../configure --disable-dependency-tracking --without-tomcrypt --without-gtk mingw32-make -j4 mingw32-make install cd ../../ @@ -47,7 +47,7 @@ git checkout ${OC_TAG} ./autogen.sh mkdir build32 cd build32 -../configure --with-vpnc-script=vpnc-script-win.js +../configure --disable-dependency-tracking --with-gnutls --without-openssl --without-libpskc --with-vpnc-script=vpnc-script-win.js mingw32-make -j4 cd ../../ diff --git a/contrib/build_mingw-openconnect-w64@fedora27.sh b/contrib/build_mingw-openconnect-w64@fedora27.sh index e050390f..a10d43be 100755 --- a/contrib/build_mingw-openconnect-w64@fedora27.sh +++ b/contrib/build_mingw-openconnect-w64@fedora27.sh @@ -21,7 +21,7 @@ git checkout ${STOKEN_TAG} ./autogen.sh mkdir build64 cd build64 -mingw64-configure +mingw64-configure --disable-dependency-tracking --without-tomcrypt --without-gtk mingw64-make -j4 mingw64-make install cd ../../ @@ -33,7 +33,7 @@ git checkout ${OC_TAG} ./autogen.sh mkdir build64 cd build64 -mingw64-configure --with-vpnc-script=vpnc-script-win.js +mingw64-configure --disable-dependency-tracking --with-gnutls --without-openssl --without-libpskc --with-vpnc-script=vpnc-script-win.js mingw64-make -j4 cd ../../ diff --git a/contrib/build_mingw-openconnect-w64@msys2.sh b/contrib/build_mingw-openconnect-w64@msys2.sh index d5d38457..ce8ac41e 100644 --- a/contrib/build_mingw-openconnect-w64@msys2.sh +++ b/contrib/build_mingw-openconnect-w64@msys2.sh @@ -35,7 +35,7 @@ git checkout ${STOKEN_TAG} ./autogen.sh mkdir build64 cd build64 -../configure +../configure --disable-dependency-tracking --without-tomcrypt --without-gtk mingw32-make -j4 mingw32-make install cd ../../ @@ -47,7 +47,7 @@ git checkout ${OC_TAG} ./autogen.sh mkdir build64 cd build64 -../configure --with-vpnc-script=vpnc-script-win.js +../configure --disable-dependency-tracking --with-gnutls --without-openssl --without-libpskc --with-vpnc-script=vpnc-script-win.js mingw32-make -j4 cd ../../ From 0aae2cce14d97a08a49f3b7f445723707a8fad5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Mon, 19 Feb 2018 23:16:24 +0100 Subject: [PATCH 081/129] Update changes to Qt 5.10.1 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 381e7d55..26d457ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ History of user-visible changes. ## [v1.5.3](https://github.com/openconnect/openconnect-gui/tree/v1.5.3) (unreleased) - No disconnection triggered before quit (#202) - Don't use system wide defined proxy when disabled in profile (#208) -- update Qt (5.10.0) +- update Qt (5.10.1) - Unable to use socks5 proxy built by ssh tunneling (#187) - update spdlog (0.16.3) From a3cbea590a96532a56108a22752ed85904f51081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Mon, 19 Feb 2018 23:25:23 +0100 Subject: [PATCH 082/129] Don't track contrib build working folder --- contrib/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 contrib/.gitignore diff --git a/contrib/.gitignore b/contrib/.gitignore new file mode 100644 index 00000000..9d931c43 --- /dev/null +++ b/contrib/.gitignore @@ -0,0 +1 @@ +work/ From 32a4df8998181870a185922a3208ef9bc07d0819 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Mon, 19 Feb 2018 23:35:28 +0100 Subject: [PATCH 083/129] Update openconnect tool build hint --- docs/openconnect.md | 6 +++--- external/.gitignore | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 external/.gitignore diff --git a/docs/openconnect.md b/docs/openconnect.md index 9104cfc4..72ad7f95 100644 --- a/docs/openconnect.md +++ b/docs/openconnect.md @@ -1,8 +1,8 @@ ### OpenConnect compilation The 'openconnect' binary and libraries incl. dependent libraries -used in this project are actually build and packaged -incl. library/header dependencies on Fedora 26 -via [this script](../contrib/build_mingw-openconnect-w32@fedora26.sh). +used in this project may be actually build and packaged +include libraries/headers dependencies on MSYS2 build environment or Fedora OS +via [these scripts](../contrib/). These commands and paths may vary... diff --git a/external/.gitignore b/external/.gitignore new file mode 100644 index 00000000..33ec01b2 --- /dev/null +++ b/external/.gitignore @@ -0,0 +1,2 @@ +*.zip +*.txt From cb999cb46087f68b2b1ad5630aeb9037dac24195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Mon, 19 Feb 2018 23:43:11 +0100 Subject: [PATCH 084/129] Move oc-gui artefact to project root after build --- build_mingw@win.cmd | 2 ++ build_msys2@win.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/build_mingw@win.cmd b/build_mingw@win.cmd index 62767485..3511ce06 100644 --- a/build_mingw@win.cmd +++ b/build_mingw@win.cmd @@ -77,4 +77,6 @@ cmake . mingw32-make package VERBOSE=1 REM mingw32-make package_source VERBOSE=1 +move /Y *.exe .. + cd .. diff --git a/build_msys2@win.sh b/build_msys2@win.sh index 9ad2de1a..43824e9e 100644 --- a/build_msys2@win.sh +++ b/build_msys2@win.sh @@ -47,4 +47,6 @@ cmake . make package VERBOSE=1 # make package_source VERBOSE=1 +mv -vf *.exe .. + cd .. From 854926dfd2620f94439d97c81a452d4da491bd7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Mon, 19 Feb 2018 23:50:38 +0100 Subject: [PATCH 085/129] Ignore temporary binary files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 94c11c06..221b1678 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ build-release*/ # temporary... _xxx/ *.zip +*.exe From 3a0bbb9328d97b13d4fdd0292619085949db26ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Mon, 19 Feb 2018 23:52:35 +0100 Subject: [PATCH 086/129] Better name for msys2 build script --- build_msys2@win.sh => build_mingw2@msys.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename build_msys2@win.sh => build_mingw2@msys.sh (100%) diff --git a/build_msys2@win.sh b/build_mingw2@msys.sh similarity index 100% rename from build_msys2@win.sh rename to build_mingw2@msys.sh From c66d490d449cb27bb1c24241bb2215ea8c695cbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Tue, 20 Feb 2018 00:09:42 +0100 Subject: [PATCH 087/129] Drop duplicate line in openconnect libraries list --- CHANGELOG.md | 1 + contrib/build_mingw-openconnect-w32@msys2.sh | 1 - contrib/build_mingw-openconnect-w64@msys2.sh | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 381e7d55..f11cd9f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ History of user-visible changes. ## [v1.5.3](https://github.com/openconnect/openconnect-gui/tree/v1.5.3) (unreleased) +- update GnuTLS(3.6.1), p11-kit(0.23.9), stoken(0.92), libproxy(0.4.15), nettle(3.4), lz4(1.8.1.2), libxml2(2.9.7) - No disconnection triggered before quit (#202) - Don't use system wide defined proxy when disabled in profile (#208) - update Qt (5.10.0) diff --git a/contrib/build_mingw-openconnect-w32@msys2.sh b/contrib/build_mingw-openconnect-w32@msys2.sh index d0f93ce1..77613a45 100644 --- a/contrib/build_mingw-openconnect-w32@msys2.sh +++ b/contrib/build_mingw-openconnect-w32@msys2.sh @@ -153,7 +153,6 @@ pacman -Q \ mingw-w64-i686-nettle \ mingw-w64-i686-gmp \ mingw-w64-i686-p11-kit \ - mingw-w64-i686-zlib \ mingw-w64-i686-libxml2 \ mingw-w64-i686-zlib \ mingw-w64-i686-libxml2 \ diff --git a/contrib/build_mingw-openconnect-w64@msys2.sh b/contrib/build_mingw-openconnect-w64@msys2.sh index ce8ac41e..69f87433 100644 --- a/contrib/build_mingw-openconnect-w64@msys2.sh +++ b/contrib/build_mingw-openconnect-w64@msys2.sh @@ -153,7 +153,6 @@ pacman -Q \ mingw-w64-x86_64-nettle \ mingw-w64-x86_64-gmp \ mingw-w64-x86_64-p11-kit \ - mingw-w64-x86_64-zlib \ mingw-w64-x86_64-libxml2 \ mingw-w64-x86_64-zlib \ mingw-w64-x86_64-libxml2 \ From 911f01fed2b083038ed69a77cdd4b1b6f2a0467f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Tue, 20 Feb 2018 00:12:45 +0100 Subject: [PATCH 088/129] Update dependencies list --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f11cd9f0..1284d642 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,12 @@ History of user-visible changes. ## [v1.5.3](https://github.com/openconnect/openconnect-gui/tree/v1.5.3) (unreleased) -- update GnuTLS(3.6.1), p11-kit(0.23.9), stoken(0.92), libproxy(0.4.15), nettle(3.4), lz4(1.8.1.2), libxml2(2.9.7) - No disconnection triggered before quit (#202) - Don't use system wide defined proxy when disabled in profile (#208) -- update Qt (5.10.0) - Unable to use socks5 proxy built by ssh tunneling (#187) -- update spdlog (0.16.3) + +- update Qt(5.10.1), spdlog(0.16.3) +- update GnuTLS(3.6.1), p11-kit(0.23.9), stoken(0.92), libproxy(0.4.15), nettle(3.4), lz4(1.8.1.2), libxml2(2.9.7), libidn2(2.0.4) [Full Changelog](https://github.com/openconnect/openconnect-gui/compare/v1.5.2...v1.5.3) From 7e24024a87bc83a2b87f2efe67bb3cc4b983c253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Wed, 21 Feb 2018 23:03:33 +0100 Subject: [PATCH 089/129] Small speedup of 3rd party stuff build --- contrib/build_mingw-openconnect-w32@msys2.sh | 10 +++++----- contrib/build_mingw-openconnect-w64@msys2.sh | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/contrib/build_mingw-openconnect-w32@msys2.sh b/contrib/build_mingw-openconnect-w32@msys2.sh index 77613a45..26f1c0d7 100644 --- a/contrib/build_mingw-openconnect-w32@msys2.sh +++ b/contrib/build_mingw-openconnect-w32@msys2.sh @@ -26,26 +26,26 @@ pacman --needed -S \ mingw-w64-i686-lz4 \ mingw-w64-i686-libproxy -mkdir work +[ -d work ] || mkdir work cd work -git clone https://github.com/cernekee/stoken +[ -d stoken ] || git clone https://github.com/cernekee/stoken cd stoken git checkout ${STOKEN_TAG} ./autogen.sh -mkdir build32 +[ -d build32 ] || mkdir build32 cd build32 ../configure --disable-dependency-tracking --without-tomcrypt --without-gtk mingw32-make -j4 mingw32-make install cd ../../ -git clone git://git.infradead.org/users/dwmw2/openconnect.git +[ -d openconnect ] || git clone git://git.infradead.org/users/dwmw2/openconnect.git cd openconnect git reset --hard git checkout ${OC_TAG} ./autogen.sh -mkdir build32 +[ -d build32 ] || mkdir build32 cd build32 ../configure --disable-dependency-tracking --with-gnutls --without-openssl --without-libpskc --with-vpnc-script=vpnc-script-win.js mingw32-make -j4 diff --git a/contrib/build_mingw-openconnect-w64@msys2.sh b/contrib/build_mingw-openconnect-w64@msys2.sh index 69f87433..6bde549e 100644 --- a/contrib/build_mingw-openconnect-w64@msys2.sh +++ b/contrib/build_mingw-openconnect-w64@msys2.sh @@ -26,26 +26,26 @@ pacman --needed -S \ mingw-w64-x86_64-lz4 \ mingw-w64-x86_64-libproxy -mkdir work +[ -d work ] || mkdir work cd work -git clone https://github.com/cernekee/stoken +[ -d stoken ] || git clone https://github.com/cernekee/stoken cd stoken git checkout ${STOKEN_TAG} ./autogen.sh -mkdir build64 +[ -d build64 ] || mkdir build64 cd build64 ../configure --disable-dependency-tracking --without-tomcrypt --without-gtk mingw32-make -j4 mingw32-make install cd ../../ -git clone git://git.infradead.org/users/dwmw2/openconnect.git +[ -d openconnect ] || git clone git://git.infradead.org/users/dwmw2/openconnect.git cd openconnect git reset --hard git checkout ${OC_TAG} ./autogen.sh -mkdir build64 +[ -d build64 ] || mkdir build64 cd build64 ../configure --disable-dependency-tracking --with-gnutls --without-openssl --without-libpskc --with-vpnc-script=vpnc-script-win.js mingw32-make -j4 From d126106b8f1880295dbbaf0d56a393ee7d491bdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Tue, 27 Feb 2018 21:26:57 +0100 Subject: [PATCH 090/129] Show more info in vpnc script download --- contrib/build_mingw-openconnect-w32@fedora27.sh | 2 +- contrib/build_mingw-openconnect-w32@msys2.sh | 2 +- contrib/build_mingw-openconnect-w64@fedora27.sh | 2 +- contrib/build_mingw-openconnect-w64@msys2.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/build_mingw-openconnect-w32@fedora27.sh b/contrib/build_mingw-openconnect-w32@fedora27.sh index 0ef51191..6e888efb 100755 --- a/contrib/build_mingw-openconnect-w32@fedora27.sh +++ b/contrib/build_mingw-openconnect-w32@fedora27.sh @@ -62,7 +62,7 @@ cp ${MINGW_PREFIX}/bin/zlib1.dll . cp ${MINGW_PREFIX}/bin/libstoken-1.dll . cp ../../openconnect/build32/.libs/libopenconnect-5.dll . cp ../../openconnect/build32/.libs/openconnect.exe . -curl -o vpnc-script-win.js http://git.infradead.org/users/dwmw2/vpnc-scripts.git/blob_plain/HEAD:/vpnc-script-win.js +curl -v -o vpnc-script-win.js http://git.infradead.org/users/dwmw2/vpnc-scripts.git/blob_plain/HEAD:/vpnc-script-win.js cd ../../ mkdir -p pkg/lib && cd pkg/lib diff --git a/contrib/build_mingw-openconnect-w32@msys2.sh b/contrib/build_mingw-openconnect-w32@msys2.sh index 26f1c0d7..e7fe44db 100644 --- a/contrib/build_mingw-openconnect-w32@msys2.sh +++ b/contrib/build_mingw-openconnect-w32@msys2.sh @@ -84,7 +84,7 @@ cp ${MINGW_PREFIX}/bin/libstdc++-6.dll . cp ${MINGW_PREFIX}/bin/liblzma-5.dll . cp ../../openconnect/build32/.libs/libopenconnect-5.dll . cp ../../openconnect/build32/.libs/openconnect.exe . -curl -o vpnc-script-win.js http://git.infradead.org/users/dwmw2/vpnc-scripts.git/blob_plain/HEAD:/vpnc-script-win.js +curl -v -o vpnc-script-win.js http://git.infradead.org/users/dwmw2/vpnc-scripts.git/blob_plain/HEAD:/vpnc-script-win.js cd ../../ mkdir -p pkg/lib && cd pkg/lib diff --git a/contrib/build_mingw-openconnect-w64@fedora27.sh b/contrib/build_mingw-openconnect-w64@fedora27.sh index a10d43be..34f26d1c 100755 --- a/contrib/build_mingw-openconnect-w64@fedora27.sh +++ b/contrib/build_mingw-openconnect-w64@fedora27.sh @@ -63,7 +63,7 @@ cp ${MINGW_PREFIX}/bin/zlib1.dll . cp ${MINGW_PREFIX}/bin/libstoken-1.dll . cp ../../openconnect/build64/.libs/libopenconnect-5.dll . cp ../../openconnect/build64/.libs/openconnect.exe . -curl -o vpnc-script-win.js http://git.infradead.org/users/dwmw2/vpnc-scripts.git/blob_plain/HEAD:/vpnc-script-win.js +curl -v -o vpnc-script-win.js http://git.infradead.org/users/dwmw2/vpnc-scripts.git/blob_plain/HEAD:/vpnc-script-win.js cd ../../ mkdir -p pkg/lib && cd pkg/lib diff --git a/contrib/build_mingw-openconnect-w64@msys2.sh b/contrib/build_mingw-openconnect-w64@msys2.sh index 6bde549e..6fcbc9e2 100644 --- a/contrib/build_mingw-openconnect-w64@msys2.sh +++ b/contrib/build_mingw-openconnect-w64@msys2.sh @@ -84,7 +84,7 @@ cp ${MINGW_PREFIX}/bin/libstdc++-6.dll . cp ${MINGW_PREFIX}/bin/liblzma-5.dll . cp ../../openconnect/build64/.libs/libopenconnect-5.dll . cp ../../openconnect/build64/.libs/openconnect.exe . -curl -o vpnc-script-win.js http://git.infradead.org/users/dwmw2/vpnc-scripts.git/blob_plain/HEAD:/vpnc-script-win.js +curl -v -o vpnc-script-win.js http://git.infradead.org/users/dwmw2/vpnc-scripts.git/blob_plain/HEAD:/vpnc-script-win.js cd ../../ mkdir -p pkg/lib && cd pkg/lib From a52e3989c27859a5177c33a03c8a95deabfafa43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Wed, 28 Feb 2018 16:33:00 +0100 Subject: [PATCH 091/129] Calculate sha512 checksum for created installer package --- CMake/Includes/ProjectPackage.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/CMake/Includes/ProjectPackage.cmake b/CMake/Includes/ProjectPackage.cmake index 524bc872..7bf7117e 100644 --- a/CMake/Includes/ProjectPackage.cmake +++ b/CMake/Includes/ProjectPackage.cmake @@ -13,6 +13,7 @@ set(CPACK_PACKAGE_INSTALL_DIRECTORY "${PRODUCT_NAME_SHORT}") if(APPLE) set(CPACK_PACKAGE_ICON ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/mono_lock.icns) endif() +set(CPACK_PACKAGE_CHECKSUM SHA512) set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt) #set(CPACK_RESOURCE_FILE_README ...) #set(CPACK_RESOURCE_FILE_WELCOME ...) From aad75122d979a3e3a62c6cb6a678e1d014b87575 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Wed, 28 Feb 2018 17:02:21 +0100 Subject: [PATCH 092/129] Bump Qt version to 5.10.1 --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 85ec2926..d4989b7d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,7 +13,7 @@ branches: except: - gh-pages environment: - QT5: C:\Qt\5.10.0\mingw53_32 + QT5: C:\Qt\5.10.1\mingw53_32 MINGW: C:\Qt\Tools\mingw530_32 NSIS: C:\Program Files (x86)\NSIS matrix: From d0449a441f7efe88033d487acd41352a06bfa888 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Wed, 28 Feb 2018 17:03:02 +0100 Subject: [PATCH 093/129] Trigger build only on selected branches --- appveyor.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index d4989b7d..f48a8fe8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,17 +1,14 @@ version: 1.5.2-{build} pull_requests: do_not_increment_build_number: true +branches: + only: + - master + - develop + - /feature\/.*/ skip_tags: true image: Visual Studio 2017 clone_depth: 100 -branches: - # whitelist - only: - - master - - develop - - /feature\/.*/ - except: - - gh-pages environment: QT5: C:\Qt\5.10.1\mingw53_32 MINGW: C:\Qt\Tools\mingw530_32 From 6aaf2dafb50a2bf7d7c543cbc30d0d855f6a6b0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Wed, 28 Feb 2018 22:38:32 +0100 Subject: [PATCH 094/129] Revert "Bump Qt version to 5.10.1" This reverts commit aad75122d979a3e3a62c6cb6a678e1d014b87575. --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index f48a8fe8..db1fbec1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,7 +10,7 @@ skip_tags: true image: Visual Studio 2017 clone_depth: 100 environment: - QT5: C:\Qt\5.10.1\mingw53_32 + QT5: C:\Qt\5.10.0\mingw53_32 MINGW: C:\Qt\Tools\mingw530_32 NSIS: C:\Program Files (x86)\NSIS matrix: From 884e22e40d11d5aece1a23c6ab33e97390b2c095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Wed, 28 Feb 2018 22:46:21 +0100 Subject: [PATCH 095/129] Invalidate build-cache when AppVeyor setup changes --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index db1fbec1..257e362f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,7 +20,7 @@ environment: - GENERATOR: '"MinGW Makefiles"' BUILD_TYPE: Release TARGET: package -cache: .\build +cache: .\build -> appveyor.yml build_script: - cmd: >- set From ac21844aa12e59347a74d1eb1e68cd677d388798 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Wed, 28 Feb 2018 23:08:54 +0100 Subject: [PATCH 096/129] Upload project with tag to GitHub; small cleanup --- appveyor.yml | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 257e362f..99762fcd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,12 +1,9 @@ -version: 1.5.2-{build} +version: '{branch}-{build}' pull_requests: do_not_increment_build_number: true branches: - only: - - master - - develop - - /feature\/.*/ -skip_tags: true + except: + - gh-pages image: Visual Studio 2017 clone_depth: 100 environment: @@ -14,9 +11,9 @@ environment: MINGW: C:\Qt\Tools\mingw530_32 NSIS: C:\Program Files (x86)\NSIS matrix: - - GENERATOR: '"MinGW Makefiles"' - BUILD_TYPE: Debug - TARGET: all +# - GENERATOR: '"MinGW Makefiles"' +# BUILD_TYPE: Debug +# TARGET: all - GENERATOR: '"MinGW Makefiles"' BUILD_TYPE: Release TARGET: package @@ -24,22 +21,28 @@ cache: .\build -> appveyor.yml build_script: - cmd: >- set - set PATH=%PATH:C:\Program Files\Git\usr\bin;=% - set PATH=%MINGW%\bin;%QT5%\bin;%PATH% - set PATH="%NSIS%";%PATH% - if not exist build md build - cd .\build - cmake -G %GENERATOR% -DCMAKE_BUILD_TYPE=%BUILD_TYPE% .. - cmake --build . --config %BUILD_TYPE% --target %TARGET% test: off artifacts: - path: build\openconnect-gui*.exe - name: openconnect-gui-1.5.2-{build}-win32.exe - + name: installer +- path: build\openconnect-gui*.exe.sha512 + name: 'sha512 installer hash' +deploy: +- provider: GitHub + tag: $(APPVEYOR_REPO_TAG_NAME) + release: $(APPVEYOR_REPO_TAG_NAME) + description: TBD... + auth_token: + secure: x7ZSG2iQyNioIlyguchg7/Tzl5NzY521hr8Op0H4EQt/kPIndb2KHe/OlGiX+GSK + artifact: /build\/openconnect-gui-.*\.exe.* + draft: true + force_update: true + on: + appveyor_repo_tag: true From c261f24a29f8c95bb131a84653e14a74f03920cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Wed, 28 Feb 2018 23:13:39 +0100 Subject: [PATCH 097/129] Keep extra empty lines as command delimiter (?) --- appveyor.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 99762fcd..0fb20ae7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,13 +21,21 @@ cache: .\build -> appveyor.yml build_script: - cmd: >- set + set PATH=%PATH:C:\Program Files\Git\usr\bin;=% + set PATH=%MINGW%\bin;%QT5%\bin;%PATH% + set PATH="%NSIS%";%PATH% + if not exist build md build + cd .\build + cmake -G %GENERATOR% -DCMAKE_BUILD_TYPE=%BUILD_TYPE% .. + cmake --build . --config %BUILD_TYPE% --target %TARGET% + test: off artifacts: - path: build\openconnect-gui*.exe From 306da31344eb94619ff251c38dcc6a8e8a7f484a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Thu, 1 Mar 2018 00:00:32 +0100 Subject: [PATCH 098/129] Update link to AppVeyor build process status badge --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 0831182d..5845b515 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,7 @@ [![Downloades](https://img.shields.io/github/downloads/openconnect/openconnect-gui/latest/total.svg)](https://github.com/openconnect/openconnect-gui/releases) [![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](https://img.shields.io/badge/License-GPL%20v2-blue.svg) [![Join the chat at https://gitter.im/openconnect-gui/Lobby](https://badges.gitter.im/openconnect-gui/Lobby.svg)](https://gitter.im/openconnect-gui/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -[![Build Status](https://travis-ci.org/openconnect/openconnect-gui.svg?branch=master)](https://travis-ci.org/openconnect/openconnect-gui) -[![Build status](https://ci.appveyor.com/api/projects/status/frib67a4pa10e3ae/branch/develop?svg=true)](https://ci.appveyor.com/project/horar/openconnect-gui-58r26/branch/develop) +[![Build status](https://ci.appveyor.com/api/projects/status/hueumkrrgut9r3d7?svg=true)](https://ci.appveyor.com/project/horar/openconnect-gui) This is the GUI client for openconnect VPN. This client is in beta testing phase. It cannot be assumed to provide From 0ea6ef491473df6bd141446f4d49c4c5f5fe7873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Thu, 1 Mar 2018 00:25:44 +0100 Subject: [PATCH 099/129] Update artifacts names --- appveyor.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 0fb20ae7..4e8b4fad 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -39,9 +39,9 @@ build_script: test: off artifacts: - path: build\openconnect-gui*.exe - name: installer + name: 'Installer' - path: build\openconnect-gui*.exe.sha512 - name: 'sha512 installer hash' + name: 'Installer - sha512 hash' deploy: - provider: GitHub tag: $(APPVEYOR_REPO_TAG_NAME) @@ -54,3 +54,4 @@ deploy: force_update: true on: appveyor_repo_tag: true + From 6c72d9d21b6edeb7fdde63dd7fb6cdbed4d613bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Thu, 1 Mar 2018 01:44:40 +0100 Subject: [PATCH 100/129] retab... --- docs/dev_QtCreator.md | 4 ++-- docs/webpage.md | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/dev_QtCreator.md b/docs/dev_QtCreator.md index f963f7d1..a7924bb1 100644 --- a/docs/dev_QtCreator.md +++ b/docs/dev_QtCreator.md @@ -10,8 +10,8 @@ - update desired Qt 5.8 version build types and click "Configure" - open 'Project' tab on left side of QtCreator with CMake configuration - change - - 'PROJ\_UAC\_ON' to 'off' because QtCreator is not able to start app with UAC (?) :/ - - if you like; change 'PROJ\_INI\_SETTINGS' to 'off' if you want store all settings into file instead of Registry for development/tests + - 'PROJ\_UAC\_ON' to 'off' because QtCreator is not able to start app with UAC (?) :/ + - if you like; change 'PROJ\_INI\_SETTINGS' to 'off' if you want store all settings into file instead of Registry for development/tests - click 'Apply Configuration Changes' and then switch again to 'Edit' tab on left side of QtCreator - build the project diff --git a/docs/webpage.md b/docs/webpage.md index aacb5445..ca670e05 100644 --- a/docs/webpage.md +++ b/docs/webpage.md @@ -3,14 +3,14 @@ Following stesp summarize how to update OpenConnect-GUI web page, screen shots and its conten: 1. images/screenshots preaparation: - - prepare desired screen shots (common width is 650px) - - checkout project into 'gh-pages' branch - - create or upload images to e.g. screenshots folder - - commit & submit - and continue with web-text changes... + - prepare desired screen shots (common width is 650px) + - checkout project into 'gh-pages' branch + - create or upload images to e.g. screenshots folder + - commit & submit - and continue with web-text changes... 2. web page text: - - open GitHub project settings - - look for GitHub pages and click "Launch automatic page generator" - - edit 'markdown' page content - - click "Continue to layouts" - - choose 'Tactile' style in list - - review your changes and finish with clicking to "Publish page" + - open GitHub project settings + - look for GitHub pages and click "Launch automatic page generator" + - edit 'markdown' page content + - click "Continue to layouts" + - choose 'Tactile' style in list + - review your changes and finish with clicking to "Publish page" From 93e2d341bad082cdff631231f3e8931c73016f9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Thu, 1 Mar 2018 14:31:25 +0100 Subject: [PATCH 101/129] Regex should start/end with slash --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 4e8b4fad..b547a99f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -49,7 +49,7 @@ deploy: description: TBD... auth_token: secure: x7ZSG2iQyNioIlyguchg7/Tzl5NzY521hr8Op0H4EQt/kPIndb2KHe/OlGiX+GSK - artifact: /build\/openconnect-gui-.*\.exe.* + artifact: /build\/openconnect-gui-.*\.exe.*/ draft: true force_update: true on: From a0de3909c38bda6d3c739c9fcc29d495ed06efc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Thu, 1 Mar 2018 22:58:50 +0100 Subject: [PATCH 102/129] Reforamt mingw/msys pacakge dependencies --- .../build_mingw-openconnect-w32@fedora27.sh | 14 ++++++--- contrib/build_mingw-openconnect-w32@msys2.sh | 30 ++++++++----------- .../build_mingw-openconnect-w64@fedora27.sh | 16 ++++++---- contrib/build_mingw-openconnect-w64@msys2.sh | 30 ++++++++----------- 4 files changed, 45 insertions(+), 45 deletions(-) diff --git a/contrib/build_mingw-openconnect-w32@fedora27.sh b/contrib/build_mingw-openconnect-w32@fedora27.sh index 6e888efb..69677a84 100755 --- a/contrib/build_mingw-openconnect-w32@fedora27.sh +++ b/contrib/build_mingw-openconnect-w32@fedora27.sh @@ -6,10 +6,16 @@ export OC_TAG=v7.08 export STOKEN_TAG=v0.92 -dnf -y install mingw32-gnutls mingw32-libxml2 mingw32-gettext -dnf -y install gcc libtool -dnf -y install gettext -dnf -y install git p7zip +dnf -y install \ + mingw32-gnutls \ + mingw32-libxml2 \ + mingw32-gettext +dnf -y install \ + gcc \ + libtool \ + gettext \ + git \ + p7zip mkdir work cd work diff --git a/contrib/build_mingw-openconnect-w32@msys2.sh b/contrib/build_mingw-openconnect-w32@msys2.sh index e7fe44db..b0e370cb 100644 --- a/contrib/build_mingw-openconnect-w32@msys2.sh +++ b/contrib/build_mingw-openconnect-w32@msys2.sh @@ -6,25 +6,19 @@ export OC_TAG=v7.08 export STOKEN_TAG=v0.92 -#dnf -y install mingw64-gnutls mingw64-libxml2 mingw64-gettext -#dnf -y install gcc libtool -#dnf -y install gettext -#dnf -y install git p7zip -#dnf -y install patch - pacman --needed -S \ - mingw-w64-i686-gnutls \ - mingw-w64-i686-libidn2 \ - mingw-w64-i686-libunistring \ - mingw-w64-i686-nettle \ - mingw-w64-i686-gmp \ - mingw-w64-i686-p11-kit \ - mingw-w64-i686-zlib \ - mingw-w64-i686-libxml2 \ - mingw-w64-i686-zlib \ - mingw-w64-i686-libxml2 \ - mingw-w64-i686-lz4 \ - mingw-w64-i686-libproxy + mingw-w64-i686-gnutls \ + mingw-w64-i686-libidn2 \ + mingw-w64-i686-libunistring \ + mingw-w64-i686-nettle \ + mingw-w64-i686-gmp \ + mingw-w64-i686-p11-kit \ + mingw-w64-i686-zlib \ + mingw-w64-i686-libxml2 \ + mingw-w64-i686-zlib \ + mingw-w64-i686-libxml2 \ + mingw-w64-i686-lz4 \ + mingw-w64-i686-libproxy [ -d work ] || mkdir work cd work diff --git a/contrib/build_mingw-openconnect-w64@fedora27.sh b/contrib/build_mingw-openconnect-w64@fedora27.sh index 34f26d1c..cdef4acb 100755 --- a/contrib/build_mingw-openconnect-w64@fedora27.sh +++ b/contrib/build_mingw-openconnect-w64@fedora27.sh @@ -6,13 +6,19 @@ export OC_TAG=v7.08 export STOKEN_TAG=v0.92 -dnf -y install mingw64-gnutls mingw64-libxml2 mingw64-gettext -dnf -y install gcc libtool -dnf -y install gettext -dnf -y install git p7zip -dnf -y install patch mkdir work +dnf -y install \ + mingw64-gnutls \ + mingw64-libxml2 \ + mingw64-gettext +dnf -y install \ + gcc \ + libtool \ + gettext \ + git \ + p7zip \ + patch cd work git clone https://github.com/cernekee/stoken diff --git a/contrib/build_mingw-openconnect-w64@msys2.sh b/contrib/build_mingw-openconnect-w64@msys2.sh index 6fcbc9e2..00a6f5c3 100644 --- a/contrib/build_mingw-openconnect-w64@msys2.sh +++ b/contrib/build_mingw-openconnect-w64@msys2.sh @@ -6,25 +6,19 @@ export OC_TAG=v7.08 export STOKEN_TAG=v0.92 -#dnf -y install mingw64-gnutls mingw64-libxml2 mingw64-gettext -#dnf -y install gcc libtool -#dnf -y install gettext -#dnf -y install git p7zip -#dnf -y install patch - pacman --needed -S \ - mingw-w64-x86_64-gnutls \ - mingw-w64-x86_64-libidn2 \ - mingw-w64-x86_64-libunistring \ - mingw-w64-x86_64-nettle \ - mingw-w64-x86_64-gmp \ - mingw-w64-x86_64-p11-kit \ - mingw-w64-x86_64-zlib \ - mingw-w64-x86_64-libxml2 \ - mingw-w64-x86_64-zlib \ - mingw-w64-x86_64-libxml2 \ - mingw-w64-x86_64-lz4 \ - mingw-w64-x86_64-libproxy + mingw-w64-x86_64-gnutls \ + mingw-w64-x86_64-libidn2 \ + mingw-w64-x86_64-libunistring \ + mingw-w64-x86_64-nettle \ + mingw-w64-x86_64-gmp \ + mingw-w64-x86_64-p11-kit \ + mingw-w64-x86_64-zlib \ + mingw-w64-x86_64-libxml2 \ + mingw-w64-x86_64-zlib \ + mingw-w64-x86_64-libxml2 \ + mingw-w64-x86_64-lz4 \ + mingw-w64-x86_64-libproxy [ -d work ] || mkdir work cd work From 2db803dc5d3d3f15a7fa4bd9fa694d861316f5d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Sat, 3 Mar 2018 00:05:39 +0100 Subject: [PATCH 103/129] Create folder/clone if necessary --- contrib/build_mingw-openconnect-w32@fedora27.sh | 9 +++++---- contrib/build_mingw-openconnect-w32@msys2.sh | 1 + contrib/build_mingw-openconnect-w64@fedora27.sh | 11 ++++++----- contrib/build_mingw-openconnect-w64@msys2.sh | 1 + 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/contrib/build_mingw-openconnect-w32@fedora27.sh b/contrib/build_mingw-openconnect-w32@fedora27.sh index 69677a84..4bef4b12 100755 --- a/contrib/build_mingw-openconnect-w32@fedora27.sh +++ b/contrib/build_mingw-openconnect-w32@fedora27.sh @@ -17,14 +17,15 @@ dnf -y install \ git \ p7zip -mkdir work + +[ -d work ] || mkdir work cd work -git clone https://github.com/cernekee/stoken +[ -d stoken ] || git clone https://github.com/cernekee/stoken cd stoken git checkout ${STOKEN_TAG} ./autogen.sh -mkdir build32 +[ -d build32 ] || mkdir build32 cd build32 mingw32-configure --disable-dependency-tracking --without-tomcrypt --without-gtk mingw32-make -j4 @@ -36,7 +37,7 @@ cd openconnect git reset --hard git checkout ${OC_TAG} ./autogen.sh -mkdir build32 +[ -d build32 ] || mkdir build32 cd build32 mingw32-configure --disable-dependency-tracking --with-gnutls --without-openssl --without-libpskc --with-vpnc-script=vpnc-script-win.js mingw32-make -j4 diff --git a/contrib/build_mingw-openconnect-w32@msys2.sh b/contrib/build_mingw-openconnect-w32@msys2.sh index b0e370cb..4ee7fbba 100644 --- a/contrib/build_mingw-openconnect-w32@msys2.sh +++ b/contrib/build_mingw-openconnect-w32@msys2.sh @@ -20,6 +20,7 @@ pacman --needed -S \ mingw-w64-i686-lz4 \ mingw-w64-i686-libproxy + [ -d work ] || mkdir work cd work diff --git a/contrib/build_mingw-openconnect-w64@fedora27.sh b/contrib/build_mingw-openconnect-w64@fedora27.sh index cdef4acb..2c66216c 100755 --- a/contrib/build_mingw-openconnect-w64@fedora27.sh +++ b/contrib/build_mingw-openconnect-w64@fedora27.sh @@ -6,8 +6,6 @@ export OC_TAG=v7.08 export STOKEN_TAG=v0.92 - -mkdir work dnf -y install \ mingw64-gnutls \ mingw64-libxml2 \ @@ -19,13 +17,16 @@ dnf -y install \ git \ p7zip \ patch + + +[ -d work ] || mkdir work cd work -git clone https://github.com/cernekee/stoken +[ -d stoken ] || git clone https://github.com/cernekee/stoken cd stoken git checkout ${STOKEN_TAG} ./autogen.sh -mkdir build64 +[ -d build64 ] || mkdir build64 cd build64 mingw64-configure --disable-dependency-tracking --without-tomcrypt --without-gtk mingw64-make -j4 @@ -37,7 +38,7 @@ cd openconnect git reset --hard git checkout ${OC_TAG} ./autogen.sh -mkdir build64 +[ -d build64 ] || mkdir build64 cd build64 mingw64-configure --disable-dependency-tracking --with-gnutls --without-openssl --without-libpskc --with-vpnc-script=vpnc-script-win.js mingw64-make -j4 diff --git a/contrib/build_mingw-openconnect-w64@msys2.sh b/contrib/build_mingw-openconnect-w64@msys2.sh index 00a6f5c3..b97afc2b 100644 --- a/contrib/build_mingw-openconnect-w64@msys2.sh +++ b/contrib/build_mingw-openconnect-w64@msys2.sh @@ -20,6 +20,7 @@ pacman --needed -S \ mingw-w64-x86_64-lz4 \ mingw-w64-x86_64-libproxy + [ -d work ] || mkdir work cd work From f4eb6f085998e05e888ea4fdb6ed322d954117bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Sat, 3 Mar 2018 00:06:30 +0100 Subject: [PATCH 104/129] Reset project folders before new configuration/build Will prevent issues when building on the same folders for different architectures. --- contrib/build_mingw-openconnect-w32@fedora27.sh | 2 ++ contrib/build_mingw-openconnect-w32@msys2.sh | 2 ++ contrib/build_mingw-openconnect-w64@fedora27.sh | 2 ++ contrib/build_mingw-openconnect-w64@msys2.sh | 2 ++ 4 files changed, 8 insertions(+) diff --git a/contrib/build_mingw-openconnect-w32@fedora27.sh b/contrib/build_mingw-openconnect-w32@fedora27.sh index 4bef4b12..09fee115 100755 --- a/contrib/build_mingw-openconnect-w32@fedora27.sh +++ b/contrib/build_mingw-openconnect-w32@fedora27.sh @@ -27,6 +27,7 @@ git checkout ${STOKEN_TAG} ./autogen.sh [ -d build32 ] || mkdir build32 cd build32 +git clean -fdx mingw32-configure --disable-dependency-tracking --without-tomcrypt --without-gtk mingw32-make -j4 mingw32-make install @@ -39,6 +40,7 @@ git checkout ${OC_TAG} ./autogen.sh [ -d build32 ] || mkdir build32 cd build32 +git clean -fdx mingw32-configure --disable-dependency-tracking --with-gnutls --without-openssl --without-libpskc --with-vpnc-script=vpnc-script-win.js mingw32-make -j4 cd ../../ diff --git a/contrib/build_mingw-openconnect-w32@msys2.sh b/contrib/build_mingw-openconnect-w32@msys2.sh index 4ee7fbba..c2dfe761 100644 --- a/contrib/build_mingw-openconnect-w32@msys2.sh +++ b/contrib/build_mingw-openconnect-w32@msys2.sh @@ -30,6 +30,7 @@ git checkout ${STOKEN_TAG} ./autogen.sh [ -d build32 ] || mkdir build32 cd build32 +git clean -fdx ../configure --disable-dependency-tracking --without-tomcrypt --without-gtk mingw32-make -j4 mingw32-make install @@ -42,6 +43,7 @@ git checkout ${OC_TAG} ./autogen.sh [ -d build32 ] || mkdir build32 cd build32 +git clean -fdx ../configure --disable-dependency-tracking --with-gnutls --without-openssl --without-libpskc --with-vpnc-script=vpnc-script-win.js mingw32-make -j4 cd ../../ diff --git a/contrib/build_mingw-openconnect-w64@fedora27.sh b/contrib/build_mingw-openconnect-w64@fedora27.sh index 2c66216c..601693ab 100755 --- a/contrib/build_mingw-openconnect-w64@fedora27.sh +++ b/contrib/build_mingw-openconnect-w64@fedora27.sh @@ -28,6 +28,7 @@ git checkout ${STOKEN_TAG} ./autogen.sh [ -d build64 ] || mkdir build64 cd build64 +git clean -fdx mingw64-configure --disable-dependency-tracking --without-tomcrypt --without-gtk mingw64-make -j4 mingw64-make install @@ -40,6 +41,7 @@ git checkout ${OC_TAG} ./autogen.sh [ -d build64 ] || mkdir build64 cd build64 +git clean -fdx mingw64-configure --disable-dependency-tracking --with-gnutls --without-openssl --without-libpskc --with-vpnc-script=vpnc-script-win.js mingw64-make -j4 cd ../../ diff --git a/contrib/build_mingw-openconnect-w64@msys2.sh b/contrib/build_mingw-openconnect-w64@msys2.sh index b97afc2b..267aed29 100644 --- a/contrib/build_mingw-openconnect-w64@msys2.sh +++ b/contrib/build_mingw-openconnect-w64@msys2.sh @@ -30,6 +30,7 @@ git checkout ${STOKEN_TAG} ./autogen.sh [ -d build64 ] || mkdir build64 cd build64 +git clean -fdx ../configure --disable-dependency-tracking --without-tomcrypt --without-gtk mingw32-make -j4 mingw32-make install @@ -42,6 +43,7 @@ git checkout ${OC_TAG} ./autogen.sh [ -d build64 ] || mkdir build64 cd build64 +git clean -fdx ../configure --disable-dependency-tracking --with-gnutls --without-openssl --without-libpskc --with-vpnc-script=vpnc-script-win.js mingw32-make -j4 cd ../../ From 23381cfcff30a9eb60ed9b0aa7028d12a2d67540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Sat, 3 Mar 2018 00:08:42 +0100 Subject: [PATCH 105/129] Check running platform before build Don't try trigger e.g. 64bit build in 32bit environment on msys2 --- contrib/build_mingw-openconnect-w32@msys2.sh | 3 +++ contrib/build_mingw-openconnect-w64@msys2.sh | 3 +++ 2 files changed, 6 insertions(+) diff --git a/contrib/build_mingw-openconnect-w32@msys2.sh b/contrib/build_mingw-openconnect-w32@msys2.sh index c2dfe761..5501c8a7 100644 --- a/contrib/build_mingw-openconnect-w32@msys2.sh +++ b/contrib/build_mingw-openconnect-w32@msys2.sh @@ -3,6 +3,9 @@ # with mingw32 on MSYS2 toolchain # +[ "$MSYSTEM" != "MINGW32" ] && exit -1 +echo "Starting under MINGW32 build environment..." + export OC_TAG=v7.08 export STOKEN_TAG=v0.92 diff --git a/contrib/build_mingw-openconnect-w64@msys2.sh b/contrib/build_mingw-openconnect-w64@msys2.sh index 267aed29..af6e6c5f 100644 --- a/contrib/build_mingw-openconnect-w64@msys2.sh +++ b/contrib/build_mingw-openconnect-w64@msys2.sh @@ -3,6 +3,9 @@ # with mingw64 on MSYS2 toolchain # +[ "$MSYSTEM" != "MINGW64" ] && exit -1 +echo "Starting under MINGW64 build environment..." + export OC_TAG=v7.08 export STOKEN_TAG=v0.92 From 2c0d7286b1b7b72c627d49875fc486d43e463773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Sat, 3 Mar 2018 00:14:07 +0100 Subject: [PATCH 106/129] retab... --- contrib/build_mingw-openconnect-w32@msys2.sh | 30 ++++++++-------- .../build_mingw-openconnect-w64@fedora27.sh | 2 +- contrib/build_mingw-openconnect-w64@msys2.sh | 34 +++++++++---------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/contrib/build_mingw-openconnect-w32@msys2.sh b/contrib/build_mingw-openconnect-w32@msys2.sh index 5501c8a7..513a596d 100644 --- a/contrib/build_mingw-openconnect-w32@msys2.sh +++ b/contrib/build_mingw-openconnect-w32@msys2.sh @@ -141,23 +141,23 @@ cd ../ #sudo mingw32-make uninstall echo "List of system-wide used packages versions:" \ - > openconnect-${OC_TAG}_mingw32.txt + > openconnect-${OC_TAG}_mingw32.txt echo "openconnect-${OC_TAG}" \ - >> openconnect-${OC_TAG}_mingw32.txt + >> openconnect-${OC_TAG}_mingw32.txt echo "stoken-${STOKEN_TAG}" \ - >> openconnect-${OC_TAG}_mingw32.txt + >> openconnect-${OC_TAG}_mingw32.txt pacman -Q \ - mingw-w64-i686-gnutls \ - mingw-w64-i686-libidn2 \ - mingw-w64-i686-libunistring \ - mingw-w64-i686-nettle \ - mingw-w64-i686-gmp \ - mingw-w64-i686-p11-kit \ - mingw-w64-i686-libxml2 \ - mingw-w64-i686-zlib \ - mingw-w64-i686-libxml2 \ - mingw-w64-i686-lz4 \ - mingw-w64-i686-libproxy \ - >> openconnect-${OC_TAG}_mingw32.txt + mingw-w64-i686-gnutls \ + mingw-w64-i686-libidn2 \ + mingw-w64-i686-libunistring \ + mingw-w64-i686-nettle \ + mingw-w64-i686-gmp \ + mingw-w64-i686-p11-kit \ + mingw-w64-i686-libxml2 \ + mingw-w64-i686-zlib \ + mingw-w64-i686-libxml2 \ + mingw-w64-i686-lz4 \ + mingw-w64-i686-libproxy \ + >> openconnect-${OC_TAG}_mingw32.txt mv -v openconnect-*.zip openconnect-*.txt .. diff --git a/contrib/build_mingw-openconnect-w64@fedora27.sh b/contrib/build_mingw-openconnect-w64@fedora27.sh index 601693ab..15aeda77 100755 --- a/contrib/build_mingw-openconnect-w64@fedora27.sh +++ b/contrib/build_mingw-openconnect-w64@fedora27.sh @@ -137,4 +137,4 @@ rpm -qv \ mingw64-libxml2 \ >> openconnect-${OC_TAG}_mingw64.txt -mv openconnect-*.zip openconnect-*.txt .. +mv -v openconnect-*.zip openconnect-*.txt .. diff --git a/contrib/build_mingw-openconnect-w64@msys2.sh b/contrib/build_mingw-openconnect-w64@msys2.sh index af6e6c5f..f3a478f5 100644 --- a/contrib/build_mingw-openconnect-w64@msys2.sh +++ b/contrib/build_mingw-openconnect-w64@msys2.sh @@ -141,23 +141,23 @@ cd ../ #sudo mingw64-make uninstall echo "List of system-wide used packages versions:" \ - > openconnect-${OC_TAG}_mingw64.txt + > openconnect-${OC_TAG}_mingw64.txt echo "openconnect-${OC_TAG}" \ - >> openconnect-${OC_TAG}_mingw64.txt + >> openconnect-${OC_TAG}_mingw64.txt echo "stoken-${STOKEN_TAG}" \ - >> openconnect-${OC_TAG}_mingw64.txt + >> openconnect-${OC_TAG}_mingw64.txt pacman -Q \ - mingw-w64-x86_64-gnutls \ - mingw-w64-x86_64-libidn2 \ - mingw-w64-x86_64-libunistring \ - mingw-w64-x86_64-nettle \ - mingw-w64-x86_64-gmp \ - mingw-w64-x86_64-p11-kit \ - mingw-w64-x86_64-libxml2 \ - mingw-w64-x86_64-zlib \ - mingw-w64-x86_64-libxml2 \ - mingw-w64-x86_64-lz4 \ - mingw-w64-x86_64-libproxy \ - >> openconnect-${OC_TAG}_mingw64.txt - -mv openconnect-*.zip openconnect-*.txt .. + mingw-w64-x86_64-gnutls \ + mingw-w64-x86_64-libidn2 \ + mingw-w64-x86_64-libunistring \ + mingw-w64-x86_64-nettle \ + mingw-w64-x86_64-gmp \ + mingw-w64-x86_64-p11-kit \ + mingw-w64-x86_64-libxml2 \ + mingw-w64-x86_64-zlib \ + mingw-w64-x86_64-libxml2 \ + mingw-w64-x86_64-lz4 \ + mingw-w64-x86_64-libproxy \ + >> openconnect-${OC_TAG}_mingw64.txt + +mv -v openconnect-*.zip openconnect-*.txt .. From b046c3e9502e986c3d07c28c15e5ab435e6de5c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Sat, 3 Mar 2018 16:32:27 +0100 Subject: [PATCH 107/129] Add missing profile decoding properties error messages --- src/server_storage.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/server_storage.cpp b/src/server_storage.cpp index bbdff05f..93472ca5 100644 --- a/src/server_storage.cpp +++ b/src/server_storage.cpp @@ -169,8 +169,10 @@ int StoredServer::load(QString& name) ret = CryptData::decode(this->m_servername, settings.value("password").toByteArray(), this->m_password); - if (ret == false) + if (ret == false) { + m_last_err = "decoding of password failed"; rval = -1; + } } QByteArray data; @@ -190,6 +192,7 @@ int StoredServer::load(QString& name) ret = CryptData::decode(this->m_servername, settings.value("client-key").toByteArray(), str); if (ret == false) { + m_last_err = "decoding of client keyfailed"; rval = -1; } @@ -207,6 +210,7 @@ int StoredServer::load(QString& name) settings.value("token-str").toByteArray(), this->m_token_string); if (ret == false) { + m_last_err = "decoding of OTP token failed"; rval = -1; } From 77cbe92cad044b45a4c3459882f5777b306fc68c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Sat, 3 Mar 2018 16:38:29 +0100 Subject: [PATCH 108/129] Don't lose password in batch mode and keys from storage (resolve #220, resolve #142) --- CHANGELOG.md | 1 + src/cryptdata.cpp | 33 ++++++++++++++++++--------------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1284d642..318c1716 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ History of user-visible changes. ## [v1.5.3](https://github.com/openconnect/openconnect-gui/tree/v1.5.3) (unreleased) +- Don't lose password in batch mode and keys from storage (resolve #220, #142) - No disconnection triggered before quit (#202) - Don't use system wide defined proxy when disabled in profile (#208) - Unable to use socks5 proxy built by ssh tunneling (#187) diff --git a/src/cryptdata.cpp b/src/cryptdata.cpp index b6f9127d..e302110e 100644 --- a/src/cryptdata.cpp +++ b/src/cryptdata.cpp @@ -69,16 +69,19 @@ QByteArray CryptData::encode(QString& txt, QString password) } DATA_BLOB DataIn; - DataIn.pbData = (BYTE*)password.toUtf8().data(); - DataIn.cbData = password.toUtf8().size(); + QByteArray passwordArray{password.toUtf8()}; + DataIn.pbData = (BYTE*)passwordArray.data(); + DataIn.cbData = passwordArray.size() + 1; + + DATA_BLOB Entropy; + QByteArray txtArray{txt.toUtf8()}; + Entropy.pbData = (BYTE*)txtArray.data(); + Entropy.cbData = txtArray.size() + 1; - DATA_BLOB Opt; - Opt.pbData = (BYTE*)txt.toUtf8().data(); - Opt.cbData = txt.toUtf8().size(); DATA_BLOB DataOut; QByteArray res; - BOOL r = pCryptProtectData(&DataIn, NULL, &Opt, NULL, NULL, 0, &DataOut); + BOOL r = pCryptProtectData(&DataIn, NULL, &Entropy, NULL, NULL, 0, &DataOut); if (r == false) { return res; } @@ -103,24 +106,24 @@ bool CryptData::decode(QString& txt, QByteArray _enc, QString& res) return true; } - QByteArray enc; - enc = QByteArray::fromBase64(_enc.mid(4)); - DATA_BLOB DataIn; + QByteArray enc{QByteArray::fromBase64(_enc.mid(4))}; DataIn.pbData = (BYTE*)enc.data(); - DataIn.cbData = enc.size(); + DataIn.cbData = enc.size() + 1; - DATA_BLOB Opt; - Opt.pbData = (BYTE*)txt.toLatin1().data(); - Opt.cbData = txt.toLatin1().size(); + DATA_BLOB Entropy; + QByteArray txtArray{txt.toUtf8()}; + Entropy.pbData = (BYTE*)txtArray.data(); + Entropy.cbData = txtArray.size() + 1; DATA_BLOB DataOut; - BOOL r = pCryptUnprotectData(&DataIn, NULL, &Opt, NULL, NULL, 0, &DataOut); + + BOOL r = pCryptUnprotectData(&DataIn, NULL, &Entropy, NULL, NULL, 0, &DataOut); if (r == false) { return false; } - res = QString::fromUtf8((const char*)DataOut.pbData, DataOut.cbData); + res = QString::fromUtf8((const char*)DataOut.pbData, DataOut.cbData - 1); LocalFree(DataOut.pbData); return true; } From f057381049a6cafcecfde6365c84c59cd25ab3bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Sat, 3 Mar 2018 16:55:07 +0100 Subject: [PATCH 109/129] Remember log-window position when closed by ESC --- src/dialog/logdialog.cpp | 12 +++++------- src/dialog/logdialog.h | 7 +++---- src/dialog/logdialog.ui | 2 +- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/dialog/logdialog.cpp b/src/dialog/logdialog.cpp index a4f2d283..c91de3be 100644 --- a/src/dialog/logdialog.cpp +++ b/src/dialog/logdialog.cpp @@ -79,13 +79,6 @@ void LogDialog::append(const Logger::Message& message) } } -void LogDialog::closeEvent(QCloseEvent* event) -{ - saveSettings(); - - QDialog::closeEvent(event); -} - void LogDialog::on_pushButtonClear_clicked() { if (ui->listWidget->count()) { @@ -150,3 +143,8 @@ void LogDialog::on_checkBox_autoScroll_toggled(bool checked) m_timer->stop(); } } + +void LogDialog::on_LogDialog_rejected() +{ + saveSettings(); +} diff --git a/src/dialog/logdialog.h b/src/dialog/logdialog.h index 0ad49660..1024a5dd 100644 --- a/src/dialog/logdialog.h +++ b/src/dialog/logdialog.h @@ -33,7 +33,7 @@ class LogDialog; class LogDialog : public QDialog { Q_OBJECT public: - LogDialog(QWidget* parent = 0); + explicit LogDialog(QWidget* parent = 0); ~LogDialog(); signals: @@ -41,9 +41,6 @@ class LogDialog : public QDialog { public slots: void append(const Logger::Message& message); -protected slots: - void closeEvent(QCloseEvent* event) override; - private slots: void on_pushButtonClear_clicked(); void on_pushButtonSelectAll_clicked(); @@ -53,6 +50,8 @@ private slots: void on_checkBox_autoScroll_toggled(bool checked); + void on_LogDialog_rejected(); + private: void loadSettings(); void saveSettings(); diff --git a/src/dialog/logdialog.ui b/src/dialog/logdialog.ui index 12f363d8..b214c434 100644 --- a/src/dialog/logdialog.ui +++ b/src/dialog/logdialog.ui @@ -125,7 +125,7 @@ pushButtonClose clicked() LogDialog - close() + reject() 652 From a764d7bb52c504258736466a5d3a4dc9d06af6c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Sat, 3 Mar 2018 17:37:30 +0100 Subject: [PATCH 110/129] Move sha512 checksum files into project root folder together with installers --- build_mingw2@msys.sh | 1 + build_mingw@win.cmd | 1 + 2 files changed, 2 insertions(+) diff --git a/build_mingw2@msys.sh b/build_mingw2@msys.sh index 43824e9e..8456a175 100644 --- a/build_mingw2@msys.sh +++ b/build_mingw2@msys.sh @@ -48,5 +48,6 @@ make package VERBOSE=1 # make package_source VERBOSE=1 mv -vf *.exe .. +mv -vf *.exe.sha512 .. cd .. diff --git a/build_mingw@win.cmd b/build_mingw@win.cmd index bbad6372..f63dc602 100644 --- a/build_mingw@win.cmd +++ b/build_mingw@win.cmd @@ -78,5 +78,6 @@ mingw32-make package VERBOSE=1 REM mingw32-make package_source VERBOSE=1 move /Y *.exe .. +move /Y *.exe.sha512 .. cd .. From f633b96dade6533ed18fb0678e0b8505d4c3657d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Sat, 3 Mar 2018 17:45:07 +0100 Subject: [PATCH 111/129] Drop intermediate 'openconnect' build package folder --- contrib/build_mingw-openconnect-w32@msys2.sh | 1 + contrib/build_mingw-openconnect-w64@msys2.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/contrib/build_mingw-openconnect-w32@msys2.sh b/contrib/build_mingw-openconnect-w32@msys2.sh index 513a596d..ce37e79f 100644 --- a/contrib/build_mingw-openconnect-w32@msys2.sh +++ b/contrib/build_mingw-openconnect-w32@msys2.sh @@ -135,6 +135,7 @@ cd ../ rmdir -v nsis 7za a -tzip -mx=9 -sdel ../openconnect-devel-${OC_TAG}_mingw32.zip * cd ../ +rmdir -v pkg #cd stoken/build32 diff --git a/contrib/build_mingw-openconnect-w64@msys2.sh b/contrib/build_mingw-openconnect-w64@msys2.sh index f3a478f5..74b88ab5 100644 --- a/contrib/build_mingw-openconnect-w64@msys2.sh +++ b/contrib/build_mingw-openconnect-w64@msys2.sh @@ -135,6 +135,7 @@ cd ../ rmdir -v nsis 7za a -tzip -mx=9 -sdel ../openconnect-devel-${OC_TAG}_mingw64.zip * cd ../ +rmdir -v pkg #cd stoken/build64 From 3364fb63177e6e148f1c3af935685ea5c9c0ed83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Sat, 3 Mar 2018 18:09:19 +0100 Subject: [PATCH 112/129] Generate sha512 checksum in openconnect sample build files --- contrib/build_mingw-openconnect-w32@msys2.sh | 5 ++++- contrib/build_mingw-openconnect-w64@msys2.sh | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/contrib/build_mingw-openconnect-w32@msys2.sh b/contrib/build_mingw-openconnect-w32@msys2.sh index ce37e79f..3e4b1b4b 100644 --- a/contrib/build_mingw-openconnect-w32@msys2.sh +++ b/contrib/build_mingw-openconnect-w32@msys2.sh @@ -161,4 +161,7 @@ pacman -Q \ mingw-w64-i686-libproxy \ >> openconnect-${OC_TAG}_mingw32.txt -mv -v openconnect-*.zip openconnect-*.txt .. +sha512sum.exe openconnect-${OC_TAG}_mingw32.zip > openconnect-${OC_TAG}_mingw32.zip.sha512 +sha512sum.exe openconnect-devel-${OC_TAG}_mingw32.zip > openconnect-devel-${OC_TAG}_mingw32.zip.sha512 + +mv -v openconnect-*.zip openconnect-*.txt openconnect-*.zip.sha512 .. diff --git a/contrib/build_mingw-openconnect-w64@msys2.sh b/contrib/build_mingw-openconnect-w64@msys2.sh index 74b88ab5..e817350d 100644 --- a/contrib/build_mingw-openconnect-w64@msys2.sh +++ b/contrib/build_mingw-openconnect-w64@msys2.sh @@ -161,4 +161,7 @@ pacman -Q \ mingw-w64-x86_64-libproxy \ >> openconnect-${OC_TAG}_mingw64.txt -mv -v openconnect-*.zip openconnect-*.txt .. +sha512sum.exe openconnect-${OC_TAG}_mingw64.zip > openconnect-${OC_TAG}_mingw64.zip.sha512 +sha512sum.exe openconnect-devel-${OC_TAG}_mingw64.zip > openconnect-devel-${OC_TAG}_mingw64.zip.sha512 + +mv -v openconnect-*.zip openconnect-*.txt openconnect-*.zip.sha512 .. From 91c5f22418e2b1839e601c6d154da6a974094afd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Sat, 3 Mar 2018 18:16:39 +0100 Subject: [PATCH 113/129] Ignore hash files in 'external' helper folder --- external/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/external/.gitignore b/external/.gitignore index 33ec01b2..0d275de5 100644 --- a/external/.gitignore +++ b/external/.gitignore @@ -1,2 +1,3 @@ *.zip +*.zip.sha512 *.txt From ec374c8c966f1cdc4ef6f968cad6d9958ed5e699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Sun, 4 Mar 2018 18:36:22 +0100 Subject: [PATCH 114/129] Update executable flags on shell scripts --- build_mingw2@msys.sh | 0 contrib/build_mingw-openconnect-w32@msys2.sh | 0 contrib/build_mingw-openconnect-w64@msys2.sh | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 build_mingw2@msys.sh mode change 100644 => 100755 contrib/build_mingw-openconnect-w32@msys2.sh mode change 100644 => 100755 contrib/build_mingw-openconnect-w64@msys2.sh diff --git a/build_mingw2@msys.sh b/build_mingw2@msys.sh old mode 100644 new mode 100755 diff --git a/contrib/build_mingw-openconnect-w32@msys2.sh b/contrib/build_mingw-openconnect-w32@msys2.sh old mode 100644 new mode 100755 diff --git a/contrib/build_mingw-openconnect-w64@msys2.sh b/contrib/build_mingw-openconnect-w64@msys2.sh old mode 100644 new mode 100755 From 051ab792bcc16a70c0c850c2e15e83e1b2bcb536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Thu, 8 Mar 2018 22:01:08 +0100 Subject: [PATCH 115/129] Don't process generated files, solve circular dependency with ninja --- src/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d29a9a92..0baa799a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,7 @@ +set_property(SOURCE ${PROJECT_NAME}.cpp PROPERTY SKIP_AUTOGEN ON) +set_property(SOURCE timestamp.cpp PROPERTY SKIP_AUTOGEN ON) + set(${PROJECT_NAME}_SRCS ${PROJECT_NAME}.cpp ${PROJECT_NAME}.qrc From 65de70eadd74e072be5988f1ffd3e81284907597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Thu, 8 Mar 2018 22:03:30 +0100 Subject: [PATCH 116/129] Handle dependency on imported target and external project This will help parallel build issues. --- CMake/Includes/ProjectExternals_qt-solutions.cmake | 3 +++ CMake/Includes/ProjectExternals_spdlog.cmake | 1 + src/CMakeLists.txt | 3 --- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMake/Includes/ProjectExternals_qt-solutions.cmake b/CMake/Includes/ProjectExternals_qt-solutions.cmake index cf60b478..4ea6c8c6 100644 --- a/CMake/Includes/ProjectExternals_qt-solutions.cmake +++ b/CMake/Includes/ProjectExternals_qt-solutions.cmake @@ -26,3 +26,6 @@ set_target_properties(qt-solutions::qtsingleapplication PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/external/include" IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/external/lib/libqtsingleapplication.a ) +set_property(TARGET qt-solutions::qtsingleapplication PROPERTY + DEPENDS qt-solutions-${qt-solutions-TAG} +) diff --git a/CMake/Includes/ProjectExternals_spdlog.cmake b/CMake/Includes/ProjectExternals_spdlog.cmake index d752d713..daa188f7 100644 --- a/CMake/Includes/ProjectExternals_spdlog.cmake +++ b/CMake/Includes/ProjectExternals_spdlog.cmake @@ -21,3 +21,4 @@ add_library(spdlog::spdlog INTERFACE IMPORTED) set_target_properties(spdlog::spdlog PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/external/include" ) +add_dependencies(spdlog::spdlog DEPENDS spdlog-${spdlog-TAG}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0baa799a..d6e393c5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -88,9 +88,6 @@ if(MINGW) openconnect-devel-${openconnect-TAG} openconnect-${openconnect-TAG} vpnc-scripts-${vpnc-scripts-TAG} - qt-solutions-${qt-solutions-TAG} - - spdlog-${spdlog-TAG} ) set_target_properties(${PROJECT_NAME} PROPERTIES From ef2bb35f51174acff941adfe8eb0cfd9a108897b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Thu, 8 Mar 2018 22:04:14 +0100 Subject: [PATCH 117/129] Ninja build tool workaround --- CMake/Includes/ProjectExternals_qt-solutions.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMake/Includes/ProjectExternals_qt-solutions.cmake b/CMake/Includes/ProjectExternals_qt-solutions.cmake index 4ea6c8c6..ed636d0d 100644 --- a/CMake/Includes/ProjectExternals_qt-solutions.cmake +++ b/CMake/Includes/ProjectExternals_qt-solutions.cmake @@ -19,6 +19,10 @@ ExternalProject_Add(qt-solutions-${qt-solutions-TAG} ${CMAKE_SOURCE_DIR}/CMake/Includes/CMakeLists_qt-solutions.cmake.in ${CMAKE_BINARY_DIR}/external/src/qt-solutions-master/CMakeLists.txt CMAKE_COMMAND ${CMAKE_CROSS_COMMAND} -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} + + # Note: ninja-1.8.2 & cmake-3.10.2 failed in find/install this dependency wo next 2 lines :( + BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/external/lib/libqtsingleapplication.a + INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install ) add_library(qt-solutions::qtsingleapplication STATIC IMPORTED) From 1e91e98079bb79d35699ad8e587b999fbc2201fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Thu, 8 Mar 2018 22:04:45 +0100 Subject: [PATCH 118/129] Small CMake refactoring --- CMake/Includes/ProjectExternals_qt-solutions.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMake/Includes/ProjectExternals_qt-solutions.cmake b/CMake/Includes/ProjectExternals_qt-solutions.cmake index ed636d0d..c291e5ca 100644 --- a/CMake/Includes/ProjectExternals_qt-solutions.cmake +++ b/CMake/Includes/ProjectExternals_qt-solutions.cmake @@ -27,8 +27,8 @@ ExternalProject_Add(qt-solutions-${qt-solutions-TAG} add_library(qt-solutions::qtsingleapplication STATIC IMPORTED) set_target_properties(qt-solutions::qtsingleapplication PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/external/include" - IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/external/lib/libqtsingleapplication.a + INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR}/external/include + IMPORTED_LOCATION external/lib/libqtsingleapplication.a ) set_property(TARGET qt-solutions::qtsingleapplication PROPERTY DEPENDS qt-solutions-${qt-solutions-TAG} From 6976549e19a468c19695587cf2440c89f2613aab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Thu, 8 Mar 2018 22:13:33 +0100 Subject: [PATCH 119/129] Authors and maintainers of gui part --- AUTHORS | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 AUTHORS diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 00000000..8c0b08cf --- /dev/null +++ b/AUTHORS @@ -0,0 +1,4 @@ +Nikos Mavrogiannopoulos (author) +Ľubomír Carik (current maintainer) + +Thanks to all Contributors From 230fa3f05abd5617def6f7ec9b8508774195f99d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Wed, 14 Mar 2018 22:28:23 +0100 Subject: [PATCH 120/129] Igonore generated files... --- contrib/.gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/.gitignore b/contrib/.gitignore index 9d931c43..260c1054 100644 --- a/contrib/.gitignore +++ b/contrib/.gitignore @@ -1 +1,3 @@ -work/ +/work/ +/*.txt +/*.sha512 From 3bc1c792b238e81c3bbd6e5cd7cfff035916fb88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Wed, 14 Mar 2018 22:38:33 +0100 Subject: [PATCH 121/129] Check for Qt 5.10 for QtSolutions remote project --- CMake/Includes/CMakeLists_qt-solutions.cmake.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMake/Includes/CMakeLists_qt-solutions.cmake.in b/CMake/Includes/CMakeLists_qt-solutions.cmake.in index edb29917..2959185a 100644 --- a/CMake/Includes/CMakeLists_qt-solutions.cmake.in +++ b/CMake/Includes/CMakeLists_qt-solutions.cmake.in @@ -11,7 +11,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) -find_package(Qt5 5.6 REQUIRED COMPONENTS Core Gui Widgets Network) +find_package(Qt5 5.10 REQUIRED COMPONENTS Core Gui Widgets Network) add_definitions(-DUNICODE) add_library(qtsingleapplication STATIC @@ -39,4 +39,4 @@ install( qtsingleapplication/src/QtLockedFile qtsingleapplication/src/QtSingleApplication DESTINATION include -) \ No newline at end of file +) From 4d07264a6dbbb4c6b2b8b44bc48a35f84b923c9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Wed, 14 Mar 2018 22:39:20 +0100 Subject: [PATCH 122/129] Update Appveyor's Qt version to 5.10.1 --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index b547a99f..54d043dc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,7 +7,7 @@ branches: image: Visual Studio 2017 clone_depth: 100 environment: - QT5: C:\Qt\5.10.0\mingw53_32 + QT5: C:\Qt\5.10.1\mingw53_32 MINGW: C:\Qt\Tools\mingw530_32 NSIS: C:\Program Files (x86)\NSIS matrix: From cc2bc724461c27be3f5515fa28a050249d539d3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Wed, 14 Mar 2018 22:57:29 +0100 Subject: [PATCH 123/129] Move sample build scripts into contrib stuff --- build_mingw2@msys.sh => contrib/build_mingw@msys2.sh | 2 +- build_mingw@win.cmd => contrib/build_mingw@win.cmd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename build_mingw2@msys.sh => contrib/build_mingw@msys2.sh (99%) mode change 100755 => 100644 rename build_mingw@win.cmd => contrib/build_mingw@win.cmd (99%) diff --git a/build_mingw2@msys.sh b/contrib/build_mingw@msys2.sh old mode 100755 new mode 100644 similarity index 99% rename from build_mingw2@msys.sh rename to contrib/build_mingw@msys2.sh index 8456a175..87bbe61f --- a/build_mingw2@msys.sh +++ b/contrib/build_mingw@msys2.sh @@ -18,7 +18,7 @@ echo "=======================================================================" cd build-release-$MSYSTEM cmake -G "MSYS Makefiles" \ -DCMAKE_BUILD_TYPE=Release \ - .. + ../.. echo "=======================================================================" echo " Compiling..." diff --git a/build_mingw@win.cmd b/contrib/build_mingw@win.cmd similarity index 99% rename from build_mingw@win.cmd rename to contrib/build_mingw@win.cmd index f63dc602..22871eaf 100644 --- a/build_mingw@win.cmd +++ b/contrib/build_mingw@win.cmd @@ -48,7 +48,7 @@ echo "=======================================================================" cd build-release cmake -G "MinGW Makefiles" ^ -DCMAKE_BUILD_TYPE=Release ^ - ..\ + ..\..\ echo "=======================================================================" echo " Compiling..." From 7284aebbbaf4ab666870da137ad6b1d82182f086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=BDubom=C3=ADr=20Carik?= Date: Wed, 14 Mar 2018 22:57:36 +0100 Subject: [PATCH 124/129] Revert "Small CMake refactoring" This reverts commit 1e91e98079bb79d35699ad8e587b999fbc2201fc. --- CMake/Includes/ProjectExternals_qt-solutions.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMake/Includes/ProjectExternals_qt-solutions.cmake b/CMake/Includes/ProjectExternals_qt-solutions.cmake index c291e5ca..ed636d0d 100644 --- a/CMake/Includes/ProjectExternals_qt-solutions.cmake +++ b/CMake/Includes/ProjectExternals_qt-solutions.cmake @@ -27,8 +27,8 @@ ExternalProject_Add(qt-solutions-${qt-solutions-TAG} add_library(qt-solutions::qtsingleapplication STATIC IMPORTED) set_target_properties(qt-solutions::qtsingleapplication PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR}/external/include - IMPORTED_LOCATION external/lib/libqtsingleapplication.a + INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/external/include" + IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/external/lib/libqtsingleapplication.a ) set_property(TARGET qt-solutions::qtsingleapplication PROPERTY DEPENDS qt-solutions-${qt-solutions-TAG} From d1430676effc944012537dee1ca54535035e3d5f Mon Sep 17 00:00:00 2001 From: Jan Gleixner Date: Tue, 20 Mar 2018 13:03:39 +0100 Subject: [PATCH 125/129] fix #144 --- src/vpninfo.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/vpninfo.cpp b/src/vpninfo.cpp index ead139e0..941f163f 100644 --- a/src/vpninfo.cpp +++ b/src/vpninfo.cpp @@ -181,6 +181,7 @@ static int process_auth_form(void* privdata, struct oc_auth_form* form) && strcasecmp(opt->name, "username") == 0) { openconnect_set_option_value(opt, vpn->ss->get_username().toLatin1().data()); + empty = 0; continue; } From e7b08a87b2e7a7be5e1be27a90129e5fc6f28eec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Sun, 25 Mar 2018 21:19:24 +0200 Subject: [PATCH 126/129] Workaround from previous commit should be applied here as well --- src/vpninfo.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/vpninfo.cpp b/src/vpninfo.cpp index 941f163f..e2c2b014 100644 --- a/src/vpninfo.cpp +++ b/src/vpninfo.cpp @@ -211,6 +211,7 @@ static int process_auth_form(void* privdata, struct oc_auth_form* form) && strcasecmp(opt->name, "password") == 0) { openconnect_set_option_value(opt, vpn->ss->get_password().toLatin1().data()); + empty = 0; continue; } From aa31c4ba778bbeb7558e5e7883cded97fb19748c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Sun, 25 Mar 2018 21:45:12 +0200 Subject: [PATCH 127/129] Sync visible changes for v1.5.3 --- CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 318c1716..fc44067d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,15 @@ History of user-visible changes. ## [v1.5.3](https://github.com/openconnect/openconnect-gui/tree/v1.5.3) (unreleased) -- Don't lose password in batch mode and keys from storage (resolve #220, #142) +- Don't lose password in batch mode and keys from storage (resolve #220, #142, #144) - No disconnection triggered before quit (#202) - Don't use system wide defined proxy when disabled in profile (#208) - Unable to use socks5 proxy built by ssh tunneling (#187) +- Invalid routes (#190) +- macOS tray icons improved for dark/light dock panel (#192) - update Qt(5.10.1), spdlog(0.16.3) -- update GnuTLS(3.6.1), p11-kit(0.23.9), stoken(0.92), libproxy(0.4.15), nettle(3.4), lz4(1.8.1.2), libxml2(2.9.7), libidn2(2.0.4) +- update (msys2): GnuTLS(3.6.1), p11-kit(0.23.9), stoken(0.92), libproxy(0.4.15), nettle(3.4), lz4(1.8.1.2), libxml2(2.9.7), libidn2(2.0.4) [Full Changelog](https://github.com/openconnect/openconnect-gui/compare/v1.5.2...v1.5.3) From 5e860833a115380d86dbcac41485b640bef368fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Sun, 25 Mar 2018 21:46:47 +0200 Subject: [PATCH 128/129] Update build dependencies list and url paths --- docs/sw_requirements.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/sw_requirements.md b/docs/sw_requirements.md index 3711f702..ffa42d39 100644 --- a/docs/sw_requirements.md +++ b/docs/sw_requirements.md @@ -9,8 +9,8 @@ This is target platform for the product. - Tools/MinGW 5.3.0 component - Tools/QtCreator component - Tools/QtCreator CDB Debugger support -- [NSIS 3.0+](http://nsis.sourceforge.net/Main_Page) -- [CMake 3.6+](https://cmake.org/) +- [NSIS 3.0+](https://sourceforge.net/projects/nsis) +- [CMake 3.10+](https://cmake.org/) - [Git 2.7+](https://git-scm.com/) ##### Externals @@ -18,7 +18,7 @@ This is target platform for the product. These projects will be downloaded automatically by CMake. - [OpenConnect for MinGW32](https://github.com/horar/openconnect/releases) -- [TAP-windoes](https://openvpn.net/index.php/open-source/downloads.html) +- [TAP-windows](https://openvpn.net/index.php/open-source/downloads.html) - [spdlog](https://github.com/gabime/spdlog) - [qt-solutions](https://github.com/qtproject/qt-solutions.git) @@ -42,7 +42,7 @@ This is not main target platform, because openconnect is used by other projects ~~sudo dnf install -y spdlog-devel~~ #### MacOS -- MacOS 10.10+ +- MacOS 10.13+ - Xcode 9.2+ incl. command line tools - [Qt online installer](http://download.qt.io/official_releases/online_installers/qt-unified-mac-x64-online.dmg) and choose: - 5.10.0/"OS X" component From 9125cd5ed6116cd0309e30f2af3bd83cb4eac766 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Sun, 25 Mar 2018 23:38:17 +0200 Subject: [PATCH 129/129] Bump v1.5.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ľubomír Carik --- CHANGELOG.md | 8 +++++++- CMakeLists.txt | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc44067d..fdf9f991 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ History of user-visible changes. -## [v1.5.3](https://github.com/openconnect/openconnect-gui/tree/v1.5.3) (unreleased) +## [v1.5.4](https://github.com/openconnect/openconnect-gui/tree/v1.5.4) (unreleased) +- TBD + +[Full Changelog](https://github.com/openconnect/openconnect-gui/compare/v1.5.3...develop) + + +## [v1.5.3](https://github.com/openconnect/openconnect-gui/tree/v1.5.3) (2018-03-25) - Don't lose password in batch mode and keys from storage (resolve #220, #142, #144) - No disconnection triggered before quit (#202) - Don't use system wide defined proxy when disabled in profile (#208) diff --git a/CMakeLists.txt b/CMakeLists.txt index d9718b70..b61ebb1e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ if(APPLE) endif() project(openconnect-gui - VERSION 1.5.2 + VERSION 1.5.3 LANGUAGES CXX )