bump version to 12.0.3-pve1

diff --git a/patches/0001-update-changelog.patch b/patches/0001-update-changelog.patch
index 42fa3ac98313ac21a9a23747baa2ff410866b6a4..9a9dfda964aed6ad4282b503b62a5a4318518d31 100644 (file)
--- a/patches/0001-update-changelog.patch
+++ b/patches/0001-update-changelog.patch
@@ -1,21 +1,39 @@
-From a3a706cfe86d02c1c6f7564d2ddd9c155bd9ff80 Mon Sep 17 00:00:00 2001
+From d98627902c7534966e57c1efaf0d251556af751e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Mon, 20 Mar 2017 09:12:50 +0100
-Subject: [PATCH 1/6] update changelog
+Subject: [PATCH 1/7] update changelog
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
- debian/changelog | 40 ++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 40 insertions(+)
+ debian/changelog | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 52 insertions(+)
 
 diff --git a/debian/changelog b/debian/changelog
-index adf0b98..5956db2 100644
+index 147e186..b394148 100644
 --- a/debian/changelog
 +++ b/debian/changelog
-@@ -1,15 +1,55 @@
+@@ -1,21 +1,73 @@
++ceph (12.0.3-pve1) stable; urgency=medium
++
++  * rebase on top of v12.0.3
++
++  * don't enable (broken) ceph-mgr module by default
++
++  * use bundled boost
++
++  * fix Ceph #15569: two logrotate scripts when upgrading from Debian packages
++
++ -- Proxmox Support Team <support@proxmox.com>  Tue, 6 Jun 2017 12:22:39 +0200
++
+ ceph (12.0.3-1) stable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Ceph Release Team <ceph-maintainers@ceph.com>  Tue, 16 May 2017 12:42:53 +0000
+ 
 +ceph (12.0.2-pve1) stable; urgency=medium
 +
 +  * rebase on top of v12.0.2

diff --git a/patches/0002-cmake-disable-version-from-git.patch b/patches/0002-cmake-disable-version-from-git.patch
index 5e50feda830c4f2fe700168b83bb2ebea9fb9eee..1d3f0ef175ca8de0e38b618ad5b12af4c87272ed 100644 (file)
--- a/patches/0002-cmake-disable-version-from-git.patch
+++ b/patches/0002-cmake-disable-version-from-git.patch
@@ -1,7 +1,7 @@
-From cd591c10ab6f746d6dde0da3842efb4877581428 Mon Sep 17 00:00:00 2001
+From 10d79ed7976413a7ff3e8732893b3842d242090d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Wed, 31 May 2017 14:33:09 +0200
-Subject: [PATCH 2/6] cmake: disable version from git
+Subject: [PATCH 2/7] cmake: disable version from git
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

diff --git a/patches/0003-ceph-detect-init-support-Debian-Stretch.patch b/patches/0003-ceph-detect-init-support-Debian-Stretch.patch
index 8018b33447cf6129f2ecf6f01f7884fedea62442..39934b8edf59f13bd0150c9cf9d8182afda63301 100644 (file)
--- a/patches/0003-ceph-detect-init-support-Debian-Stretch.patch
+++ b/patches/0003-ceph-detect-init-support-Debian-Stretch.patch
@@ -1,7 +1,7 @@
-From 3b9799d44ec7d67284e2446563c85bf5411add81 Mon Sep 17 00:00:00 2001
+From 32abea0976d79885c361ed7a3e2084c2983d831a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Tue, 21 Mar 2017 07:47:08 +0100
-Subject: [PATCH 3/6] ceph-detect-init: support Debian Stretch
+Subject: [PATCH 3/7] ceph-detect-init: support Debian Stretch
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

diff --git a/patches/0004-enable-systemd-targets-by-default.patch b/patches/0004-enable-systemd-targets-by-default.patch
index fb1c973da4919f93ce3f23f377ac08da7d662b5c..642cb88b182b376647b1a590ec389258217ead31 100644 (file)
--- a/patches/0004-enable-systemd-targets-by-default.patch
+++ b/patches/0004-enable-systemd-targets-by-default.patch
@@ -1,7 +1,7 @@
-From 49241b48abf146098b335071671aab7dc41358a3 Mon Sep 17 00:00:00 2001
+From c755c71d5f5c1cc7b0642c27e504140e2768ccbf Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Wed, 22 Mar 2017 09:00:34 +0100
-Subject: [PATCH 4/6] enable systemd targets by default
+Subject: [PATCH 4/7] enable systemd targets by default
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

diff --git a/patches/0005-ceph-mgr-fix-package-description.patch b/patches/0005-ceph-mgr-fix-package-description.patch
index 703f9821f8a1ad4000c3ddb5a0f107dd1a37259a..8d97d9b4db60871bec16e802047edf9c025537fd 100644 (file)
--- a/patches/0005-ceph-mgr-fix-package-description.patch
+++ b/patches/0005-ceph-mgr-fix-package-description.patch
@@ -1,7 +1,7 @@
-From 7437c66185bb565a3e9b5e29c297bf769de162fd Mon Sep 17 00:00:00 2001
+From 0b60c4f0d420fd2dfb65a221ffb6b3ffa98e42c0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Thu, 18 May 2017 14:35:19 +0200
-Subject: [PATCH 5/6] ceph-mgr: fix package description
+Subject: [PATCH 5/7] ceph-mgr: fix package description
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

diff --git a/patches/0006-ceph-mgr-don-t-load-broken-rest-module-by-default.patch b/patches/0006-ceph-mgr-don-t-load-broken-rest-module-by-default.patch
index 5b6592e71515ef76736cfe1a6141549caf5412b4..94d420aa6dd9f77e42f85cdc6d3b6ee80803af31 100644 (file)
--- a/patches/0006-ceph-mgr-don-t-load-broken-rest-module-by-default.patch
+++ b/patches/0006-ceph-mgr-don-t-load-broken-rest-module-by-default.patch
@@ -1,7 +1,7 @@
-From f174680b7caf53c4dcc6183cdb437bbc3df5596c Mon Sep 17 00:00:00 2001
+From 0bf1ab6d4ca99892f82a27692498f77bd2cc48d5 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Thu, 1 Jun 2017 10:28:13 +0200
-Subject: [PATCH 6/6] ceph-mgr: don't load broken rest module by default
+Subject: [PATCH 6/7] ceph-mgr: don't load broken rest module by default
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

diff --git a/patches/0007-ceph-common-fix-logrotate-on-upgrade-from-Debian.patch b/patches/0007-ceph-common-fix-logrotate-on-upgrade-from-Debian.patch
index a49d394b05db39bf654e57053af31a0c42db3565..de0bfb1f097120460e2ffc2d2cb21015343bde17 100644 (file)
--- a/patches/0007-ceph-common-fix-logrotate-on-upgrade-from-Debian.patch
+++ b/patches/0007-ceph-common-fix-logrotate-on-upgrade-from-Debian.patch
@@ -1,4 +1,4 @@
-From da20a6c3188f37b1f3fe30c651a90fc17e46b148 Mon Sep 17 00:00:00 2001
+From 00eebc3db3243ddf52063b58666947e0301ed3e1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Tue, 6 Jun 2017 12:20:06 +0200
 Subject: [PATCH 7/7] ceph-common: fix logrotate on upgrade from Debian