Attachment #195265 for bug #229877

View | Details | Raw Unified | Return to bug 229877
Collapse All | Expand All





PORTNAME=	ceph
DISTVERSIONPREFIX=	v
DISTVERSION=	12.2.7
PORTREVISION=	1
CATEGORIES=	net

MAINTAINER=	wjw@digiware.nl

BUILD_DEPENDS=	\
	yasm:devel/yasm \
	pkgconf:devel/pkgconf \
	sphinx-build:textproc/py-sphinx@${PY_FLAVOR} \
	gperf:devel/gperf \
	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
LIB_DEPENDS=	\

	xml:textproc/xmlstarlet \
	jq:textproc/jq \
	flock:sysutils/flock \
	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 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: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

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:xxHash:1f40c65:xxHash/src/xxHash
GH_TUPLE+=	facebook:zstd:f4340f4:zstd/src/zstd

CMAKE_BUILD_TYPE=	Release
CMAKE_ARGS=	\

	-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 \




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

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-xxHash-1f40c65_GH0.tar.gz) = 809e06b7493ed01f13c7ba972393a5a6d23dd92fd6b884381aa907005e569372
SIZE (ceph-xxHash-1f40c65_GH0.tar.gz) = 25484
SHA256 (facebook-zstd-f4340f4_GH0.tar.gz) = 0db909a46914eb7800bce044b86fcf595451713e56a2b131ace6f70ff25c1c4d
SIZE (facebook-zstd-f4340f4_GH0.tar.gz) = 1619022

Lines 1-2 Link Here

(-)files/file-git_version (-2 / +2 lines)
1	cf0baeeeeba3b47f9427c6c97e2144b094b7e5ba	1	3ec878d1e53e1aeb47a9f619c49d9e7c0aa384d5
2	v12.2.4	2	v12.2.7




--- 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*();
     }
   };

Return to bug 229877

Lines 3-10 Link Here

(-)Makefile (-10 / +9 lines)
3		3
4	PORTNAME= ceph	4	PORTNAME= ceph
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	DISTVERSION= 12.2.4	6	DISTVERSION= 12.2.7
7	PORTREVISION= 1
8	CATEGORIES= net	7	CATEGORIES= net
9		8
10	MAINTAINER= wjw@digiware.nl	9	MAINTAINER= wjw@digiware.nl
Lines 20-26 Link Here
20	BUILD_DEPENDS= \	19	BUILD_DEPENDS= \
21	yasm:devel/yasm \	20	yasm:devel/yasm \
22	pkgconf:devel/pkgconf \	21	pkgconf:devel/pkgconf \
23	sphinx-build:textproc/py-sphinx \	22	sphinx-build:textproc/py-sphinx@${PY_FLAVOR} \
24	gperf:devel/gperf \	23	gperf:devel/gperf \
25	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops	24	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
26	LIB_DEPENDS= \	25	LIB_DEPENDS= \
Lines 42-61 Link Here
42	xml:textproc/xmlstarlet \	41	xml:textproc/xmlstarlet \
43	jq:textproc/jq \	42	jq:textproc/jq \
44	flock:sysutils/flock \	43	flock:sysutils/flock \
45	virtualenv:devel/py-virtualenv \	44	virtualenv:devel/py-virtualenv@${PY_FLAVOR} \
46	${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR}	45	${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR}
47		46
48	CONFLICTS_INSTALL= ceph-devel	47	CONFLICTS_INSTALL= ceph-devel
49	PORTSCOUT= limit:^v12\.	48	PORTSCOUT= limit:^v12\.
50		49
51	USES= gmake cmake:outsource,noninja python:2.7 fuse gettext-runtime shebangfix	50	USES= gmake cmake:outsource,noninja python:2.7 fuse gettext-runtime shebangfix ssl
52	USE_PYTHON= cython	51	USE_PYTHON= cython
53	USE_OPENLDAP= yes	52	USE_OPENLDAP= yes
54	USE_GITHUB= yes	53	USE_GITHUB= yes
55	GH_ACCOUNT= ceph:DEFAULT	54	GH_ACCOUNT= ceph:DEFAULT
		55
