From 42fec8511c0a636cbc5a4c8e68a16240960a6f3f Mon Sep 17 00:00:00 2001 From: liuxinhao Date: Fri, 28 Mar 2025 11:04:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF=E7=9A=84?= =?UTF-8?q?=E8=AF=BB=E5=8F=96IPv6=E5=9C=B0=E5=9D=80=E4=BB=8ENetworkManager?= =?UTF-8?q?=E6=80=BB=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...anually-specified-ipv6-addresses-fro.patch | 30 +++++++++++++++++++ kf5-networkmanager-qt.spec | 6 +++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 0002-Correctly-read-manually-specified-ipv6-addresses-fro.patch diff --git a/0002-Correctly-read-manually-specified-ipv6-addresses-fro.patch b/0002-Correctly-read-manually-specified-ipv6-addresses-fro.patch new file mode 100644 index 0000000..2cdd887 --- /dev/null +++ b/0002-Correctly-read-manually-specified-ipv6-addresses-fro.patch @@ -0,0 +1,30 @@ +From 162b07c2253d2324d17427458dac4d09628db4b2 Mon Sep 17 00:00:00 2001 +From: "J. T. Elscott" +Date: Mon, 9 Sep 2024 21:49:30 -0700 +Subject: [PATCH] Correctly read manually-specified ipv6 addresses from + Networkmanager + +Copy+paste mistake was checking for the presence of DNS rather than addresses + +BUG: 476008 +BUG: 453453 +--- + src/settings/ipv6setting.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/settings/ipv6setting.cpp b/src/settings/ipv6setting.cpp +index 74cd340..ec14505 100644 +--- a/src/settings/ipv6setting.cpp ++++ b/src/settings/ipv6setting.cpp +@@ -413,7 +413,7 @@ void NetworkManager::Ipv6Setting::fromMap(const QVariantMap &setting) + + if (setting.contains(QLatin1String(NMQT_SETTING_IP6_CONFIG_ADDRESSES))) { + QList temp; +- if (setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_DNS)).canConvert()) { ++ if (setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_ADDRESSES)).canConvert()) { + QDBusArgument addressArg = setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_ADDRESSES)).value(); + temp = qdbus_cast>(addressArg); + } else { +-- +2.33.0 + diff --git a/kf5-networkmanager-qt.spec b/kf5-networkmanager-qt.spec index f9d0b84..4056e15 100644 --- a/kf5-networkmanager-qt.spec +++ b/kf5-networkmanager-qt.spec @@ -4,7 +4,7 @@ Name: kf5-%{framework} Version: 5.113.0 -Release: 3 +Release: 4 Summary: A Tier 1 KDE Frameworks 5 module that wraps NetworkManager DBus API License: LGPLv2+ @@ -15,6 +15,7 @@ URL: https://invent.kde.org/frameworks/%{framework} Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz Patch0001: 0001-devic-add-interfaceFlag-and-support-WPA3.patch +Patch0002: 0002-Correctly-read-manually-specified-ipv6-addresses-fro.patch BuildRequires: extra-cmake-modules >= %{majmin} BuildRequires: kf5-rpm-macros >= %{majmin} @@ -65,6 +66,9 @@ that use NetworkManager. %changelog +* Fri Mar 28 2025 liuxinhao - 5.113.0-4 +- Fix error reading IPv6 addresses from NetworkManager buses(#IBWXPK) + * Wed Aug 28 2024 pangqing - 5.113.0-3 - modify macros (fix dde-network-core build error) -- Gitee