[ceph/f21] Fix several issues with spec file

branto branto at fedoraproject.org
Wed Mar 4 18:12:41 UTC 2015


commit cba5e9554c2429510863e2fb6bd00019c5b751c8
Author: Boris Ranto <branto at redhat.com>
Date:   Wed Mar 4 19:11:14 2015 +0100

    Fix several issues with spec file
    
    - Perform a hardened build
    - Use git-formatted patches
    - Do not remove conf files on uninstall
    - Remove the cleanup post-script function

 0001-gperftools-deprecated-google-includes.patch   | 27 ++++++++++
 ...-format-causes-compiler-options-collision.patch | 25 +++++++++
 ...003-Backport-pull-request-2937-to-firefly.patch |  8 +--
 ceph-call-rados-shutdown-explicitly.patch          | 31 -----------
 ceph-google-gperftools.patch                       | 13 -----
 ceph-no-format-security.patch                      | 11 ----
 ceph-remove-rados-py-destructor.patch              | 61 ----------------------
 ceph.spec                                          | 21 ++++----
 8 files changed, 68 insertions(+), 129 deletions(-)
---
diff --git a/0001-gperftools-deprecated-google-includes.patch b/0001-gperftools-deprecated-google-includes.patch
new file mode 100644
index 0000000..40cfc9c
--- /dev/null
+++ b/0001-gperftools-deprecated-google-includes.patch
@@ -0,0 +1,27 @@
+From 6c280200b42758d3e84cfd1a5b256171cab132d1 Mon Sep 17 00:00:00 2001
+From: Boris Ranto <branto at redhat.com>
+Date: Wed, 14 Jan 2015 07:46:56 +0100
+Subject: [PATCH 1/3] gperftools deprecated google/* includes
+
+---
+ src/perfglue/heap_profiler.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/perfglue/heap_profiler.cc b/src/perfglue/heap_profiler.cc
+index 6b079b8..cdd5ccb 100644
+--- a/src/perfglue/heap_profiler.cc
++++ b/src/perfglue/heap_profiler.cc
+@@ -12,8 +12,8 @@
+  * 
+  */
+ 
+-#include <google/heap-profiler.h>
+-#include <google/malloc_extension.h>
++#include <gperftools/heap-profiler.h>
++#include <gperftools/malloc_extension.h>
+ #include "heap_profiler.h"
+ #include "common/environment.h"
+ #include "common/LogClient.h"
+-- 
+1.9.3
+
diff --git a/0002-Wno-format-causes-compiler-options-collision.patch b/0002-Wno-format-causes-compiler-options-collision.patch
new file mode 100644
index 0000000..dd24eda
--- /dev/null
+++ b/0002-Wno-format-causes-compiler-options-collision.patch
@@ -0,0 +1,25 @@
+From 213613337d56bf1b1257f043c7b737ee86b0e1be Mon Sep 17 00:00:00 2001
+From: Boris Ranto <branto at redhat.com>
+Date: Wed, 14 Jan 2015 07:47:47 +0100
+Subject: [PATCH 2/3] -Wno-format causes compiler options collision
+
+---
+ src/test/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/test/Makefile.am b/src/test/Makefile.am
+index 69f9e84..9ede275 100644
+--- a/src/test/Makefile.am
++++ b/src/test/Makefile.am
+@@ -646,7 +646,7 @@ bin_DEBUGPROGRAMS += ceph_test_librbd
+ if LINUX
+ ceph_test_librbd_fsx_SOURCES = test/librbd/fsx.c
+ ceph_test_librbd_fsx_LDADD = $(LIBRBD) $(LIBRADOS) -lm
+-ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS} -Wno-format
++ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS}
+ bin_DEBUGPROGRAMS += ceph_test_librbd_fsx
+ endif
+ 
+-- 
+1.9.3
+
diff --git a/ceph-common-do-not-unlock-rwlock-on-destruction.patch b/0003-Backport-pull-request-2937-to-firefly.patch
similarity index 79%
rename from ceph-common-do-not-unlock-rwlock-on-destruction.patch
rename to 0003-Backport-pull-request-2937-to-firefly.patch
index b6ba221..c61c63b 100644
--- a/ceph-common-do-not-unlock-rwlock-on-destruction.patch
+++ b/0003-Backport-pull-request-2937-to-firefly.patch
@@ -1,14 +1,14 @@
-From 922247e25bfb64bdbe43dd8133881aaf405b8a0b Mon Sep 17 00:00:00 2001
+From 149481ac6dc52a852fb53800384a99e3d69ad11a Mon Sep 17 00:00:00 2001
 From: Boris Ranto <branto at redhat.com>
 Date: Mon, 8 Dec 2014 08:36:37 +0100