56	GH_TUPLE+= ceph:ceph-erasure-code-corpus:2d7d78b:ceph_erasure_code_corpus/ceph-erasure-code-corpus	56	GH_TUPLE+= ceph:ceph-erasure-code-corpus:2d7d78b:ceph_erasure_code_corpus/ceph-erasure-code-corpus
57	GH_TUPLE+= ceph:ceph-object-corpus:f0ba19f:ceph_object_corpus/ceph-object-corpus	57	GH_TUPLE+= ceph:ceph-object-corpus:e32bf8c:ceph_object_corpus/ceph-object-corpus
58	GH_TUPLE+= ceph:civetweb:bdaa39a:civetweb/src/civetweb	58	GH_TUPLE+= ceph:civetweb:de23828:civetweb/src/civetweb
59	GH_TUPLE+= 01org:isa-l_crypto:603529a:isa_l_crypto/src/crypto/isa-l/isa-l_crypto	59	GH_TUPLE+= 01org:isa-l_crypto:603529a:isa_l_crypto/src/crypto/isa-l/isa-l_crypto
60	GH_TUPLE+= ceph:gf-complete:7e61b44:gf_complete/src/erasure-code/jerasure/gf-complete	60	GH_TUPLE+= ceph:gf-complete:7e61b44:gf_complete/src/erasure-code/jerasure/gf-complete
61	GH_TUPLE+= ceph:jerasure:96c76b8:jerasure/src/erasure-code/jerasure/jerasure	61	GH_TUPLE+= ceph:jerasure:96c76b8:jerasure/src/erasure-code/jerasure/jerasure
Lines 63-71 Link Here
63	GH_TUPLE+= ceph:isa-l:7e1a337:isa_l/src/isa-l	63	GH_TUPLE+= ceph:isa-l:7e1a337:isa_l/src/isa-l
64	GH_TUPLE+= ceph:lua:1fce39c:lua/src/lua	64	GH_TUPLE+= ceph:lua:1fce39c:lua/src/lua
65	GH_TUPLE+= ceph:rapidjson:f54b0e4:rapidjson/src/rapidjson	65	GH_TUPLE+= ceph:rapidjson:f54b0e4:rapidjson/src/rapidjson
66	GH_TUPLE+= ceph:rocksdb:62782e7:rocksdb/src/rocksdb	66	GH_TUPLE+= ceph:rocksdb:e15382c:rocksdb/src/rocksdb
67	GH_TUPLE+= ceph:xxHash:1f40c65:xxHash/src/xxHash	67	GH_TUPLE+= ceph:xxHash:1f40c65:xxHash/src/xxHash
68	GH_TUPLE+= facebook:zstd:dc99312:zstd/src/zstd	68	GH_TUPLE+= facebook:zstd:f4340f4:zstd/src/zstd
69		69
70	CMAKE_BUILD_TYPE= Release	70	CMAKE_BUILD_TYPE= Release
71	CMAKE_ARGS= \	71	CMAKE_ARGS= \
Lines 77-83 Link Here
77	-D WITH_XFS:BOOL=OFF \	77	-D WITH_XFS:BOOL=OFF \
78	-D WITH_KVS:BOOL=OFF \	78	-D WITH_KVS:BOOL=OFF \
79	-D WITH_BABELTRACE:BOOL=OFF \	79	-D WITH_BABELTRACE:BOOL=OFF \
80	-D HAVE_BABELTRACE:BOOL=OFF \
81	-D WITH_LIBCEPHFS:BOOL=OFF \	80	-D WITH_LIBCEPHFS:BOOL=OFF \
82	-D WITH_CEPHFS:BOOL=OFF \	81	-D WITH_CEPHFS:BOOL=OFF \
83	-D WITH_EMBEDDED:BOOL=OFF \	82	-D WITH_EMBEDDED:BOOL=OFF \

Lines 1-12 Link Here

