patches: remove fuzz and re-format

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/patches/0001-update-changelog.patch b/patches/0001-update-changelog.patch
index 28fb3923ddea4c72ecc7a75e36f5cf7cc44c01b7..7c80c47f039bd581e8eaefff8af911c25e30864d 100644 (file)
--- a/patches/0001-update-changelog.patch
+++ b/patches/0001-update-changelog.patch
@@ -8,13 +8,13 @@ Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
- debian/changelog | 156 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 156 insertions(+)
+ debian/changelog | 175 +++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 175 insertions(+)
 
-Index: ceph/debian/changelog
-===================================================================
---- ceph.orig/debian/changelog
-+++ ceph/debian/changelog
+diff --git a/debian/changelog b/debian/changelog
+index 642fc450fa..a8f2a30ee0 100644
+--- a/debian/changelog
++++ b/debian/changelog
 @@ -1,9 +1,28 @@
 +ceph (12.2.8-pve1) stable; urgency=medium
 +

diff --git a/patches/0002-cmake-disable-version-from-git.patch b/patches/0002-cmake-disable-version-from-git.patch
index 6829479ae37bd92a28eb6b89ca7d95d0fbd825db..6889ec62dd10c2b9fdc0d634e86ad79d883c520e 100644 (file)
--- a/patches/0002-cmake-disable-version-from-git.patch
+++ b/patches/0002-cmake-disable-version-from-git.patch
@@ -15,7 +15,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  1 file changed, 5 deletions(-)
 
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 7aa8a4392e..77a05ad960 100644
+index 80d4b351f5..10e4a6013b 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -206,15 +206,10 @@ set(GCOV_PREFIX_STRIP 4)
@@ -34,6 +34,3 @@ index 7aa8a4392e..77a05ad960 100644
    # remove 'v' prefix from raw git version
    string(SUBSTRING ${CEPH_GIT_NICE_VER} 1 -1 CEPH_GIT_NICE_VER)
  else(${ENABLE_GIT_VERSION})
--- 
-2.14.2
-

diff --git a/patches/0003-enable-systemd-targets-by-default.patch b/patches/0003-enable-systemd-targets-by-default.patch
index 9d9b7d0c311340159159c5fd7be90983629260f3..d99cef48eb4f3d96d8e488e05f17e053bc39a5f9 100644 (file)
--- a/patches/0003-enable-systemd-targets-by-default.patch
+++ b/patches/0003-enable-systemd-targets-by-default.patch
@@ -12,7 +12,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/debian/rules b/debian/rules
-index 9c63c99c31..4442732e17 100755
+index 99a3e8e982..db051ded25 100755
 --- a/debian/rules
 +++ b/debian/rules
 @@ -133,6 +133,9 @@ override_dh_installinit:
@@ -25,6 +25,3 @@ index 9c63c99c31..4442732e17 100755
  
        # NOTE: execute systemd helpers so they pickup dh_install'ed units and targets
        dh_systemd_enable
--- 
-2.14.2
-

diff --git a/patches/0004-enable-LZ4-support.patch b/patches/0004-enable-LZ4-support.patch
index 9727a427daff8298ff76e29573a8bbf90a8c7734..55bb0883a2c018846aaf73827e2f2597f61b92f5 100644 (file)
--- a/patches/0004-enable-LZ4-support.patch
+++ b/patches/0004-enable-LZ4-support.patch
@@ -13,7 +13,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  2 files changed, 2 insertions(+)
 
 diff --git a/debian/control b/debian/control
-index bdc74471da..bc5d03b0ab 100644
+index d5bc16e9ee..d96f5aedd0 100644
 --- a/debian/control
 +++ b/debian/control
 @@ -38,6 +38,7 @@ Build-Depends: bc,
@@ -25,17 +25,14 @@ index bdc74471da..bc5d03b0ab 100644
                 libsnappy-dev,
                 libssl-dev,
 diff --git a/debian/rules b/debian/rules
-index 4442732e17..a631658d4c 100755
+index db051ded25..9dad5ad166 100755
 --- a/debian/rules
 +++ b/debian/rules
 @@ -7,6 +7,7 @@ export DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
  
- extraopts += -DUSE_CRYPTOPP=OFF -DWITH_OCF=ON -DWITH_LTTNG=ON -DWITH_PYTHON3=ON -DWITH_EMBEDDED=OFF
+ extraopts += -DUSE_CRYPTOPP=OFF -DWITH_OCF=ON -DWITH_LTTNG=ON -DWITH_PYTHON3=ON
  extraopts += -DWITH_CEPHFS_JAVA=ON
 +extraopts += -DWITH_LZ4=ON
  # assumes that ceph is exmpt from multiarch support, so we override the libdir.
  extraopts += -DCMAKE_INSTALL_LIBDIR=/usr/lib
  extraopts += -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib
--- 
-2.14.2
-

