diff --git a/ceph-15.2.0-108-g8cf4f02b08.tar.bz2 b/ceph-15.2.0-108-g8cf4f02b08.tar.bz2 deleted file mode 100644 index 7c3e3f8..0000000 --- a/ceph-15.2.0-108-g8cf4f02b08.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e8fa2af1d3e6ce0612f1afb93cfe468c8ec837911aaca898245e352b33cdeb79 -size 151050459 diff --git a/ceph-15.2.2-18-g1dbcddb5d8.tar.bz2 b/ceph-15.2.2-18-g1dbcddb5d8.tar.bz2 new file mode 100644 index 0000000..fdfc7bf --- /dev/null +++ b/ceph-15.2.2-18-g1dbcddb5d8.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:636909d0ba6c11fe122d1e24b77545916b077e1138fd771c8ee1864e11465806 +size 151815515 diff --git a/ceph-test.changes b/ceph-test.changes index e37bc41..66eb454 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Tue May 19 15:00:23 UTC 2020 - Nathan Cutler + +- Update to 15.2.2-18-g1dbcddb5d8: + + rebase on tip of upstream "octopus" branch, SHA1 0c857e985a29d90501a285f242ea9c008df49eb8 + * Upstream v15.2.2 release + https://ceph.io/releases/v15-2-2-octopus-released/ + * mon, mgr: require all caps for pre-octopus tell commands (bsc#1170021, CVE-2020-10736) + +------------------------------------------------------------------- +Tue May 5 12:00:09 UTC 2020 - Nathan Cutler + +- Update to 15.2.1-277-g17d346932e: + + rebase on tip of upstream "octopus" branch, SHA1 752b293586d0c8749483e60e43c7a98c1e0d7b19 + * rpm: drop "is_opensuse" conditional in SUSE-specific bcond block + (jsc#SLE-11802) + +------------------------------------------------------------------- +Mon May 4 17:27:20 UTC 2020 - Nathan Cutler + +- Update to 15.2.1-246-g66cd0e5497: + + rebase on tip of upstream "octopus" branch, SHA1 939661f696d3d9eb4d31e998a3ad1487852a4741 + +------------------------------------------------------------------- +Mon Apr 13 18:19:49 UTC 2020 - Nathan Cutler + +- Update to 15.2.1-16-gb3a86250a6: + + rebase on tip of upstream "octopus" branch, SHA1 9fd2f65f91d9246fae2c841a6222d34d121680ee + * upstream 15.2.1 release + https://ceph.io/releases/v15-2-1-octopus-released/ + + fix Nonce reuse in msgr V2 secure mode (bsc#1166403, CVE-2020-1759) + + prevent RGW GetObject header-splitting XSS (bsc#1166484, CVE-2020-1760) + ------------------------------------------------------------------- Mon Mar 30 13:08:29 UTC 2020 - Nathan Cutler diff --git a/ceph-test.spec b/ceph-test.spec index 4ed7363..b1f0248 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -44,26 +44,21 @@ %global _remote_tarball_prefix https://download.ceph.com/tarballs/ %endif %if 0%{?suse_version} -%bcond_with selinux -%bcond_with cephfs_java %bcond_with amqp_endpoint +%bcond_with cephfs_java %bcond_with kafka_endpoint -#Compat macro for new _fillupdir macro introduced in Nov 2017 -%if ! %{defined _fillupdir} -%global _fillupdir /var/adm/fillup-templates -%endif -%if 0%{?is_opensuse} -%bcond_without libradosstriper -%bcond_without ocf -%else %bcond_with libradosstriper -%bcond_with ocf -%endif %ifarch x86_64 aarch64 ppc64le %bcond_without lttng %else %bcond_with lttng %endif +%bcond_with ocf +%bcond_with selinux +#Compat macro for _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} +%global _fillupdir /var/adm/fillup-templates +%endif %endif %bcond_with seastar %if 0%{?fedora} || 0%{?suse_version} >= 1500 @@ -104,7 +99,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 15.2.0.108+g8cf4f02b08 +Version: 15.2.2.18+g1dbcddb5d8 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -120,7 +115,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-15.2.0-108-g8cf4f02b08.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-15.2.2-18-g1dbcddb5d8.tar.bz2 %if 0%{?suse_version} Source96: checkin.sh Source97: README-checkin.txt @@ -423,6 +418,8 @@ This package contains Ceph benchmarks and test tools. %if 0%{?suse_version} %endif %if 0%{?fedora} || 0%{?rhel} +%if 0%{?weak_deps} +%endif %endif %if 0%{?suse_version} %endif @@ -547,7 +544,7 @@ This package contains Ceph benchmarks and test tools. %if 0%{?suse_version} %endif %prep -%autosetup -p1 -n ceph-15.2.0-108-g8cf4f02b08 +%autosetup -p1 -n ceph-15.2.2-18-g1dbcddb5d8 %build # LTO can be enabled as soon as the following GCC bug is fixed: @@ -801,6 +798,7 @@ rm -rf %{buildroot}%{_mandir}/man8/osdmaptool.8* rm -rf %{buildroot}%{_mandir}/man8/monmaptool.8* rm -rf %{buildroot}%{_mandir}/man8/ceph-kvstore-tool.8* rm -rf %{buildroot}%{_sbindir}/cephadm +rm -rf %{buildroot}%{_mandir}/man8/cephadm.8* rm -rf %{buildroot}%{_sysconfdir}/sudoers.d/cephadm rm -rf %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys rm -rf %{buildroot}%doc @@ -1197,7 +1195,7 @@ rm -rf %{buildroot} %if 0%{with cephfs_java} %endif %if 0%{with selinux} -%endif # with selinux +%endif %if 0%{?suse_version} %endif %if 0%{?suse_version} diff --git a/ceph.changes b/ceph.changes index e37bc41..66eb454 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Tue May 19 15:00:23 UTC 2020 - Nathan Cutler + +- Update to 15.2.2-18-g1dbcddb5d8: + + rebase on tip of upstream "octopus" branch, SHA1 0c857e985a29d90501a285f242ea9c008df49eb8 + * Upstream v15.2.2 release + https://ceph.io/releases/v15-2-2-octopus-released/ + * mon, mgr: require all caps for pre-octopus tell commands (bsc#1170021, CVE-2020-10736) + +------------------------------------------------------------------- +Tue May 5 12:00:09 UTC 2020 - Nathan Cutler + +- Update to 15.2.1-277-g17d346932e: + + rebase on tip of upstream "octopus" branch, SHA1 752b293586d0c8749483e60e43c7a98c1e0d7b19 + * rpm: drop "is_opensuse" conditional in SUSE-specific bcond block + (jsc#SLE-11802) + +------------------------------------------------------------------- +Mon May 4 17:27:20 UTC 2020 - Nathan Cutler + +- Update to 15.2.1-246-g66cd0e5497: + + rebase on tip of upstream "octopus" branch, SHA1 939661f696d3d9eb4d31e998a3ad1487852a4741 + +------------------------------------------------------------------- +Mon Apr 13 18:19:49 UTC 2020 - Nathan Cutler + +- Update to 15.2.1-16-gb3a86250a6: + + rebase on tip of upstream "octopus" branch, SHA1 9fd2f65f91d9246fae2c841a6222d34d121680ee + * upstream 15.2.1 release + https://ceph.io/releases/v15-2-1-octopus-released/ + + fix Nonce reuse in msgr V2 secure mode (bsc#1166403, CVE-2020-1759) + + prevent RGW GetObject header-splitting XSS (bsc#1166484, CVE-2020-1760) + ------------------------------------------------------------------- Mon Mar 30 13:08:29 UTC 2020 - Nathan Cutler diff --git a/ceph.spec b/ceph.spec index 0d8b2b7..2d14324 100644 --- a/ceph.spec +++ b/ceph.spec @@ -44,26 +44,21 @@ %global _remote_tarball_prefix https://download.ceph.com/tarballs/ %endif %if 0%{?suse_version} -%bcond_with selinux -%bcond_with cephfs_java %bcond_with amqp_endpoint +%bcond_with cephfs_java %bcond_with kafka_endpoint -#Compat macro for new _fillupdir macro introduced in Nov 2017 -%if ! %{defined _fillupdir} -%global _fillupdir /var/adm/fillup-templates -%endif -%if 0%{?is_opensuse} -%bcond_without libradosstriper -%bcond_without ocf -%else %bcond_with libradosstriper -%bcond_with ocf -%endif %ifarch x86_64 aarch64 ppc64le %bcond_without lttng %else %bcond_with lttng %endif +%bcond_with ocf +%bcond_with selinux +#Compat macro for _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} +%global _fillupdir /var/adm/fillup-templates +%endif %endif %bcond_with seastar %if 0%{?fedora} || 0%{?suse_version} >= 1500 @@ -104,7 +99,7 @@ # main package definition ################################################################################# Name: ceph -Version: 15.2.0.108+g8cf4f02b08 +Version: 15.2.2.18+g1dbcddb5d8 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -120,7 +115,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-15.2.0-108-g8cf4f02b08.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-15.2.2-18-g1dbcddb5d8.tar.bz2 %if 0%{?suse_version} # _insert_obs_source_lines_here ExclusiveArch: x86_64 aarch64 ppc64le s390x @@ -530,12 +525,16 @@ Requires: python%{python3_pkgversion}-cherrypy Requires: python%{python3_pkgversion}-jwt Requires: python%{python3_pkgversion}-routes Requires: python%{python3_pkgversion}-werkzeug +%if 0%{?weak_deps} +Recommends: python%{python3_pkgversion}-saml +%endif %endif %if 0%{?suse_version} Requires: python%{python3_pkgversion}-CherryPy Requires: python%{python3_pkgversion}-PyJWT Requires: python%{python3_pkgversion}-Routes Requires: python%{python3_pkgversion}-Werkzeug +Recommends: python%{python3_pkgversion}-python3-saml %endif %description mgr-dashboard ceph-mgr-dashboard is a manager module, providing a web-based application @@ -940,7 +939,7 @@ Summary: Ceph distributed file system client library %if 0%{?suse_version} Group: System/Libraries %endif -Obsoletes: libcephfs1 +Obsoletes: libcephfs1 < %{_epoch_prefix}%{version}-%{release} %if 0%{?rhel} || 0%{?fedora} Obsoletes: ceph-libs < %{_epoch_prefix}%{version}-%{release} Obsoletes: ceph-libcephfs @@ -1122,7 +1121,7 @@ This package provides Ceph’s default alerts for Prometheus. # common ################################################################################# %prep -%autosetup -p1 -n ceph-15.2.0-108-g8cf4f02b08 +%autosetup -p1 -n ceph-15.2.2-18-g1dbcddb5d8 %build # LTO can be enabled as soon as the following GCC bug is fixed: @@ -1462,6 +1461,7 @@ exit 0 %files -n cephadm %{_sbindir}/cephadm +%{_mandir}/man8/cephadm.8* %{_sysconfdir}/sudoers.d/cephadm %attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm %attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm/.ssh @@ -2333,8 +2333,7 @@ if [ $1 -eq 0 ]; then fi fi exit 0 - -%endif # with selinux +%endif %files grafana-dashboards %if 0%{?suse_version}