Merge branch 'master' of gitee.com:src-openeuler/ceph into master

Signed-off-by: wangzengliang <wangzengliang2@huawei.com>
This commit is contained in:
wangzengliang 2023-02-10 03:33:24 +00:00 committed by Gitee
commit 73e4176810

View File

@ -125,7 +125,7 @@
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 16.2.7 Version: 16.2.7
Release: 15 Release: 16
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
Epoch: 2 Epoch: 2
%endif %endif
@ -177,6 +177,7 @@ BuildRequires: sharutils
BuildRequires: checkpolicy BuildRequires: checkpolicy
BuildRequires: selinux-policy-devel BuildRequires: selinux-policy-devel
%endif %endif
BuildRequires: python3-unversioned-command
BuildRequires: gperf BuildRequires: gperf
BuildRequires: cmake > 3.5 BuildRequires: cmake > 3.5
BuildRequires: cryptsetup BuildRequires: cryptsetup
@ -1715,6 +1716,8 @@ fi
%{_datadir}/ceph/mgr/mgr_util.* %{_datadir}/ceph/mgr/mgr_util.*
%{_unitdir}/ceph-mgr@.service %{_unitdir}/ceph-mgr@.service
%{_unitdir}/ceph-mgr.target %{_unitdir}/ceph-mgr.target
%exclude %{_datadir}/ceph/mgr/__pycache__/mgr_module.*
%exclude %{_datadir}/ceph/mgr/__pycache__/mgr_util.*
%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/mgr %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/mgr
%post mgr %post mgr
@ -2502,9 +2505,12 @@ exit 0
%config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
%changelog %changelog
* Mon Jan 30 2023 wangzengliang <wangzengliang2@huawei.com> - 2:16.2.7-15 * Fri Feb 10 2023 wangzengliang <wangzengliang2@huawei.com> - 2:16.2.7-16
- fix CVE-2022-3854 - fix CVE-2022-3854
* Mon Feb 6 2023 liuqinfei<liuqinfei@hisilicon.com> - 2:16.2.7-15
- fix no python symbol for python3
* Thu Jan 12 2023 Wenlong Zhang<zhangwenlong@loongson.cn> - 2:16.2.7-14 * Thu Jan 12 2023 Wenlong Zhang<zhangwenlong@loongson.cn> - 2:16.2.7-14
- add loongarch support for ceph - add loongarch support for ceph