Architecture specific change in rpms/glusterfs.git
by githook-noreply＠fedoraproject.org
The package rpms/glusterfs.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/glusterfs.git/commit/?id=4afe6359....
Change:
+%ifarch s390 s390x armv7hl
Thanks.
Full change:
============
commit 4afe63595ccc39cf7f5d0a139ef39b2ca5bba287
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Fri Mar 1 09:05:25 2019 -0500
4.1.7 s390x, armv7hl no rdma
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/glusterfs.spec b/glusterfs.spec
index c1a56ba..6607843 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -83,6 +83,11 @@
# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without rdma
%{?_without_rdma:%global _without_rdma --disable-ibverbs}
+# No RDMA Support on s390(x)
+%ifarch s390 s390x armv7hl
+%global _without_rdma --disable-ibverbs
+%endif
+
# server
# if you wish to build rpms without server components, compile like this
# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without server
@@ -218,7 +223,7 @@ Summary: Distributed File System
%if ( 0%{_for_fedora_koji_builds} )
Name: glusterfs
Version: 4.1.7
-Release: %{?prereltag:1.}2%{?prereltag:.%{prereltag}}%{?dist}
+Release: %{?prereltag:1.}3%{?prereltag:.%{prereltag}}%{?dist}
%else
Name: @PACKAGE_NAME@
Version: @PACKAGE_VERSION@
@@ -1444,6 +1449,9 @@ exit 0
%endif
%changelog
+* Fri Mar 1 2019 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.1.7-3
+- 4.1.7 s390x, armv7hl no rdma
+
* Thu Jan 17 2019 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.1.7-2
- 4.1.7 GA
5 years, 1 month
Architecture specific change in rpms/glusterfs.git
by githook-noreply＠fedoraproject.org
The package rpms/glusterfs.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/glusterfs.git/commit/?id=b75bbec0....
Change:
+%ifarch s390 s390x armv7hl
Thanks.
Full change:
============
commit b75bbec09f0d462e650b4076f08d89f357acb0db
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Fri Mar 1 09:04:06 2019 -0500
5.4 s390x, armv7hl no rdma
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/glusterfs.spec b/glusterfs.spec
index f71f2cd..90dd4ad 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -92,6 +92,11 @@
# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without rdma
%{?_without_rdma:%global _without_rdma --disable-ibverbs}
+# No RDMA Support on s390(x)
+%ifarch s390 s390x armv7hl
+%global _without_rdma --disable-ibverbs
+%endif
+
# server
# if you wish to build rpms without server components, compile like this
# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without server
@@ -219,7 +224,7 @@ Summary: Distributed File System
%if ( 0%{_for_fedora_koji_builds} )
Name: glusterfs
Version: 5.4
-Release: %{?prereltag:0.}1%{?prereltag:.%{prereltag}}%{?dist}
+Release: %{?prereltag:0.}2%{?prereltag:.%{prereltag}}%{?dist}
%else
Name: @PACKAGE_NAME@
Version: @PACKAGE_VERSION@
@@ -1452,6 +1457,9 @@ exit 0
%endif
%changelog
+* Fri Mar 1 2019 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 5.4-2
+- 5.4 s390x, armv7hl no rdma
+
* Wed Feb 27 2019 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 5.4-1
- 5.4 GA
5 years, 1 month
Architecture specific change in rpms/glusterfs.git
by githook-noreply＠fedoraproject.org
The package rpms/glusterfs.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/glusterfs.git/commit/?id=b598b104....
Change:
+%ifarch s390 s390x armv7hl
Thanks.
Full change:
============
commit e465c1a10914787d1b587781b052f3964fdcd6a3
Merge: 2b49ee6 b598b10
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Fri Mar 1 09:02:01 2019 -0500
Merge remote-tracking branch 'origin/master' into f30
commit b598b104d5b3104ef11779a5320ad05809b3bd46
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Fri Mar 1 09:01:38 2019 -0500
6.0 RC0, s390x, armv7hl no rdma
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/glusterfs.spec b/glusterfs.spec
index 062b85c..c5ffbc1 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -92,6 +92,11 @@
# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without rdma
%{?_without_rdma:%global _without_rdma --disable-ibverbs}
+# No RDMA Support on s390(x)
+%ifarch s390 s390x armv7hl
+%global _without_rdma --disable-ibverbs
+%endif
+
# server
# if you wish to build rpms without server components, compile like this
# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without server
@@ -227,7 +232,7 @@ Summary: Distributed File System
%if ( 0%{_for_fedora_koji_builds} )
Name: glusterfs
Version: 6.0
-Release: %{?prereltag:0.}1%{?prereltag:.%{prereltag}}%{?dist}
+Release: %{?prereltag:0.}2%{?prereltag:.%{prereltag}}%{?dist}
%else
Name: @PACKAGE_NAME@
Version: @PACKAGE_VERSION@
@@ -1413,6 +1418,9 @@ exit 0
%endif
%changelog
+* Fri Mar 1 2019 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 6.0rc0-0.2
+- 6.0 RC0, s390x, armv7hl no rdma
+
* Fri Feb 22 2019 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 6.0rc0-0.1
- 6.0 RC0
5 years, 1 month
Architecture specific change in rpms/glusterfs.git
by githook-noreply＠fedoraproject.org
The package rpms/glusterfs.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/glusterfs.git/commit/?id=b598b104....
Change:
+%ifarch s390 s390x armv7hl
Thanks.
Full change:
============
commit b598b104d5b3104ef11779a5320ad05809b3bd46
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Fri Mar 1 09:01:38 2019 -0500
6.0 RC0, s390x, armv7hl no rdma
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/glusterfs.spec b/glusterfs.spec
index 062b85c..c5ffbc1 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -92,6 +92,11 @@
# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without rdma
%{?_without_rdma:%global _without_rdma --disable-ibverbs}
+# No RDMA Support on s390(x)
+%ifarch s390 s390x armv7hl
+%global _without_rdma --disable-ibverbs
+%endif
+
# server
# if you wish to build rpms without server components, compile like this
# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without server
@@ -227,7 +232,7 @@ Summary: Distributed File System
%if ( 0%{_for_fedora_koji_builds} )
Name: glusterfs
Version: 6.0
-Release: %{?prereltag:0.}1%{?prereltag:.%{prereltag}}%{?dist}
+Release: %{?prereltag:0.}2%{?prereltag:.%{prereltag}}%{?dist}
%else
Name: @PACKAGE_NAME@
Version: @PACKAGE_VERSION@
@@ -1413,6 +1418,9 @@ exit 0
%endif
%changelog
+* Fri Mar 1 2019 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 6.0rc0-0.2
+- 6.0 RC0, s390x, armv7hl no rdma
+
* Fri Feb 22 2019 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 6.0rc0-0.1
- 6.0 RC0
5 years, 1 month
Architecture specific change in rpms/crawl.git
by githook-noreply＠fedoraproject.org
The package rpms/crawl.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/crawl.git/commit/?id=a3cc5bc7d5ad....
Change:
+%ifnarch x86_64 i386
Thanks.
Full change:
============
commit a3cc5bc7d5ad30920f0a3b0558a19719c95eb40f
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Fri Mar 1 15:00:08 2019 +0100
Upstream bugfix release 0.23.1 (bz#1684362)
diff --git a/.gitignore b/.gitignore
index 0640758..944be34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
/crawl-0.22.0.tar.gz
/crawl-0.22.1.tar.gz
/crawl-0.23.0.tar.gz
+/crawl-0.23.1.tar.gz
diff --git a/crawl.spec b/crawl.spec
index 09b15e3..77ac73b 100644
--- a/crawl.spec
+++ b/crawl.spec
@@ -2,7 +2,7 @@
Name: crawl
Summary: Roguelike dungeon exploration game
-Version: 0.23.0
+Version: 0.23.1
Release: 1%{?dist}
# Main license : GPLv2+
# 2-clause BSD: all contributions by Steve Noonan and Jesse Luehrs
@@ -128,6 +128,9 @@ SETOPT_FLAGS=$(echo "%{optflags}" | sed -e 's/-Wp,-D_GLIBCXX_ASSERTIONS//g')
%make_build -C crawl-ref/source \
%endif
CC=gcc CXX=g++ CFOPTIMIZE="$SETOPT_FLAGS -fPIC" \
+%ifnarch x86_64 i386
+ CFOTHERS="" \
+%endif
STDFLAG="$SETOPT_FLAGS -std=gnu++11 -fPIC" SOUND=y V=y MONOSPACED_FONT=y \
EXTERNAL_LDFLAGS="%{__global_ldflags} -fPIC" NO_TRY_GOLD=y \
PROPORTIONAL_FONT=%{_fontbasedir}/bitstream-vera/Vera.ttf \
@@ -141,6 +144,9 @@ SETOPT_FLAGS=$(echo "%{optflags}" | sed -e 's/-Wp,-D_GLIBCXX_ASSERTIONS//g')
%make_build -C crawl-ref/crawl-tiles \
%endif
CC=gcc CXX=g++ CFOPTIMIZE="$SETOPT_FLAGS -fPIC" \
+%ifnarch x86_64 i386
+ CFOTHERS="" \
+%endif
STDFLAG="$SETOPT_FLAGS -std=gnu++11 -fPIC" TILES=y SOUND=y V=y MONOSPACED_FONT=y \
EXTERNAL_LDFLAGS="%{__global_ldflags} -fPIC" NO_TRY_GOLD=y \
PROPORTIONAL_FONT=%{_fontbasedir}/bitstream-vera/Vera.ttf \
@@ -155,6 +161,9 @@ SETOPT_FLAGS=$(echo "%{optflags}" | sed -e 's/-Wp,-D_GLIBCXX_ASSERTIONS//g')
%make_install -C crawl-ref/crawl-tiles \
%endif
CC=gcc CXX=g++ CFOPTIMIZE="$SETOPT_FLAGS -fPIC" \
+%ifnarch x86_64 i386
+ CFOTHERS="" \
+%endif
STDFLAG="$SETOPT_FLAGS -std=gnu++11 -fPIC" TILES=y SOUND=y V=y MONOSPACED_FONT=y \
EXTERNAL_LDFLAGS="%{__global_ldflags} -fPIC" NO_TRY_GOLD=y \
PROPORTIONAL_FONT=%{_fontbasedir}/bitstream-vera/Vera.ttf \
@@ -168,6 +177,9 @@ SETOPT_FLAGS=$(echo "%{optflags}" | sed -e 's/-Wp,-D_GLIBCXX_ASSERTIONS//g')
%make_install -C crawl-ref/source \
%endif
CC=gcc CXX=g++ CFOPTIMIZE="$SETOPT_FLAGS -fPIC" \
+%ifnarch x86_64 i386
+ CFOTHERS="" \
+%endif
STDFLAG="$SETOPT_FLAGS -std=gnu++11 -fPIC" SOUND=y V=y MONOSPACED_FONT=y \
EXTERNAL_LDFLAGS="%{__global_ldflags} -fPIC" NO_TRY_GOLD=y \
PROPORTIONAL_FONT=%{_fontbasedir}/bitstream-vera/Vera.ttf \
@@ -231,6 +243,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
%{_datadir}/%{name}/dat/tiles/
%changelog
+* Fri Mar 01 2019 Antonio Trande <sagitter(a)fedoraproject.org> - 0.23.1-1
+- Upstream bugfix release 0.23.1 (bz#1684362)
+- Override -mfpmath=sse -msse2 except on x86_64 and i386 architectures
+
* Fri Feb 08 2019 Antonio Trande <sagitter(a)fedoraproject.org> - 0.23.0-1
- Upstream release 0.23.0 (bz#1673723)
diff --git a/crawl_bin.patch b/crawl_bin.patch
index 5184b5d..6ee05a6 100644
--- a/crawl_bin.patch
+++ b/crawl_bin.patch
@@ -1,8 +1,8 @@
--- a/crawl-ref/source/Makefile.orig 2016-05-05 17:37:55.000000000 +0200
+++ b/crawl-ref/source/Makefile 2016-06-03 21:19:03.840066325 +0200
-@@ -110,7 +110,7 @@
-
- CFOTHERS := -pipe $(EXTERNAL_FLAGS)
+@@ -121,7 +121,7 @@
+ CFOTHERS += -mfpmath=sse -msse2
+ endif
CFWARN :=
-CFWARN_L := -Wall -Wformat-security -Wundef
+CFWARN_L := -Wundef
diff --git a/crawl_tiles.patch b/crawl_tiles.patch
index 9df9e96..0c8304e 100644
--- a/crawl_tiles.patch
+++ b/crawl_tiles.patch
@@ -9,9 +9,9 @@
# Disable GNU Make implicit rules and variables. Leaving them enabled will slow
# down MinGW and Cygwin builds by a very VERY noticeable degree. Besides, we have
-@@ -110,7 +110,7 @@
-
- CFOTHERS := -pipe $(EXTERNAL_FLAGS)
+@@ -121,7 +121,7 @@
+ CFOTHERS += -mfpmath=sse -msse2
+ endif
CFWARN :=
-CFWARN_L := -Wall -Wformat-security -Wundef
+CFWARN_L := -Wundef
diff --git a/sources b/sources
index 384e345..6fdb187 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (crawl-0.23.0.tar.gz) = c889cfeaf55c731db0792b4f9fb5930495c80205ec7f4b04c18b494ad37573e2bffd22c99eacf1db52a8160ed81d9f24c432471698136bda0a48b73d525ac6cd
+SHA512 (crawl-0.23.1.tar.gz) = d361d5460b01d5861995428963d7ba382f8b21bcaab465a84bf10c0e344b1339ef63b7ffd0dd722b8b2da3be45c5a32e866482c25e42cca9a898eda592b966aa
5 years, 1 month
Architecture specific change in rpms/ceph.git
by githook-noreply＠fedoraproject.org
The package rpms/ceph.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ceph.git/commit/?id=fa25767214fd8....
Change:
-%ifarch x86_64
Thanks.
Full change:
============
commit 315d3a8c86a9009d98a611775f97bdf9bf77208f
Author: Boris Ranto <branto(a)redhat.com>
Date: Thu Feb 28 12:58:29 2019 +0100
Update the s390x compile patch
diff --git a/0001-s390x-A-compile-hack.patch b/0001-s390x-A-compile-hack.patch
index 1e63e86..4765989 100644
--- a/0001-s390x-A-compile-hack.patch
+++ b/0001-s390x-A-compile-hack.patch
@@ -1,12 +1,13 @@
-From efb45add11eb3516b939f04381bd21ab9a5523d1 Mon Sep 17 00:00:00 2001
+From a45270a441d483ce57db48cda699a0d2d9c01f18 Mon Sep 17 00:00:00 2001
From: Boris Ranto <branto(a)redhat.com>
Date: Thu, 28 Feb 2019 00:58:12 +0100
Subject: [PATCH] s390x: A compile hack
Signed-off-by: Boris Ranto <branto(a)redhat.com>
---
- src/rgw/rgw_dmclock_async_scheduler.cc | 2 ++
- 1 file changed, 2 insertions(+)
+ src/rgw/rgw_dmclock_async_scheduler.cc | 2 ++
+ src/test/rgw/test_rgw_dmclock_scheduler.cc | 8 ++++----
+ 2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/rgw/rgw_dmclock_async_scheduler.cc b/src/rgw/rgw_dmclock_async_scheduler.cc
index 18ba5a5e32..08657cf2b5 100644
@@ -28,6 +29,37 @@ index 18ba5a5e32..08657cf2b5 100644
return 0;
}
+diff --git a/src/test/rgw/test_rgw_dmclock_scheduler.cc b/src/test/rgw/test_rgw_dmclock_scheduler.cc
+index 4e4177cb0b..ddbfd12217 100644
+--- a/src/test/rgw/test_rgw_dmclock_scheduler.cc
++++ b/src/test/rgw/test_rgw_dmclock_scheduler.cc
+@@ -14,6 +14,8 @@
+
+ //#define BOOST_ASIO_ENABLE_HANDLER_TRACKING
+
++#ifdef HAVE_BOOST_CONTEXT
++
+ #include "rgw/rgw_dmclock_sync_scheduler.h"
+ #include "rgw/rgw_dmclock_async_scheduler.h"
+
+@@ -395,8 +397,6 @@ TEST(Queue, CrossExecutorRequest)
+ EXPECT_EQ(PhaseType::priority, *p2);
+ }
+
+-#ifdef HAVE_BOOST_CONTEXT
+-
+ TEST(Queue, SpawnAsyncRequest)
+ {
+ boost::asio::io_context context;
+@@ -426,6 +426,6 @@ TEST(Queue, SpawnAsyncRequest)
+ EXPECT_TRUE(context.stopped());
+ }
+
+-#endif
+-
+ } // namespace rgw::dmclock
++
++#endif
--
2.20.1
commit fa25767214fd86e46e4e5771b798457225f11e0b
Author: Boris Ranto <branto(a)redhat.com>
Date: Thu Feb 28 09:01:04 2019 +0100
Package libceph_crypto_* on all platforms
diff --git a/ceph.spec b/ceph.spec
index f840eaf..0b82750 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -1238,10 +1238,8 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd-mirror
%dir %{_libdir}/ceph/compressor
%{_libdir}/ceph/compressor/libceph_*.so*
%{_unitdir}/ceph-crash.service
-%ifarch x86_64
%dir %{_libdir}/ceph/crypto
%{_libdir}/ceph/crypto/libceph_*.so*
-%endif
%if %{with lttng}
%{_libdir}/libos_tp.so*
%{_libdir}/libosd_tp.so*
commit 2eee2bbcbd49c416707c858a309afd8341311e84
Author: Boris Ranto <branto(a)redhat.com>
Date: Thu Feb 28 00:59:41 2019 +0100
s390x: Add a compile hack
Signed-off-by: Boris Ranto <branto(a)redhat.com>
diff --git a/0001-s390x-A-compile-hack.patch b/0001-s390x-A-compile-hack.patch
new file mode 100644
index 0000000..1e63e86
--- /dev/null
+++ b/0001-s390x-A-compile-hack.patch
@@ -0,0 +1,33 @@
+From efb45add11eb3516b939f04381bd21ab9a5523d1 Mon Sep 17 00:00:00 2001
+From: Boris Ranto <branto(a)redhat.com>
+Date: Thu, 28 Feb 2019 00:58:12 +0100
+Subject: [PATCH] s390x: A compile hack
+
+Signed-off-by: Boris Ranto <branto(a)redhat.com>
+---
+ src/rgw/rgw_dmclock_async_scheduler.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/rgw/rgw_dmclock_async_scheduler.cc b/src/rgw/rgw_dmclock_async_scheduler.cc
+index 18ba5a5e32..08657cf2b5 100644
+--- a/src/rgw/rgw_dmclock_async_scheduler.cc
++++ b/src/rgw/rgw_dmclock_async_scheduler.cc
+@@ -41,6 +41,7 @@ int AsyncScheduler::schedule_request_impl(const client_id& client,
+ const Time& time, const Cost& cost,
+ optional_yield yield_ctx)
+ {
++#ifdef HAVE_BOOST_CONTEXT
+ ceph_assert(yield_ctx);
+
+ auto &yield = yield_ctx.get_yield_context();
+@@ -53,6 +54,7 @@ int AsyncScheduler::schedule_request_impl(const client_id& client,
+ else
+ return -ec.value();
+ }
++#endif
+
+ return 0;
+ }
+--
+2.20.1
+
diff --git a/ceph.spec b/ceph.spec
index ff20c64..f840eaf 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -120,6 +120,7 @@ Group: System/Filesystems
%endif
URL: http://ceph.com/
Source0: %{?_remote_tarball_prefix}ceph-%{version}.tar.bz2
+Patch001: 0001-s390x-A-compile-hack.patch
ExcludeArch: i686 armv7hl
#################################################################################
# dependencies that apply across all distro families
commit 5846ea07216f7d2eaad0f007904983b604d6ce0f
Author: Boris Ranto <branto(a)redhat.com>
Date: Wed Feb 27 20:59:15 2019 +0100
Sync spec file with upstream
diff --git a/ceph.spec b/ceph.spec
index fe09957..ff20c64 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -14,6 +14,12 @@
#
# Please submit bugfixes or comments via http://tracker.ceph.com/
#
+#################################################################################
+# conditional build section
+#
+# please read http://rpm.org/user_doc/conditional_builds.html for explanation of
+# bcond syntax!
+#################################################################################
# This package depends on automagic byte compilation
# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompi...
%global _python_bytecompile_extra 1
@@ -32,12 +38,14 @@
%bcond_without cephfs_java
%bcond_without lttng
%bcond_without libradosstriper
+%bcond_without amqp_endpoint
%global _remote_tarball_prefix https://download.ceph.com/tarballs/
%endif
%if 0%{?suse_version}
%bcond_with selinux
%bcond_with ceph_test_package
%bcond_with cephfs_java
+%bcond_with amqp_endpoint
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%global _fillupdir /var/adm/fillup-templates
@@ -55,11 +63,11 @@
%endif
%endif
%bcond_with seastar
-%if 0%{?fedora} || 0%{?suse_version} >= 1500
-# distros where py2 is _optional_
+%if 0%{?fedora} >= 29 || 0%{?suse_version} >= 1500 || 0%{?rhel} >= 8
+# distros that need a py3 Ceph build
%bcond_with python2
%else
-# distros where py2 is _mandatory_
+# distros that need a py2 Ceph build
%bcond_without python2
%endif
%if 0%{?fedora} || 0%{?suse_version} >= 1500
@@ -108,6 +116,7 @@ Epoch: 1
Summary: User space components of the Ceph file system
License: LGPL-2.1 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and MIT
%if 0%{?suse_version}
+Group: System/Filesystems
%endif
URL: http://ceph.com/
Source0: %{?_remote_tarball_prefix}ceph-%{version}.tar.bz2
@@ -128,7 +137,6 @@ BuildRequires: sharutils
BuildRequires: checkpolicy
BuildRequires: selinux-policy-devel
%endif
-BuildRequires: bc
BuildRequires: gperf
%if 0%{?rhel} == 7
BuildRequires: cmake3 > 3.5
@@ -140,7 +148,7 @@ BuildRequires: fuse-devel
%if 0%{?rhel} == 7
# devtoolset offers newer make and valgrind-devel, but the old ones are good
# enough.
-BuildRequires: devtoolset-7-gcc-c++ >= 7.3.1
+BuildRequires: devtoolset-7-gcc-c++ >= 7.3.1-5.13
%else
BuildRequires: gcc-c++
%endif
@@ -153,7 +161,6 @@ BuildRequires: gperftools-devel >= 2.6.1
BuildRequires: gperftools-devel >= 2.4
%endif
%endif
-BuildRequires: jq
BuildRequires: leveldb-devel > 1.2
BuildRequires: libaio-devel
BuildRequires: libblkid-devel >= 2.17
@@ -164,6 +171,7 @@ BuildRequires: libtool
BuildRequires: libxml2-devel
BuildRequires: libuuid-devel
BuildRequires: make
+BuildRequires: ncurses-devel
BuildRequires: parted
BuildRequires: perl
BuildRequires: pkgconfig
@@ -180,7 +188,10 @@ BuildRequires: xfsprogs
BuildRequires: xfsprogs-devel
BuildRequires: xmlstarlet
BuildRequires: yasm
+BuildRequires: librabbitmq-devel
%if 0%{with make_check}
+BuildRequires: jq
+BuildRequires: python%{_python_buildid}-bcrypt
BuildRequires: python%{_python_buildid}-coverage
BuildRequires: python%{_python_buildid}-nose
BuildRequires: python%{_python_buildid}-pecan
@@ -188,6 +199,7 @@ BuildRequires: python%{_python_buildid}-requests
BuildRequires: python%{_python_buildid}-six
BuildRequires: python%{_python_buildid}-tox
BuildRequires: python%{_python_buildid}-virtualenv
+BuildRequires: python%{_python_buildid}-pyOpenSSL
BuildRequires: socat
%endif
%if 0%{with seastar}
@@ -212,14 +224,15 @@ BuildRequires: systemd
PreReq: %fillup_prereq
BuildRequires: net-tools
BuildRequires: libbz2-devel
-BuildRequires: btrfsprogs
BuildRequires: mozilla-nss-devel
BuildRequires: keyutils-devel
BuildRequires: libopenssl-devel
BuildRequires: lsb-release
BuildRequires: openldap2-devel
+#BuildRequires: krb5
+#BuildRequires: krb5-devel
BuildRequires: cunit-devel
-BuildRequires: python%{_python_buildid}-base
+BuildRequires: python%{_python_buildid}-setuptools
BuildRequires: python%{_python_buildid}-Cython
BuildRequires: python%{_python_buildid}-PrettyTable
BuildRequires: python%{_python_buildid}-Sphinx
@@ -229,22 +242,17 @@ BuildRequires: liblz4-devel >= 1.7
%if 0%{?fedora} || 0%{?rhel}
Requires: systemd
BuildRequires: boost-random
-BuildRequires: btrfs-progs
BuildRequires: nss-devel
BuildRequires: keyutils-libs-devel
BuildRequires: libibverbs-devel
BuildRequires: librdmacm-devel
BuildRequires: openldap-devel
+#BuildRequires: krb5-devel
BuildRequires: openssl-devel
BuildRequires: CUnit-devel
BuildRequires: redhat-lsb-core
-BuildRequires: python%{_python_buildid}-Cython
-BuildRequires: python%{_python_buildid}-prettytable
-BuildRequires: python%{_python_buildid}-sphinx
-BuildRequires: lz4-devel >= 1.7
-%endif
-# python34-... for RHEL, python3-... for all other supported distros
-%if 0%{?rhel}
+%if 0%{?rhel} == 7
+BuildRequires: Cython
BuildRequires: python34-devel
BuildRequires: python34-setuptools
BuildRequires: python34-Cython
@@ -253,20 +261,26 @@ BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: python3-Cython
%endif
+BuildRequires: python%{_python_buildid}-prettytable
+BuildRequires: python%{_python_buildid}-sphinx
+BuildRequires: lz4-devel >= 1.7
+%endif
# distro-conditional make check dependencies
%if 0%{with make_check}
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: python%{_python_buildid}-cherrypy
+BuildRequires: python%{_python_buildid}-jwt
BuildRequires: python%{_python_buildid}-routes
BuildRequires: python%{_python_buildid}-werkzeug
-BuildRequires: python%{_python_buildid}-bcrypt
+BuildRequires: xmlsec1
%endif
%if 0%{?suse_version}
BuildRequires: python%{_python_buildid}-CherryPy
+BuildRequires: python%{_python_buildid}-PyJWT
BuildRequires: python%{_python_buildid}-Routes
BuildRequires: python%{_python_buildid}-Werkzeug
BuildRequires: python%{_python_buildid}-numpy-devel
-BuildRequires: python%{_python_buildid}-bcrypt
+BuildRequires: xmlsec1-devel
%endif
%endif
# lttng and babeltrace for rbd-replay-prep
@@ -313,6 +327,7 @@ on commodity hardware and delivers object, block and file system storage.
%package base
Summary: Ceph Base Package
%if 0%{?suse_version}
+Group: System/Filesystems
%endif
Provides: ceph-test:/usr/bin/ceph-kvstore-tool
Requires: ceph-common = %{_epoch_prefix}%{version}-%{release}
@@ -336,11 +351,14 @@ Requires: util-linux
Requires: xfsprogs
Requires: which
%if 0%{?fedora} || 0%{?rhel}
-Requires: gdisk
+# The following is necessary due to tracker 36508 and can be removed once the
+# associated upstream bugs are resolved.
+%if 0%{with tcmalloc}
+Requires: gperftools-libs >= 2.6.1
+%endif
%endif
%if 0%{?suse_version}
Recommends: chrony
-Requires: gptfdisk
%endif
%description base
Base is the package that includes all the files shared amongst ceph servers
@@ -348,6 +366,7 @@ Base is the package that includes all the files shared amongst ceph servers
%package -n ceph-common
Summary: Ceph Common
%if 0%{?suse_version}
+Group: System/Filesystems
%endif
Requires: librbd1 = %{_epoch_prefix}%{version}-%{release}
Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
@@ -357,13 +376,12 @@ Requires: python%{_python_buildid}-rbd = %{_epoch_prefix}%{version}-%{release}
Requires: python%{_python_buildid}-cephfs = %{_epoch_prefix}%{version}-%{release}
Requires: python%{_python_buildid}-rgw = %{_epoch_prefix}%{version}-%{release}
Requires: python%{_python_buildid}-ceph-argparse = %{_epoch_prefix}%{version}-%{release}
+Requires: python%{_python_buildid}-requests
%if 0%{?fedora} || 0%{?rhel}
Requires: python%{_python_buildid}-prettytable
-Requires: python%{_python_buildid}-requests
%endif
%if 0%{?suse_version}
Requires: python%{_python_buildid}-PrettyTable
-Requires: python%{_python_buildid}-requests
%endif
%if 0%{with libradosstriper}
Requires: libradosstriper1 = %{_epoch_prefix}%{version}-%{release}
@@ -379,6 +397,7 @@ Comprised of files that are common to Ceph clients and servers.
%package mds
Summary: Ceph Metadata Server Daemon
%if 0%{?suse_version}
+Group: System/Filesystems
%endif
Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
%description mds
@@ -389,6 +408,7 @@ namespace, coordinating access to the shared OSD cluster.
%package mon
Summary: Ceph Monitor Daemon
%if 0%{?suse_version}
+Group: System/Filesystems
%endif
Provides: ceph-test:/usr/bin/ceph-monstore-tool
Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
@@ -401,26 +421,25 @@ of cluster membership, configuration, and state.
%package mgr
Summary: Ceph Manager Daemon
%if 0%{?suse_version}
+Group: System/Filesystems
%endif
Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
+Requires: python%{_python_buildid}-bcrypt
Requires: python%{_python_buildid}-pecan
Requires: python%{_python_buildid}-six
%if 0%{?fedora} || 0%{?rhel}
Requires: python%{_python_buildid}-cherrypy
-Requires: python%{_python_buildid}-jinja2
-Requires: python%{_python_buildid}-routes
Requires: python%{_python_buildid}-werkzeug
-Requires: python%{_python_buildid}-pyOpenSSL
-Requires: python%{_python_buildid}-bcrypt
%endif
%if 0%{?suse_version}
Requires: python%{_python_buildid}-CherryPy
-Requires: python%{_python_buildid}-Routes
-Requires: python%{_python_buildid}-Jinja2
Requires: python%{_python_buildid}-Werkzeug
-Requires: python%{_python_buildid}-pyOpenSSL
-Requires: python%{_python_buildid}-bcrypt
Recommends: python%{_python_buildid}-influxdb
+Recommends: ceph-mgr-dashboard = %{_epoch_prefix}%{version}-%{release}
+Recommends: ceph-mgr-diskprediction-local = %{_epoch_prefix}%{version}-%{release}
+Recommends: ceph-mgr-diskprediction-cloud = %{_epoch_prefix}%{version}-%{release}
+Recommends: ceph-mgr-rook = %{_epoch_prefix}%{version}-%{release}
+Recommends: ceph-mgr-ssh = %{_epoch_prefix}%{version}-%{release}
%endif
%description mgr
ceph-mgr enables python modules that provide services (such as the REST
@@ -428,17 +447,97 @@ module derived from Calamari) and expose CLI hooks. ceph-mgr gathers
the cluster maps, the daemon metadata, and performance counters, and
exposes all these to the python modules.
+%package mgr-dashboard
+Summary: Ceph Dashboard
+BuildArch: noarch
+%if 0%{?suse_version}
+Group: System/Filesystems
+%endif
+Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release}
+%if 0%{?fedora} || 0%{?rhel}
+Requires: python%{_python_buildid}-cherrypy
+Requires: python%{_python_buildid}-jwt
+Requires: python%{_python_buildid}-routes
+Requires: python%{_python_buildid}-werkzeug
+%endif
+%if 0%{?suse_version}
+Requires: python%{_python_buildid}-CherryPy
+Requires: python%{_python_buildid}-PyJWT
+Requires: python%{_python_buildid}-Routes
+Requires: python%{_python_buildid}-Werkzeug
+%endif
+%if 0%{?rhel} == 7
+Requires: pyOpenSSL
+%else
+Requires: python%{_python_buildid}-pyOpenSSL
+%endif
+%description mgr-dashboard
+ceph-mgr-dashboard is a manager plugin, providing a web-based application
+to monitor and manage many aspects of a Ceph cluster and related components.
+See the Dashboard documentation at http://docs.ceph.com/ for details and a
+detailed feature overview.
+
+%package mgr-diskprediction-local
+Summary: ceph-mgr diskprediction_local plugin
+BuildArch: noarch
+%if 0%{?suse_version}
+Group: System/Filesystems
+%endif
+Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release}
+Requires: numpy
+Requires: scipy
+%description mgr-diskprediction-local
+ceph-mgr-diskprediction-local is a ceph-mgr plugin that tries to predict
+disk failures using local algorithms and machine-learning databases.
+
+%package mgr-diskprediction-cloud
+Summary: ceph-mgr diskprediction_cloud plugin
+BuildArch: noarch
+%if 0%{?suse_version}
+Group: System/Filesystems
+%endif
+Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release}
+%description mgr-diskprediction-cloud
+ceph-mgr-diskprediction-cloud is a ceph-mgr plugin that tries to predict
+disk failures using services in the Google cloud.
+
+%package mgr-rook
+BuildArch: noarch
+Summary: ceph-mgr rook plugin
+%if 0%{?suse_version}
+Group: System/Filesystems
+%endif
+Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release}
+%description mgr-rook
+ceph-mgr-rook is a ceph-mgr plugin for orchestration functions using
+a Rook backend.
+
+%package mgr-ssh
+Summary: ceph-mgr ssh module
+BuildArch: noarch
+%if 0%{?suse_version}
+Group: System/Filesystems
+%endif
+Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release}
+Requires: python-remoto
+%description mgr-ssh
+ceph-mgr-ssh is a ceph-mgr module for orchestration functions using
+direct SSH connections for management operations.
+
%package fuse
Summary: Ceph fuse-based client
%if 0%{?suse_version}
+Group: System/Filesystems
%endif
Requires: fuse
+Requires: python%{python3_pkgversion}
%description fuse
FUSE based client for Ceph distributed network file system
%package -n rbd-fuse
Summary: Ceph fuse-based client
%if 0%{?suse_version}
+Group: System/Filesystems
%endif
Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
Requires: librbd1 = %{_epoch_prefix}%{version}-%{release}
@@ -448,9 +547,11 @@ FUSE based client to map Ceph rbd images to files
%package -n rbd-mirror
Summary: Ceph daemon for mirroring RBD images
%if 0%{?suse_version}
+Group: System/Filesystems
%endif
-Requires: ceph-common = %{_epoch_prefix}%{version}-%{release}
+Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
+Requires: librbd1 = %{_epoch_prefix}%{version}-%{release}
%description -n rbd-mirror
Daemon for mirroring RBD images between Ceph clusters, streaming
changes asynchronously.
@@ -458,6 +559,7 @@ changes asynchronously.
%package -n rbd-nbd
Summary: Ceph RBD client base on NBD
%if 0%{?suse_version}
+Group: System/Filesystems
%endif
Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
Requires: librbd1 = %{_epoch_prefix}%{version}-%{release}
@@ -467,8 +569,9 @@ NBD based client to map Ceph rbd images to local device
%package radosgw
Summary: Rados REST gateway
%if 0%{?suse_version}
+Group: System/Filesystems
%endif
-Requires: ceph-common = %{_epoch_prefix}%{version}-%{release}
+Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
%if 0%{with selinux}
Requires: ceph-selinux = %{_epoch_prefix}%{version}-%{release}
%endif
@@ -487,6 +590,7 @@ service as well as the OpenStack Object Storage ("Swift") API.
%package resource-agents
Summary: OCF-compliant resource agents for Ceph daemons
%if 0%{?suse_version}
+Group: System/Filesystems
%endif
Requires: ceph-base = %{_epoch_prefix}%{version}
Requires: resource-agents
@@ -499,6 +603,7 @@ managers such as Pacemaker.
%package osd
Summary: Ceph Object Storage Daemon
%if 0%{?suse_version}
+Group: System/Filesystems
%endif
Provides: ceph-test:/usr/bin/ceph-osdomap-tool
Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
@@ -512,6 +617,7 @@ and providing access to them over the network.
%package -n librados2
Summary: RADOS distributed object store client library
%if 0%{?suse_version}
+Group: System/Libraries
%endif
%if 0%{?rhel} || 0%{?fedora}
Obsoletes: ceph-libs < %{_epoch_prefix}%{version}-%{release}
@@ -525,18 +631,31 @@ store using a simple file-like interface.
%package -n librados-devel
Summary: RADOS headers
%if 0%{?suse_version}
+Group: Development/Libraries/C and C++
%endif
Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release}
Provides: librados2-devel = %{_epoch_prefix}%{version}-%{release}
Obsoletes: librados2-devel < %{_epoch_prefix}%{version}-%{release}
%description -n librados-devel
-This package contains libraries and headers needed to develop programs
+This package contains C libraries and headers needed to develop programs
+that use RADOS object store.
+
+%package -n libradospp-devel
+Summary: RADOS headers
+%if 0%{?suse_version}
+Group: Development/Libraries/C and C++
+%endif
+Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
+Requires: librados-devel = %{_epoch_prefix}%{version}-%{release}
+%description -n libradospp-devel
+This package contains C++ libraries and headers needed to develop programs
that use RADOS object store.
%package -n librgw2
Summary: RADOS gateway client library
%if 0%{?suse_version}
+Group: System/Libraries
%endif
Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
%description -n librgw2
@@ -546,6 +665,7 @@ This package provides a library implementation of the RADOS gateway
%package -n librgw-devel
Summary: RADOS gateway client library
%if 0%{?suse_version}
+Group: Development/Libraries/C and C++
%endif
Requires: librados-devel = %{_epoch_prefix}%{version}-%{release}
Requires: librgw2 = %{_epoch_prefix}%{version}-%{release}
@@ -559,6 +679,7 @@ that use RADOS gateway client library.
%package -n python-rgw
Summary: Python 2 libraries for the RADOS gateway
%if 0%{?suse_version}
+Group: Development/Libraries/Python
%endif
Requires: librgw2 = %{_epoch_prefix}%{version}-%{release}
Requires: python-rados = %{_epoch_prefix}%{version}-%{release}
@@ -571,6 +692,7 @@ gateway.
%package -n python%{python3_pkgversion}-rgw
Summary: Python 3 libraries for the RADOS gateway
%if 0%{?suse_version}
+Group: Development/Libraries/Python
%endif
Requires: librgw2 = %{_epoch_prefix}%{version}-%{release}
Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release}
@@ -582,6 +704,7 @@ gateway.
%package -n python-rados
Summary: Python 2 libraries for the RADOS object store
%if 0%{?suse_version}
+Group: Development/Libraries/Python
%endif
Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release}
@@ -593,6 +716,7 @@ object store.
%package -n python%{python3_pkgversion}-rados
Summary: Python 3 libraries for the RADOS object store
%if 0%{?suse_version}
+Group: Development/Libraries/Python
%endif
Requires: python%{python3_pkgversion}
Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
@@ -604,6 +728,7 @@ object store.
%package -n libradosstriper1
Summary: RADOS striping interface
%if 0%{?suse_version}
+Group: System/Libraries
%endif
Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
%description -n libradosstriper1
@@ -614,9 +739,11 @@ an interface very similar to the rados one.
%package -n libradosstriper-devel
Summary: RADOS striping interface headers
%if 0%{?suse_version}
+Group: Development/Libraries/C and C++
%endif
Requires: libradosstriper1 = %{_epoch_prefix}%{version}-%{release}
Requires: librados-devel = %{_epoch_prefix}%{version}-%{release}
+Requires: libradospp-devel = %{_epoch_prefix}%{version}-%{release}
Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release}
Provides: libradosstriper1-devel = %{_epoch_prefix}%{version}-%{release}
Obsoletes: libradosstriper1-devel < %{_epoch_prefix}%{version}-%{release}
@@ -628,6 +755,7 @@ that use RADOS striping interface.
%package -n librbd1
Summary: RADOS block device client library
%if 0%{?suse_version}
+Group: System/Libraries
%endif
Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
%if 0%{?suse_version}
@@ -645,9 +773,11 @@ shared library allowing applications to manage these block devices.
%package -n librbd-devel
Summary: RADOS block device headers
%if 0%{?suse_version}
+Group: Development/Libraries/C and C++
%endif
Requires: librbd1 = %{_epoch_prefix}%{version}-%{release}
Requires: librados-devel = %{_epoch_prefix}%{version}-%{release}
+Requires: libradospp-devel = %{_epoch_prefix}%{version}-%{release}
Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release}
Provides: librbd1-devel = %{_epoch_prefix}%{version}-%{release}
Obsoletes: librbd1-devel < %{_epoch_prefix}%{version}-%{release}
@@ -659,6 +789,7 @@ that use RADOS block device.
%package -n python-rbd
Summary: Python 2 libraries for the RADOS block device
%if 0%{?suse_version}
+Group: Development/Libraries/Python
%endif
Requires: librbd1 = %{_epoch_prefix}%{version}-%{release}
Requires: python-rados = %{_epoch_prefix}%{version}-%{release}
@@ -671,6 +802,7 @@ block device.
%package -n python%{python3_pkgversion}-rbd
Summary: Python 3 libraries for the RADOS block device
%if 0%{?suse_version}
+Group: Development/Libraries/Python
%endif
Requires: librbd1 = %{_epoch_prefix}%{version}-%{release}
Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release}
@@ -681,6 +813,7 @@ block device.
%package -n libcephfs2
Summary: Ceph distributed file system client library
%if 0%{?suse_version}
+Group: System/Libraries
%endif
Obsoletes: libcephfs1
%if 0%{?rhel} || 0%{?fedora}
@@ -696,6 +829,7 @@ POSIX-like interface.
%package -n libcephfs-devel
Summary: Ceph distributed file system headers
%if 0%{?suse_version}
+Group: Development/Libraries/C and C++
%endif
Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release}
Requires: librados-devel = %{_epoch_prefix}%{version}-%{release}
@@ -710,6 +844,7 @@ that use Cephs distributed file system.
%package -n python-cephfs
Summary: Python 2 libraries for Ceph distributed file system
%if 0%{?suse_version}
+Group: Development/Libraries/Python
%endif
Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release}
Requires: python-rados = %{_epoch_prefix}%{version}-%{release}
@@ -723,6 +858,7 @@ file system.
%package -n python%{python3_pkgversion}-cephfs
Summary: Python 3 libraries for Ceph distributed file system
%if 0%{?suse_version}
+Group: Development/Libraries/Python
%endif
Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release}
Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release}
@@ -735,6 +871,7 @@ file system.
%package -n python-ceph-argparse
Summary: Python 2 utility libraries for Ceph CLI
%if 0%{?suse_version}
+Group: Development/Libraries/Python
%endif
%description -n python-ceph-argparse
This package contains types and routines for Python 2 used by the Ceph CLI as
@@ -746,6 +883,7 @@ descriptions, and submitting the command to the appropriate daemon.
%package -n python%{python3_pkgversion}-ceph-argparse
Summary: Python 3 utility libraries for Ceph CLI
%if 0%{?suse_version}
+Group: Development/Libraries/Python
%endif
%description -n python%{python3_pkgversion}-ceph-argparse
This package contains types and routines for Python 3 used by the Ceph CLI as
@@ -769,6 +907,7 @@ works like an FTP client.
%package -n ceph-test
Summary: Ceph benchmarks and test tools
%if 0%{?suse_version}
+Group: System/Benchmark
%endif
Requires: ceph-common = %{_epoch_prefix}%{version}-%{release}
Requires: xmlstarlet
@@ -783,6 +922,7 @@ This package contains Ceph benchmarks and test tools.
%package -n libcephfs_jni1
Summary: Java Native Interface library for CephFS Java bindings
%if 0%{?suse_version}
+Group: System/Libraries
%endif
Requires: java
Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release}
@@ -793,6 +933,7 @@ bindings.
%package -n libcephfs_jni-devel
Summary: Development files for CephFS Java Native Interface library
%if 0%{?suse_version}
+Group: Development/Libraries/Java
%endif
Requires: java
Requires: libcephfs_jni1 = %{_epoch_prefix}%{version}-%{release}
@@ -806,6 +947,7 @@ library.
%package -n cephfs-java
Summary: Java libraries for the Ceph File System
%if 0%{?suse_version}
+Group: System/Libraries
%endif
Requires: java
Requires: libcephfs_jni1 = %{_epoch_prefix}%{version}-%{release}
@@ -819,8 +961,9 @@ This package contains the Java libraries for the Ceph File System.
%package -n rados-objclass-devel
Summary: RADOS object class development kit
%if 0%{?suse_version}
+Group: Development/Libraries/C and C++
%endif
-Requires: librados2-devel = %{_epoch_prefix}%{version}-%{release}
+Requires: libradospp-devel = %{_epoch_prefix}%{version}-%{release}
%description -n rados-objclass-devel
This package contains libraries and headers needed to develop RADOS object
class plugins.
@@ -830,6 +973,7 @@ class plugins.
%package selinux
Summary: SELinux support for Ceph MON, OSD and MDS
%if 0%{?suse_version}
+Group: System/Filesystems
%endif
Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
Requires: policycoreutils, libselinux-utils
@@ -847,6 +991,7 @@ populated file-systems.
%package -n python-ceph-compat
Summary: Compatibility package for Cephs python libraries
%if 0%{?suse_version}
+Group: Development/Libraries/Python
%endif
Obsoletes: python-ceph
Requires: python-rados = %{_epoch_prefix}%{version}-%{release}
@@ -861,6 +1006,19 @@ depending on python-ceph should be fixed to depend on python-rados,
python-rbd, python-rgw or python-cephfs instead.
%endif
+%package grafana-dashboards
+Summary: The set of Grafana dashboards for monitoring purposes
+BuildArch: noarch
+%if 0%{?suse_version}
+Group: System/Filesystems
+%endif
+%description grafana-dashboards
+This package provides a set of Grafana dashboards for monitoring of
+Ceph clusters. The dashboards require a Prometheus server setup
+collecting data from Ceph Manager "prometheus" module and Prometheus
+project "node_exporter" module. The dashboards are designed to be
+integrated with the Ceph Manager Dashboard web UI.
+
#################################################################################
# common
#################################################################################
@@ -972,7 +1130,13 @@ cd build
%else
-DWITH_LIBRADOSSTRIPER=OFF \
%endif
- -DBOOST_J=$CEPH_SMP_NCPUS
+%if 0%{with amqp_endpoint}
+ -DWITH_RADOSGW_AMQP_ENDPOINT=ON \
+%else
+ -DWITH_RADOSGW_AMQP_ENDPOINT=OFF \
+%endif
+ -DBOOST_J=$CEPH_SMP_NCPUS \
+ -DWITH_GRAFANA=ON
export VERBOSE=1
export V=1
@@ -1039,11 +1203,15 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-mds
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rgw
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-mgr
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd
+mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd-mirror
%if 0%{?suse_version}
# create __pycache__ directories and their contents
%py3_compile %{buildroot}%{python3_sitelib}
%endif
+%if 0%{?rhel} == 8
+%py_byte_compile %{__python3} %{buildroot}%{python3_sitelib}
+%endif
#################################################################################
# files and systemd scriptlets
@@ -1112,6 +1280,7 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd
%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-rgw
%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-mgr
%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-rbd
+%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-rbd-mirror
%post base
/sbin/ldconfig
@@ -1158,7 +1327,7 @@ fi
%files common
%dir %{_docdir}/ceph
%doc %{_docdir}/ceph/sample.ceph.conf
-%doc %{_docdir}/ceph/COPYING
+%license %{_docdir}/ceph/COPYING
%{_bindir}/ceph
%{_bindir}/ceph-authtool
%{_bindir}/ceph-conf
@@ -1301,7 +1470,33 @@ fi
%files mgr
%{_bindir}/ceph-mgr
-%{_libdir}/ceph/mgr
+%dir %{_datadir}/ceph/mgr
+%{_datadir}/ceph/mgr/ansible
+%{_datadir}/ceph/mgr/balancer
+%{_datadir}/ceph/mgr/crash
+%{_datadir}/ceph/mgr/deepsea
+%{_datadir}/ceph/mgr/devicehealth
+%{_datadir}/ceph/mgr/influx
+%{_datadir}/ceph/mgr/insights
+%{_datadir}/ceph/mgr/iostat
+%{_datadir}/ceph/mgr/localpool
+%{_datadir}/ceph/mgr/mgr_module.*
+%{_datadir}/ceph/mgr/mgr_util.*
+%{_datadir}/ceph/mgr/orchestrator_cli
+%{_datadir}/ceph/mgr/orchestrator.*
+%{_datadir}/ceph/mgr/osd_perf_query
+%{_datadir}/ceph/mgr/pg_autoscaler
+%{_datadir}/ceph/mgr/progress
+%{_datadir}/ceph/mgr/prometheus
+%{_datadir}/ceph/mgr/rbd_support
+%{_datadir}/ceph/mgr/restful
+%{_datadir}/ceph/mgr/selftest
+%{_datadir}/ceph/mgr/status
+%{_datadir}/ceph/mgr/telegraf
+%{_datadir}/ceph/mgr/telemetry
+%{_datadir}/ceph/mgr/test_orchestrator
+%{_datadir}/ceph/mgr/volumes
+%{_datadir}/ceph/mgr/zabbix
%{_unitdir}/ceph-mgr@.service
%{_unitdir}/ceph-mgr.target
%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/mgr
@@ -1348,6 +1543,71 @@ if [ $FIRST_ARG -ge 1 ] ; then
fi
fi
+%files mgr-dashboard
+%{_datadir}/ceph/mgr/dashboard
+
+%post mgr-dashboard
+if [ $1 -eq 1 ] ; then
+ /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || :
+fi
+
+%postun mgr-dashboard
+if [ $1 -eq 1 ] ; then
+ /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || :
+fi
+
+%files mgr-diskprediction-local
+%{_datadir}/ceph/mgr/diskprediction_local
+
+%post mgr-diskprediction-local
+if [ $1 -eq 1 ] ; then
+ /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || :
+fi
+
+%postun mgr-diskprediction-local
+if [ $1 -eq 1 ] ; then
+ /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || :
+fi
+
+%files mgr-diskprediction-cloud
+%{_datadir}/ceph/mgr/diskprediction_cloud
+
+%post mgr-diskprediction-cloud
+if [ $1 -eq 1 ] ; then
+ /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || :
+fi
+
+%postun mgr-diskprediction-cloud
+if [ $1 -eq 1 ] ; then
+ /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || :
+fi
+
+%files mgr-rook
+%{_datadir}/ceph/mgr/rook
+
+%post mgr-rook
+if [ $1 -eq 1 ] ; then
+ /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || :
+fi
+
+%postun mgr-rook
+if [ $1 -eq 1 ] ; then
+ /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || :
+fi
+
+%files mgr-ssh
+%{_datadir}/ceph/mgr/ssh
+
+%post mgr-ssh
+if [ $1 -eq 1 ] ; then
+ /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || :
+fi
+
+%postun mgr-ssh
+if [ $1 -eq 1 ] ; then
+ /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || :
+fi
+
%files mon
%{_bindir}/ceph-mon
%{_bindir}/ceph-monstore-tool
@@ -1527,9 +1787,6 @@ fi
%{_mandir}/man8/ceph-bluestore-tool.8*
%{_mandir}/man8/ceph-volume.8*
%{_mandir}/man8/ceph-volume-systemd.8*
-%if 0%{?rhel} && ! 0%{?centos}
-%attr(0755,-,-) %{_sysconfdir}/cron.hourly/subman
-%endif
%{_unitdir}/ceph-osd@.service
%{_unitdir}/ceph-osd.target
%{_unitdir}/ceph-volume@.service
@@ -1597,24 +1854,19 @@ fi
%files -n librados2
%{_libdir}/librados.so.*
%dir %{_libdir}/ceph
-%{_libdir}/ceph/libceph-common.so*
+%{_libdir}/ceph/libceph-common.so.*
%if %{with lttng}
%{_libdir}/librados_tp.so.*
%endif
-%ldconfig_scriptlets -n librados2
+%post -n librados2 -p /sbin/ldconfig
+
+%postun -n librados2 -p /sbin/ldconfig
%files -n librados-devel
%dir %{_includedir}/rados
%{_includedir}/rados/librados.h
-%{_includedir}/rados/librados.hpp
-%{_includedir}/rados/buffer.h
-%{_includedir}/rados/buffer_fwd.h
-%{_includedir}/rados/inline_memory.h
-%{_includedir}/rados/page.h
-%{_includedir}/rados/crc32c.h
%{_includedir}/rados/rados_types.h
-%{_includedir}/rados/rados_types.hpp
%{_libdir}/librados.so
%if %{with lttng}
%{_libdir}/librados_tp.so
@@ -1622,6 +1874,17 @@ fi
%{_bindir}/librados-config
%{_mandir}/man8/librados-config.8*
+%files -n libradospp-devel
+%dir %{_includedir}/rados
+%{_includedir}/rados/buffer.h
+%{_includedir}/rados/buffer_fwd.h
+%{_includedir}/rados/crc32c.h
+%{_includedir}/rados/inline_memory.h
+%{_includedir}/rados/librados.hpp
+%{_includedir}/rados/librados_fwd.hpp
+%{_includedir}/rados/page.h
+%{_includedir}/rados/rados_types.hpp
+
%if 0%{with python2}
%files -n python-rados
%{python_sitearch}/rados.so
@@ -1636,7 +1899,9 @@ fi
%files -n libradosstriper1
%{_libdir}/libradosstriper.so.*
-%ldconfig_scriptlets -n libradosstriper1
+%post -n libradosstriper1 -p /sbin/ldconfig
+
+%postun -n libradosstriper1 -p /sbin/ldconfig
%files -n libradosstriper-devel
%dir %{_includedir}/radosstriper
@@ -1651,7 +1916,9 @@ fi
%{_libdir}/librbd_tp.so.*
%endif
-%ldconfig_scriptlets -n librbd1
+%post -n librbd1 -p /sbin/ldconfig
+
+%postun -n librbd1 -p /sbin/ldconfig
%files -n librbd-devel
%dir %{_includedir}/rbd
@@ -1671,7 +1938,9 @@ fi
%{_libdir}/librgw_rados_tp.so*
%endif
-%ldconfig_scriptlets -n librgw2
+%post -n librgw2 -p /sbin/ldconfig
+
+%postun -n librgw2 -p /sbin/ldconfig
%files -n librgw-devel
%dir %{_includedir}/rados
@@ -1704,7 +1973,9 @@ fi
%files -n libcephfs2
%{_libdir}/libcephfs.so.*
-%ldconfig_scriptlets -n libcephfs2
+%post -n libcephfs2 -p /sbin/ldconfig
+
+%postun -n libcephfs2 -p /sbin/ldconfig
%files -n libcephfs-devel
%dir %{_includedir}/cephfs
@@ -1766,6 +2037,7 @@ fi
%{_bindir}/ceph_test_*
%{_bindir}/ceph-coverage
%{_bindir}/ceph-debugpack
+%{_bindir}/cephdeduptool
%{_mandir}/man8/ceph-debugpack.8*
%dir %{_libdir}/ceph
%{_libdir}/ceph/ceph-monstore-update-crush.sh
@@ -1775,7 +2047,9 @@ fi
%files -n libcephfs_jni1
%{_libdir}/libcephfs_jni.so.*
-%ldconfig_scriptlets -n libcephfs_jni1
+%post -n libcephfs_jni1 -p /sbin/ldconfig
+
+%postun -n libcephfs_jni1 -p /sbin/ldconfig
%files -n libcephfs_jni-devel
%{_libdir}/libcephfs_jni.so
@@ -1882,6 +2156,18 @@ exit 0
# actually build this meta package.
%endif
+%files grafana-dashboards
+%if 0%{?suse_version}
+%attr(0750,root,grafana) %dir %{_sysconfdir}/grafana
+%attr(0750,root,grafana) %dir %{_sysconfdir}/grafana/dashboards
+%attr(0750,root,grafana) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard
+%else
+%attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard
+%endif
+%config %{_sysconfdir}/grafana/dashboards/ceph-dashboard/*
+%doc monitoring/grafana/dashboards/README
+%doc monitoring/grafana/README.md
+
%changelog
* Wed Feb 27 2019 Boris Ranto <branto(a)redhat.com> - 1:14.1.0-1
commit 6ad252c21d249f6a31fb610d4e6f8457ed571fda
Author: Boris Ranto <branto(a)redhat.com>
Date: Wed Feb 27 19:43:22 2019 +0100
Rebase to v14.1.0
- contains updates for fixes in upstream nautilus branch
diff --git a/0001-f30-python3-execs.patch b/0001-f30-python3-execs.patch
deleted file mode 100644
index 850220e..0000000
--- a/0001-f30-python3-execs.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 7b6d91fb78be31c9a95b10ad01765eb627784119 Mon Sep 17 00:00:00 2001
-From: Boris Ranto <branto(a)redhat.com>
-Date: Tue, 27 Nov 2018 00:30:26 +0100
-Subject: [PATCH 1/4] f30 python3 execs
-
----
- src/ceph-create-keys | 2 +-
- src/ceph-volume/bin/ceph-volume | 2 +-
- src/ceph-volume/bin/ceph-volume-systemd | 2 +-
- src/ceph.in | 2 +-
- src/mount.fuse.ceph | 2 +-
- 7 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/ceph-create-keys b/src/ceph-create-keys
-index c14c02f28d..7e80aab6a2 100755
---- a/src/ceph-create-keys
-+++ b/src/ceph-create-keys
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- import argparse
- import errno
- import json
-diff --git a/src/ceph-volume/bin/ceph-volume b/src/ceph-volume/bin/ceph-volume
-index 5905cfccc0..a4f62b4a1f 100755
---- a/src/ceph-volume/bin/ceph-volume
-+++ b/src/ceph-volume/bin/ceph-volume
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
-
- from ceph_volume import main
-
-diff --git a/src/ceph-volume/bin/ceph-volume-systemd b/src/ceph-volume/bin/ceph-volume-systemd
-index 7da8ec6b1c..f6c751cf44 100755
---- a/src/ceph-volume/bin/ceph-volume-systemd
-+++ b/src/ceph-volume/bin/ceph-volume-systemd
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
-
- from ceph_volume.systemd import main
-
-diff --git a/src/ceph.in b/src/ceph.in
-index c37ce6d846..c54f9a7006 100755
---- a/src/ceph.in
-+++ b/src/ceph.in
-@@ -1,4 +1,4 @@
--#!@PYTHON_EXECUTABLE@
-+#!@PYTHON3_EXECUTABLE@
- # -*- mode:python -*-
- # vim: ts=4 sw=4 smarttab expandtab
- #
-diff --git a/src/mount.fuse.ceph b/src/mount.fuse.ceph
-index 87349a0ab0..c61625a8c2 100755
---- a/src/mount.fuse.ceph
-+++ b/src/mount.fuse.ceph
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- '''
- Helper to mount ceph-fuse from /etc/fstab. To use, add an entry
- like:
---
-2.19.1
-
diff --git a/0002-f30-gcc9.patch b/0002-f30-gcc9.patch
deleted file mode 100644
index 93e854a..0000000
--- a/0002-f30-gcc9.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- ceph-14.0.1/src/dpdk/mk/toolchain/gcc/rte.vars.mk.orig 2019-02-05 16:28:09.211608099 -0500
-+++ ceph-14.0.1/src/dpdk/mk/toolchain/gcc/rte.vars.mk 2019-02-05 18:10:00.237608099 -0500
-@@ -75,7 +75,7 @@
- WERROR_FLAGS += -Wmissing-declarations -Wold-style-definition -Wpointer-arith
- WERROR_FLAGS += -Wcast-align -Wnested-externs -Wcast-qual
- WERROR_FLAGS += -Wformat-nonliteral -Wformat-security
--WERROR_FLAGS += -Wundef -Wwrite-strings
-+WERROR_FLAGS += -Wundef -Wwrite-strings -Wno-address-of-packed-member
-
- ifeq ($(RTE_DEVEL_BUILD),y)
- WERROR_FLAGS += -Werror
-@@ -99,5 +99,6 @@
- WERROR_FLAGS += -Wno-uninitialized
- endif
-
-+
- export CC AS AR LD OBJCOPY OBJDUMP STRIP READELF
- export TOOLCHAIN_CFLAGS TOOLCHAIN_LDFLAGS TOOLCHAIN_ASFLAGS
---- ceph-14.0.1/src/spdk/dpdk/mk/toolchain/gcc/rte.vars.mk.orig 2019-02-05 18:28:01.999608099 -0500
-+++ ceph-14.0.1/src/spdk/dpdk/mk/toolchain/gcc/rte.vars.mk 2019-02-05 18:29:08.664608099 -0500
-@@ -47,7 +47,7 @@
- WERROR_FLAGS += -Wmissing-declarations -Wold-style-definition -Wpointer-arith
- WERROR_FLAGS += -Wcast-align -Wnested-externs -Wcast-qual
- WERROR_FLAGS += -Wformat-nonliteral -Wformat-security
--WERROR_FLAGS += -Wundef -Wwrite-strings -Wdeprecated
-+WERROR_FLAGS += -Wundef -Wwrite-strings -Wno-address-of-packed-member -Wdeprecated
-
- ifeq ($(RTE_DEVEL_BUILD),y)
- WERROR_FLAGS += -Werror
---- ceph-14.0.1/src/common/config.cc.orig 2019-02-06 09:08:43.078608099 -0500
-+++ ceph-14.0.1/src/common/config.cc 2019-02-06 12:10:13.484608099 -0500
-@@ -1340,6 +1340,8 @@
- template<typename Size>
- struct get_size_visitor : public boost::static_visitor<Size>
- {
-+ get_size_visitor() {}
-+
- template<typename T>
- Size operator()(const T&) const {
- return -1;
---- ceph-14.0.1/src/dmclock/src/dmclock_server.h.orig 2019-02-07 07:10:17.778608099 -0500
-+++ ceph-14.0.1/src/dmclock/src/dmclock_server.h 2019-02-07 07:29:47.868608099 -0500
-@@ -829,8 +829,8 @@
- AtLimitParam at_limit_param,
- double _anticipation_timeout) :
- client_info_f(_client_info_f),
-- at_limit(get_or_default<AtLimit>(at_limit_param, AtLimit::Reject)),
-- reject_threshold(get_or_default<RejectThreshold>(at_limit_param, 0)),
-+ at_limit(get_or_default(at_limit_param, AtLimit::Reject)),
-+ reject_threshold(get_or_default(at_limit_param, RejectThreshold{0})),
- anticipation_timeout(_anticipation_timeout),
- finishing(false),
- idle_age(std::chrono::duration_cast<Duration>(_idle_age)),
diff --git a/0003-cve-2019-3821.patch b/0003-cve-2019-3821.patch
deleted file mode 100644
index f25bbb7..0000000
--- a/0003-cve-2019-3821.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur ceph-14.0.1/src/civetweb/src/civetweb.c ceph-14.0.1.mod/src/civetweb/src/civetweb.c
---- ceph-14.0.1/src/civetweb/src/civetweb.c 2018-06-20 15:53:52.000000000 +0200
-+++ ceph-14.0.1.mod/src/civetweb/src/civetweb.c 2019-02-21 08:28:09.797504543 +0100
-@@ -16268,6 +16268,9 @@
- conn->request_info.client_cert = 0;
- }
- }
-+ else {
-+ close_connection(conn);
-+ }
- #endif
- } else {
- /* process HTTP connection */
diff --git a/ceph.spec b/ceph.spec
index 7897311..fe09957 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -95,8 +95,8 @@
# main package definition
#################################################################################
Name: ceph
-Version: 14.0.1
-Release: 2%{?dist}
+Version: 14.1.0
+Release: 1%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 1
%endif
@@ -110,10 +110,7 @@ License: LGPL-2.1 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and
%if 0%{?suse_version}
%endif
URL: http://ceph.com/
-Source0: %{?_remote_tarball_prefix}ceph-14.0.1.tar.bz2
-Patch001: 0001-f30-python3-execs.patch
-Patch002: 0002-f30-gcc9.patch
-Patch003: 0003-cve-2019-3821.patch
+Source0: %{?_remote_tarball_prefix}ceph-%{version}.tar.bz2
ExcludeArch: i686 armv7hl
#################################################################################
# dependencies that apply across all distro families
@@ -868,7 +865,7 @@ python-rbd, python-rgw or python-cephfs instead.
# common
#################################################################################
%prep
-%autosetup -p1 -n ceph-14.0.1
+%autosetup -p1
%build
@@ -1887,6 +1884,9 @@ exit 0
%changelog
+* Wed Feb 27 2019 Boris Ranto <branto(a)redhat.com> - 1:14.1.0-1
+- Rebase to v14.1.0 (updated for fixes in upstream nautilus branch)
+
* Thu Feb 21 2019 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:14.0.1-2
- Eliminate redundant CMAKE_* macros when using %%cmake global
- Add CMAKE_BUILD_TYPE=RelWithDeb(ug)Info and BUILD_CONFIG=rpmbuild
diff --git a/sources b/sources
index dd95f3e..342383d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ceph-14.0.1.tar.bz2) = a949ea3cbd6ee0cae1cf60193b3e8de80b7af43155869f8f504e2aeedc7ee2db5d484013572b28d5ae1a0a0b7b619ee912f536a0015f4c9d18ea2a8705f9150a
+SHA512 (ceph-14.1.0.tar.bz2) = 6d24cd24092a75ef8b2bc14543f3eca33528467af39322f4ae9169b28fccf2b1840caeec7998cf305ac0e9dc52e8fd68b8c6a90baf0b9da6a1d37e4f10a412eb
commit 621cf4d6f7bf09d3c9579366bdabf6aa13fb8562
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Fri Feb 22 10:52:18 2019 -0500
Eliminate redundant CMAKE_* macros when using %cmake global
Add CMAKE_BUILD_TYPE=RelWithDeb(ug)Info and BUILD_CONFIG=rpmbuild
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/ceph.spec b/ceph.spec
index 3b28ef6..7897311 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -96,7 +96,7 @@
#################################################################################
Name: ceph
Version: 14.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 1
%endif
@@ -923,14 +923,13 @@ cd build
%global cmake cmake3
%endif
%{cmake} .. \
- -DCMAKE_INSTALL_PREFIX=%{_prefix} \
- -DCMAKE_INSTALL_LIBDIR=%{_libdir} \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DBUILD_CONFIG=rpmbuild \
-DCMAKE_INSTALL_LIBEXECDIR=%{_libexecdir} \
-DCMAKE_INSTALL_LOCALSTATEDIR=%{_localstatedir} \
-DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} \
-DCMAKE_INSTALL_MANDIR=%{_mandir} \
-DCMAKE_INSTALL_DOCDIR=%{_docdir}/ceph \
- -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \
-DWITH_MANPAGE=ON \
-DWITH_PYTHON3=ON \
-DWITH_MGR_DASHBOARD_FRONTEND=OFF \
@@ -1888,6 +1887,10 @@ exit 0
%changelog
+* Thu Feb 21 2019 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:14.0.1-2
+- Eliminate redundant CMAKE_* macros when using %%cmake global
+- Add CMAKE_BUILD_TYPE=RelWithDeb(ug)Info and BUILD_CONFIG=rpmbuild
+
* Wed Feb 20 2019 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:14.0.1-1
- rebuild for f31/rawhide, including:
- use the %%{cmake} %%global to get all the extra Fedora cmake options.
commit a9b0fc4948caae9d0d248cbfd8c7ff382034226e
Author: Boris Ranto <branto(a)redhat.com>
Date: Thu Feb 21 08:33:15 2019 +0100
Fix cve-2019-3821
Signed-off-by: Boris Ranto <branto(a)redhat.com>
diff --git a/0003-cve-2019-3821.patch b/0003-cve-2019-3821.patch
new file mode 100644
index 0000000..f25bbb7
--- /dev/null
+++ b/0003-cve-2019-3821.patch
@@ -0,0 +1,13 @@
+diff -ur ceph-14.0.1/src/civetweb/src/civetweb.c ceph-14.0.1.mod/src/civetweb/src/civetweb.c
+--- ceph-14.0.1/src/civetweb/src/civetweb.c 2018-06-20 15:53:52.000000000 +0200
++++ ceph-14.0.1.mod/src/civetweb/src/civetweb.c 2019-02-21 08:28:09.797504543 +0100
+@@ -16268,6 +16268,9 @@
+ conn->request_info.client_cert = 0;
+ }
+ }
++ else {
++ close_connection(conn);
++ }
+ #endif
+ } else {
+ /* process HTTP connection */
diff --git a/ceph.spec b/ceph.spec
index 96bb308..3b28ef6 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -113,6 +113,7 @@ URL: http://ceph.com/
Source0: %{?_remote_tarball_prefix}ceph-14.0.1.tar.bz2
Patch001: 0001-f30-python3-execs.patch
Patch002: 0002-f30-gcc9.patch
+Patch003: 0003-cve-2019-3821.patch
ExcludeArch: i686 armv7hl
#################################################################################
# dependencies that apply across all distro families
commit fcfe376de33754c6da322728898f75eb6b37e46a
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Wed Feb 20 09:27:29 2019 -0500
rebuild for f31/rawhide, including:
use the %{cmake} %global to get all the extra Fedora cmake options.
(This is Fedora, so don't care so much about rhel/rhel7 cmake3.)
reset epoch to 1. Note we use (have been using) epoch=1 in Fedora since
forever. I presume this is so that people can install Ceph RPMs from
ceph.com if they prefer those, which use epoch=2, and not run into issues
when updating.
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/ceph.spec b/ceph.spec
index 1b29164..96bb308 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -96,9 +96,9 @@
#################################################################################
Name: ceph
Version: 14.0.1
-Release: 4%{?dist}
+Release: 1%{?dist}
%if 0%{?fedora} || 0%{?rhel}
-Epoch: 2
+Epoch: 1
%endif
# define _epoch_prefix macro which will expand to the empty string if epoch is
@@ -919,11 +919,9 @@ env | sort
mkdir build
cd build
%if 0%{?rhel} == 7
-CMAKE=cmake3
-%else
-CMAKE=cmake
+%global cmake cmake3
%endif
-${CMAKE} .. \
+%{cmake} .. \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DCMAKE_INSTALL_LIBDIR=%{_libdir} \
-DCMAKE_INSTALL_LIBEXECDIR=%{_libexecdir} \
@@ -1889,7 +1887,16 @@ exit 0
%changelog
-* Thu Feb 8 2019 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.0.1-4
+* Wed Feb 20 2019 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:14.0.1-1
+- rebuild for f31/rawhide, including:
+- use the %%{cmake} %%global to get all the extra Fedora cmake options.
+ (This is Fedora, so don't care so much about rhel/rhel7 cmake3.)
+- reset epoch to 1. Note we use (have been using) epoch=1 in Fedora since
+ forever. I presume this is so that people can install Ceph RPMs from
+ ceph.com if they prefer those, which use epoch=2, and not run into issues
+ when updating.
+
+* Thu Feb 7 2019 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.0.1-4
- w/ fixes for gcc9
* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2:14.0.1-3
5 years, 1 month
Architecture specific change in rpms/firefox.git
by githook-noreply＠fedoraproject.org
The package rpms/firefox.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/firefox.git/commit/?id=830c907bb5....
Change:
+ExcludeArch: armv7hl
Thanks.
Full change:
============
commit 830c907bb53b34c7bbca1cb5ec889a2c12ea0035
Author: Martin Stransky <stransky(a)redhat.com>
Date: Fri Mar 1 08:30:19 2019 +0100
Revered the debug setup
diff --git a/firefox.spec b/firefox.spec
index dc523a6..8498e15 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -1,5 +1,5 @@
# Disabled arm due to rhbz#1658940
-ExcludeArch: armv7hl, s390x, ppc64
+ExcludeArch: armv7hl
%global system_nss 1
%global system_ffi 1
@@ -16,7 +16,7 @@ ExcludeArch: armv7hl, s390x, ppc64
%global build_with_clang 0
%global use_bundled_cbindgen 1
%ifnarch %{ix86} ppc64 s390x
-%global build_with_pgo 0
+%global build_with_pgo 1
%endif
%if 0%{?fedora} > 29
%global wayland_backend_default 1
@@ -30,7 +30,7 @@ ExcludeArch: armv7hl, s390x, ppc64
%else
%global debug_build 1
%else
-%global debug_build 1
+%global debug_build 0
%endif
%if 0%{?build_with_pgo}
@@ -83,7 +83,7 @@ ExcludeArch: armv7hl, s390x, ppc64
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 65.0.1
-Release: 2.debug%{?pre_tag}%{?dist}
+Release: 2%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version...
5 years, 1 month
Architecture specific change in rpms/firefox.git
by githook-noreply＠fedoraproject.org
The package rpms/firefox.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/firefox.git/commit/?id=830c907bb5....
Change:
+ExcludeArch: armv7hl
Thanks.
Full change:
============
commit 830c907bb53b34c7bbca1cb5ec889a2c12ea0035
Author: Martin Stransky <stransky(a)redhat.com>
Date: Fri Mar 1 08:30:19 2019 +0100
Revered the debug setup
diff --git a/firefox.spec b/firefox.spec
index dc523a6..8498e15 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -1,5 +1,5 @@
# Disabled arm due to rhbz#1658940
-ExcludeArch: armv7hl, s390x, ppc64
+ExcludeArch: armv7hl
%global system_nss 1
%global system_ffi 1
@@ -16,7 +16,7 @@ ExcludeArch: armv7hl, s390x, ppc64
%global build_with_clang 0
%global use_bundled_cbindgen 1
%ifnarch %{ix86} ppc64 s390x
-%global build_with_pgo 0
+%global build_with_pgo 1
%endif
%if 0%{?fedora} > 29
%global wayland_backend_default 1
@@ -30,7 +30,7 @@ ExcludeArch: armv7hl, s390x, ppc64
%else
%global debug_build 1
%else
-%global debug_build 1
+%global debug_build 0
%endif
%if 0%{?build_with_pgo}
@@ -83,7 +83,7 @@ ExcludeArch: armv7hl, s390x, ppc64
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 65.0.1
-Release: 2.debug%{?pre_tag}%{?dist}
+Release: 2%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version...
5 years, 1 month
Architecture specific change in rpms/firefox.git
by githook-noreply＠fedoraproject.org
The package rpms/firefox.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/firefox.git/commit/?id=830c907bb5....
Change:
+ExcludeArch: armv7hl
Thanks.
Full change:
============
commit 830c907bb53b34c7bbca1cb5ec889a2c12ea0035
Author: Martin Stransky <stransky(a)redhat.com>
Date: Fri Mar 1 08:30:19 2019 +0100
Revered the debug setup
diff --git a/firefox.spec b/firefox.spec
index dc523a6..8498e15 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -1,5 +1,5 @@
# Disabled arm due to rhbz#1658940
-ExcludeArch: armv7hl, s390x, ppc64
+ExcludeArch: armv7hl
%global system_nss 1
%global system_ffi 1
@@ -16,7 +16,7 @@ ExcludeArch: armv7hl, s390x, ppc64
%global build_with_clang 0
%global use_bundled_cbindgen 1
%ifnarch %{ix86} ppc64 s390x
-%global build_with_pgo 0
+%global build_with_pgo 1
%endif
%if 0%{?fedora} > 29
%global wayland_backend_default 1
@@ -30,7 +30,7 @@ ExcludeArch: armv7hl, s390x, ppc64
%else
%global debug_build 1
%else
-%global debug_build 1
+%global debug_build 0
%endif
%if 0%{?build_with_pgo}
@@ -83,7 +83,7 @@ ExcludeArch: armv7hl, s390x, ppc64
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 65.0.1
-Release: 2.debug%{?pre_tag}%{?dist}
+Release: 2%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version...
5 years, 1 month
Architecture specific change in rpms/firefox.git
by githook-noreply＠fedoraproject.org
The package rpms/firefox.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/firefox.git/commit/?id=830c907bb5....
Change:
+ExcludeArch: armv7hl
Thanks.
Full change:
============
commit 830c907bb53b34c7bbca1cb5ec889a2c12ea0035
Author: Martin Stransky <stransky(a)redhat.com>
Date: Fri Mar 1 08:30:19 2019 +0100
Revered the debug setup
diff --git a/firefox.spec b/firefox.spec
index dc523a6..8498e15 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -1,5 +1,5 @@
# Disabled arm due to rhbz#1658940
-ExcludeArch: armv7hl, s390x, ppc64
+ExcludeArch: armv7hl
%global system_nss 1
%global system_ffi 1
@@ -16,7 +16,7 @@ ExcludeArch: armv7hl, s390x, ppc64
%global build_with_clang 0
%global use_bundled_cbindgen 1
%ifnarch %{ix86} ppc64 s390x
-%global build_with_pgo 0
+%global build_with_pgo 1
%endif
%if 0%{?fedora} > 29
%global wayland_backend_default 1
@@ -30,7 +30,7 @@ ExcludeArch: armv7hl, s390x, ppc64
%else
%global debug_build 1
%else
-%global debug_build 1
+%global debug_build 0
%endif
%if 0%{?build_with_pgo}
@@ -83,7 +83,7 @@ ExcludeArch: armv7hl, s390x, ppc64
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 65.0.1
-Release: 2.debug%{?pre_tag}%{?dist}
+Release: 2%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version...
5 years, 1 month