1. photon
  2. Commit c0159471b5bb64f06f4e10e2082b567dcd0c38d2
Browse code

ceph : Updated to version 12.2.4, fix CVE-2018-7262

Change-Id: I19962fdcd61b784492aef9d2c126d8aadc80942a
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5074
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Dheeraj S Shetty <dheerajs@vmware.com>

Xiaolin Li authored on 2018/04/24 12:52:16
Showing 2 changed files
SPECS/ceph/ceph.spec
History View file @ c015947
... ... 
@@ -1,3 +1,4 @@
1 
+%global debug_package %{nil}
1 2 
 %bcond_with lowmem_builder
2 3 
 %{!?_udevrulesdir: %define _udevrulesdir /lib/udev/rules.d}
3 4 
 %{!?tmpfiles_create: %define tmpfiles_create systemd-tmpfiles --create}
... ... 
@@ -12,15 +13,15 @@
12 12 
 # common
13 13 
 #################################################################################
14 14 
 Name:       ceph
15 
-Version:    11.2.0
16 
-Release:    10%{?dist}
15 
+Version:    12.2.4
16 
+Release:    1%{?dist}
17 17 
 Epoch:      1
18 18 
 Summary:    User space components of the Ceph file system
19 19 
 License:    LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT
20 20 
 Group:      System/Filesystems
21 21 
 URL:        http://ceph.com/
22 22 
 Source0:    http://ceph.com/download/%{name}-%{version}.tar.gz
23 
-%define sha1 ceph=8bb87494c9b47b2ef02bfe51bb981a8cd94fa9fb
23 
+%define sha1 ceph=df93bc3fac55249f5f0d30caa567962b387693dd
24 24 
 Vendor:     VMware, Inc.
25 25 
 Distribution:   Photon
26 26 
 #################################################################################
... ... 
@@ -77,6 +78,7 @@ BuildRequires:  cython
77 77 
 BuildRequires:  cython3
78 78 
 BuildRequires:  python-setuptools
79 79 
 BuildRequires:  fcgi-devel
80 
+BuildRequires:  gperf
80 81
81 82
82 83 
 %description
... ... 
@@ -216,6 +218,7 @@ License:    LGPL-2.0
216 216 
 %if 0%{?rhel} || 0%{?fedora}
217 217 
 Obsoletes:  ceph-libs < %{epoch}:%{version}-%{release}
218 218 
 Requires:   libatomic_ops
219 
+Requires:   libceph-common = %{epoch}:%{version}-%{release}
219 220 
 %endif
220 221 
 %description -n librados2
221 222 
 RADOS is a reliable, autonomic distributed object storage cluster
... ... 
@@ -240,6 +243,7 @@ Summary:    RADOS gateway client library
240 240 
 Group:      System Environment/Libraries
241 241 
 License:    LGPL-2.0
242 242 
 Requires:   librados2 = %{epoch}:%{version}-%{release}
243 
+Requires:   libceph-common = %{epoch}:%{version}-%{release}
243 244 
 %description -n librgw2
244 245 
 This package provides a library implementation of the RADOS gateway
245 246 
 (distributed object store with S3 and Swift personalities).
... ... 
@@ -297,11 +301,19 @@ Requires:   librados2 = %{epoch}:%{version}-%{release}
297 297 
 This package contains Python 3 libraries for interacting with Cephs RADOS
298 298 
 object store.
299 299
300 
+%package -n libceph-common
301 
+Summary:    libceph-common
302 
+Group:      System Environment/Libraries
303 
+License:    LGPL-2.0
304 
+%description -n libceph-common
305 
+libceph-common.
306 
+
300 307 
 %package -n libradosstriper1
301 308 
 Summary:    RADOS striping interface
302 309 
 Group:      System Environment/Libraries
303 310 
 License:    LGPL-2.0
304 311 
 Requires:   librados2 = %{epoch}:%{version}-%{release}
312 
+Requires:   libceph-common = %{epoch}:%{version}-%{release}
305 313 
 %description -n libradosstriper1
306 314 
 Striping interface built on top of the rados library, allowing
307 315 
 to stripe bigger objects onto several standard rados objects using
... ... 
@@ -326,6 +338,8 @@ Group:      System Environment/Libraries
326 326 
 License:    LGPL-2.0
