Hello community,
here is the log from the commit of package libKF5NetworkManagerQt for
openSUSE:Factory checked in at 2017-11-16 14:41:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libKF5NetworkManagerQt (Old)
and /work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libKF5NetworkManagerQt"
Thu Nov 16 14:41:51 2017 rev:44 rq:541695 version:5.40.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/libKF5NetworkManagerQt/libKF5NetworkManagerQt.changes
2017-10-27 13:59:11.358277703 +0200
+++
/work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new/libKF5NetworkManagerQt.changes
2017-11-16 14:41:52.492797697 +0100
@@ -1,0 +2,12 @@
+Mon Nov 13 07:01:16 CET 2017 - lbeltr...@kde.org
+
+- Update to 5.40.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.40.0.php
+- Changes since 5.39.0:
+ * Fix 8021xSetting unit test
+ * 8021xSetting: domain-suffix-match is defined in NM 1.2.0 and newer
+ * Support "domain-suffix-match" in Security8021xSetting
+
+-------------------------------------------------------------------
Old:
----
networkmanager-qt-5.39.0.tar.xz
New:
----
networkmanager-qt-5.40.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libKF5NetworkManagerQt.spec ++++++
--- /var/tmp/diff_new_pack.gQ2Krh/_old 2017-11-16 14:41:53.116775051 +0100
+++ /var/tmp/diff_new_pack.gQ2Krh/_new 2017-11-16 14:41:53.120774906 +0100
@@ -17,13 +17,13 @@
%define soversion 6
-%define _tar_path 5.39
+%define _tar_path 5.40
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
%{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} |
awk -F. '{print $1"."$2}')}
Name: libKF5NetworkManagerQt
-Version: 5.39.0
+Version: 5.40.0
Release: 0
Summary: A Qt wrapper for NetworkManager DBus API
License: LGPL-2.1 or LGPL-3.0
++++++ networkmanager-qt-5.39.0.tar.xz -> networkmanager-qt-5.40.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.39.0/CMakeLists.txt
new/networkmanager-qt-5.40.0/CMakeLists.txt
--- old/networkmanager-qt-5.39.0/CMakeLists.txt 2017-10-07 13:24:36.000000000
+0200
+++ new/networkmanager-qt-5.40.0/CMakeLists.txt 2017-11-04 22:50:19.000000000
+0100
@@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.0)
-set(KF5_VERSION "5.39.0") # handled by release scripts
+set(KF5_VERSION "5.40.0") # handled by release scripts
project(NetworkManagerQt VERSION ${KF5_VERSION})
include(FeatureSummary)
-find_package(ECM 5.39.0 NO_MODULE)
+find_package(ECM 5.40.0 NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake
Modules." URL
"https://projects.kde.org/projects/kdesupport/extra-cmake-modules";)
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND
FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.39.0/autotests/settings/8021xsettingtest.cpp
new/networkmanager-qt-5.40.0/autotests/settings/8021xsettingtest.cpp
--- old/networkmanager-qt-5.39.0/autotests/settings/8021xsettingtest.cpp
2017-10-07 13:24:36.000000000 +0200
+++ new/networkmanager-qt-5.40.0/autotests/settings/8021xsettingtest.cpp
2017-11-04 22:50:19.000000000 +0100
@@ -29,6 +29,10 @@
#include <nm-setting-8021x.h>
#endif
+#if !NM_CHECK_VERSION(1, 2, 0)
+#define NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH "domain-suffix-match"
+#endif
+
#include <QTest>
void Security8021xSettingTest::testSetting_data()
@@ -38,6 +42,7 @@
QTest::addColumn<QString>("anonymousIdentity");
QTest::addColumn<QString>("pacFile");
QTest::addColumn<QByteArray>("caCert");
+ QTest::addColumn<QString>("domainSuffixMatch");
QTest::addColumn<QString>("caPath");
QTest::addColumn<QString>("subjectMatch");
QTest::addColumn<QStringList>("altSubjectMatches");
@@ -78,6 +83,7 @@
<< QString("anonymousIdentity") //
anonymousIdentity
<< QString("file://path/to/pac/file") // pacFile
<< QByteArray("file://path/to/ca/cert") // caCert
+ << QString("example.com") //
domainSuffixMatch
<< QString("file://path/to/ca/cert") // caPath
<< QString("subjectMatch") // subjectMatch
<< altSubjectMatches //
altSubjectMatches
@@ -114,6 +120,7 @@
QFETCH(QString, anonymousIdentity);
QFETCH(QString, pacFile);
QFETCH(QByteArray, caCert);
+ QFETCH(QString, domainSuffixMatch);
QFETCH(QString, caPath);
QFETCH(QString, subjectMatch);
QFETCH(QStringList, altSubjectMatches);
@@ -149,6 +156,7 @@
map.insert(QLatin1String(NM_SETTING_802_1X_ANONYMOUS_IDENTITY),
anonymousIdentity);
map.insert(QLatin1String(NM_SETTING_802_1X_PAC_FILE), pacFile);
map.insert(QLatin1String(NM_SETTING_802_1X_CA_CERT), caCert);
+ map.insert(QLatin1String(NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH),
domainSuffixMatch);
map.insert(QLatin1String(NM_SETTING_802_1X_CA_PATH), caPath);
map.insert(QLatin1String(NM_SETTING_802_1X_SUBJECT_MATCH), subjectMatch);
map.insert(QLatin1String(NM_SETTING_802_1X_ALTSUBJECT_MATCHES),
altSubjectMatches);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.39.0/src/settings/security8021xsetting.cpp
new/networkmanager-qt-5.40.0/src/settings/security8021xsetting.cpp
--- old/networkmanager-qt-5.39.0/src/settings/security8021xsetting.cpp
2017-10-07 13:24:36.000000000 +0200
+++ new/networkmanager-qt-5.40.0/src/settings/security8021xsetting.cpp
2017-11-04 22:50:19.000000000 +0100
@@ -25,6 +25,10 @@
#include <nm-setting-8021x.h>
#endif
+#if !NM_CHECK_VERSION(1, 2, 0)
+#define NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH "domain-suffix-match"
+#endif
+
#include <QtCore/QDebug>
NetworkManager::Security8021xSettingPrivate::Security8021xSettingPrivate()
@@ -53,6 +57,7 @@
{
setEapMethods(other->eapMethods());
setIdentity(other->identity());
+ setDomainSuffixMatch(other->domainSuffixMatch());
setAnonymousIdentity(other->anonymousIdentity());
setPacFile(other->pacFile());
setCaCertificate(other->caCertificate());
@@ -136,6 +141,20 @@
return d->anonymousIdentity;
}
+void NetworkManager::Security8021xSetting::setDomainSuffixMatch(const QString
&domain)
+{
+ Q_D(Security8021xSetting);
+
+ d->domainSuffixMatch = domain;
+}
+
+QString NetworkManager::Security8021xSetting::domainSuffixMatch() const
+{
+ Q_D(const Security8021xSetting);
+
+ return d->domainSuffixMatch;
+}
+
void NetworkManager::Security8021xSetting::setPacFile(const QString &filePath)
{
Q_D(Security8021xSetting);
@@ -650,6 +669,10 @@
setAnonymousIdentity(setting.value(QLatin1String(NM_SETTING_802_1X_ANONYMOUS_IDENTITY)).toString());
}
+ if
(setting.contains(QLatin1String(NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH))) {
+
setDomainSuffixMatch(setting.value(QLatin1String(NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH)).toString());
+ }
+
if (setting.contains(QLatin1String(NM_SETTING_802_1X_PAC_FILE))) {
setPacFile(setting.value(QLatin1String(NM_SETTING_802_1X_PAC_FILE)).toString());
}
@@ -853,6 +876,10 @@
setting.insert(QLatin1String(NM_SETTING_802_1X_ANONYMOUS_IDENTITY),
anonymousIdentity());
}
+ if (!domainSuffixMatch().isEmpty()) {
+ setting.insert(QLatin1String(NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH),
domainSuffixMatch());
+ }
+
if (!pacFile().isEmpty()) {
setting.insert(QLatin1String(NM_SETTING_802_1X_PAC_FILE), pacFile());
}
@@ -1073,6 +1100,7 @@
dbg.nospace() << NM_SETTING_802_1X_PAC_FILE << ": " << setting.pacFile()
<< '\n';
dbg.nospace() << NM_SETTING_802_1X_CA_CERT << ": " <<
setting.caCertificate() << '\n';
dbg.nospace() << NM_SETTING_802_1X_CA_PATH << ": " << setting.caPath() <<
'\n';
+ dbg.nospace() << NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH << ": " <<
setting.domainSuffixMatch() << '\n';
dbg.nospace() << NM_SETTING_802_1X_SUBJECT_MATCH << ": " <<
setting.subjectMatch() << '\n';
dbg.nospace() << NM_SETTING_802_1X_ALTSUBJECT_MATCHES << ": " <<
setting.altSubjectMatches() << '\n';
dbg.nospace() << NM_SETTING_802_1X_CLIENT_CERT << ": " <<
setting.clientCertificate() << '\n';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.39.0/src/settings/security8021xsetting.h
new/networkmanager-qt-5.40.0/src/settings/security8021xsetting.h
--- old/networkmanager-qt-5.39.0/src/settings/security8021xsetting.h
2017-10-07 13:24:36.000000000 +0200
+++ new/networkmanager-qt-5.40.0/src/settings/security8021xsetting.h
2017-11-04 22:50:19.000000000 +0100
@@ -63,6 +63,9 @@
void setAnonymousIdentity(const QString &identity);
QString anonymousIdentity() const;
+ void setDomainSuffixMatch(const QString &domainSuffixMatch);
+ QString domainSuffixMatch() const;
+
/**
* Set UTF-8 encoded file path containing PAC for EAP-FAST.
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.39.0/src/settings/security8021xsetting_p.h
new/networkmanager-qt-5.40.0/src/settings/security8021xsetting_p.h
--- old/networkmanager-qt-5.39.0/src/settings/security8021xsetting_p.h
2017-10-07 13:24:36.000000000 +0200
+++ new/networkmanager-qt-5.40.0/src/settings/security8021xsetting_p.h
2017-11-04 22:50:19.000000000 +0100
@@ -35,6 +35,7 @@
QList<Security8021xSetting::EapMethod> eap;
QString identity;
QString anonymousIdentity;
+ QString domainSuffixMatch;
QString pacFile;
QByteArray caCert;
QString caPath;
