Package: fastnetmon
Version: 1.2.8-1
Severity: normal
Tags: patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Please find attached a patch that will allow fastnetmon to build with
mongo-c-driver >= 2.0 (which was recently uploaded to unstable).
Regards,
- -Roberto
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEIYZ1DR4ae5UL01q7ldFmTdL1kUIFAmine8wACgkQldFmTdL1
kUJYVQ/7BnvkP8EoVbw1Kay6IqQOm1GofuZOsOh2q0E/vFAvJNkhqzeEmnPlFzWN
SU68ZPW2M2rUCC7RYWVoeIUypDvxvsZqIeHWMRttPjCWkNuT6OCy6Blkfx2+aAPY
GnBpJ/kwENaaioWiUy7fT+iIaqsHp/ILM0bkVO6WfzqpQtfmyFWjs+aenmcRdnY6
E48R/cMs0hYhig9+3JnNfQXyNDX0n9Lgqy324QIKClRyUTGwixUvl3VhNgZsAP+9
qekM1Hp8iJe1z/8g6VgGh7JO8ObHDEOMdxAn0seM8FzEjjJUxquiUd1UQGfHIol/
3nBSzmrzWXO2DaQ3Hl069SvfYFEKYLATuESc1pvDD3Wq8wLI4JCEPj2WVz/1ad9C
+etUkDlFbiwU7vgLW5yqGmg9nOQ98j8fBzU2M5ZwzmtitknI+c1vSzYftnNNjbqn
Odm/kTRb/toc+3BE5Zbm030krh1nt2O8DFrVXRnTqAtz51951P10BSZfuffMTZnF
7EvDUW0kcll5IlmRezTPDkDFiaOR6Mz/7RbVlS+z8ulplJBrm3r+Z8yOn9W2KPW2
/qYayz/WgOq9uB5g0NG9Pn8MwVA4RXU1VIuemMqm8t96NKnzCn+YnugxztTAON79
4rTntjXHPm86XNuwEe7nmnnkGW/rcCnwzEEczRmt63ST5DGepXg=
=ZQbF
-----END PGP SIGNATURE-----
---
src/CMakeLists.txt | 49 ++++++++++++++++++++++++++++-------------------
src/fastnetmon_logic.cpp | 5 ++++
2 files changed, 35 insertions(+), 19 deletions(-)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -934,26 +934,37 @@
if (ENABLE_MONGODB_SUPPORT)
- ### Find mongo-c
- find_path(MONGOC_INCLUDES_FOLDER NAMES libmongoc-1.0/mongoc.h PATHS
"${MONGO_C_CUSTOM_INSTALL_PATH}/include" ${DISABLE_DEFAULT_PATH_SEARCH_VAR})
- find_library(MONGOC_LIBRARY_PATH NAMES mongoc-1.0 PATHS
"${MONGO_C_CUSTOM_INSTALL_PATH}/lib" ${DISABLE_DEFAULT_PATH_SEARCH_VAR})
-
- ### find bson
- find_path(BSON_INCLUDES_FOLDER NAMES libbson-1.0/bson.h PATHS
"${MONGO_C_CUSTOM_INSTALL_PATH}/include" ${DISABLE_DEFAULT_PATH_SEARCH_VAR})
- find_library(BSON_LIBRARY_PATH NAMES bson-1.0 PATHS
"${MONGO_C_CUSTOM_INSTALL_PATH}/lib" ${DISABLE_DEFAULT_PATH_SEARCH_VAR})
-
- if (MONGOC_INCLUDES_FOLDER AND MONGOC_LIBRARY_PATH AND
BSON_INCLUDES_FOLDER AND BSON_LIBRARY_PATH)
- message(STATUS "We found mongo-c library ${MONGOC_INCLUDES_FOLDER}
${MONGOC_LIBRARY_PATH} ${BSON_INCLUDES_FOLDER} ${BSON_LIBRARY_PATH}")
- add_definitions(-DMONGO)
-
- # We add suffix name because cmake could not detect it correctly...
- include_directories("${MONGOC_INCLUDES_FOLDER}/libmongoc-1.0")
- include_directories("${BSON_INCLUDES_FOLDER}/libbson-1.0")
+ find_package(bson QUIET)
+ find_package(mongoc QUIET)
- target_link_libraries(fastnetmon ${MONGOC_LIBRARY_PATH}
${BSON_LIBRARY_PATH})
- target_link_libraries(fastnetmon_logic ${MONGOC_LIBRARY_PATH}
${BSON_LIBRARY_PATH})
+ if (bson_FOUND AND mongoc_FOUND)
+ message(STATUS "We found mongo-c library mongoc::mongoc bson::bson")
+ add_definitions(-DMONGO -DUSING_MONGO2)
+ target_link_libraries(fastnetmon mongoc::mongoc)
+ target_link_libraries(fastnetmon_logic mongoc::mongoc)
else()
- message(FATAL_ERROR "We can't find Mongo C library")
+ ### Find mongo-c
+ find_path(MONGOC_INCLUDES_FOLDER NAMES libmongoc-1.0/mongoc.h PATHS
"${MONGO_C_CUSTOM_INSTALL_PATH}/include" ${DISABLE_DEFAULT_PATH_SEARCH_VAR})
+ find_library(MONGOC_LIBRARY_PATH NAMES mongoc-1.0 PATHS
"${MONGO_C_CUSTOM_INSTALL_PATH}/lib" ${DISABLE_DEFAULT_PATH_SEARCH_VAR})
+
+ ### find bson
+ find_path(BSON_INCLUDES_FOLDER NAMES libbson-1.0/bson.h PATHS
"${MONGO_C_CUSTOM_INSTALL_PATH}/include" ${DISABLE_DEFAULT_PATH_SEARCH_VAR})
+ find_library(BSON_LIBRARY_PATH NAMES bson-1.0 PATHS
"${MONGO_C_CUSTOM_INSTALL_PATH}/lib" ${DISABLE_DEFAULT_PATH_SEARCH_VAR})
+
+ if (MONGOC_INCLUDES_FOLDER AND MONGOC_LIBRARY_PATH AND
BSON_INCLUDES_FOLDER AND BSON_LIBRARY_PATH)
+ message(STATUS "We found mongo-c library ${MONGOC_INCLUDES_FOLDER}
${MONGOC_LIBRARY_PATH} ${BSON_INCLUDES_FOLDER} ${BSON_LIBRARY_PATH}")
+ add_definitions(-DMONGO)
+
+ # We add suffix name because cmake could not detect it correctly...
+ include_directories("${MONGOC_INCLUDES_FOLDER}/libmongoc-1.0")
+ include_directories("${BSON_INCLUDES_FOLDER}/libbson-1.0")
+
+ target_link_libraries(fastnetmon ${MONGOC_LIBRARY_PATH}
${BSON_LIBRARY_PATH})
+ target_link_libraries(fastnetmon_logic ${MONGOC_LIBRARY_PATH}
${BSON_LIBRARY_PATH})
+ else()
+ message(FATAL_ERROR "We can't find Mongo C library")
+ endif()
+
endif()
endif()
@@ -1216,4 +1227,4 @@
target_link_libraries(fastnetmon desock)
endif()
-
\ No newline at end of file
+
--- a/src/fastnetmon_logic.cpp
+++ b/src/fastnetmon_logic.cpp
@@ -56,9 +56,14 @@
#include "example_plugin/example_collector.hpp"
#ifdef MONGO
+#ifdef USING_MONGO2
+#include <bson/bson.h>
+#include <mongoc/mongoc.h>
+#elif
#include <bson.h>
#include <mongoc.h>
#endif
+#endif
#include "fastnetmon_networks.hpp"
