pool/collectd
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 115081 from home:a_jaeger:FactoryFix

Browse Source 
Remove upstreamed patches.

OBS-URL: https://build.opensuse.org/request/show/115081
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=105
This commit is contained in:
Stefan Schubert 2012-04-23 10:59:28 +00:00 committed by Git OBS Bridge
parent a710be8044
commit d7c754c79b
3 changed files with 6 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
collectd-fix_new_yajl_lib.patch
View File

@ -1,24 +0,0 @@
--- src/curl_json.c
+++ src/curl_json.c
@@ -100,11 +100,9 @@
status = yajl_parse(db->yajl, (unsigned char *)buf, len);
if (status == yajl_status_ok)
{
- status = yajl_parse_complete(db->yajl);
+ status = yajl_complete_parse(db->yajl);
return (len);
}
- else if (status == yajl_status_insufficient_data)
- return (len);
if (status != yajl_status_ok)
{
@@ -760,7 +758,7 @@
char *url;
yajl_handle yprev = db->yajl;
- db->yajl = yajl_alloc (&ycallbacks, NULL, NULL, (void *)db);
+ db->yajl = yajl_alloc (&ycallbacks, NULL, (void *)db);
if (db->yajl == NULL)
{
ERROR ("curl_json plugin: yajl_alloc failed.");

18
collectd-libnotify_070.patch
View File

@ -1,18 +0,0 @@
diff --git a/src/notify_desktop.c b/src/notify_desktop.c
index 839bc61..31c2411 100644
--- a/src/notify_desktop.c
+++ b/src/notify_desktop.c
@@ -95,7 +95,13 @@ static int c_notify (const notification_t *n,
: (NOTIF_WARNING == n->severity) ? "WARNING"
: (NOTIF_OKAY == n->severity) ? "OKAY" : "UNKNOWN");
+#if (defined NOTIFY_CHECK_VERSION)
+#if NOTIFY_CHECK_VERSION(0, 7, 0)
+ notification = notify_notification_new (summary, n->message, NULL);
+#endif
+#else
notification = notify_notification_new (summary, n->message, NULL, NULL);
+#endif
if (NULL == notification) {
log_err ("Failed to create a new notification.");
return -1;

6
collectd.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Apr 23 10:56:57 UTC 2012 - aj@suse.de
- Drop collectd-fix_new_yajl_lib.patch and collect-libnotify_070.patch
both are handled in the new version.
-------------------------------------------------------------------
Tue Apr 17 15:26:43 UTC 2012 - pascal.bleser@opensuse.org