diff --git a/patches/0005-msg-async-rdma-uninitialized-variable-fix.patch b/patches/0005-msg-async-rdma-uninitialized-variable-fix.patch
index 975fad1dac2161b5c7c531335f6d5f5b071f5e9e..88b51b7caee8f4d20c2d1d2d71ac2b9e8c7c3d9d 100644 (file)
--- a/patches/0005-msg-async-rdma-uninitialized-variable-fix.patch
+++ b/patches/0005-msg-async-rdma-uninitialized-variable-fix.patch
@@ -29,6 +29,3 @@ index 37e1a53077..06f514fe24 100644
  {
  #ifdef HAVE_IBV_EXP
    union ibv_gid cgid;
--- 
-2.14.2
-

diff --git a/patches/0006-Revert-debian-control-adjust-ceph-osdomap-kvstore-mo.patch b/patches/0006-Revert-debian-control-adjust-ceph-osdomap-kvstore-mo.patch
index 6daa0592346b4ecd238a9b0d9025f39c52536dc8..626d0d8d9e3f5204fc1159d1824ddbcbac18e301 100644 (file)
--- a/patches/0006-Revert-debian-control-adjust-ceph-osdomap-kvstore-mo.patch
+++ b/patches/0006-Revert-debian-control-adjust-ceph-osdomap-kvstore-mo.patch
@@ -17,10 +17,10 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/debian/control b/debian/control
-index bc5d03b0ab..902d033098 100644
+index d96f5aedd0..ecbecca725 100644
 --- a/debian/control
 +++ b/debian/control
-@@ -105,10 +105,10 @@ Recommends: btrfs-tools,
+@@ -106,10 +106,10 @@ Recommends: btrfs-tools,
              ntp | time-daemon,
  Replaces: ceph (<< 10),
            ceph-common (<< 0.78-500),
@@ -33,7 +33,7 @@ index bc5d03b0ab..902d033098 100644
          python-ceph (<< 0.92-1223),
  Description: common ceph daemon libraries and management tools
   Ceph is a massively scalable, open-source, distributed
-@@ -207,8 +207,8 @@ Depends: ceph-base (= ${binary:Version}),
+@@ -208,8 +208,8 @@ Depends: ceph-base (= ${binary:Version}),
           ${misc:Depends},
           ${shlibs:Depends},
  Recommends: ceph-common,
@@ -44,7 +44,7 @@ index bc5d03b0ab..902d033098 100644
  Description: monitor server for the ceph storage system
   Ceph is a massively scalable, open-source, distributed
   storage system that runs on commodity hardware and delivers object,
-@@ -241,8 +241,8 @@ Depends: ceph-base (= ${binary:Version}),
+@@ -242,8 +242,8 @@ Depends: ceph-base (= ${binary:Version}),
           ${python:Depends},
           ${shlibs:Depends},
  Recommends: ceph-common (= ${binary:Version}),
@@ -55,6 +55,3 @@ index bc5d03b0ab..902d033098 100644
  Description: OSD server for the ceph storage system
   Ceph is a massively scalable, open-source, distributed
   storage system that runs on commodity hardware and delivers object,
--- 
-2.14.2
-

diff --git a/patches/0007-debian-control-add-break-libpvestorage-perl.patch b/patches/0007-debian-control-add-break-libpvestorage-perl.patch
index d851210b3d91e958def9c387a6e5fa9b07249c2b..977dc8e60538c0223540b4fcffc93b9ef5dc85aa 100644 (file)
--- a/patches/0007-debian-control-add-break-libpvestorage-perl.patch
+++ b/patches/0007-debian-control-add-break-libpvestorage-perl.patch
@@ -1,16 +1,25 @@
-Index: ceph/debian/control
-===================================================================
---- ceph.orig/debian/control
-+++ ceph/debian/control
-@@ -110,6 +110,7 @@ Replaces: ceph (<< 10),
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Alwin Antreich <a.antreich@proxmox.com>
+Date: Wed, 24 Oct 2018 10:38:19 +0200
+Subject: [PATCH] debian/control: add break libpvestorage-perl
+
+---
+ debian/control | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/debian/control b/debian/control
+index ecbecca725..19aa49f9f4 100644
+--- a/debian/control
++++ b/debian/control
+@@ -111,6 +111,7 @@ Replaces: ceph (<< 10),
  Breaks: ceph (<< 10),
-         ceph-test (<< 12.2.2-14),
+         ceph-test (<< 12.2.3),
          python-ceph (<< 0.92-1223),
 +        libpve-storage-perl (<= 5.0-25),
  Description: common ceph daemon libraries and management tools
   Ceph is a massively scalable, open-source, distributed
   storage system that runs on commodity hardware and delivers object,
-@@ -406,6 +407,7 @@ Breaks: ceph (<< 10),
+@@ -407,6 +408,7 @@ Breaks: ceph (<< 10),
          ceph-test (<< 9.0.3-1646),
          librbd1 (<< 0.92-1238),
          python-ceph (<< 0.92-1223),