From 366b87aaf0f7a7e692d9a56bd8d68544cb475c3634bb758f70d306241f87d5b7 Mon Sep 17 00:00:00 2001 From: Hillwood Yang Date: Sun, 29 Aug 2021 08:46:42 +0000 Subject: [PATCH 1/2] Accepting request 914805 from X11:Deepin:Factory - Update version to 1.1 * Fix a security issue, change temp dir to /root/.cache. * Drop deepin-api profiles installation. fix boo#1070943 OBS-URL: https://build.opensuse.org/request/show/914805 OBS-URL: https://build.opensuse.org/package/show/X11:Deepin/deepin-feature-enable?expand=0&rev=4 --- deepin-feature-enable.changes | 7 ++++ deepin-feature-enable.in | 68 ++--------------------------------- 2 files changed, 9 insertions(+), 66 deletions(-) diff --git a/deepin-feature-enable.changes b/deepin-feature-enable.changes index 7b9e9eb..39ebfd8 100644 --- a/deepin-feature-enable.changes +++ b/deepin-feature-enable.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Aug 28 14:45:01 UTC 2021 - Hillwood Yang + +- Update version to 1.1 + * Fix a security issue, change temp dir to /root/.cache. + * Drop deepin-api profiles installation. fix boo#1070943 + ------------------------------------------------------------------- Tue Apr 27 12:05:03 UTC 2021 - Hillwood Yang diff --git a/deepin-feature-enable.in b/deepin-feature-enable.in index 13a9abc..617e9c7 100644 --- a/deepin-feature-enable.in +++ b/deepin-feature-enable.in @@ -1,75 +1,11 @@ #!/bin/bash # Name: Deepin Features installer -# Version: 1.0 +# Version: 1.1 # Description: Enable dbus and policykit for Deepin Desktop on openSUSE # Author: Hillwood Yang # License: WTFPL-2.0 -SYSTEM_TMP=/tmp - -################################################################################ -# deepin-api-dbus -TMP_DIR=$SYSTEM_TMP/deepin-api-dbus - -pushd /usr/share/dbus-1/system.d/ &>/dev/null - - Filelist1=&(ls com.deepin.api*) &>/dev/null - - if [ "$Filelist1" != "" ]; then - rm -rf "$Filelist1" - fi - -popd &>/dev/null - -pushd /usr/share/dbus-1/system-services/ &>/dev/null - - Filelist2=&(ls com.deepin.api*) &>/dev/null - - if [ "$Filelist2" != "" ]; then - rm -rf "$Filelist2" - fi - -popd &>/dev/null - -mkdir -p $TMP_DIR - -pushd $TMP_DIR &>/dev/null - tar -xvf /usr/share/dde-api/dbus.tar.gz &>/dev/null - cp dbus/system.d/* /usr/share/dbus-1/system.d/ - cp dbus/system-services/* /usr/share/dbus-1/system-services/ - chmod 0644 /usr/share/dbus-1/system.d/com.deepin.api* - chmod 0644 /usr/share/dbus-1/system-services/com.deepin.api* -popd &>/dev/null - -rm -rf $TMP_DIR - -echo "Deepin api profiles install succeed!" - -################################################################################ -# deepin-api-polkit -TMP_DIR=$SYSTEM_TMP/deepin-api-polkit - -pushd /usr/share/polkit-1/actions/ &>/dev/null - - Filelist=&(ls com.deepin.api*) &>/dev/null - - if [ "$Filelist" != "" ]; then - rm -rf "$Filelist" - fi - -popd &>/dev/null - -mkdir -p $TMP_DIR - -pushd $TMP_DIR &>/dev/null - tar -xvf /usr/share/dde-api/polkit.tar.gz &>/dev/null - cp polkit/* /usr/share/polkit-1/actions/ - chmod 0644 /usr/share/polkit-1/actions/com.deepin.api* -popd &>/dev/null - -rm -rf $TMP_DIR - -echo "Deepin API polkit profiles install succeed!" +SYSTEM_TMP=/root/.cache ################################################################################ # deepin-daemon-dbus From b135241d47f040e1db5ea570c597501a824a182836aad431330372e15eec6ec6 Mon Sep 17 00:00:00 2001 From: Hillwood Yang Date: Sun, 29 Aug 2021 11:53:54 +0000 Subject: [PATCH 2/2] Accepting request 914876 from X11:Deepin:Factory OBS-URL: https://build.opensuse.org/request/show/914876 OBS-URL: https://build.opensuse.org/package/show/X11:Deepin/deepin-feature-enable?expand=0&rev=5 --- deepin-feature-enable.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/deepin-feature-enable.spec b/deepin-feature-enable.spec index 9ec27bb..acf01e5 100644 --- a/deepin-feature-enable.spec +++ b/deepin-feature-enable.spec @@ -17,15 +17,13 @@ Name: deepin-feature-enable -Version: 1.0 +Version: 1.1 Release: 0 Summary: Deepin Features installer License: WTFPL Group: System/GUI/Other Url: https://github.com/linuxdeepin Source0: %{name}.in -Requires: deepin-api-dbus -Requires: deepin-api-polkit Requires: deepin-daemon-dbus Requires: deepin-daemon-polkit Recommends: deepin-file-manager-dbus