net/ceph: update to 12.2.4

- Convert to USE_OPENLDAP
- Drop LLD dependency [1]
- Limit portscout reports to 12.*

Changes:	https://ceph.com/releases/v12-2-3-luminous-released/
Changes:	https://ceph.com/releases/v12-2-4-luminous-released/
PR:		224805 [1] 226376
Submitted by:	Willem Jan Withagen (maintainer)

net/ceph/Makefile

@@ -3,8 +3,7 @@
 
 PORTNAME=	ceph
 DISTVERSIONPREFIX=	v
-DISTVERSION=	12.2.2
-PORTREVISION=	1
+DISTVERSION=	12.2.4
 CATEGORIES=	net
 
 MAINTAINER=	wjw@digiware.nl
@@ -25,9 +24,9 @@ BUILD_DEPENDS=	\
 	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
 LIB_DEPENDS=	\
 	${PY_BOOST} \
+	libboost_python.so:devel/boost-python-libs \
 	libboost_thread.so:devel/boost-libs \
 	libleveldb.so:databases/leveldb \
-	libldap.so:net/openldap24-client \
 	libnss3.so:security/nss \
 	libcryptopp.so:security/cryptopp \
 	libsnappy.so:archivers/snappy \
@@ -47,14 +46,16 @@ RUN_DEPENDS=	\
 	${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
 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:de23828:civetweb/src/civetweb
+GH_TUPLE+=	ceph:civetweb:bdaa39a: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,14 +63,12 @@ GH_TUPLE+=	ceph:googletest:fdb8504:googletest/src/googletest
 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:62782e7:rocksdb/src/rocksdb
 GH_TUPLE+=	ceph:xxHash:1f40c65:xxHash/src/xxHash
 GH_TUPLE+=	facebook:zstd:dc99312:zstd/src/zstd
 
 CMAKE_BUILD_TYPE=	Release
 CMAKE_ARGS=	\
-	-D CMAKE_C_LINK_FLAGS:STRING=" -fuse-ld=/usr/bin/ld.lld" \
-	-D CMAKE_CXX_LINK_FLAGS:STRING=" -fuse-ld=/usr/bin/ld.lld" \
 	-D WITH_SYSTEM_BOOST:BOOL=ON \
 	-D CEPH_MAN_DIR:STRING=man \
 	-D WITH_LTTNG:BOOL=OFF \

net/ceph/distinfo

@@ -1,12 +1,12 @@
-TIMESTAMP = 1514583693
-SHA256 (ceph-ceph-v12.2.2_GH0.tar.gz) = 398e8b2217b4b270083a6bb8c8dab1c312a6c373d6e02b8f24c82f82e704518a
-SIZE (ceph-ceph-v12.2.2_GH0.tar.gz) = 17408729
+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-de23828_GH0.tar.gz) = a9a95dd58e9b4a696fa0c822c1401856c55ef9b67fb28cf15d97f19f1af2ecbd
-SIZE (ceph-civetweb-de23828_GH0.tar.gz) = 6850197
+SHA256 (ceph-civetweb-bdaa39a_GH0.tar.gz) = 4beb2e90c1f5d2ded9007de1c5159b88df14584978cefd47f713a9083172a2c0
+SIZE (ceph-civetweb-bdaa39a_GH0.tar.gz) = 6850271
 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 @@ SHA256 (ceph-lua-1fce39c_GH0.tar.gz) = fb5f778ce4da349ca903512a2fdb3987b12e3f0a5
 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-62782e7_GH0.tar.gz) = b9e986117a57e27bd36d56b13a6abbb8819ad90a6f94669621e5a14be8e95b8e
+SIZE (ceph-rocksdb-62782e7_GH0.tar.gz) = 3278289
 SHA256 (ceph-xxHash-1f40c65_GH0.tar.gz) = 809e06b7493ed01f13c7ba972393a5a6d23dd92fd6b884381aa907005e569372
 SIZE (ceph-xxHash-1f40c65_GH0.tar.gz) = 25484
 SHA256 (facebook-zstd-dc99312_GH0.tar.gz) = e10abc649b2708ad9112e138001a9c88eed05cae35e1139f5b96a51a549cf724

net/ceph/files/file-git_version

@@ -1,2 +1,2 @@
 cf0baeeeeba3b47f9427c6c97e2144b094b7e5ba
-v12.2.2
+v12.2.4

net/ceph/files/patch-src_common_bounded__key__counter.h

@@ -0,0 +1,15 @@
+--- 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*();
+     }
+   };

net/ceph/files/patch-src_tools_ceph__kvstore__tool.cc

@@ -1,6 +1,6 @@
---- src/tools/ceph_kvstore_tool.cc.orig	2017-11-30 14:59:27 UTC
+--- src/tools/ceph_kvstore_tool.cc.orig	2018-02-26 21:47:18 UTC
 +++ src/tools/ceph_kvstore_tool.cc
-@@ -36,11 +36,13 @@ using namespace std;
+@@ -36,7 +36,9 @@ using namespace std;
  
  class StoreTool
  {
@@ -10,10 +10,6 @@
  
    // TODO: make KeyValueDB enable_shared_from_this
    // bluestore will hold *db* also, use unique_ptr/shared_ptr will
-   // double free. 
-   KeyValueDB* db;
- 
-   string store_path;
 @@ -74,10 +76,13 @@ class StoreTool
    }