| 1 |
hwoarang 12/10/30 19:33:13 |
| 2 |
|
| 3 |
Added: collectd-5.1.0-libperl.patch |
| 4 |
collectd-5.1.0-mongoc06.patch |
| 5 |
Log: |
| 6 |
Revbump for #436538 and #437680. Thanks to Johan Bergström <bugs@××××××××××.nu> |
| 7 |
|
| 8 |
(Portage version: 2.1.11.30/cvs/Linux x86_64, signed Manifest commit with key B4AFF2C2) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 app-admin/collectd/files/collectd-5.1.0-libperl.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/files/collectd-5.1.0-libperl.patch?rev=1.1&view=markup |
| 14 |
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 |
| 15 |
|
| 16 |
Index: collectd-5.1.0-libperl.patch |
| 17 |
=================================================================== |
| 18 |
diff --git a/configure.in b/configure.in |
| 19 |
index 1cfc2fc..384c298 100644 |
| 20 |
--- a/configure.in |
| 21 |
+++ b/configure.in |
| 22 |
@@ -2944,11 +2944,13 @@ if test "x$with_libperl" = "xyes" \ |
| 23 |
then |
| 24 |
SAVE_CFLAGS="$CFLAGS" |
| 25 |
SAVE_LDFLAGS="$LDFLAGS" |
| 26 |
+ SAVE_LIBS="$LIBS" |
| 27 |
dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string) |
| 28 |
PERL_CFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ccopts` |
| 29 |
PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts` |
| 30 |
CFLAGS="$CFLAGS $PERL_CFLAGS" |
| 31 |
LDFLAGS="$LDFLAGS $PERL_LDFLAGS" |
| 32 |
+ LIBS="$LIBS -lperl -lpthread" |
| 33 |
|
| 34 |
AC_CACHE_CHECK([for libperl], |
| 35 |
[c_cv_have_libperl], |
| 36 |
@@ -2967,7 +2969,10 @@ dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string |
| 37 |
Nullsv); |
| 38 |
]]), |
| 39 |
[c_cv_have_libperl="yes"], |
| 40 |
- [c_cv_have_libperl="no"] |
| 41 |
+ [ |
| 42 |
+ c_cv_have_libperl="no" |
| 43 |
+ LIBS="$SAVE_LIBS" |
| 44 |
+ ] |
| 45 |
) |
| 46 |
) |
| 47 |
|
| 48 |
|
| 49 |
|
| 50 |
1.1 app-admin/collectd/files/collectd-5.1.0-mongoc06.patch |
| 51 |
|
| 52 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/files/collectd-5.1.0-mongoc06.patch?rev=1.1&view=markup |
| 53 |
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 |
| 54 |
|
| 55 |
Index: collectd-5.1.0-mongoc06.patch |
| 56 |
=================================================================== |
| 57 |
diff --git a/src/write_mongodb.c b/src/write_mongodb.c |
| 58 |
index 8d76b60..c7b7682 100644 |
| 59 |
--- a/src/write_mongodb.c |
| 60 |
+++ b/src/write_mongodb.c |
| 61 |
@@ -195,7 +195,14 @@ static int wm_write (const data_set_t *ds, /* {{{ */ |
| 62 |
/* Assert if the connection has been established */ |
| 63 |
assert (mongo_is_connected (node->conn)); |
| 64 |
|
| 65 |
- status = mongo_insert (node->conn, collection_name, bson_record); |
| 66 |
+ #if MONGO_MINOR >= 6 |
| 67 |
+ /* There was an API change in 0.6.0 as linked below */ |
| 68 |
+ /* https://github.com/mongodb/mongo-c-driver/blob/master/HISTORY.md */ |
| 69 |
+ status = mongo_insert (node->conn, collection_name, bson_record, NULL); |
| 70 |
+ #else |
| 71 |
+ status = mongo_insert (node->conn, collection_name, bson_record); |
| 72 |
+ #endif |
| 73 |
+ |
| 74 |
if(status != MONGO_OK) |
| 75 |
{ |
| 76 |
ERROR ( "write_mongodb plugin: error inserting record: %d", node->conn->err); |
Archives