Attachment 195265 Details for Bug 229877 – Diff of net/ceph

[patch] Diff of net/ceph

net_ceph12.diff (text/plain), 6.74 KB, created by Willem Jan Withagen on 2018-07-18 23:04:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Willem Jan Withagen

Created: 2018-07-18 23:04:32 UTC

Size: 6.74 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 474901)
>+++ Makefile	(working copy)
>@@ -3,8 +3,7 @@
> 
> PORTNAME=	ceph
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	12.2.4
>-PORTREVISION=	1
>+DISTVERSION=	12.2.7
> CATEGORIES=	net
> 
> MAINTAINER=	wjw@digiware.nl
>@@ -20,7 +19,7 @@
> BUILD_DEPENDS=	\
> 	yasm:devel/yasm \
> 	pkgconf:devel/pkgconf \
>-	sphinx-build:textproc/py-sphinx \
>+	sphinx-build:textproc/py-sphinx@${PY_FLAVOR} \
> 	gperf:devel/gperf \
> 	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
> LIB_DEPENDS=	\
>@@ -42,20 +41,21 @@
> 	xml:textproc/xmlstarlet \
> 	jq:textproc/jq \
> 	flock:sysutils/flock \
>-	virtualenv:devel/py-virtualenv \
>+	virtualenv:devel/py-virtualenv@${PY_FLAVOR} \
> 	${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR}
> 
> CONFLICTS_INSTALL=	ceph-devel
> PORTSCOUT=	limit:^v12\.
> 
>-USES=	gmake cmake:outsource,noninja python:2.7 fuse gettext-runtime shebangfix
>+USES=	gmake cmake:outsource,noninja python:2.7 fuse gettext-runtime shebangfix ssl
> 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:f0ba19f:ceph_object_corpus/ceph-object-corpus
>-GH_TUPLE+=	ceph:civetweb:bdaa39a:civetweb/src/civetweb
>+GH_TUPLE+=	ceph:ceph-object-corpus:e32bf8c:ceph_object_corpus/ceph-object-corpus
>+GH_TUPLE+=	ceph:civetweb:de23828: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
>@@ -63,9 +63,9 @@
> 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:62782e7:rocksdb/src/rocksdb
>+GH_TUPLE+=	ceph:rocksdb:e15382c:rocksdb/src/rocksdb
> GH_TUPLE+=	ceph:xxHash:1f40c65:xxHash/src/xxHash
>-GH_TUPLE+=	facebook:zstd:dc99312:zstd/src/zstd
>+GH_TUPLE+=	facebook:zstd:f4340f4:zstd/src/zstd
> 
> CMAKE_BUILD_TYPE=	Release
> CMAKE_ARGS=	\
>@@ -77,7 +77,6 @@
> 	-D WITH_XFS:BOOL=OFF \
> 	-D WITH_KVS:BOOL=OFF \
> 	-D WITH_BABELTRACE:BOOL=OFF \
>-	-D HAVE_BABELTRACE:BOOL=OFF \
> 	-D WITH_LIBCEPHFS:BOOL=OFF \
> 	-D WITH_CEPHFS:BOOL=OFF \
> 	-D WITH_EMBEDDED:BOOL=OFF \
>Index: distinfo
>===================================================================
>--- distinfo	(revision 474901)
>+++ distinfo	(working copy)
>@@ -1,12 +1,12 @@
>-TIMESTAMP = 1520209941
>-SHA256 (ceph-ceph-v12.2.4_GH0.tar.gz) = cc7586c8011a9e89edcb9021686d68daf6eeaf1f27cebe706aef454fd4f8728e
>-SIZE (ceph-ceph-v12.2.4_GH0.tar.gz) = 12153003
>-SHA256 (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 466f7185015df8d13f8b2b9a17ee30ab419bcd667284ce2b6d32a1128c4640f1
>-SIZE (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 3634266
>-SHA256 (ceph-ceph-object-corpus-f0ba19f_GH0.tar.gz) = 90e4052c6dca0e272bdca492216e62fdc0d19719e121451798295799bdf95499
>-SIZE (ceph-ceph-object-corpus-f0ba19f_GH0.tar.gz) = 1837935
>-SHA256 (ceph-civetweb-bdaa39a_GH0.tar.gz) = 4beb2e90c1f5d2ded9007de1c5159b88df14584978cefd47f713a9083172a2c0
>-SIZE (ceph-civetweb-bdaa39a_GH0.tar.gz) = 6850271
>+TIMESTAMP = 1531846602
>+SHA256 (ceph-ceph-v12.2.7_GH0.tar.gz) = 742dd402686b6c48824687be9bff951ede7608d41736cbcd55b130f7bd94f086
>+SIZE (ceph-ceph-v12.2.7_GH0.tar.gz) = 12236446
>+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 (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,9 +21,9 @@
> 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-62782e7_GH0.tar.gz) = b9e986117a57e27bd36d56b13a6abbb8819ad90a6f94669621e5a14be8e95b8e
>-SIZE (ceph-rocksdb-62782e7_GH0.tar.gz) = 3278289
>+SHA256 (ceph-rocksdb-e15382c_GH0.tar.gz) = e23177dd893b81b4d3d959464ee8e5c4fe64a408841c2584b29540c60ac5cf47
>+SIZE (ceph-rocksdb-e15382c_GH0.tar.gz) = 3278113
> SHA256 (ceph-xxHash-1f40c65_GH0.tar.gz) = 809e06b7493ed01f13c7ba972393a5a6d23dd92fd6b884381aa907005e569372
> SIZE (ceph-xxHash-1f40c65_GH0.tar.gz) = 25484
>-SHA256 (facebook-zstd-dc99312_GH0.tar.gz) = e10abc649b2708ad9112e138001a9c88eed05cae35e1139f5b96a51a549cf724
>-SIZE (facebook-zstd-dc99312_GH0.tar.gz) = 769078
>+SHA256 (facebook-zstd-f4340f4_GH0.tar.gz) = 0db909a46914eb7800bce044b86fcf595451713e56a2b131ace6f70ff25c1c4d
>+SIZE (facebook-zstd-f4340f4_GH0.tar.gz) = 1619022
>Index: files/file-git_version
>===================================================================
>--- files/file-git_version	(revision 474901)
>+++ files/file-git_version	(working copy)
>@@ -1,2 +1,2 @@
>-cf0baeeeeba3b47f9427c6c97e2144b094b7e5ba
>-v12.2.4
>+3ec878d1e53e1aeb47a9f619c49d9e7c0aa384d5
>+v12.2.7
>Index: files/patch-src_common_bounded__key__counter.h
>===================================================================
>--- files/patch-src_common_bounded__key__counter.h	(revision 474901)
>+++ files/patch-src_common_bounded__key__counter.h	(nonexistent)
>@@ -1,15 +0,0 @@
>---- src/common/bounded_key_counter.h.orig	2018-02-26 21:47:18 UTC
>-+++ src/common/bounded_key_counter.h
>-@@ -73,7 +73,11 @@ class BoundedKeyCounter {
>-   struct const_pointer_iterator : public map_type::const_iterator {
>-     const_pointer_iterator(typename map_type::const_iterator i)
>-       : map_type::const_iterator(i) {}
>--    const value_type* operator*() const {
>-+
>-+    using value_type = typename map_type::const_iterator::value_type*;
>-+    using reference = const typename map_type::const_iterator::value_type*;
>-+
>-+    reference operator*() const {
>-       return &map_type::const_iterator::operator*();
>-     }
>-   };
>
>Property changes on: files/patch-src_common_bounded__key__counter.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 229877: 195263 | 195265