Attachment 206747 Details for Bug 240009 – svn diff

[patch] svn diff

ceph12-2-12.diff (text/plain), 7.39 KB, created by Willem Jan Withagen on 2019-08-21 10:28:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Willem Jan Withagen

Created: 2019-08-21 10:28:22 UTC

Size: 7.39 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 509497)
>+++ Makefile	(working copy)
>@@ -3,8 +3,7 @@
> 
> PORTNAME=	ceph
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	12.2.11
>-PORTREVISION=	2
>+DISTVERSION=	12.2.12
> CATEGORIES=	net
> PKGNAMESUFFIX=	12
> 
>@@ -51,10 +50,11 @@
> USE_PYTHON=	cython
> USE_OPENLDAP=	yes
> USE_GITHUB=	yes
>+GH_ACCOUNT=	ceph:DEFAULT
> 
> GH_TUPLE+=	ceph:ceph-erasure-code-corpus:2d7d78b:ceph_erasure_code_corpus/ceph-erasure-code-corpus
>-GH_TUPLE+=	ceph:ceph-object-corpus:e32bf8c:ceph_object_corpus/ceph-object-corpus
>-GH_TUPLE+=	ceph:civetweb:de23828:civetweb/src/civetweb
>+GH_TUPLE+=	ceph:ceph-object-corpus:f0ba19f:ceph_object_corpus/ceph-object-corpus
>+GH_TUPLE+=	ceph:civetweb:088b813:civetweb/src/civetweb
> GH_TUPLE+=	01org:isa-l_crypto:603529a:isa_l_crypto/src/crypto/isa-l/isa-l_crypto
> GH_TUPLE+=	ceph:gf-complete:7e61b44:gf_complete/src/erasure-code/jerasure/gf-complete
> GH_TUPLE+=	ceph:jerasure:96c76b8:jerasure/src/erasure-code/jerasure/jerasure
>@@ -62,7 +62,7 @@
> GH_TUPLE+=	ceph:isa-l:7e1a337:isa_l/src/isa-l
> GH_TUPLE+=	ceph:lua:1fce39c:lua/src/lua
> GH_TUPLE+=	ceph:rapidjson:f54b0e4:rapidjson/src/rapidjson
>-GH_TUPLE+=	ceph:rocksdb:e15382c:rocksdb/src/rocksdb
>+GH_TUPLE+=	ceph:rocksdb:b181f17:rocksdb/src/rocksdb
> GH_TUPLE+=	ceph:xxHash:1f40c65:xxHash/src/xxHash
> GH_TUPLE+=	facebook:zstd:f4340f4:zstd/src/zstd
> 
>@@ -121,7 +121,7 @@
> 	${MKDIR} ${STAGEDIR}/var/log/ceph
> 	${MKDIR} ${STAGEDIR}/var/run/ceph
> 	# Use the Ceph init.d script as the interface to regular
>-	# starting and stopping daemons. rc.d work is done thru
>+	# starting and stopping deamons. rc.d work is done thru
> 	# a separate rc.d/ceph script calling init-ceph again.
> 	${MV} ${STAGEDIR}${PREFIX}/etc/init.d/ceph ${STAGEDIR}${PREFIX}/bin/init-ceph
> 	# remove files not packaged
>Index: distinfo
>===================================================================
>--- distinfo	(revision 509497)
>+++ distinfo	(working copy)
>@@ -1,12 +1,12 @@
>-TIMESTAMP = 1550935963
>-SHA256 (ceph-ceph-v12.2.11_GH0.tar.gz) = 67a2afe2de2087279e5a6bfab9c2b2a391093fb73723b629aaaeb204044be499
>-SIZE (ceph-ceph-v12.2.11_GH0.tar.gz) = 12451786
>+TIMESTAMP = 1566172846
>+SHA256 (ceph-ceph-v12.2.12_GH0.tar.gz) = 194f6cb475cf01340d1d19aaa9f1052dc5a06cbe97360256ac24a4e06c7ba316
>+SIZE (ceph-ceph-v12.2.12_GH0.tar.gz) = 12487700
> SHA256 (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 8ab8f36f3e0a720c882b8bb4abb3f2e26bd6b025cc263119207f7d2eb3b1e490
> SIZE (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 3685656
>-SHA256 (ceph-ceph-object-corpus-e32bf8c_GH0.tar.gz) = 79ff0d1b9f959c9f5264a0dff193105d71885615deaa9c8469902400fd82d214
>-SIZE (ceph-ceph-object-corpus-e32bf8c_GH0.tar.gz) = 1838192
>-SHA256 (ceph-civetweb-de23828_GH0.tar.gz) = a9a95dd58e9b4a696fa0c822c1401856c55ef9b67fb28cf15d97f19f1af2ecbd
>-SIZE (ceph-civetweb-de23828_GH0.tar.gz) = 6850197
>+SHA256 (ceph-ceph-object-corpus-f0ba19f_GH0.tar.gz) = 820cf72a687c4ff5fafbb7439a9dedf03d5c8ddb6fa3dfbf3d6a9cf5b64b551f
>+SIZE (ceph-ceph-object-corpus-f0ba19f_GH0.tar.gz) = 1837945
>+SHA256 (ceph-civetweb-088b813_GH0.tar.gz) = 7ae109f32ee92a3d81223ce88b6d2dfcadfa6b91cf2be877743a5cee30f115e2
>+SIZE (ceph-civetweb-088b813_GH0.tar.gz) = 11349538
> SHA256 (01org-isa-l_crypto-603529a_GH0.tar.gz) = 52708b98c832bb7e6db60c949ece261d9609c822ae55239b0f2133cec2b3d155
> SIZE (01org-isa-l_crypto-603529a_GH0.tar.gz) = 439149
> SHA256 (ceph-gf-complete-7e61b44_GH0.tar.gz) = 7b0e5c1b41399d2c7d97ed7a7547ebf40023bcd104ed9a8b2b75bdee440c1a4d
>@@ -21,8 +21,8 @@
> SIZE (ceph-lua-1fce39c_GH0.tar.gz) = 366778
> SHA256 (ceph-rapidjson-f54b0e4_GH0.tar.gz) = 35c330d40ed9def99e8dea8f3b0e4fda7610b813b6f4aac9a70ffefcb9ab1f1e
> SIZE (ceph-rapidjson-f54b0e4_GH0.tar.gz) = 1019457
>-SHA256 (ceph-rocksdb-e15382c_GH0.tar.gz) = e23177dd893b81b4d3d959464ee8e5c4fe64a408841c2584b29540c60ac5cf47
>-SIZE (ceph-rocksdb-e15382c_GH0.tar.gz) = 3278113
>+SHA256 (ceph-rocksdb-b181f17_GH0.tar.gz) = e09e52a45f86c67992dbdfbf4c6bbb31e3f930d226766bdd2bba9675cdf2b8c0
>+SIZE (ceph-rocksdb-b181f17_GH0.tar.gz) = 3278398
> SHA256 (ceph-xxHash-1f40c65_GH0.tar.gz) = 809e06b7493ed01f13c7ba972393a5a6d23dd92fd6b884381aa907005e569372
> SIZE (ceph-xxHash-1f40c65_GH0.tar.gz) = 25484
> SHA256 (facebook-zstd-f4340f4_GH0.tar.gz) = 0db909a46914eb7800bce044b86fcf595451713e56a2b131ace6f70ff25c1c4d
>Index: files/file-git_version
>===================================================================
>--- files/file-git_version	(revision 509497)
>+++ files/file-git_version	(working copy)
>@@ -1,2 +1,2 @@
>-26dc3775efc7bb286a1d6d66faee0ba30ea23eee
>-v12.2.11
>+dc24c37717be1fac98eabdcc434d16d7c0c14245
>+v12.2.12-351-gdc24c37717
>Index: files/patch-src_rgw_rgw_civetweb.cc
>===================================================================
>--- files/patch-src_rgw_rgw_civetweb.cc	(nonexistent)
>+++ files/patch-src_rgw_rgw_civetweb.cc	(working copy)
>@@ -0,0 +1,36 @@
>+*** src/rgw/rgw_civetweb.cc	Thu Apr 11 14:33:50 2019
>+--- src/rgw/rgw_civetweb.cc.new	Mon Aug 19 11:31:24 2019
>+***************
>+*** 89,95 ****
>+    }
>+  
>+    for (int i = 0; i < info->num_headers; i++) {
>+!     const struct mg_request_info::mg_header* header = &info->http_headers[i];
>+  
>+      if (header->name == nullptr || header->value==nullptr) {
>+        lderr(cct) << "client supplied malformatted headers" << dendl;
>+--- 89,95 ----
>+    }
>+  
>+    for (int i = 0; i < info->num_headers; i++) {
>+!     const auto header = &info->http_headers[i];
>+  
>+      if (header->name == nullptr || header->value==nullptr) {
>+        lderr(cct) << "client supplied malformatted headers" << dendl;
>+***************
>+*** 132,138 ****
>+    env.set("REQUEST_METHOD", info->request_method);
>+    env.set("HTTP_VERSION", info->http_version);
>+    env.set("REQUEST_URI", info->request_uri); // get the full uri, we anyway handle abs uris later
>+!   env.set("SCRIPT_URI", info->uri); /* FIXME */
>+    if (info->query_string) {
>+      env.set("QUERY_STRING", info->query_string);
>+    }
>+--- 132,138 ----
>+    env.set("REQUEST_METHOD", info->request_method);
>+    env.set("HTTP_VERSION", info->http_version);
>+    env.set("REQUEST_URI", info->request_uri); // get the full uri, we anyway handle abs uris later
>+!   env.set("SCRIPT_URI", info->local_uri); 
>+    if (info->query_string) {
>+      env.set("QUERY_STRING", info->query_string);
>+    }
>
>Property changes on: files/patch-src_rgw_rgw_civetweb.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_rgw_rgw_sync_module_es.cc
>===================================================================
>--- files/patch-src_rgw_rgw_sync_module_es.cc	(revision 509497)
>+++ files/patch-src_rgw_rgw_sync_module_es.cc	(working copy)
>@@ -1,8 +1,17 @@
> diff --git a/src/rgw/rgw_sync_module_es.cc b/src/rgw/rgw_sync_module_es.cc
>-index aa58219b5a..de4200d75e 100644
>+index b5be52413b..7275823314 100644
> --- src/rgw/rgw_sync_module_es.cc
> +++ src/rgw/rgw_sync_module_es.cc
>-@@ -244,7 +244,7 @@ struct es_index_config {
>+@@ -108,7 +108,7 @@ public:
>+ #define ES_NUM_REPLICAS_DEFAULT 1
>+ 
>+ using ESVersion = std::pair<int,int>;
>+-static constexpr ESVersion ES_V5{5,0};
>++static const ESVersion ES_V5{5,0};
>+ 
>+ struct ESInfo {
>+   std::string name;
>+@@ -402,7 +402,7 @@ struct es_index_config : public es_index_config_base {
>  };
>  
>  static bool is_sys_attr(const std::string& attr_name){

Flags:

wjw: maintainer-approval+

Actions: View | Diff

Attachments on bug 240009: 206747