diff --git a/ceph-16.2.9-158-gd93952c7eea.tar.bz2 b/ceph-16.2.9-158-gd93952c7eea.tar.bz2 deleted file mode 100644 index 860438f..0000000 --- a/ceph-16.2.9-158-gd93952c7eea.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:06ee70a43bffb6050581b60c8ef9dc7a6de50589c8082e12fc93cc533793b589 -size 155323570 diff --git a/ceph-16.2.9-536-g41a9f9a5573.tar.bz2 b/ceph-16.2.9-536-g41a9f9a5573.tar.bz2 new file mode 100644 index 0000000..157087a --- /dev/null +++ b/ceph-16.2.9-536-g41a9f9a5573.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdc739123324eea9b6f09743f5043aa1ff0842de6034583d0367ed1f24a1b408 +size 155344240 diff --git a/ceph-test.changes b/ceph-test.changes index c455044..9841890 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jul 13 07:18:02 UTC 2022 - Tim Serong + +- Update to 16.2.9-536-g41a9f9a5573: + + (bsc#1195359, bsc#1200553) rgw: check bucket shard init status in RGWRadosBILogTrimCR + + (bsc#1194131) ceph-volume: honour osd_dmcrypt_key_size option (CVE-2021-3979) + ------------------------------------------------------------------- Thu Jun 9 23:37:24 UTC 2022 - Tim Serong @@ -23,6 +30,7 @@ Mon May 23 23:56:57 UTC 2022 - Michael Fritch Tue Apr 19 21:15:33 UTC 2022 - Michael Fritch - Update to 16.2.7-969-g6195a460d89 + + (jsc#SES-2515) High-availability NFS export ------------------------------------------------------------------- Thu Mar 31 17:09:16 UTC 2022 - Stefen Allen diff --git a/ceph-test.spec b/ceph-test.spec index 2cb77fe..dcfab86 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -30,7 +30,11 @@ %else %bcond_without tcmalloc %endif +%if 0%{?rhel} >= 9 +%bcond_without system_pmdk +%else %bcond_with system_pmdk +%endif %if 0%{?fedora} || 0%{?rhel} %bcond_without selinux %ifarch x86_64 ppc64le @@ -121,11 +125,18 @@ # disable dwz which compresses the debuginfo %global _find_debuginfo_dwz_opts %{nil} +%if 0%{with seastar} +# disable -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1, as gcc-toolset-{9,10}-annobin +# do not provide gcc-annobin.so anymore, despite that they provide annobin.so. but +# redhat-rpm-config still passes -fplugin=gcc-annobin to the compiler. +%undefine _annotated_build +%endif + ################################################################################# # main package definition ################################################################################# Name: ceph-test -Version: 16.2.9.158+gd93952c7eea +Version: 16.2.9.536+g41a9f9a5573 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -141,7 +152,7 @@ License: LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD- Group: System/Filesystems %endif URL: http://ceph.com/ -Source0: %{?_remote_tarball_prefix}ceph-16.2.9-158-gd93952c7eea.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-16.2.9-536-g41a9f9a5573.tar.bz2 %if 0%{?suse_version} Source94: ceph-rpmlintrc Source95: checkin.sh @@ -584,7 +595,7 @@ This package contains Ceph benchmarks and test tools. %if 0%{?suse_version} %endif %prep -%autosetup -p1 -n ceph-16.2.9-158-gd93952c7eea +%autosetup -p1 -n ceph-16.2.9-536-g41a9f9a5573 %build # LTO can be enabled as soon as the following GCC bug is fixed: diff --git a/ceph.changes b/ceph.changes index c455044..9841890 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jul 13 07:18:02 UTC 2022 - Tim Serong + +- Update to 16.2.9-536-g41a9f9a5573: + + (bsc#1195359, bsc#1200553) rgw: check bucket shard init status in RGWRadosBILogTrimCR + + (bsc#1194131) ceph-volume: honour osd_dmcrypt_key_size option (CVE-2021-3979) + ------------------------------------------------------------------- Thu Jun 9 23:37:24 UTC 2022 - Tim Serong @@ -23,6 +30,7 @@ Mon May 23 23:56:57 UTC 2022 - Michael Fritch Tue Apr 19 21:15:33 UTC 2022 - Michael Fritch - Update to 16.2.7-969-g6195a460d89 + + (jsc#SES-2515) High-availability NFS export ------------------------------------------------------------------- Thu Mar 31 17:09:16 UTC 2022 - Stefen Allen diff --git a/ceph.spec b/ceph.spec index e7aaab1..9db3bdc 100644 --- a/ceph.spec +++ b/ceph.spec @@ -30,7 +30,11 @@ %else %bcond_without tcmalloc %endif +%if 0%{?rhel} >= 9 +%bcond_without system_pmdk +%else %bcond_with system_pmdk +%endif %if 0%{?fedora} || 0%{?rhel} %bcond_without selinux %ifarch x86_64 ppc64le @@ -121,11 +125,18 @@ # disable dwz which compresses the debuginfo %global _find_debuginfo_dwz_opts %{nil} +%if 0%{with seastar} +# disable -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1, as gcc-toolset-{9,10}-annobin +# do not provide gcc-annobin.so anymore, despite that they provide annobin.so. but +# redhat-rpm-config still passes -fplugin=gcc-annobin to the compiler. +%undefine _annotated_build +%endif + ################################################################################# # main package definition ################################################################################# Name: ceph -Version: 16.2.9.158+gd93952c7eea +Version: 16.2.9.536+g41a9f9a5573 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -141,7 +152,7 @@ License: LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD- Group: System/Filesystems %endif URL: http://ceph.com/ -Source0: %{?_remote_tarball_prefix}ceph-16.2.9-158-gd93952c7eea.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-16.2.9-536-g41a9f9a5573.tar.bz2 %if 0%{?suse_version} # _insert_obs_source_lines_here ExclusiveArch: x86_64 aarch64 ppc64le s390x @@ -1197,7 +1208,7 @@ This package provides Ceph default alerts for Prometheus. # common ################################################################################# %prep -%autosetup -p1 -n ceph-16.2.9-158-gd93952c7eea +%autosetup -p1 -n ceph-16.2.9-536-g41a9f9a5573 %build # LTO can be enabled as soon as the following GCC bug is fixed: