diff --git a/0001-update-license.patch b/0001-update-license.patch new file mode 100644 index 0000000000000000000000000000000000000000..ec3a4cec78dd6d00854b51fb3a79e982de0fc5ee --- /dev/null +++ b/0001-update-license.patch @@ -0,0 +1,32 @@ +From a3f2eae2503ebb830137ff88f3cd3c88c88f4130 Mon Sep 17 00:00:00 2001 +From: maqi +Date: Tue, 19 Aug 2025 13:41:43 +0800 +Subject: [PATCH] update license + +--- + rpm/dde-polkit-agent.spec | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/rpm/dde-polkit-agent.spec b/rpm/dde-polkit-agent.spec +index 5c80f4f..4429430 100644 +--- a/rpm/dde-polkit-agent.spec ++++ b/rpm/dde-polkit-agent.spec +@@ -12,7 +12,7 @@ Name: dde-polkit-agent + Version: 5.4.5 + Release: %{specrelease} + Summary: Deepin Polkit Agent +-License: GPLv3 ++License: GPL-3.0-or-later + URL: https://github.com/linuxdeepin/dde-polkit-agent + Source0: %{name}-%{version}.orig.tar.xz + +@@ -64,4 +64,4 @@ export PATH=%{_qt5_bindir}:$PATH + + %changelog + * Thu Apr 26 2021 uniontech - 5.4.5-1 +-- Update to 5.4.5 +\ No newline at end of file ++- Update to 5.4.5 +-- +2.39.3 + diff --git a/dde-polkit-agent-5.5.21.tar.gz b/dde-polkit-agent-5.5.21.tar.gz deleted file mode 100644 index d414c7c3f4411354d36a462edb95ac2033f29b36..0000000000000000000000000000000000000000 Binary files a/dde-polkit-agent-5.5.21.tar.gz and /dev/null differ diff --git a/dde-polkit-agent-lock-faillock.patch b/dde-polkit-agent-lock-faillock.patch new file mode 100644 index 0000000000000000000000000000000000000000..d75592e3a1635f6243dab62dbcb93224f9a5af24 --- /dev/null +++ b/dde-polkit-agent-lock-faillock.patch @@ -0,0 +1,43 @@ +diff --git a/AuthDialog.cpp b/AuthDialog.cpp +index ae9ce44..c20ebaf 100644 +--- a/AuthDialog.cpp ++++ b/AuthDialog.cpp +@@ -89,10 +89,17 @@ void AuthDialog::setAuthInfo(const QString &info) + if ("Password" == info) + m_passwordInput->lineEdit()->setFocus(); + ++ m_passwordInput->clear(); + m_passwordInput->lineEdit()->setPlaceholderText(QString(dgettext("deepin-authentication", info.toStdString().c_str()))); + + setButtonText(1, tr("Confirm", "button")); + getButton(1)->setAccessibleName("Confirm"); ++ ++ if (info.contains("The account is locked due to ", Qt::CaseSensitive)) { ++ bool isLock = true; ++ authenticationFailure(isLock); ++ } ++ + update(); + } + +@@ -286,7 +293,7 @@ void AuthDialog::authenticationFailure(bool &isLock) + + m_passwordInput->setEnabled(true); + m_passwordInput->showAlertMessage(m_errorMsg); +- m_passwordInput->setAlert(true); ++ //m_passwordInput->setAlert(true); + m_passwordInput->lineEdit()->selectAll(); + m_passwordInput->lineEdit()->setFocus(); + if (isLock) { +diff --git a/public_fun.cpp b/public_fun.cpp +index 4665388..f39457e 100644 +--- a/public_fun.cpp ++++ b/public_fun.cpp +@@ -28,6 +28,7 @@ QVariant getLimitPropertyValue(QString account, QString type, QString key) + QJsonArray array = getLimitInfo(account); + + QVariant result; ++ return result; + for (auto item = array.constBegin(); item != array.constEnd(); item++) { + // 后续可以支持多种认证方式：fingerprint, face, usbkey 等 + if (item->toObject()["type"].toString() == type) { diff --git a/dde-polkit-agent.spec b/dde-polkit-agent.spec index 052d6bc92c61c5239f3083f7780967290ce27a02..e2869e17b382adcf46ab773f946b7938b88e68de 100644 --- a/dde-polkit-agent.spec +++ b/dde-polkit-agent.spec @@ -1,34 +1,23 @@ -%define anolis_release 2 -%{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}} %global repo dde-polkit-agent Name: dde-polkit-agent -Version: 5.5.21 -Release: 1.%{anolis_release}%{?dist} +Version: 5.6.3 +Release: 1%{?dist}.01 Summary: Deepin Polkit Agent -License: GPLv3 +License: GPL-3.0-or-later URL: https://github.com/linuxdeepin/dde-polkit-agent -Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Source0: dde-polkit-agent_5.6.3.orig.tar.xz +Patch0: 0001-update-license.patch +Patch1: dde-polkit-agent-lock-faillock.patch +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: dtkwidget-devel >= 5.1.1 BuildRequires: pkgconfig(dframeworkdbus) >= 2.0 -BuildRequires: dde-qt-dbus-factory-devel -BuildRequires: dde-qt-dbus-factory BuildRequires: pkgconfig(polkit-qt5-1) -BuildRequires: qt5-devel -BuildRequires: pkgconfig(Qt5) -BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(gsettings-qt) -BuildRequires: pkgconfig(Qt5Multimedia) -BuildRequires: pkgconfig(Qt5MultimediaWidgets) -BuildRequires: pkgconfig(Qt5X11Extras) -BuildRequires: qt5-linguist BuildRequires: qt5-qttools-devel -BuildRequires: dtkcore-devel -BuildRequires: make -BuildRequires: cmake + +Requires: dde-common >= 2026 %description DDE Polkit Agent is the polkit agent used in Deepin Desktop Environment. @@ -41,16 +30,16 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Header files and libraries for %{name}. %prep -%setup -q -n %{repo}-%{version} +%autosetup -p1 -n %{repo}-%{version} sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh %build export PATH=%{_qt5_bindir}:$PATH %cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=%{_arch} . -%make_build -C %{_vpath_builddir} +%make_build %install -%make_install INSTALL_ROOT=%{buildroot} -C %{_vpath_builddir} +%make_install INSTALL_ROOT=%{buildroot} %files %doc README.md @@ -63,11 +52,20 @@ export PATH=%{_qt5_bindir}:$PATH %{_includedir}/dpa/agent-extension.h %changelog -* Tue Nov 07 2023 yangxianzhao - 5.5.21-1.2 -- rebuild for qt +* Wed Feb 04 2026 zhaoshuang - 5.6.3-1.01 +- fix: fix not lock issue while faillock(bugid:348253) + +* Mon Dec 22 2025 liweigang - 5.6.3-1 +- update: update to version 5.6.3 + +* Tue Aug 19 2025 maqi - 5.5.23.2-2.01 +- spec: update license + +* Wed Jan 24 2024 weidongkl - 5.5.23.2-2 +- fix: polkitd-agent lock error (bugid:236601) -* Tue Sep 26 2023 yangxianzhao - 5.5.21-1.1 -- fix build error on a23 +* Fri Aug 18 2023 liuzhilin - 5.5.23.2-1 +- update: update to 5.5.23.2 * Thu Dec 29 2022 liweiganga - 5.5.21-1 - update: update to 5.5.21 diff --git a/dde-polkit-agent_5.6.3.orig.tar.xz b/dde-polkit-agent_5.6.3.orig.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..d59de8f8ab5bc64ad3e25dd2d124706ce6d98848 Binary files /dev/null and b/dde-polkit-agent_5.6.3.orig.tar.xz differ