Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libKF5NetworkManagerQt for openSUSE:Factory checked in at 2021-08-16 10:08:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libKF5NetworkManagerQt (Old) and /work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libKF5NetworkManagerQt" Mon Aug 16 10:08:17 2021 rev:93 rq:912172 version:5.85.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libKF5NetworkManagerQt/libKF5NetworkManagerQt.changes 2021-07-16 00:02:03.112777651 +0200 +++ /work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new.1899/libKF5NetworkManagerQt.changes 2021-08-16 10:12:29.123035187 +0200 @@ -1,0 +2,13 @@ +Fri Aug 6 12:13:29 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.85.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.85.0 +- Changes since 5.84.0: + * Remove faulty semicolon + * Fix build: missing semicolon + * feat: add assigned-mac-address + * Expose mDNS configuration used by NM plugins + +------------------------------------------------------------------- Old: ---- networkmanager-qt-5.84.0.tar.xz networkmanager-qt-5.84.0.tar.xz.sig New: ---- networkmanager-qt-5.85.0.tar.xz networkmanager-qt-5.85.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libKF5NetworkManagerQt.spec ++++++ --- /var/tmp/diff_new_pack.8zzrnP/_old 2021-08-16 10:12:29.551034685 +0200 +++ /var/tmp/diff_new_pack.8zzrnP/_new 2021-08-16 10:12:29.555034680 +0200 @@ -17,7 +17,7 @@ %define soversion 6 -%define _tar_path 5.84 +%define _tar_path 5.85 # 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.84.0 +Version: 5.85.0 Release: 0 Summary: A Qt wrapper for NetworkManager DBus API License: LGPL-2.1-only OR LGPL-3.0-only ++++++ networkmanager-qt-5.84.0.tar.xz -> networkmanager-qt-5.85.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanager-qt-5.84.0/CMakeLists.txt new/networkmanager-qt-5.85.0/CMakeLists.txt --- old/networkmanager-qt-5.84.0/CMakeLists.txt 2021-06-19 18:03:54.000000000 +0200 +++ new/networkmanager-qt-5.85.0/CMakeLists.txt 2021-07-30 13:40:28.000000000 +0200 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.84.0") # handled by release scripts +set(KF_VERSION "5.85.0") # handled by release scripts project(NetworkManagerQt VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.84.0 NO_MODULE) +find_package(ECM 5.85.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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanager-qt-5.84.0/autotests/settings/wiredsettingtest.cpp new/networkmanager-qt-5.85.0/autotests/settings/wiredsettingtest.cpp --- old/networkmanager-qt-5.84.0/autotests/settings/wiredsettingtest.cpp 2021-06-19 18:03:54.000000000 +0200 +++ new/networkmanager-qt-5.85.0/autotests/settings/wiredsettingtest.cpp 2021-07-30 13:40:28.000000000 +0200 @@ -13,6 +13,8 @@ #include <QTest> +#define NM_SETTING_WIRED_ASSIGNED_MAC_ADDRESS "assigned-mac-address" + void WiredSettingTest::testSetting_data() { QTest::addColumn<QString>("port"); @@ -29,6 +31,7 @@ QTest::addColumn<NMStringMap>("s390Options"); QTest::addColumn<uint>("wakeOnLan"); QTest::addColumn<QString>("wakeOnLanPassword"); + QTest::addColumn<QString>("assignedMacAddress"); QStringList macAddressBlacklist; macAddressBlacklist << "00:08:C7:1B:8C:02"; @@ -54,7 +57,8 @@ << QString("qeth") // s390NetType << s390Options // s390Options << (uint)(NetworkManager::WiredSetting::WakeOnLanMulticast | NetworkManager::WiredSetting::WakeOnLanMagic) // wakeOnLan - << QString("password"); // wakeOnLanPassword + << QString("password") // wakeOnLanPassword + << QString("random"); // assignedMacAddress } void WiredSettingTest::testSetting() @@ -73,6 +77,7 @@ QFETCH(NMStringMap, s390Options); QFETCH(uint, wakeOnLan); QFETCH(QString, wakeOnLanPassword); + QFETCH(QString, assignedMacAddress); QVariantMap map; @@ -90,6 +95,7 @@ map.insert(QLatin1String(NM_SETTING_WIRED_S390_OPTIONS), QVariant::fromValue(s390Options)); map.insert(QLatin1String(NM_SETTING_WIRED_WAKE_ON_LAN), wakeOnLan); map.insert(QLatin1String(NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD), wakeOnLanPassword); + map.insert(QLatin1String(NM_SETTING_WIRED_ASSIGNED_MAC_ADDRESS), assignedMacAddress); NetworkManager::WiredSetting setting; setting.fromMap(map); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanager-qt-5.84.0/src/settings/connectionsettings.cpp new/networkmanager-qt-5.85.0/src/settings/connectionsettings.cpp --- old/networkmanager-qt-5.84.0/src/settings/connectionsettings.cpp 2021-06-19 18:03:54.000000000 +0200 +++ new/networkmanager-qt-5.85.0/src/settings/connectionsettings.cpp 2021-07-30 13:40:28.000000000 +0200 @@ -39,6 +39,10 @@ #define NM_SETTING_CONNECTION_AUTOCONNECT_RETRIES "autoconnect-retries" #endif +#if !NM_CHECK_VERSION(1, 12, 0) +#define NM_SETTING_CONNECTION_MDNS "mdns" +#endif + #if !NM_CHECK_VERSION(1, 16, 0) #define NM_SETTING_WIREGUARD_SETTING_NAME "wireguard" #endif @@ -65,6 +69,7 @@ , autoconnectSlaves(ConnectionSettings::SlavesDefault) , lldp(ConnectionSettings::LldpDefault) , metered(ConnectionSettings::MeteredUnknown) + , mdns(ConnectionSettings::MdnsDefault) , q_ptr(q) { } @@ -481,6 +486,7 @@ setAutoconnectSlaves(other->autoconnectSlaves()); setLldp(other->lldp()); setMetered(other->metered()); + setMdns(other->mdns()); setStableId(other->stableId()); d->initSettings(other); @@ -572,6 +578,10 @@ setMetered((NetworkManager::ConnectionSettings::Metered)connectionSettings.value(QLatin1String(NM_SETTING_CONNECTION_METERED)).toInt()); } + if (connectionSettings.contains(QLatin1String(NM_SETTING_CONNECTION_MDNS))) { + setMdns((NetworkManager::ConnectionSettings::Mdns)connectionSettings.value(QLatin1String(NM_SETTING_CONNECTION_MDNS)).toInt()); + } + if (connectionSettings.contains(QLatin1String(NM_SETTING_CONNECTION_STABLE_ID))) { setStableId(connectionSettings.value(QLatin1String(NM_SETTING_CONNECTION_STABLE_ID)).toString()); } @@ -665,6 +675,10 @@ connectionSetting.insert(QLatin1String(NM_SETTING_CONNECTION_LLDP), lldp()); connectionSetting.insert(QLatin1String(NM_SETTING_CONNECTION_METERED), metered()); + if (mdns() != MdnsDefault) { + connectionSetting.insert(QLatin1String(NM_SETTING_CONNECTION_MDNS), mdns()); + } + if (!stableId().isEmpty()) { connectionSetting.insert(QLatin1String(NM_SETTING_CONNECTION_STABLE_ID), stableId()); } @@ -955,6 +969,20 @@ d->metered = metered; } +NetworkManager::ConnectionSettings::Mdns NetworkManager::ConnectionSettings::mdns() const +{ + Q_D(const ConnectionSettings); + + return d->mdns; +} + +void NetworkManager::ConnectionSettings::setMdns(NetworkManager::ConnectionSettings::Mdns mdns) +{ + Q_D(ConnectionSettings); + + d->mdns = mdns; +} + QString NetworkManager::ConnectionSettings::stableId() const { Q_D(const ConnectionSettings); @@ -1016,6 +1044,7 @@ dbg.nospace() << NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES << ": " << setting.autoconnectSlaves() << '\n'; dbg.nospace() << NM_SETTING_CONNECTION_LLDP << ": " << setting.lldp() << '\n'; dbg.nospace() << NM_SETTING_CONNECTION_METERED << ": " << setting.metered() << '\n'; + dbg.nospace() << NM_SETTING_CONNECTION_MDNS << ": " << setting.mdns() << '\n'; dbg.nospace() << NM_SETTING_CONNECTION_STABLE_ID << ": " << setting.stableId() << '\n'; dbg.nospace() << "===================\n"; const auto settingsList = setting.settings(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanager-qt-5.84.0/src/settings/connectionsettings.h new/networkmanager-qt-5.85.0/src/settings/connectionsettings.h --- old/networkmanager-qt-5.84.0/src/settings/connectionsettings.h 2021-06-19 18:03:54.000000000 +0200 +++ new/networkmanager-qt-5.85.0/src/settings/connectionsettings.h 2021-07-30 13:40:28.000000000 +0200 @@ -77,6 +77,13 @@ MeteredGuessNo = 4, }; + enum Mdns { + MdnsDefault = -1, + MdnsNo = 0, + MdnsResolve = 1, + MdnsResolveAndRespond = 2 + }; + static ConnectionType typeFromString(const QString &typeString); static QString typeAsString(const ConnectionType type); static QString createNewUuid(); @@ -150,6 +157,9 @@ void setMetered(Metered metered); Metered metered() const; + void setMdns(Mdns mdns); + Mdns mdns() const; + void setStableId(const QString &stableId); QString stableId() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanager-qt-5.84.0/src/settings/connectionsettings_p.h new/networkmanager-qt-5.85.0/src/settings/connectionsettings_p.h --- old/networkmanager-qt-5.84.0/src/settings/connectionsettings_p.h 2021-06-19 18:03:54.000000000 +0200 +++ new/networkmanager-qt-5.85.0/src/settings/connectionsettings_p.h 2021-07-30 13:40:28.000000000 +0200 @@ -46,6 +46,7 @@ NetworkManager::ConnectionSettings::AutoconnectSlaves autoconnectSlaves; NetworkManager::ConnectionSettings::Lldp lldp; NetworkManager::ConnectionSettings::Metered metered; + NetworkManager::ConnectionSettings::Mdns mdns; QString stableId; Setting::List settings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanager-qt-5.84.0/src/settings/wiredsetting.cpp new/networkmanager-qt-5.85.0/src/settings/wiredsetting.cpp --- old/networkmanager-qt-5.84.0/src/settings/wiredsetting.cpp 2021-06-19 18:03:54.000000000 +0200 +++ new/networkmanager-qt-5.85.0/src/settings/wiredsetting.cpp 2021-07-30 13:40:28.000000000 +0200 @@ -10,6 +10,8 @@ #include <QDebug> +#define NM_SETTING_WIRED_ASSIGNED_MAC_ADDRESS "assigned-mac-address" + NetworkManager::WiredSettingPrivate::WiredSettingPrivate() : name(NM_SETTING_WIRED_SETTING_NAME) , port(NetworkManager::WiredSetting::UnknownPort) @@ -50,6 +52,7 @@ setS390Options(other->s390Options()); setWakeOnLan(other->wakeOnLan()); setWakeOnLanPassword(other->wakeOnLanPassword()); + setAssignedMacAddress(other->assignedMacAddress()); } NetworkManager::WiredSetting::~WiredSetting() @@ -260,6 +263,20 @@ d->wakeOnLanPassword = password; } +void NetworkManager::WiredSetting::setAssignedMacAddress(const QString &assignedMacAddress) +{ + Q_D(WiredSetting); + + d->assignedMacAddress = assignedMacAddress; +} + +QString NetworkManager::WiredSetting::assignedMacAddress() const +{ + Q_D(const WiredSetting); + + return d->assignedMacAddress; +} + void NetworkManager::WiredSetting::fromMap(const QVariantMap &setting) { if (setting.contains(QLatin1String(NM_SETTING_WIRED_PORT))) { @@ -348,6 +365,10 @@ if (setting.contains(QLatin1String(NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD))) { setWakeOnLanPassword(setting.value(QLatin1String(NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD)).toString()); } + + if (setting.contains(QLatin1String(NM_SETTING_WIRED_ASSIGNED_MAC_ADDRESS))) { + setAssignedMacAddress(setting.value(QLatin1String(NM_SETTING_WIRED_ASSIGNED_MAC_ADDRESS)).toString()); + } } QVariantMap NetworkManager::WiredSetting::toMap() const @@ -435,6 +456,10 @@ setting.insert(QLatin1String(NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD), wakeOnLanPassword()); } + if (!assignedMacAddress().isEmpty()) { + setting.insert(QLatin1String(NM_SETTING_WIRED_ASSIGNED_MAC_ADDRESS), assignedMacAddress()); + } + return setting; } @@ -457,6 +482,7 @@ dbg.nospace() << NM_SETTING_WIRED_S390_OPTIONS << ": " << setting.s390Options() << '\n'; dbg.nospace() << NM_SETTING_WIRED_WAKE_ON_LAN << ": " << setting.wakeOnLan() << '\n'; dbg.nospace() << NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD << ": " << setting.wakeOnLanPassword() << '\n'; + dbg.nospace() << NM_SETTING_WIRED_ASSIGNED_MAC_ADDRESS << ": " << setting.assignedMacAddress() << '\n'; return dbg.maybeSpace(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanager-qt-5.84.0/src/settings/wiredsetting.h new/networkmanager-qt-5.85.0/src/settings/wiredsetting.h --- old/networkmanager-qt-5.84.0/src/settings/wiredsetting.h 2021-06-19 18:03:54.000000000 +0200 +++ new/networkmanager-qt-5.85.0/src/settings/wiredsetting.h 2021-07-30 13:40:28.000000000 +0200 @@ -107,6 +107,9 @@ QString wakeOnLanPassword() const; void setWakeOnLanPassword(const QString &password); + QString assignedMacAddress() const; + void setAssignedMacAddress(const QString &assignedMacAddress); + void fromMap(const QVariantMap &setting) override; QVariantMap toMap() const override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/networkmanager-qt-5.84.0/src/settings/wiredsetting_p.h new/networkmanager-qt-5.85.0/src/settings/wiredsetting_p.h --- old/networkmanager-qt-5.84.0/src/settings/wiredsetting_p.h 2021-06-19 18:03:54.000000000 +0200 +++ new/networkmanager-qt-5.85.0/src/settings/wiredsetting_p.h 2021-07-30 13:40:28.000000000 +0200 @@ -32,6 +32,7 @@ QString generateMacAddressMask; NetworkManager::WiredSetting::WakeOnLanFlags wakeOnLan; QString wakeOnLanPassword; + QString assignedMacAddress; }; }