Merge pull request #24816 from benley/plasma-nm

plasma-nm: Fix cipher discovery by setting path to openvpn
This commit is contained in:
Thomas Tuegel 2017-04-13 08:16:57 -05:00 committed by GitHub
commit c9ba39116c
2 changed files with 19 additions and 1 deletions

View File

@ -0,0 +1,13 @@
diff --git a/vpn/openvpn/openvpnadvancedwidget.cpp b/vpn/openvpn/openvpnadvancedwidget.cpp
index 2f11ba1d..310f11b4 100644
--- a/vpn/openvpn/openvpnadvancedwidget.cpp
+++ b/vpn/openvpn/openvpnadvancedwidget.cpp
@@ -75,7 +75,7 @@ OpenVpnAdvancedWidget::OpenVpnAdvancedWidget(const NetworkManager::VpnSetting::P
connect(m_ui->cmbProxyType, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &OpenVpnAdvancedWidget::proxyTypeChanged);
// start openVPN process and get its cipher list
- const QString openVpnBinary = QStandardPaths::findExecutable("openvpn", QStringList() << "/sbin" << "/usr/sbin");
+ const QString openVpnBinary = "@openvpn@/bin/openvpn";
const QStringList ciphersArgs(QLatin1String("--show-ciphers"));
const QStringList versionArgs(QLatin1String("--version"));

View File

@ -4,7 +4,7 @@
, knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem
, kxmlgui, mobile_broadband_provider_info
, modemmanager-qt, networkmanager-qt, openconnect, plasma-framework
, qca-qt5, qtdeclarative, solid
, qca-qt5, qtdeclarative, solid, openvpn
}:
plasmaPackage {
@ -14,6 +14,10 @@ plasmaPackage {
src = ./0001-mobile-broadband-provider-info-path.patch;
inherit mobile_broadband_provider_info;
})
(substituteAll {
src = ./0002-openvpn-binary-path.patch;
inherit openvpn;
})
];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
@ -23,4 +27,5 @@ plasmaPackage {
mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect
qca-qt5 solid
];
enableParallelBuilding = true;
}