327 327 
 Requires:   librados2 = %{epoch}:%{version}-%{release}
328 328 
 Obsoletes:  ceph-libs < %{epoch}:%{version}-%{release}
329 
+Requires:   libceph-common = %{epoch}:%{version}-%{release}
330 
+
329 331 
 %description -n librbd1
330 332 
 RBD is a block device striped across multiple distributed objects in
331 333 
 RADOS, a reliable, autonomic distributed object storage cluster
... ... 
@@ -372,6 +386,7 @@ Group:      System Environment/Libraries
372 372 
 License:    LGPL-2.0
373 373 
 Obsoletes:  ceph-libs < %{epoch}:%{version}-%{release}
374 374 
 Obsoletes:  ceph-libcephfs
375 
+Requires:   libceph-common = %{epoch}:%{version}-%{release}
375 376 
 %description -n libcephfs2
376 377 
 Ceph is a distributed network file system designed to provide excellent
377 378 
 performance, reliability, and scalability. This is a shared library
... ... 
@@ -473,7 +488,7 @@ cmake .. \
473 473 
     -DWITH_XIO=OFF \
474 474 
     -DWITH_TESTS=OFF \
475 475 
     -DWITH_LTTNG=OFF \
476 
-    -DHAVE_BABELTRACE=OFF \
476 
+    -DWITH_BABELTRACE=OFF \
477 477 
     $CEPH_EXTRA_CMAKE_ARGS \
478 478 
     -DWITH_OCF=OFF
479 479
... ... 
@@ -496,7 +511,6 @@ sed -i 's/\/bin/\/usr\/bin/g' %{buildroot}%{_bindir}/ceph-detect-init
496 496 
 sed -i 's/\/bin/\/usr\/bin/g' %{buildroot}%{_sbindir}/ceph-disk
497 497 
 install -m 0644 -D src/logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ceph
498 498 
 chmod 0644 %{buildroot}%{_docdir}/ceph/sample.ceph.conf
499 
-chmod 0644 %{buildroot}%{_docdir}/ceph/sample.fetch_config
500 499
501 500 
 # udev rules
502 501 
 install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules
... ... 
@@ -530,7 +544,6 @@ rm -rf %{buildroot}
530 530 
 %docdir %{_docdir}
531 531 
 %dir %{_docdir}/ceph
532 532 
 %{_docdir}/ceph/sample.ceph.conf
533 
-%{_docdir}/ceph/sample.fetch_config
534 533 
 %{_bindir}/crushtool
535 534 
 %{_bindir}/monmaptool
536 535 
 %{_bindir}/osdmaptool
... ... 
@@ -593,7 +606,10 @@ rm -rf %{buildroot}
593 593 
 %{_bindir}/rbd-replay
594 594 
 %{_bindir}/rbd-replay-many
595 595 
 %{_bindir}/rbdmap
596 
+%{_bindir}/ceph-bluestore-tool
596 597 
 %{_sbindir}/mount.ceph
598 
+%{_sbindir}/ceph-volume
599 
+%{_sbindir}/ceph-volume-systemd
597 600 
 %if %{with lttng}
598 601 
 %{_bindir}/rbd-replay-prep
599 602 
 %endif
... ... 
@@ -609,6 +625,7 @@ rm -rf %{buildroot}
609 609 
 %config %{_sysconfdir}/bash_completion.d/rbd
610 610 
 %config(noreplace) %{_sysconfdir}/ceph/rbdmap
611 611 
 %{_unitdir}/rbdmap.service
612 
+%{_unitdir}/ceph-volume@.service
612 613 
 %{python_sitelib}/ceph_argparse.py*
613 614 
 %{python_sitelib}/ceph_daemon.py*
614 615 
 %dir %{_udevrulesdir}
... ... 
@@ -770,6 +787,8 @@ fi
770 770 
 %{_bindir}/radosgw-admin
771 771 
 %{_bindir}/radosgw-token
772 772 
 %{_bindir}/radosgw-object-expirer
773 
+%{_bindir}/radosgw-es
774 
+
773 775 
 %config %{_sysconfdir}/bash_completion.d/radosgw-admin
774 776 
 %dir %{_localstatedir}/lib/ceph/radosgw
775 777 
 %{_unitdir}/ceph-radosgw@.service
