[Pkg-ceph-commits] [ceph] 03/05: Drop patch for CVE-2015-5245

[James Downing Page]

This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch experimental
in repository ceph.

commit 1e93090a588ac8920ee74075b2306bf57969471b
Author: James Page <james.page at ubuntu.com>
Date:   Wed Nov 4 11:18:10 2015 +0000

    Drop patch for CVE-2015-5245
    
    Included in upstream point release.
---
 debian/patches/CVE-2015-5245.patch | 31 -------------------------------
 debian/patches/series              |  1 -
 2 files changed, 32 deletions(-)

diff --git a/debian/patches/CVE-2015-5245.patch b/debian/patches/CVE-2015-5245.patch
deleted file mode 100644
index 8c59d06..0000000
--- a/debian/patches/CVE-2015-5245.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ad5507fe0bf72ed5bdf8353e315cc9092c740144 Mon Sep 17 00:00:00 2001
-From: Yehuda Sadeh <yehuda at redhat.com>
-Date: Thu, 30 Jul 2015 14:47:15 -0700
-Subject: [PATCH] rgw: url encode exposed bucket
-
-Fixes: #12537
-Don't send the bucket name back without url encoding it.
-
-Signed-off-by: Yehuda Sadeh <yehuda at redhat.com>
----
- src/rgw/rgw_rest.cc | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc
-index a03e31f..84681c7 100644
---- a/src/rgw/rgw_rest.cc
-+++ b/src/rgw/rgw_rest.cc
-@@ -361,8 +361,11 @@ void dump_bucket_from_state(struct req_state *s)
- {
-   int expose_bucket = g_conf->rgw_expose_bucket;
-   if (expose_bucket) {
--    if (!s->bucket_name_str.empty())
--      s->cio->print("Bucket: %s\r\n", s->bucket_name_str.c_str());
-+    if (!s->bucket_name_str.empty()) {
-+      string b;
-+      url_encode(s->bucket_name_str, b);
-+      s->cio->print("Bucket: %s\r\n", b.c_str());
-+    }
-   }
- }
- 
diff --git a/debian/patches/series b/debian/patches/series
index a4eb539..9f24fbd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 ## Backported / Upstream
 sleep-recover.patch
-CVE-2015-5245.patch
 
 ## Debian
 rbdmap3-lazyumount.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git