(-)distinfo (-13 / +13 lines)
1	TIMESTAMP = 1520209941	1	TIMESTAMP = 1531846602
2	SHA256 (ceph-ceph-v12.2.4_GH0.tar.gz) = cc7586c8011a9e89edcb9021686d68daf6eeaf1f27cebe706aef454fd4f8728e	2	SHA256 (ceph-ceph-v12.2.7_GH0.tar.gz) = 742dd402686b6c48824687be9bff951ede7608d41736cbcd55b130f7bd94f086
3	SIZE (ceph-ceph-v12.2.4_GH0.tar.gz) = 12153003	3	SIZE (ceph-ceph-v12.2.7_GH0.tar.gz) = 12236446
4	SHA256 (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 466f7185015df8d13f8b2b9a17ee30ab419bcd667284ce2b6d32a1128c4640f1	4	SHA256 (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 8ab8f36f3e0a720c882b8bb4abb3f2e26bd6b025cc263119207f7d2eb3b1e490
5	SIZE (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 3634266	5	SIZE (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 3685656
6	SHA256 (ceph-ceph-object-corpus-f0ba19f_GH0.tar.gz) = 90e4052c6dca0e272bdca492216e62fdc0d19719e121451798295799bdf95499	6	SHA256 (ceph-ceph-object-corpus-e32bf8c_GH0.tar.gz) = 79ff0d1b9f959c9f5264a0dff193105d71885615deaa9c8469902400fd82d214
7	SIZE (ceph-ceph-object-corpus-f0ba19f_GH0.tar.gz) = 1837935	7	SIZE (ceph-ceph-object-corpus-e32bf8c_GH0.tar.gz) = 1838192
8	SHA256 (ceph-civetweb-bdaa39a_GH0.tar.gz) = 4beb2e90c1f5d2ded9007de1c5159b88df14584978cefd47f713a9083172a2c0	8	SHA256 (ceph-civetweb-de23828_GH0.tar.gz) = a9a95dd58e9b4a696fa0c822c1401856c55ef9b67fb28cf15d97f19f1af2ecbd
9	SIZE (ceph-civetweb-bdaa39a_GH0.tar.gz) = 6850271	9	SIZE (ceph-civetweb-de23828_GH0.tar.gz) = 6850197
10	SHA256 (01org-isa-l_crypto-603529a_GH0.tar.gz) = 52708b98c832bb7e6db60c949ece261d9609c822ae55239b0f2133cec2b3d155	10	SHA256 (01org-isa-l_crypto-603529a_GH0.tar.gz) = 52708b98c832bb7e6db60c949ece261d9609c822ae55239b0f2133cec2b3d155
11	SIZE (01org-isa-l_crypto-603529a_GH0.tar.gz) = 439149	11	SIZE (01org-isa-l_crypto-603529a_GH0.tar.gz) = 439149
12	SHA256 (ceph-gf-complete-7e61b44_GH0.tar.gz) = 7b0e5c1b41399d2c7d97ed7a7547ebf40023bcd104ed9a8b2b75bdee440c1a4d	12	SHA256 (ceph-gf-complete-7e61b44_GH0.tar.gz) = 7b0e5c1b41399d2c7d97ed7a7547ebf40023bcd104ed9a8b2b75bdee440c1a4d
Lines 21-29 Link Here
21	SIZE (ceph-lua-1fce39c_GH0.tar.gz) = 366778	21	SIZE (ceph-lua-1fce39c_GH0.tar.gz) = 366778
22	SHA256 (ceph-rapidjson-f54b0e4_GH0.tar.gz) = 35c330d40ed9def99e8dea8f3b0e4fda7610b813b6f4aac9a70ffefcb9ab1f1e	22	SHA256 (ceph-rapidjson-f54b0e4_GH0.tar.gz) = 35c330d40ed9def99e8dea8f3b0e4fda7610b813b6f4aac9a70ffefcb9ab1f1e
23	SIZE (ceph-rapidjson-f54b0e4_GH0.tar.gz) = 1019457	23	SIZE (ceph-rapidjson-f54b0e4_GH0.tar.gz) = 1019457
24	SHA256 (ceph-rocksdb-62782e7_GH0.tar.gz) = b9e986117a57e27bd36d56b13a6abbb8819ad90a6f94669621e5a14be8e95b8e	24	SHA256 (ceph-rocksdb-e15382c_GH0.tar.gz) = e23177dd893b81b4d3d959464ee8e5c4fe64a408841c2584b29540c60ac5cf47
25	SIZE (ceph-rocksdb-62782e7_GH0.tar.gz) = 3278289	25	SIZE (ceph-rocksdb-e15382c_GH0.tar.gz) = 3278113
26	SHA256 (ceph-xxHash-1f40c65_GH0.tar.gz) = 809e06b7493ed01f13c7ba972393a5a6d23dd92fd6b884381aa907005e569372	26	SHA256 (ceph-xxHash-1f40c65_GH0.tar.gz) = 809e06b7493ed01f13c7ba972393a5a6d23dd92fd6b884381aa907005e569372
27	SIZE (ceph-xxHash-1f40c65_GH0.tar.gz) = 25484	27	SIZE (ceph-xxHash-1f40c65_GH0.tar.gz) = 25484
28	SHA256 (facebook-zstd-dc99312_GH0.tar.gz) = e10abc649b2708ad9112e138001a9c88eed05cae35e1139f5b96a51a549cf724	28	SHA256 (facebook-zstd-f4340f4_GH0.tar.gz) = 0db909a46914eb7800bce044b86fcf595451713e56a2b131ace6f70ff25c1c4d
29	SIZE (facebook-zstd-dc99312_GH0.tar.gz) = 769078	29	SIZE (facebook-zstd-f4340f4_GH0.tar.gz) = 1619022

Lines 1-15 Link Here

(-)files/patch-src_common_bounded__key__counter.h (-15 lines)
1	--- src/common/bounded_key_counter.h.orig 2018-02-26 21:47:18 UTC
2	+++ src/common/bounded_key_counter.h
3	@@ -73,7 +73,11 @@ class BoundedKeyCounter {
4	struct const_pointer_iterator : public map_type::const_iterator {
5	const_pointer_iterator(typename map_type::const_iterator i)
6	: map_type::const_iterator(i) {}
7	- const value_type* operator*() const {
8	+
9	+ using value_type = typename map_type::const_iterator::value_type*;
10	+ using reference = const typename map_type::const_iterator::value_type*;
11	+
12	+ reference operator*() const {
13	return &map_type::const_iterator::operator*();
14	}
15	};