... ... 
@@ -799,11 +818,9 @@ fi
799 799
800 800 
 %files osd
801 801 
 %{_bindir}/ceph-clsinfo
802 
-%{_bindir}/ceph-bluefs-tool
803 802 
 %{_bindir}/ceph-objectstore-tool
804 803 
 %{_bindir}/ceph-osd
805 804 
 %{_sbindir}/ceph-disk
806 
-%{_sbindir}/ceph-disk-udev
807 805 
 %{_libexecdir}/ceph/ceph-osd-prestart.sh
808 806 
 %dir %{_udevrulesdir}
809 807 
 %{_udevrulesdir}/60-ceph-by-parttypeuuid.rules
... ... 
@@ -835,6 +852,11 @@ if [ $FIRST_ARG -ge 1 ] ; then
835 835 
   fi
836 836 
 fi
837 837
838 
+%files -n libceph-common
839 
+%defattr(-,root,root,-)
840 
+%{_libdir}/ceph/libceph-common.so*
841 
+
842 
+
838 843 
 %files -n librados2
839 844 
 %defattr(-,root,root,-)
840 845 
 %{_libdir}/librados.so.*
... ... 
@@ -935,6 +957,7 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
935 935 
 %dir %{_includedir}/rados
936 936 
 %{_includedir}/rados/librgw.h
937 937 
 %{_includedir}/rados/rgw_file.h
938 
+%{_includedir}/rados/objclass.h
938 939 
 %{_libdir}/librgw.so
939 940
940 941 
 %files -n python-rgw
... ... 
@@ -979,6 +1002,8 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
979 979 
 %{python_sitearch}/cephfs.so
980 980 
 %{python_sitearch}/cephfs-*.egg-info
981 981 
 %{python_sitelib}/ceph_volume_client.py*
982 
+%{python_sitelib}/ceph_volume/*
983 
+%{python_sitearch}/ceph_volume-*.egg-info
982 984
983 985 
 %files -n python3-cephfs
984 986 
 %defattr(-,root,root,-)
... ... 
@@ -997,6 +1022,8 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
997 997 
 # actually build this meta package.
998 998
999 999 
 %changelog
1000 
+*   Thu Apr 19 2018 Xiaolin Li <xiaolinl@vmware.com> 12.2.4-1
1001 
+-   Updated to version 12.2.4, fix CVE-2018-7262
1000 1002 
 *   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 11.2.0-10
1001 1003 
 -   Requires /bin/grep, /usr/bin/which, or toybox
1002 1004 
 *   Tue Aug 22 2017 Dheeraj Shetty <dheerajs@vmware.com> 11.2.0-9
SPECS/device-mapper-multipath/device-mapper-multipath.spec
History View file @ c015947
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:    Provide tools to manage multipath devices
2 2 
 Name:       device-mapper-multipath
3 3 
 Version:    0.7.3
4 
-Release:    1%{?dist}
4 
+Release:    2%{?dist}
5 5 
 License:    GPL+
6 6 
 Group:      System Environment/Base
7 7 
 URL:        http://christophe.varoqui.free.fr/
... ... 
@@ -9,7 +9,7 @@ Source0:    multipath-tools-a0e0752.tar.gz
9 9 
 %define git_commit_short a0e0752
10 10 
 %define sha1 multipath-tools=56c171d5ed567654a10996b6d9892944d9d0cb48
11 11 
 BuildRequires:  userspace-rcu-devel
12 
-BuildRequires:  librados-devel
12 
+BuildRequires:  librados-devel >= 12.2.4
13 13 
 BuildRequires:  libaio-devel
14 14 
 BuildRequires:  device-mapper-devel
15 15 
 BuildRequires:  readline-devel
... ... 
@@ -95,6 +95,8 @@ rm -rf %{buildroot}
95 95 
 %{_mandir}/man8/kpartx.8.gz
96 96
97 97 
 %changelog
98 
+*   Mon Apr 23 2018 Xiaolin Li <xiaolinl@vmware.com> 0.7.3-2
99 
+-   Build with librados-devel 12.2.4
98 100 
 *   Wed Oct 04 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.7.3-1
99 101 
 -   Update to 0.7.3
100 102 
 *   Tue May 9  2017 Bo Gan <ganb@vmware.com> 0.7.1-1