[arch-commits] Commit in kdeplasma-applets-plasma-nm/trunk (2 files)
Date: Friday, January 2, 2015 @ 16:35:35
Author: andrea
Revision: 228341
upgpkg: kdeplasma-applets-plasma-nm 0.9.3.5-2
OpenConnect 7 rebuild
Added:
kdeplasma-applets-plasma-nm/trunk/openconnect7.patch
Modified:
kdeplasma-applets-plasma-nm/trunk/PKGBUILD
+
PKGBUILD | 11 +
openconnect7.patch | 309 +++
2 files changed, 317 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-01-02 11:36:35 UTC (rev 228340)
+++ PKGBUILD2015-01-02 15:35:35 UTC (rev 228341)
@@ -4,7 +4,7 @@
pkgname=kdeplasma-applets-plasma-nm
pkgver=0.9.3.5
-pkgrel=1
+pkgrel=2
pkgdesc="Plasma applet written in QML for managing network connections"
arch=('i686' 'x86_64')
url="https://projects.kde.org/projects/kde/workspace/plasma-nm";
@@ -14,11 +14,16 @@
optdepends=('mobile-broadband-provider-info: Database of mobile broadband
service providers'
'openconnect: Cisco AnyConnect VPN plugin')
conflicts=('kdeplasma-applets-networkmanagement')
-source=("http://download.kde.org/stable/plasma-nm/plasma-nm-${pkgver}.tar.xz";)
-md5sums=('16f5e711de503fa8e5adeef9922c7c98')
+source=("http://download.kde.org/stable/plasma-nm/plasma-nm-${pkgver}.tar.xz";
+'openconnect7.patch')
+md5sums=('16f5e711de503fa8e5adeef9922c7c98'
+ '669e568324f059acc8777e82403b1deb')
prepare() {
mkdir build
+
+ cd plasma-nm-${pkgver}
+ patch -p1 -i "${srcdir}"/openconnect7.patch
}
build() {
Added: openconnect7.patch
===
--- openconnect7.patch (rev 0)
+++ openconnect7.patch 2015-01-02 15:35:35 UTC (rev 228341)
@@ -0,0 +1,309 @@
+From: David Woodhouse
+Date: Wed, 03 Dec 2014 14:10:44 +
+Subject: Update OpenConnect support for library version 5
+X-Git-Url:
http://quickgit.kde.org/?p=plasma-nm.git&a=commitdiff&h=3e6585fa4dd2fb3d9b59c7704bd3d7ae5b2c4167
+---
+Update OpenConnect support for library version 5
+
+String ownership rules are now very simple: the library never takes ownership
+of a string it's passed. It always takes its *own* copy and is responsible
+for freeing that. Mostly driven by Windows DLL Hell where it's painful to
+allocate in one library and free in another because they might actually be
+using different heaps.
+
+Also adapt to the changes in server certificate hash handling. We are no
+longer supposed to just compare strings, and must call the relevant function
+to check a hash against the server's certificate. This gives better matching
+and allows libopenconnect to upgrade the hash in future when it becomes
+necessary.
+---
+
+
+--- a/vpn/openconnect/CMakeLists.txt
b/vpn/openconnect/CMakeLists.txt
+@@ -15,6 +15,8 @@
+
+ if (${OPENCONNECT_VERSION} VERSION_GREATER
${MINIMUM_OPENCONNECT_VERSION_REQUIRED} OR
+ ${OPENCONNECT_VERSION} VERSION_EQUAL
${MINIMUM_OPENCONNECT_VERSION_REQUIRED})
++
++include_directories(${OPENCONNECT_INCLUDE_DIRS})
+
+ set(openconnect_SRCS
+ openconnectui.cpp
+
+--- a/vpn/openconnect/openconnectauth.cpp
b/vpn/openconnect/openconnectauth.cpp
+@@ -161,7 +161,7 @@
+ }
+ if (!dataMap[NM_OPENCONNECT_KEY_CACERT].isEmpty()) {
+ const QByteArray crt =
QFile::encodeName(dataMap[NM_OPENCONNECT_KEY_CACERT]);
+-openconnect_set_cafile(d->vpninfo, strdup(crt.data()));
++openconnect_set_cafile(d->vpninfo, OC3DUP(crt.data()));
+ }
+ if (dataMap[NM_OPENCONNECT_KEY_CSD_ENABLE] == "yes") {
+ char *wrapper;
+@@ -174,12 +174,12 @@
+ }
+ if (!dataMap[NM_OPENCONNECT_KEY_PROXY].isEmpty()) {
+ const QByteArray proxy =
QFile::encodeName(dataMap[NM_OPENCONNECT_KEY_PROXY]);
+-openconnect_set_http_proxy(d->vpninfo, strdup(proxy.data()));
++openconnect_set_http_proxy(d->vpninfo, OC3DUP(proxy.data()));
+ }
+ if (!dataMap[NM_OPENCONNECT_KEY_USERCERT].isEmpty()) {
+ const QByteArray crt =
QFile::encodeName(dataMap[NM_OPENCONNECT_KEY_USERCERT]);
+ const QByteArray key =
QFile::encodeName(dataMap[NM_OPENCONNECT_KEY_PRIVKEY]);
+-openconnect_set_client_cert (d->vpninfo, strdup(crt.data()),
strdup(key.data()));
++openconnect_set_client_cert (d->vpninfo, OC3DUP(crt.data()),
OC3DUP(key.data()));
+
+ if (!crt.isEmpty() && dataMap[NM_OPENCONNECT_KEY_PEM_PASSPHRASE_FSID]
== "yes") {
+ openconnect_passphrase_from_fsid(d->vpninfo);
+@@ -276,10 +276,10 @@
+ const VPNHost &host = d->hosts.at(i);
+ if (openconnect_parse_url(d->vpninfo, host.address.toAscii().data())) {
+ kWarning() << "Failed to parse server URL" << host.address;
+-openconnect_set_hostname(d->vpninfo,
strdup(host.address.toAscii().data()));
++openconnect_set_hostname(d->vpninfo,
OC3DUP(host.address.toAscii().data()));
+ }
+ if (!openconnect_get_urlpath(d->vpninf
[arch-commits] Commit in kdeplasma-applets-plasma-nm/trunk (2 files)
Date: Friday, November 22, 2013 @ 01:08:43
Author: andrea
Revision: 200038
upgpkg: kdeplasma-applets-plasma-nm 0.9.3.2-1
Upstream release
Modified:
kdeplasma-applets-plasma-nm/trunk/PKGBUILD
Deleted:
kdeplasma-applets-plasma-nm/trunk/plasma-nm-fixes.patch
---+
PKGBUILD | 15 --
plasma-nm-fixes.patch | 322
2 files changed, 5 insertions(+), 332 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-11-21 23:30:26 UTC (rev 200037)
+++ PKGBUILD2013-11-22 00:08:43 UTC (rev 200038)
@@ -3,27 +3,22 @@
# Contributor: Antonio Rojas < nqn1976 @ gmail.com >
pkgname=kdeplasma-applets-plasma-nm
-pkgver=0.9.3.1
-pkgrel=3
+pkgver=0.9.3.2
+pkgrel=1
pkgdesc="Plasma applet written in QML for managing network connections"
arch=('i686' 'x86_64')
url="https://projects.kde.org/projects/playground/network/plasma-nm";
license=('GPL')
depends=('kdebase-workspace' 'libnm-qt')
-makedepends=('cmake' 'automoc4' 'openconnect')
+makedepends=('cmake' 'automoc4' 'openconnect' 'mobile-broadband-provider-info')
optdepends=('mobile-broadband-provider-info: Database of mobile broadband
service providers'
'openconnect: Cisco AnyConnect VPN plugin')
conflicts=('kdeplasma-applets-networkmanagement')
-source=("http://download.kde.org/unstable/plasma-nm/plasma-nm-${pkgver}.tar.xz";
-'plasma-nm-fixes.patch')
-md5sums=('c6ce9cd8523ec0f99fe87dea8b76a02f'
- 'e5825709f49ba6c4386e909b80f75066')
+source=("http://download.kde.org/unstable/plasma-nm/plasma-nm-${pkgver}.tar.xz";)
+md5sums=('67dde011a859f2d72633cf3af5c9f847')
prepare() {
mkdir build
-
- cd plasma-nm-${pkgver}
- patch -p1 -i "${srcdir}"/plasma-nm-fixes.patch
}
build() {
Deleted: plasma-nm-fixes.patch
===
--- plasma-nm-fixes.patch 2013-11-21 23:30:26 UTC (rev 200037)
+++ plasma-nm-fixes.patch 2013-11-22 00:08:43 UTC (rev 200038)
@@ -1,322 +0,0 @@
-diff --git a/applet/declarative/contents/ui/main.qml
b/applet/declarative/contents/ui/main.qml
-index 8ea88cc..aa81707 100644
a/applet/declarative/contents/ui/main.qml
-+++ b/applet/declarative/contents/ui/main.qml
-@@ -19,6 +19,7 @@
- */
-
- import QtQuick 1.1
-+import org.kde.plasma.extras 0.1 as PlasmaExtras
- import org.kde.plasma.components 0.1 as PlasmaComponents
- import org.kde.plasma.core 0.1 as PlasmaCore
- import org.kde.networkmanagement 0.1 as PlasmaNM
-@@ -77,16 +78,7 @@ Item {
- anchors.fill: parent
- }
-
--ListView {
--id: connectionView;
--
--property bool expandedItem: false;
--property string previouslyExpandedItem: "";
--
--property bool activeExpanded: true;
--property bool previousExpanded: true;
--property bool unknownExpanded: true;
--
-+PlasmaExtras.ScrollArea {
- anchors {
- left: parent.left;
- right: parent.right;
-@@ -95,50 +87,64 @@ Item {
- topMargin: padding.margins.top;
- bottomMargin: padding.margins.bottom
- }
--clip: true
--model: connectionSortModel;
--currentIndex: -1;
--interactive: true;
--boundsBehavior: Flickable.StopAtBounds;
--section.property: "itemSection";
--section.delegate: SectionHeader {
--onHideSection: {
--if (section == i18n("Active connections")) {
--connectionView.activeExpanded = false;
--} else if (section == i18n("Previous connections")) {
--connectionView.previousExpanded = false;
--} else {
--connectionView.unknownExpanded = false;
-+
-+ListView {
-+id: connectionView;
-+
-+property bool expandedItem: false;
-+property string previouslyExpandedItem: "";
-+
-+property bool activeExpanded: true;
-+property bool previousExpanded: true;
-+property bool unknownExpanded: true;
-+
-+anchors.fill: parent;
-+
-+clip: true
-+model: connectionSortModel;
-+currentIndex: -1;
-+interactive: true;
-+boundsBehavior: Flickable.StopAtBounds;
-+section.property: "itemSection";
-+section.delegate: SectionHeader {
-+onHideSection: {
-+if (section == i18n("Active connections")) {
-+connectionView.activeExpanded = false;
-+} else if (section == i18n("Previous connections")) {
-+connectionView.previousExpanded = false;
-+} else {
-+connectionView.unknownExpanded = false;
-+}
- }
--}
-
--onShowSection: {
--if (sectio
[arch-commits] Commit in kdeplasma-applets-plasma-nm/trunk (2 files)
Date: Wednesday, October 23, 2013 @ 14:04:38
Author: andrea
Revision: 197150
upgpkg: kdeplasma-applets-plasma-nm 0.9.3.1-3
Apply fixes suggested by upstream
Added:
kdeplasma-applets-plasma-nm/trunk/plasma-nm-fixes.patch
Modified:
kdeplasma-applets-plasma-nm/trunk/PKGBUILD
---+
PKGBUILD | 11 +
plasma-nm-fixes.patch | 322
2 files changed, 330 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-10-23 11:49:27 UTC (rev 197149)
+++ PKGBUILD2013-10-23 12:04:38 UTC (rev 197150)
@@ -4,7 +4,7 @@
pkgname=kdeplasma-applets-plasma-nm
pkgver=0.9.3.1
-pkgrel=2
+pkgrel=3
pkgdesc="Plasma applet written in QML for managing network connections"
arch=('i686' 'x86_64')
url="https://projects.kde.org/projects/playground/network/plasma-nm";
@@ -14,11 +14,16 @@
optdepends=('mobile-broadband-provider-info: Database of mobile broadband
service providers'
'openconnect: Cisco AnyConnect VPN plugin')
conflicts=('kdeplasma-applets-networkmanagement')
-source=("http://download.kde.org/unstable/plasma-nm/plasma-nm-${pkgver}.tar.xz";)
-md5sums=('c6ce9cd8523ec0f99fe87dea8b76a02f')
+source=("http://download.kde.org/unstable/plasma-nm/plasma-nm-${pkgver}.tar.xz";
+'plasma-nm-fixes.patch')
+md5sums=('c6ce9cd8523ec0f99fe87dea8b76a02f'
+ 'e5825709f49ba6c4386e909b80f75066')
prepare() {
mkdir build
+
+ cd plasma-nm-${pkgver}
+ patch -p1 -i "${srcdir}"/plasma-nm-fixes.patch
}
build() {
Added: plasma-nm-fixes.patch
===
--- plasma-nm-fixes.patch (rev 0)
+++ plasma-nm-fixes.patch 2013-10-23 12:04:38 UTC (rev 197150)
@@ -0,0 +1,322 @@
+diff --git a/applet/declarative/contents/ui/main.qml
b/applet/declarative/contents/ui/main.qml
+index 8ea88cc..aa81707 100644
+--- a/applet/declarative/contents/ui/main.qml
b/applet/declarative/contents/ui/main.qml
+@@ -19,6 +19,7 @@
+ */
+
+ import QtQuick 1.1
++import org.kde.plasma.extras 0.1 as PlasmaExtras
+ import org.kde.plasma.components 0.1 as PlasmaComponents
+ import org.kde.plasma.core 0.1 as PlasmaCore
+ import org.kde.networkmanagement 0.1 as PlasmaNM
+@@ -77,16 +78,7 @@ Item {
+ anchors.fill: parent
+ }
+
+-ListView {
+-id: connectionView;
+-
+-property bool expandedItem: false;
+-property string previouslyExpandedItem: "";
+-
+-property bool activeExpanded: true;
+-property bool previousExpanded: true;
+-property bool unknownExpanded: true;
+-
++PlasmaExtras.ScrollArea {
+ anchors {
+ left: parent.left;
+ right: parent.right;
+@@ -95,50 +87,64 @@ Item {
+ topMargin: padding.margins.top;
+ bottomMargin: padding.margins.bottom
+ }
+-clip: true
+-model: connectionSortModel;
+-currentIndex: -1;
+-interactive: true;
+-boundsBehavior: Flickable.StopAtBounds;
+-section.property: "itemSection";
+-section.delegate: SectionHeader {
+-onHideSection: {
+-if (section == i18n("Active connections")) {
+-connectionView.activeExpanded = false;
+-} else if (section == i18n("Previous connections")) {
+-connectionView.previousExpanded = false;
+-} else {
+-connectionView.unknownExpanded = false;
++
++ListView {
++id: connectionView;
++
++property bool expandedItem: false;
++property string previouslyExpandedItem: "";
++
++property bool activeExpanded: true;
++property bool previousExpanded: true;
++property bool unknownExpanded: true;
++
++anchors.fill: parent;
++
++clip: true
++model: connectionSortModel;
++currentIndex: -1;
++interactive: true;
++boundsBehavior: Flickable.StopAtBounds;
++section.property: "itemSection";
++section.delegate: SectionHeader {
++onHideSection: {
++if (section == i18n("Active connections")) {
++connectionView.activeExpanded = false;
++} else if (section == i18n("Previous connections")) {
++connectionView.previousExpanded = false;
++} else {
++connectionView.unknownExpanded = false;
++}
+ }
+-}
+
+-onShowSection: {
+-if (section == i18n("Active connections")) {
+-connectionView.activeExpanded = true;
+-} else if (section == i18n("Previous connections")) {
+-connectionView.previousExpanded = true;
+-
