From b4e1f56b63e7c44761dc461a1d100aca65e285bf Mon Sep 17 00:00:00 2001 From: fuleyi Date: Wed, 19 Aug 2026 13:37:03 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"chore:=20add=20airplane=20mode=20inte?= =?UTF-8?q?rface=20permission=20declaration"=20=E2=80=94=20=E5=9B=9E?= =?UTF-8?q?=E9=80=80=E9=A3=9E=E8=A1=8C=E6=A8=A1=E5=BC=8F=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E7=9A=84=E6=B3=A8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 原因:配合 dde-daemon 回退安全启动校验的方案。该接口的安全校验 影响范围较广,涉及控制中心、快捷键、任务栏插件等。由于项目架构 问题,在这些项目上加安全启动很复杂,且会严重影响这些项目的架构。 后续计划 需重新评估安全方案的整体设计,制定更契合 V25 架构的分阶段实施方案。 --- dcc-network/CMakeLists.txt | 4 ---- .../permission-interfaces/org.deepin.dcc-network.json | 11 ----------- debian/control | 9 ++++----- debian/dcc-network-plugin.install | 1 - 4 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 dcc-network/misc/permission-interfaces/org.deepin.dcc-network.json diff --git a/dcc-network/CMakeLists.txt b/dcc-network/CMakeLists.txt index 923b23874..7789fdd85 100644 --- a/dcc-network/CMakeLists.txt +++ b/dcc-network/CMakeLists.txt @@ -72,8 +72,4 @@ target_link_libraries(${DccNetwork_Name} PRIVATE dcc_install_plugin(NAME ${DccNetwork_Name} TARGET ${DccNetwork_Name}) -# security loader permission interfaces config -install(FILES "misc/permission-interfaces/org.deepin.dcc-network.json" - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dde-control-center/permission-interfaces) - dcc_handle_plugin_translation(NAME ${DccNetwork_Name} ) diff --git a/dcc-network/misc/permission-interfaces/org.deepin.dcc-network.json b/dcc-network/misc/permission-interfaces/org.deepin.dcc-network.json deleted file mode 100644 index d4f7a3000..000000000 --- a/dcc-network/misc/permission-interfaces/org.deepin.dcc-network.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "version": "1.0", - "description": "网络插件需要授权的 D-Bus 系统服务接口", - "DestList": [ - { - "DbusName": "org.deepin.dde.AirplaneMode1", - "DbusPath": "/org/deepin/dde/AirplaneMode1", - "DbusInterface": "org.deepin.dde.AirplaneMode1" - } - ] -} diff --git a/debian/control b/debian/control index d5ea66f47..9ebbd2e88 100644 --- a/debian/control +++ b/debian/control @@ -52,26 +52,25 @@ Depends: ${misc:Depends}, network-manager-openconnect, network-manager-strongswan | libreswan (>=4.12), network-manager-sstp, - libdde-network-core (= ${binary:Version}), - dde-daemon (>= 6.1.102) + libdde-network-core (= ${binary:Version}) Description: the plugin of network for dde control center dcc-network-plugin module Package: dock-network-plugin Architecture: any -Depends: ${misc:Depends},${shlibs:Depends},libdde-network-core (= ${binary:Version}),dde-daemon (>= 6.1.102) +Depends: ${misc:Depends},${shlibs:Depends},libdde-network-core (= ${binary:Version}) Description: the plugin of network for dde-dock dock-plugin module Package: dss-network-plugin Architecture: any -Depends: ${misc:Depends},${shlibs:Depends},libdde-network-core (= ${binary:Version}),dde-daemon (>= 6.1.102) +Depends: ${misc:Depends},${shlibs:Depends},libdde-network-core (= ${binary:Version}) Description: the plugin of network for dde-lock dss-network-plugin module Package: deepin-service-plugin-network Architecture: any -Depends: ${misc:Depends},${shlibs:Depends},curl,dde-daemon (>= 6.1.102) +Depends: ${misc:Depends},${shlibs:Depends},curl Breaks: dde-daemon (<<6.1.58) Replaces: dde-daemon (<<6.1.58) Description: the plugin of network service for deepin-service-manager diff --git a/debian/dcc-network-plugin.install b/debian/dcc-network-plugin.install index 81896a7b0..744f19136 100644 --- a/debian/dcc-network-plugin.install +++ b/debian/dcc-network-plugin.install @@ -1,3 +1,2 @@ usr/lib/*/dde-control-center usr/share/dde-control-center/translations -usr/share/dde-control-center/permission-interfaces