diff --git a/ceph.spec b/ceph.spec index cb9cfc0..cf4df41 100644 --- a/ceph.spec +++ b/ceph.spec @@ -68,7 +68,7 @@ ################################################################################# Name: ceph Version: 12.2.8 -Release: 23 +Release: 24 Epoch: 2 # define _epoch_prefix macro which will expand to the empty string if epoch is @@ -1089,7 +1089,7 @@ if [ $1 -eq 1 ] ; then fi %endif %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} -%systemd_post ceph-disk@\*.service ceph.target +%systemd_post ceph-disk@\x2a.service ceph.target %endif if [ $1 -eq 1 ] ; then /usr/bin/systemctl start ceph.target >/dev/null 2>&1 || : @@ -1100,7 +1100,7 @@ fi %service_del_preun ceph-disk@\*.service ceph.target %endif %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} -%systemd_preun ceph-disk@\*.service ceph.target +%systemd_preun ceph-disk@\x2a.service ceph.target %endif %postun base @@ -1111,7 +1111,7 @@ DISABLE_RESTART_ON_UPDATE="yes" %service_del_postun ceph-disk@\*.service ceph.target %endif %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} -%systemd_postun ceph-disk@\*.service ceph.target +%systemd_postun ceph-disk@\x2a.service ceph.target %endif if [ $FIRST_ARG -ge 1 ] ; then # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to @@ -1238,7 +1238,7 @@ if [ $1 -eq 1 ] ; then fi %endif %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} -%systemd_post ceph-mds@\*.service ceph-mds.target +%systemd_post ceph-mds@\x2a.service ceph-mds.target %endif if [ $1 -eq 1 ] ; then /usr/bin/systemctl start ceph-mds.target >/dev/null 2>&1 || : @@ -1249,7 +1249,7 @@ fi %service_del_preun ceph-mds@\*.service ceph-mds.target %endif %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} -%systemd_preun ceph-mds@\*.service ceph-mds.target +%systemd_preun ceph-mds@\x2a.service ceph-mds.target %endif %postun mds @@ -1259,7 +1259,7 @@ DISABLE_RESTART_ON_UPDATE="yes" %service_del_postun ceph-mds@\*.service ceph-mds.target %endif %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} -%systemd_postun ceph-mds@\*.service ceph-mds.target +%systemd_postun ceph-mds@\x2a.service ceph-mds.target %endif if [ $FIRST_ARG -ge 1 ] ; then # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to @@ -1287,7 +1287,7 @@ if [ $1 -eq 1 ] ; then fi %endif %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} -%systemd_post ceph-mgr@\*.service ceph-mgr.target +%systemd_post ceph-mgr@\x2a.service ceph-mgr.target %endif if [ $1 -eq 1 ] ; then /usr/bin/systemctl start ceph-mgr.target >/dev/null 2>&1 || : @@ -1298,7 +1298,7 @@ fi %service_del_preun ceph-mgr@\*.service ceph-mgr.target %endif %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} -%systemd_preun ceph-mgr@\*.service ceph-mgr.target +%systemd_preun ceph-mgr@\x2a.service ceph-mgr.target %endif %postun mgr @@ -1308,7 +1308,7 @@ DISABLE_RESTART_ON_UPDATE="yes" %service_del_postun ceph-mgr@\*.service ceph-mgr.target %endif %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} -%systemd_postun ceph-mgr@\*.service ceph-mgr.target +%systemd_postun ceph-mgr@\x2a.service ceph-mgr.target %endif if [ $FIRST_ARG -ge 1 ] ; then # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to @@ -1340,7 +1340,7 @@ if [ $1 -eq 1 ] ; then fi %endif %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} -%systemd_post ceph-mon@\*.service ceph-mon.target +%systemd_post ceph-mon@\x2a.service ceph-mon.target %endif if [ $1 -eq 1 ] ; then /usr/bin/systemctl start ceph-mon.target >/dev/null 2>&1 || : @@ -1351,7 +1351,7 @@ fi %service_del_preun ceph-mon@\*.service ceph-mon.target %endif %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} -%systemd_preun ceph-mon@\*.service ceph-mon.target +%systemd_preun ceph-mon@\x2a.service ceph-mon.target %endif %postun mon @@ -1361,7 +1361,7 @@ DISABLE_RESTART_ON_UPDATE="yes" %service_del_postun ceph-mon@\*.service ceph-mon.target %endif %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} -%systemd_postun ceph-mon@\*.service ceph-mon.target +%systemd_postun ceph-mon@\x2a.service ceph-mon.target %endif if [ $FIRST_ARG -ge 1 ] ; then # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to @@ -1399,7 +1399,7 @@ if [ $1 -eq 1 ] ; then fi %endif %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} -%systemd_post ceph-rbd-mirror@\*.service ceph-rbd-mirror.target +%systemd_post ceph-rbd-mirror@\x2a.service ceph-rbd-mirror.target %endif if [ $1 -eq 1 ] ; then /usr/bin/systemctl start ceph-rbd-mirror.target >/dev/null 2>&1 || : @@ -1410,7 +1410,7 @@ fi %service_del_preun ceph-rbd-mirror@\*.service ceph-rbd-mirror.target %endif %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} -%systemd_preun ceph-rbd-mirror@\*.service ceph-rbd-mirror.target +%systemd_preun ceph-rbd-mirror@\x2a.service ceph-rbd-mirror.target %endif %postun -n rbd-mirror @@ -1420,7 +1420,7 @@ DISABLE_RESTART_ON_UPDATE="yes" %service_del_postun ceph-rbd-mirror@\*.service ceph-rbd-mirror.target %endif %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} -%systemd_postun ceph-rbd-mirror@\*.service ceph-rbd-mirror.target +%systemd_postun ceph-rbd-mirror@\x2a.service ceph-rbd-mirror.target %endif if [ $FIRST_ARG -ge 1 ] ; then # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to @@ -1455,7 +1455,7 @@ if [ $1 -eq 1 ] ; then fi %endif %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} -%systemd_post ceph-radosgw@\*.service ceph-radosgw.target +%systemd_post ceph-radosgw@\x2a.service ceph-radosgw.target %endif if [ $1 -eq 1 ] ; then /usr/bin/systemctl start ceph-radosgw.target >/dev/null 2>&1 || : @@ -1466,7 +1466,7 @@ fi %service_del_preun ceph-radosgw@\*.service ceph-radosgw.target %endif %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} -%systemd_preun ceph-radosgw@\*.service ceph-radosgw.target +%systemd_preun ceph-radosgw@\x2a.service ceph-radosgw.target %endif %postun radosgw @@ -1476,7 +1476,7 @@ DISABLE_RESTART_ON_UPDATE="yes" %service_del_postun ceph-radosgw@\*.service ceph-radosgw.target %endif %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} -%systemd_postun ceph-radosgw@\*.service ceph-radosgw.target +%systemd_postun ceph-radosgw@\x2a.service ceph-radosgw.target %endif if [ $FIRST_ARG -ge 1 ] ; then # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to @@ -1523,7 +1523,7 @@ if [ $1 -eq 1 ] ; then fi %endif %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} -%systemd_post ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target +%systemd_post ceph-osd@\x2a.service ceph-volume@\x2a.service ceph-osd.target %endif if [ $1 -eq 1 ] ; then /usr/bin/systemctl start ceph-osd.target >/dev/null 2>&1 || : @@ -1541,7 +1541,7 @@ chown -f -h ceph:ceph /var/lib/ceph/osd/*/block* 2>&1 > /dev/null || : %service_del_preun ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target %endif %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} -%systemd_preun ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target +%systemd_preun ceph-osd@\x2a.service ceph-volume@\x2a.service ceph-osd.target %endif %postun osd @@ -1551,7 +1551,7 @@ DISABLE_RESTART_ON_UPDATE="yes" %service_del_postun ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target %endif %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} -%systemd_postun ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target +%systemd_postun ceph-osd@\x2a.service ceph-volume@\x2a.service ceph-osd.target %endif if [ $FIRST_ARG -ge 1 ] ; then # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to @@ -1859,6 +1859,9 @@ exit 0 %changelog +* Sat Nov 25 2023 wangzengliang - 2:12.2.8-24 +- fix * recognition error when install + * Wed Oct 18 2023 wangzengliang - 2:12.2.8-23 - fix CVE-2023-43040 - sync PR #207