-Subject: [PATCH] Backport pull request #2937 to firefly
+Subject: [PATCH 3/3] Backport pull request #2937 to firefly
 
 ---
  src/common/RWLock.h | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/common/RWLock.h b/src/common/RWLock.h
-index f901ac0..4699b66 100644
+index f901ac0..f4d1937 100644
 --- a/src/common/RWLock.h
 +++ b/src/common/RWLock.h
 @@ -36,7 +36,9 @@ public:
@@ -23,5 +23,5 @@ index f901ac0..4699b66 100644
    }
  
 -- 
-2.1.3
+1.9.3
 
diff --git a/ceph.spec b/ceph.spec
index 3cb4880..4a3643f 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -5,21 +5,23 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %endif
 
+%global _hardened_build 1
+
 #################################################################################
 # common
 #################################################################################
 Name:		ceph
 Version:	0.80.8
 Release:	1%{?dist}
-Epoch:		1
+Epoch:		2
 Summary:	User space components of the Ceph file system
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://ceph.com/
 Source0:	http://ceph.com/download/%{name}-%{version}.tar.bz2
-Patch0:		ceph-google-gperftools.patch
-Patch1:		ceph-no-format-security.patch
-Patch2:		ceph-common-do-not-unlock-rwlock-on-destruction.patch
+Patch1:		0001-gperftools-deprecated-google-includes.patch
+Patch2:		0002-Wno-format-causes-compiler-options-collision.patch
+Patch3:		0003-Backport-pull-request-2937-to-firefly.patch
 Requires:	librbd1 = %{epoch}:%{version}-%{release}
 Requires:	librados2 = %{epoch}:%{version}-%{release}
 Requires:	libcephfs1 = %{epoch}:%{version}-%{release}
@@ -664,7 +666,6 @@ fi
 # Package removal cleanup
 if [ "$1" -eq "0" ] ; then
     rm -rf /var/log/ceph
-    rm -rf /etc/ceph
 fi
 
 #################################################################################
@@ -771,10 +772,6 @@ fi
 
 %post -n librbd1
 /sbin/ldconfig
-# First, cleanup
-rm -f /usr/lib64/qemu/librbd.so.1
-rmdir /usr/lib64/qemu 2>/dev/null || true
-rmdir /usr/lib64/ 2>/dev/null || true
 # If x86_64 and rhel6+, link the library to /usr/lib64/qemu -- rhel hack
 %ifarch x86_64
 %if 0%{?rhel} >= 6
@@ -878,6 +875,12 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 %files -n python-ceph-compat
 
 %changelog
+* Wed Mar 4 2015 Boris Ranto <branto at redhat.com> - 1:0.80.8-2
+- Perform a hardened build
+- Use git-formatted patches
+- Do not remove conf files on uninstall
+- Remove the cleanup post-script function
+
 * Mon Feb 23 2015 Boris Ranto <branto at redhat.com> - 1:0.80.8-1
 - Rebase to 0.80.8 release
 - Require yasm, the yasm-related selinux issue was fixed in .8 release


More information about the scm-commits mailing list