[gentoo-commits] gentoo-x86 commit in app-admin/collectd/files: collectd-5.1.0-libperl.patch collectd-5.1.0-mongoc06.patch

[gentoo-commits] gentoo-x86 commit in app-admin/collectd/files: collectd-5.1.0-libperl.patch collectd-5.1.0-mongoc06.patch

[Markos Chandras (hwoarang)]

hwoarang    12/10/30 19:33:13

  Added:                collectd-5.1.0-libperl.patch
                        collectd-5.1.0-mongoc06.patch
  Log:
  Revbump for #436538 and #437680. Thanks to Johan Bergström <bugs@bergstroem.nu>
  
  (Portage version: 2.1.11.30/cvs/Linux x86_64, signed Manifest commit with key B4AFF2C2)

Revision  Changes    Path
1.1                  app-admin/collectd/files/collectd-5.1.0-libperl.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/files/collectd-5.1.0-libperl.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/files/collectd-5.1.0-libperl.patch?rev=1.1&content-type=text/plain

Index: collectd-5.1.0-libperl.patch
===================================================================
diff --git a/configure.in b/configure.in
index 1cfc2fc..384c298 100644
--- a/configure.in
+++ b/configure.in
@@ -2944,11 +2944,13 @@ if test "x$with_libperl" = "xyes" \
 then
   SAVE_CFLAGS="$CFLAGS"
   SAVE_LDFLAGS="$LDFLAGS"
+  SAVE_LIBS="$LIBS"
 dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string)
   PERL_CFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ccopts`
   PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts`
   CFLAGS="$CFLAGS $PERL_CFLAGS"
   LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
+  LIBS="$LIBS -lperl -lpthread"
 
   AC_CACHE_CHECK([for libperl],
     [c_cv_have_libperl],
@@ -2967,7 +2969,10 @@ dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string
 			 Nullsv);
       ]]),
       [c_cv_have_libperl="yes"],
-      [c_cv_have_libperl="no"]
+      [ 
+        c_cv_have_libperl="no" 
+        LIBS="$SAVE_LIBS"
+      ]
     )
   )
 


1.1                  app-admin/collectd/files/collectd-5.1.0-mongoc06.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/files/collectd-5.1.0-mongoc06.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/files/collectd-5.1.0-mongoc06.patch?rev=1.1&content-type=text/plain

Index: collectd-5.1.0-mongoc06.patch
===================================================================
diff --git a/src/write_mongodb.c b/src/write_mongodb.c
index 8d76b60..c7b7682 100644
--- a/src/write_mongodb.c
+++ b/src/write_mongodb.c
@@ -195,7 +195,14 @@ static int wm_write (const data_set_t *ds, /* {{{ */
   /* Assert if the connection has been established */
   assert (mongo_is_connected (node->conn));
 
-  status = mongo_insert (node->conn, collection_name, bson_record);
+  #if MONGO_MINOR >= 6
+    /* There was an API change in 0.6.0 as linked below */
+    /* https://github.com/mongodb/mongo-c-driver/blob/master/HISTORY.md */
+    status = mongo_insert (node->conn, collection_name, bson_record, NULL);
+  #else
+    status = mongo_insert (node->conn, collection_name, bson_record);
+  #endif
+
   if(status != MONGO_OK)
   {
     ERROR ( "write_mongodb plugin: error inserting record: %d", node->conn->err);