[Pkg-ceph-commits] [ceph] 02/02: New upstream stable release (LP: #1649856).
James Downing Page
jamespage at moszumanska.debian.org
Wed Dec 14 13:50:49 UTC 2016
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch ubuntu/zesty
in repository ceph.
commit 52afc8193b5447535f8e36232d3e797564059a1d
Author: James Page <james.page at ubuntu.com>
Date: Wed Dec 14 11:25:00 2016 +0000
New upstream stable release (LP: #1649856).
* New upstream stable release (LP: #1649856).
- d/p/32bit-ftbfs.patch: Drop, no longer needed.
- d/p/*: Refresh.
---
debian/changelog | 8 +
debian/patches/32bit-ftbfs.patch | 198 ---------------------
debian/patches/fix-argparse-defaults.patch | 2 +-
.../patches/osd-limit-omap-data-in-push-op.patch | 2 +-
debian/patches/rgw_rados-creation_time.patch | 4 +-
debian/patches/series | 1 -
debian/patches/sleep-recover.patch | 2 +-
debian/patches/tests-disable.patch | 4 +-
8 files changed, 14 insertions(+), 207 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b8c337d..25f1e03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ceph (10.2.5-0ubuntu1) UNRELEASED; urgency=medium
+
+ * New upstream stable release (LP: #1649856).
+ - d/p/32bit-ftbfs.patch: Drop, no longer needed.
+ - d/p/*: Refresh.
+
+ -- James Page <james.page at ubuntu.com> Wed, 14 Dec 2016 11:21:33 +0000
+
ceph (10.2.3-0ubuntu5) zesty; urgency=medium
* d/ceph.{postinst,preinst,postrm}: Ensure that ceph logrotate
diff --git a/debian/patches/32bit-ftbfs.patch b/debian/patches/32bit-ftbfs.patch
deleted file mode 100644
index 78ecd9f..0000000
--- a/debian/patches/32bit-ftbfs.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-From 518883d939f34ec0afa03aea1bac35960fb579f2 Mon Sep 17 00:00:00 2001
-From: Loic Dachary <ldachary at redhat.com>
-Date: Thu, 25 Aug 2016 09:09:40 +0200
-Subject: [PATCH 1/4] Revert "common: add int64_t template for
- strict_si_cast()"
-
-This reverts commit e3a99c082e3ebd56d5b40d7d94d98e35629df81e.
----
- src/common/strtol.cc | 2 --
- src/test/strtol.cc | 15 ---------------
- 2 files changed, 17 deletions(-)
-
-diff --git a/src/common/strtol.cc b/src/common/strtol.cc
-index f43d661..50598b9 100644
---- a/src/common/strtol.cc
-+++ b/src/common/strtol.cc
-@@ -189,8 +189,6 @@ template int strict_si_cast<int>(const char *str, std::string *err);
-
- template long long strict_si_cast<long long>(const char *str, std::string *err);
-
--template int64_t strict_si_cast<int64_t>(const char *str, std::string *err);
--
- template uint64_t strict_si_cast<uint64_t>(const char *str, std::string *err);
-
- uint64_t strict_sistrtoll(const char *str, std::string *err)
-diff --git a/src/test/strtol.cc b/src/test/strtol.cc
-index 3946736..646c055 100644
---- a/src/test/strtol.cc
-+++ b/src/test/strtol.cc
-@@ -234,21 +234,6 @@ TEST(StrictSICast, Error) {
- (void)strict_si_cast<int>("1T", &err);
- ASSERT_NE(err, "");
- }
-- {
-- std::string err;
-- (void)strict_si_cast<int64_t>("2E", &err);
-- ASSERT_EQ(err, "");
-- }
-- {
-- std::string err;
-- (void)strict_si_cast<int64_t>("-2E", &err);
-- ASSERT_EQ(err, "");
-- }
-- {
-- std::string err;
-- (void)strict_si_cast<int64_t>("1T", &err);
-- ASSERT_EQ(err, "");
-- }
- }
-
- /*
-
-From f7cd28460147530cfd265a593b32d02adb93abe6 Mon Sep 17 00:00:00 2001
-From: Kefu Chai <tchaikov at gmail.com>
-Date: Sat, 30 Apr 2016 18:31:37 +0800
-Subject: [PATCH 2/4] common/config: cast OPT_U32 options using uint32_t
-
-the OPT_U32 options was translated using strict_si_cast<int>(), and then
-cast the converted result to uint32_t. this could cause integer
-underflow. we could have lifted the burden of checking invalid input
-from the user of this option to the strict_si_cast<>() function. so in
-this change, we use strict_si_cast<uint32_t>() instead, before casting
-the converted value into `uint32_t`.
-
-Signed-off-by: Kefu Chai <tchaikov at gmail.com>
-(cherry picked from commit b7babd6aa671d688eef0af61ca17fd11eec22773)
----
- src/common/config.cc | 2 +-
- src/common/strtol.cc | 3 +--
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/common/config.cc b/src/common/config.cc
-index 622e237..d27bfbf 100644
---- a/src/common/config.cc
-+++ b/src/common/config.cc
-@@ -994,7 +994,7 @@ int md_config_t::set_val_raw(const char *val, const config_option *opt)
- return 0;
- case OPT_U32: {
- std::string err;
-- int f = strict_si_cast<int>(val, &err);
-+ int f = strict_si_cast<uint32_t>(val, &err);
- if (!err.empty())
- return -EINVAL;
- *(uint32_t*)opt->conf_ptr(this) = f;
-diff --git a/src/common/strtol.cc b/src/common/strtol.cc
-index 50598b9..bc5ccc7 100644
---- a/src/common/strtol.cc
-+++ b/src/common/strtol.cc
-@@ -186,10 +186,9 @@ T strict_si_cast(const char *str, std::string *err)
- }
-
- template int strict_si_cast<int>(const char *str, std::string *err);
--
- template long long strict_si_cast<long long>(const char *str, std::string *err);
--
- template uint64_t strict_si_cast<uint64_t>(const char *str, std::string *err);
-+template uint32_t strict_si_cast<uint32_t>(const char *str, std::string *err);
-
- uint64_t strict_sistrtoll(const char *str, std::string *err)
- {
-
-From d93eda88048d2bcefe4be3ea0aaa6ca0289eabbf Mon Sep 17 00:00:00 2001
-From: Vikhyat Umrao <vumrao at redhat.com>
-Date: Thu, 26 May 2016 23:30:25 +0530
-Subject: [PATCH 3/4] common: add int64_t template for strict_si_cast()
-
-Signed-off-by: Vikhyat Umrao <vumrao at redhat.com>
-(cherry picked from commit 8e429d05370fbe7935212d0ae9608e7547f39860)
----
- src/common/strtol.cc | 1 +
- src/test/strtol.cc | 15 +++++++++++++++
- 2 files changed, 16 insertions(+)
-
-diff --git a/src/common/strtol.cc b/src/common/strtol.cc
-index bc5ccc7..0e7ea7d 100644
---- a/src/common/strtol.cc
-+++ b/src/common/strtol.cc
-@@ -187,6 +187,7 @@ T strict_si_cast(const char *str, std::string *err)
-
- template int strict_si_cast<int>(const char *str, std::string *err);
- template long long strict_si_cast<long long>(const char *str, std::string *err);
-+template int64_t strict_si_cast<int64_t>(const char *str, std::string *err);
- template uint64_t strict_si_cast<uint64_t>(const char *str, std::string *err);
- template uint32_t strict_si_cast<uint32_t>(const char *str, std::string *err);
-
-diff --git a/src/test/strtol.cc b/src/test/strtol.cc
-index 646c055..3946736 100644
---- a/src/test/strtol.cc
-+++ b/src/test/strtol.cc
-@@ -234,6 +234,21 @@ TEST(StrictSICast, Error) {
- (void)strict_si_cast<int>("1T", &err);
- ASSERT_NE(err, "");
- }
-+ {
-+ std::string err;
-+ (void)strict_si_cast<int64_t>("2E", &err);
-+ ASSERT_EQ(err, "");
-+ }
-+ {
-+ std::string err;
-+ (void)strict_si_cast<int64_t>("-2E", &err);
-+ ASSERT_EQ(err, "");
-+ }
-+ {
-+ std::string err;
-+ (void)strict_si_cast<int64_t>("1T", &err);
-+ ASSERT_EQ(err, "");
-+ }
- }
-
- /*
-
-From 117aa35094c059dbf5770b01ac13a583471e54aa Mon Sep 17 00:00:00 2001
-From: Kefu Chai <kchai at redhat.com>
-Date: Sun, 26 Jun 2016 01:02:03 +0800
-Subject: [PATCH 4/4] common: instantiate strict_si_cast<long> not
- strict_si_cast<int64_t>
-
-this fixes the build on armf.
-
-on 32bit platforms, cstdint is very likely to
-
- typedef long long int int64_t;
-
-this results in compilation error like
-
- `common/strtol.cc:190:75: error: duplicate explicit instantiation of 'T
- strict_si_cast(const char, std::string) [with T = long long int;
- std::string = std::basic_string]'
-
- [-fpermissive]
- template int64_t strict_si_cast(const char *str, std::string *err);
- ^`
-
-we can address this by instantiate the primitive type of `long long`
-instead of `in64_t`.
-
-Fixes: http://tracker.ceph.com/issues/16398
-Signed-off-by: Kefu Chai <kchai at redhat.com>
-(cherry picked from commit 31db4c5f9f725e13e38f3c90744e299e023d02a4)
----
- src/common/strtol.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/common/strtol.cc b/src/common/strtol.cc
-index 0e7ea7d..321521d 100644
---- a/src/common/strtol.cc
-+++ b/src/common/strtol.cc
-@@ -186,8 +186,8 @@ T strict_si_cast(const char *str, std::string *err)
- }
-
- template int strict_si_cast<int>(const char *str, std::string *err);
-+template long strict_si_cast<long>(const char *str, std::string *err);
- template long long strict_si_cast<long long>(const char *str, std::string *err);
--template int64_t strict_si_cast<int64_t>(const char *str, std::string *err);
- template uint64_t strict_si_cast<uint64_t>(const char *str, std::string *err);
- template uint32_t strict_si_cast<uint32_t>(const char *str, std::string *err);
-
diff --git a/debian/patches/fix-argparse-defaults.patch b/debian/patches/fix-argparse-defaults.patch
index 505f5fe..1703b31 100644
--- a/debian/patches/fix-argparse-defaults.patch
+++ b/debian/patches/fix-argparse-defaults.patch
@@ -8,7 +8,7 @@ Forwarded: no
--- a/src/ceph-disk/ceph_disk/main.py
+++ b/src/ceph-disk/ceph_disk/main.py
-@@ -4479,6 +4479,7 @@ def parse_args(argv):
+@@ -4477,6 +4477,7 @@ def parse_args(argv):
parser.set_defaults(
# we want to hold on to this, for later
prog=parser.prog,
diff --git a/debian/patches/osd-limit-omap-data-in-push-op.patch b/debian/patches/osd-limit-omap-data-in-push-op.patch
index 1754ffe..918f158 100644
--- a/debian/patches/osd-limit-omap-data-in-push-op.patch
+++ b/debian/patches/osd-limit-omap-data-in-push-op.patch
@@ -17,7 +17,7 @@ Signed-off-by: Wanlong Gao <wanlong.gao at easystack.cn>
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
-@@ -749,6 +749,7 @@ OPTION(osd_recovery_delay_start, OPT_FLO
+@@ -748,6 +748,7 @@ OPTION(osd_recovery_delay_start, OPT_FLO
OPTION(osd_recovery_max_active, OPT_INT, 3)
OPTION(osd_recovery_max_single_start, OPT_INT, 1)
OPTION(osd_recovery_max_chunk, OPT_U64, 8<<20) // max size of push chunk
diff --git a/debian/patches/rgw_rados-creation_time.patch b/debian/patches/rgw_rados-creation_time.patch
index ccc8e0e..c5e51fe 100644
--- a/debian/patches/rgw_rados-creation_time.patch
+++ b/debian/patches/rgw_rados-creation_time.patch
@@ -13,11 +13,9 @@ Signed-off-by: weiqiaomiao <wei.qiaomiao at zte.com.cn>
src/rgw/rgw_rados.cc | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
-diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
-index d356fb8..8e0f0fd 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
-@@ -5156,10 +5156,11 @@ int RGWRados::create_bucket(RGWUserInfo& owner, rgw_bucket& bucket,
+@@ -5153,10 +5153,11 @@ int RGWRados::create_bucket(RGWUserInfo&
info.num_shards = bucket_index_max_shards;
info.bucket_index_shard_hash_type = RGWBucketInfo::MOD;
info.requester_pays = false;
diff --git a/debian/patches/series b/debian/patches/series
index baca071..c3be6a0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,5 +17,4 @@ fix-cycles-arch.patch
skip-setup.py-makefiles.patch
disable-openssl-linking.patch
osd-limit-omap-data-in-push-op.patch
-32bit-ftbfs.patch
rgw_rados-creation_time.patch
diff --git a/debian/patches/sleep-recover.patch b/debian/patches/sleep-recover.patch
index 2369611..d7ee410 100644
--- a/debian/patches/sleep-recover.patch
+++ b/debian/patches/sleep-recover.patch
@@ -6,7 +6,7 @@ Description: fix fuse-client hang after wake-up from suspend.
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
-@@ -12014,6 +12014,7 @@ void Client::ms_handle_remote_reset(Conn
+@@ -12020,6 +12020,7 @@ void Client::ms_handle_remote_reset(Conn
case MetaSession::STATE_OPEN:
ldout(cct, 1) << "reset from mds we were open; mark session as stale" << dendl;
s->state = MetaSession::STATE_STALE;
diff --git a/debian/patches/tests-disable.patch b/debian/patches/tests-disable.patch
index f03242a..7cd5a50 100644
--- a/debian/patches/tests-disable.patch
+++ b/debian/patches/tests-disable.patch
@@ -5,7 +5,7 @@ Description: disable tests that depend on network...
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
-@@ -63,6 +63,7 @@ bin_DEBUGPROGRAMS += ceph_bench_log
+@@ -100,6 +100,7 @@ bin_DEBUGPROGRAMS += ceph_bench_log
## Unit tests
@@ -13,7 +13,7 @@ Description: disable tests that depend on network...
check_SCRIPTS += \
test/ceph_objectstore_tool.py \
test/test-ceph-helpers.sh \
-@@ -96,6 +97,8 @@ check_SCRIPTS += \
+@@ -133,6 +134,8 @@ check_SCRIPTS += \
test/test_pidfile.sh \
test/test_subman.sh
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git
More information about the Pkg-ceph-commits
mailing list