Hello community,
here is the log from the commit of package libKF5NetworkManagerQt for
openSUSE:Factory checked in at 2020-01-14 21:04:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libKF5NetworkManagerQt (Old)
and /work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new.6675 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libKF5NetworkManagerQt"
Tue Jan 14 21:04:15 2020 rev:74 rq:763497 version:5.66.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/libKF5NetworkManagerQt/libKF5NetworkManagerQt.changes
2020-01-07 23:50:52.543954141 +0100
+++
/work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new.6675/libKF5NetworkManagerQt.changes
2020-01-14 21:07:14.750761828 +0100
@@ -1,0 +2,15 @@
+Sun Jan 5 09:02:25 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr>
+
+- Update to 5.66.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.66.0.php
+- Changes since 5.65.0:
+ * Manager: add support for AddAndActivateConnection2
+ * cmake: Consider NM headers as system includes
+ * Sync Utils::securityIsValid with NetworkManager (kde#415670)
+ * Update the obsolete projects.kde.org URL
+- Drop 0001-Sync-Utils-securityIsValid-with-NetworkManager.patch
+ (merged upstream)
+
+-------------------------------------------------------------------
Old:
----
0001-Sync-Utils-securityIsValid-with-NetworkManager.patch
networkmanager-qt-5.65.0.tar.xz
networkmanager-qt-5.65.0.tar.xz.sig
New:
----
networkmanager-qt-5.66.0.tar.xz
networkmanager-qt-5.66.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libKF5NetworkManagerQt.spec ++++++
--- /var/tmp/diff_new_pack.z7CQuL/_old 2020-01-14 21:07:15.998762406 +0100
+++ /var/tmp/diff_new_pack.z7CQuL/_new 2020-01-14 21:07:15.998762406 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libKF5NetworkManagerQt
#
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
%define soversion 6
-%define _tar_path 5.65
+%define _tar_path 5.66
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
@@ -25,7 +25,7 @@
# Only needed for the package signature condition
%bcond_without lang
Name: libKF5NetworkManagerQt
-Version: 5.65.0
+Version: 5.66.0
Release: 0
Summary: A Qt wrapper for NetworkManager DBus API
License: LGPL-2.1-only OR LGPL-3.0-only
@@ -37,8 +37,6 @@
Source2: frameworks.keyring
%endif
Source99: baselibs.conf
-# PATCH-FIX-UPSTREAM
-Patch1: 0001-Sync-Utils-securityIsValid-with-NetworkManager.patch
BuildRequires: cmake
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
BuildRequires: kf5-filesystem
@@ -80,7 +78,7 @@
settings which are used in DBus communication.
%prep
-%autosetup -p1 -n networkmanager-qt-%{version}
+%setup -q -n networkmanager-qt-%{version}
%build
%cmake_kf5 -d build
++++++ networkmanager-qt-5.65.0.tar.xz -> networkmanager-qt-5.66.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.65.0/CMakeLists.txt
new/networkmanager-qt-5.66.0/CMakeLists.txt
--- old/networkmanager-qt-5.65.0/CMakeLists.txt 2019-12-07 20:46:23.000000000
+0100
+++ new/networkmanager-qt-5.66.0/CMakeLists.txt 2020-01-04 00:15:09.000000000
+0100
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.5)
-set(KF5_VERSION "5.65.0") # handled by release scripts
+set(KF5_VERSION "5.66.0") # handled by release scripts
project(NetworkManagerQt VERSION ${KF5_VERSION})
include(FeatureSummary)
-find_package(ECM 5.65.0 NO_MODULE)
-set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake
Modules." URL
"https://projects.kde.org/projects/kdesupport/extra-cmake-modules";)
+find_package(ECM 5.66.0 NO_MODULE)
+set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake
Modules." URL "https://commits.kde.org/extra-cmake-modules";)
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND
FATAL_ON_MISSING_REQUIRED_PACKAGES)
@@ -17,7 +17,7 @@
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
-set(REQUIRED_QT_VERSION 5.11.0)
+set(REQUIRED_QT_VERSION 5.12.0)
find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED Core DBus Network)
add_definitions(${QT_DEFINITIONS})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.65.0/autotests/CMakeLists.txt
new/networkmanager-qt-5.66.0/autotests/CMakeLists.txt
--- old/networkmanager-qt-5.65.0/autotests/CMakeLists.txt 2019-12-07
20:46:23.000000000 +0100
+++ new/networkmanager-qt-5.66.0/autotests/CMakeLists.txt 2020-01-04
00:15:09.000000000 +0100
@@ -1,6 +1,6 @@
include_directories (
- ${NETWORKMANAGER_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/src/settings
+ SYSTEM ${NETWORKMANAGER_INCLUDE_DIRS}
)
include(ECMAddTests)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.65.0/src/CMakeLists.txt
new/networkmanager-qt-5.66.0/src/CMakeLists.txt
--- old/networkmanager-qt-5.65.0/src/CMakeLists.txt 2019-12-07
20:46:23.000000000 +0100
+++ new/networkmanager-qt-5.66.0/src/CMakeLists.txt 2020-01-04
00:15:09.000000000 +0100
@@ -1,9 +1,9 @@
# add_subdirectory(dbus)
include_directories(
- ${NETWORKMANAGER_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}/dbus
${CMAKE_CURRENT_SOURCE_DIR}/settings
+ SYSTEM ${NETWORKMANAGER_INCLUDE_DIRS}
)
set(NetworkManagerQt_PART_SRCS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.65.0/src/dbus/introspection/org.freedesktop.NetworkManager.xml
new/networkmanager-qt-5.66.0/src/dbus/introspection/org.freedesktop.NetworkManager.xml
---
old/networkmanager-qt-5.65.0/src/dbus/introspection/org.freedesktop.NetworkManager.xml
2019-12-07 20:46:23.000000000 +0100
+++
new/networkmanager-qt-5.66.0/src/dbus/introspection/org.freedesktop.NetworkManager.xml
2020-01-04 00:15:09.000000000 +0100
@@ -106,6 +106,39 @@
</method>
<!--
+ AddAndActivateConnection2:
+ @connection: Connection settings and properties; if incomplete missing
settings will be automatically completed using the given device and specific
object.
+ @device: The object path of device to be activated using the given
connection.
+ @specific_object: The path of a connection-type-specific object this
activation should use. This parameter is currently ignored for wired and mobile
broadband connections, and the value of "/" should be used (ie, no specific
object). For Wi-Fi connections, pass the object path of a specific AP from the
card's scan list, which will be used to complete the details of the newly added
connection.
+ @options: Further options for the method call.
+ @path: Object path of the new connection that was just added.
+ @active_connection: The path of the active connection object
representing this active connection.
+ @result: a dictionary of additional output arguments for future
extension. Currently not additional
+ output arguments are supported.
+
+ Adds a new connection using the given details (if any) as a template
+ (automatically filling in missing settings with the capabilities of the
+ given device and specific object), then activate the new connection.
+ Cannot be used for VPN connections at this time.
+
+ This method extends AddAndActivateConnection to allow passing further
+ parameters. At this time the following options are supported:
+
+ * persist: A string value of either "disk" (default), "memory" or
"volatile". If "memory" is passed, the connection will not be saved to disk. If
"volatile" is passed, the connection will not be saved to disk and will be
destroyed when disconnected.
+ * bind-activation: Bind the activation lifetime. Set to "dbus-name"
to automatically disconnect when the requesting process disappears from the
bus. The default of "none" means the connection is kept activated normally.
+ -->
+ <method name="AddAndActivateConnection2">
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In0"
value="NMVariantMapMap"/>
+ <arg name="connection" type="a{sa{sv}}" direction="in"/>
+ <arg name="device" type="o" direction="in"/>
+ <arg name="specific_object" type="o" direction="in"/>
+ <arg name="options" type="a{sv}" direction="in"/>
+ <arg name="path" type="o" direction="out"/>
+ <arg name="active_connection" type="o" direction="out"/>
+ <arg name="result" type="a{sv}" direction="out"/>
+ </method>
+
+ <!--
DeactivateConnection:
@active_connection: The currently active connection to deactivate.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.65.0/src/dbus/networkmanagerinterface.h
new/networkmanager-qt-5.66.0/src/dbus/networkmanagerinterface.h
--- old/networkmanager-qt-5.65.0/src/dbus/networkmanagerinterface.h
2019-12-07 20:46:23.000000000 +0100
+++ new/networkmanager-qt-5.66.0/src/dbus/networkmanagerinterface.h
2020-01-04 00:15:09.000000000 +0100
@@ -192,6 +192,13 @@
return
asyncCallWithArgumentList(QStringLiteral("AddAndActivateConnection"),
argumentList);
}
+ inline QDBusPendingReply<QDBusObjectPath, QDBusObjectPath, QVariantMap>
AddAndActivateConnection2(NMVariantMapMap connection, const QDBusObjectPath
&device, const QDBusObjectPath &specific_object, const QVariantMap &options)
+ {
+ QList<QVariant> argumentList;
+ argumentList << QVariant::fromValue(connection) <<
QVariant::fromValue(device) << QVariant::fromValue(specific_object) <<
QVariant::fromValue(options);
+ return
asyncCallWithArgumentList(QStringLiteral("AddAndActivateConnection2"),
argumentList);
+ }
+
inline QDBusPendingReply<uint> CheckConnectivity()
{
QList<QVariant> argumentList;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.65.0/src/manager.cpp
new/networkmanager-qt-5.66.0/src/manager.cpp
--- old/networkmanager-qt-5.65.0/src/manager.cpp 2019-12-07
20:46:23.000000000 +0100
+++ new/networkmanager-qt-5.66.0/src/manager.cpp 2020-01-04
00:15:09.000000000 +0100
@@ -478,6 +478,17 @@
return iface.AddAndActivateConnection(connection, interfacePath,
QDBusObjectPath(extra_connection_parameter));
}
+QDBusPendingReply<QDBusObjectPath, QDBusObjectPath, QVariantMap>
NetworkManager::NetworkManagerPrivate::addAndActivateConnection2(const
NMVariantMapMap &connection, const QString &interfaceUni, const QString
&connectionParameter, const QVariantMap &options)
+{
+ QString extra_connection_parameter = connectionParameter;
+ if (extra_connection_parameter.isEmpty()) {
+ extra_connection_parameter = QLatin1String("/");
+ }
+ // TODO store error code
+ QDBusObjectPath interfacePath(interfaceUni);
+ return iface.AddAndActivateConnection2(connection, interfacePath,
QDBusObjectPath(extra_connection_parameter), options);
+}
+
QDBusPendingReply<>
NetworkManager::NetworkManagerPrivate::deactivateConnection(const QString
&activeConnectionPath)
{
return iface.DeactivateConnection(QDBusObjectPath(activeConnectionPath));
@@ -1021,6 +1032,15 @@
return globalNetworkManager->addAndActivateConnection(connection,
interfaceUni, connectionParameter);
}
+QDBusPendingReply<QDBusObjectPath, QDBusObjectPath, QVariantMap>
NetworkManager::addAndActivateConnection2(const NMVariantMapMap &connection,
const QString &interfaceUni, const QString &connectionParameter, const
QVariantMap &options)
+{
+ if (checkVersion(1, 16, 0)) {
+ return globalNetworkManager->addAndActivateConnection2(connection,
interfaceUni, connectionParameter, options);
+ } else {
+ return globalNetworkManager->addAndActivateConnection(connection,
interfaceUni, connectionParameter);
+ }
+}
+
QDBusPendingReply<QDBusObjectPath> NetworkManager::activateConnection(const
QString &connectionUni, const QString &interfaceUni, const QString
&connectionParameter)
{
return globalNetworkManager->activateConnection(connectionUni,
interfaceUni, connectionParameter);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.65.0/src/manager.h
new/networkmanager-qt-5.66.0/src/manager.h
--- old/networkmanager-qt-5.65.0/src/manager.h 2019-12-07 20:46:23.000000000
+0100
+++ new/networkmanager-qt-5.66.0/src/manager.h 2020-01-04 00:15:09.000000000
+0100
@@ -321,6 +321,24 @@
*/
NETWORKMANAGERQT_EXPORT QDBusPendingReply<QDBusObjectPath, QDBusObjectPath>
addAndActivateConnection(const NMVariantMapMap &connection, const QString
&interfaceUni, const QString &connectionParameter);
/**
+ * Adds a new connection using the given details (if any) as a template
(automatically filling in missing settings with the capabilities of the given
device and specific object), then activate the new connection.
+ * Cannot be used for VPN connections at this time.
+ *
+ * @param connection connection definition to be added and activated
+ * @param interfaceUni unique identifier of the network interface to be
activated
+ * @param connectionParameter can be used to specify extra parameters not
specific to the NetworkInterface or the connection, eg which AP to use when
several present with same ESSID in range (because ESSID does not guarantee that
the AP is part of the network you want to join!)
+ * @param options further options for the method call.
+ *
+ * This method extends AddAndActivateConnection to allow passing further
+ * parameters. At this time the following options are supported:
+ *
+ * * persist: A string value of either "disk" (default), "memory" or
"volatile". If "memory" is passed, the connection will not be saved to disk. If
"volatile" is passed, the connection will not be saved to disk and will be
destroyed when disconnected.
+ * * bind-activation: Bind the activation lifetime. Set to "dbus-name"
to automatically disconnect when the requesting process disappears from the
bus. The default of "none" means the connection is kept activated normally.
+ *
+ * NOTE: will call AddAndActivateConnection(connection, interfaceUni,
connectionParameter) instead when NetworkManager is older than 1.16, which
means that the options property is ignored
+ */
+NETWORKMANAGERQT_EXPORT QDBusPendingReply<QDBusObjectPath, QDBusObjectPath,
QVariantMap> addAndActivateConnection2(const NMVariantMapMap &connection, const
QString &interfaceUni, const QString &connectionParameter, const QVariantMap
&options);
+/**
* Deactivate this network interface, if active
*
* @param activeConnection identifier of the connection to deactivate
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.65.0/src/manager_p.h
new/networkmanager-qt-5.66.0/src/manager_p.h
--- old/networkmanager-qt-5.65.0/src/manager_p.h 2019-12-07
20:46:23.000000000 +0100
+++ new/networkmanager-qt-5.66.0/src/manager_p.h 2020-01-04
00:15:09.000000000 +0100
@@ -104,6 +104,7 @@
bool isWimaxHardwareEnabled() const;
QDBusPendingReply<QDBusObjectPath> activateConnection(const QString
&connectionUni, const QString &interfaceUni, const QString
&connectionParameter);
QDBusPendingReply<QDBusObjectPath, QDBusObjectPath>
addAndActivateConnection(const NMVariantMapMap &connection, const QString
&interfaceUni, const QString &connectionParameter);
+ QDBusPendingReply<QDBusObjectPath, QDBusObjectPath, QVariantMap>
addAndActivateConnection2(const NMVariantMapMap &connection, const QString
&interfaceUni, const QString &connectionParameter, const QVariantMap &options);
QDBusPendingReply<> deactivateConnection(const QString &activeConnection);
ActiveConnection::List activeConnections();
QStringList activeConnectionsPaths() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.65.0/src/utils.cpp
new/networkmanager-qt-5.66.0/src/utils.cpp
--- old/networkmanager-qt-5.65.0/src/utils.cpp 2019-12-07 20:46:23.000000000
+0100
+++ new/networkmanager-qt-5.66.0/src/utils.cpp 2020-01-04 00:15:09.000000000
+0100
@@ -167,7 +167,7 @@
return (havePair && haveGroup);
}
-// Keep this in sync with
NetworkManager/libnm-util/nm-utils.c:nm_utils_security_valid()
+// Keep this in sync with
NetworkManager/libnm-core/nm-utils.c:nm_utils_security_valid()
bool NetworkManager::securityIsValid(WirelessSecurityType type,
NetworkManager::WirelessDevice::Capabilities interfaceCaps, bool haveAp, bool
adhoc, NetworkManager::AccessPoint::Capabilities apCaps,
NetworkManager::AccessPoint::WpaFlags apWpa,
NetworkManager::AccessPoint::WpaFlags apRsn)
{
bool good = true;
@@ -184,6 +184,8 @@
if (interfaceCaps.testFlag(NetworkManager::WirelessDevice::Wep40)
||
interfaceCaps.testFlag(NetworkManager::WirelessDevice::Wep104)) {
return true;
+ } else {
+ return false;
}
}
@@ -205,7 +207,6 @@
// return true;
// }
// }
- return false;
}
switch (type) {
@@ -254,21 +255,15 @@
}
break;
case WpaPsk:
+ if (adhoc) {
+ return false;
+ }
+
if (!interfaceCaps.testFlag(NetworkManager::WirelessDevice::Wpa)) {
return false;
}
if (haveAp) {
- /* Ad-Hoc WPA APs won't necessarily have the PSK flag set */
- if (adhoc) {
- if (apWpa.testFlag(NetworkManager::AccessPoint::GroupTkip) &&
-
interfaceCaps.testFlag(NetworkManager::WirelessDevice::Tkip)) {
- return true;
- }
- if (apWpa.testFlag(NetworkManager::AccessPoint::GroupCcmp) &&
-
interfaceCaps.testFlag(NetworkManager::WirelessDevice::Ccmp)) {
- return true;
- }
- } else if
(apWpa.testFlag(NetworkManager::AccessPoint::KeyMgmtPsk)) {
+ if (apWpa.testFlag(NetworkManager::AccessPoint::KeyMgmtPsk)) {
if (apWpa.testFlag(NetworkManager::AccessPoint::PairTkip) &&
interfaceCaps.testFlag(NetworkManager::WirelessDevice::Tkip)) {
return true;
@@ -286,16 +281,25 @@
return false;
}
if (haveAp) {
- /* Ad-Hoc WPA APs won't necessarily have the PSK flag set */
- if (apRsn.testFlag(NetworkManager::AccessPoint::KeyMgmtPsk) ||
adhoc) {
- if (apRsn.testFlag(NetworkManager::AccessPoint::PairTkip) &&
-
interfaceCaps.testFlag(NetworkManager::WirelessDevice::Tkip)) {
- return true;
+ if (adhoc) {
+ if
(!interfaceCaps.testFlag(NetworkManager::WirelessDevice::IBSSRsn)) {
+ return false;
}
if (apRsn.testFlag(NetworkManager::AccessPoint::PairCcmp) &&
interfaceCaps.testFlag(NetworkManager::WirelessDevice::Ccmp)) {
return true;
}
+ } else {
+ if (apRsn.testFlag(NetworkManager::AccessPoint::KeyMgmtPsk)) {
+ if (apRsn.testFlag(NetworkManager::AccessPoint::PairTkip)
&&
+
interfaceCaps.testFlag(NetworkManager::WirelessDevice::Tkip)) {
+ return true;
+ }
+ if (apRsn.testFlag(NetworkManager::AccessPoint::PairCcmp)
&&
+
interfaceCaps.testFlag(NetworkManager::WirelessDevice::Ccmp)) {
+ return true;
+ }
+ }
}
return false;
}
@@ -339,26 +343,29 @@
return false;
}
if (haveAp) {
- if
(!interfaceCaps.testFlag(NetworkManager::WirelessDevice::IBSSRsn)) {
- return false;
- }
- if (apRsn.testFlag(NetworkManager::AccessPoint::PairCcmp) &&
-
interfaceCaps.testFlag(NetworkManager::WirelessDevice::Ccmp)) {
- return true;
- }
- } else {
- if (apRsn.testFlag(NetworkManager::AccessPoint::KeyMgmtSAE)) {
- if (apRsn.testFlag(NetworkManager::AccessPoint::PairTkip) &&
-
interfaceCaps.testFlag(NetworkManager::WirelessDevice::Tkip)) {
- return true;
+ if (adhoc) {
+ if
(!interfaceCaps.testFlag(NetworkManager::WirelessDevice::IBSSRsn)) {
+ return false;
}
if (apRsn.testFlag(NetworkManager::AccessPoint::PairCcmp) &&
interfaceCaps.testFlag(NetworkManager::WirelessDevice::Ccmp)) {
return true;
}
+ } else {
+ if (apRsn.testFlag(NetworkManager::AccessPoint::KeyMgmtSAE)) {
+ if (apRsn.testFlag(NetworkManager::AccessPoint::PairTkip)
&&
+
interfaceCaps.testFlag(NetworkManager::WirelessDevice::Tkip)) {
+ return true;
+ }
+ if (apRsn.testFlag(NetworkManager::AccessPoint::PairCcmp)
&&
+
interfaceCaps.testFlag(NetworkManager::WirelessDevice::Ccmp)) {
+ return true;
+ }
+ }
}
return false;
}
+ break;
default:
good = false;
break;
