Revision: 25869
http://sourceforge.net/p/gar/code/25869
Author: dmichelsen
Date: 2016-08-03 14:42:43 +0000 (Wed, 03 Aug 2016)
Log Message:
-----------
collectd/trunk: Update to 5.5.2
Modified Paths:
--------------
csw/mgar/pkg/collectd/trunk/Makefile
csw/mgar/pkg/collectd/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/collectd/trunk/files/0001-Forward-port-1782.patch
Modified: csw/mgar/pkg/collectd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/collectd/trunk/Makefile 2016-08-03 13:53:51 UTC (rev
25868)
+++ csw/mgar/pkg/collectd/trunk/Makefile 2016-08-03 14:42:43 UTC (rev
25869)
@@ -1,7 +1,7 @@
# $Id$
#
NAME = collectd
-VERSION = 5.5.1.1126.g37fe166
+VERSION = 5.5.2
GARTYPE = v2
DESCRIPTION = Collects system performance statistics periodically
@@ -10,6 +10,9 @@
DISTFILES += $(DISTNAME).tar.bz2
DISTFILES += cswcollectd
+# Review on 5.5.3
+PATCHFILES += 0001-Forward-port-1782.patch
+
VENDOR_URL = http://collectd.org/
# Lots of others missing
@@ -25,15 +28,17 @@
BUILD_DEP_PKGS += CSWpostgresql-dev
BUILD_DEP_PKGS += CSWlibxmms-dev
BUILD_DEP_PKGS += CSWlibpsl-dev
+BUILD_DEP_PKGS += CSWlibesmtp-dev
BUILD_DEP_PKGS += CSWjdk7
+BUILD_DEP_PKGS += CSWlibprotobuf-c-dev
-# We need asprintf
+# We need asprintf in write_sensu.c until the vendor substitute is in place
from
+# https://github.com/collectd/collectd/pull/912
LINKER_MAPS =
GARCOMPILER = GNU
-# BUILD64 = 1
-BUILD64_ONLY = 1
+BUILD64 = 1
ISAEXEC = 1
###EXTRA_CPPFLAGS += -D__EXTENSIONS__
@@ -71,6 +76,19 @@
JAVA_CPPFLAGS = -I$(JAVA_HOME)/include
JAVA_LDFLAGS = -L$(JAVA_LIBDIR) -R$(JAVA_LIBDIR)
+# This must match DEFAULT_COMMAND_FILE from the nagios package in file
include/locations.h:
+# ./include/locations.h.in:#define DEFAULT_COMMAND_FILE
"@localstatedir@/rw/nagios.cmd"
+# ./include/locations.h:#define DEFAULT_COMMAND_FILE
"/var/opt/csw/nagios/rw/nagios.cmd"
+# The definition is used in src/notify_nagios.c
+EXTRA_CPPFLAGS += -DNAGIOS_COMMAND_FILE='\"$(localstatedir)/rw/nagios.cmd\"'
+
+# Also adjust location in example configuration
+# CommandFile "/usr/local/nagios/var/rw/nagios.cmd"
+REINPLACEMENTS += nagios
+REINPLACE_MATCH_nagios = /usr/local/nagios/var/rw/nagios.cmd
+REINPLACE_WITH_nagios = $(localstatedir)/rw/nagios.cmd
+REINPLACE_FILES_nagios += src/collectd.conf.in
+
# We need 'grep -q'
CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH)
@@ -112,12 +130,20 @@
RUNTIME_DEP_PKGS_CSWcollectd += CSWlibyajl2
RUNTIME_DEP_PKGS_CSWcollectd += CSWliboping0
RUNTIME_DEP_PKGS_CSWcollectd += CSWlibldap2-4-2
+RUNTIME_DEP_PKGS_CSWcollectd += CSWlibesmtp6
+RUNTIME_DEP_PKGS_CSWcollectd += CSWlibprotobuf-c1
+RUNTIME_DEP_PKGS_CSWcollectd += CSWlibstatgrab10
# These are pulled in because of a linker anomaly
RUNTIME_DEP_PKGS_CSWcollectd-sparc += CSWlibintl8
RUNTIME_DEP_PKGS_CSWcollectd-i386 += CSWlibmemcached8
RUNTIME_DEP_PKGS_CSWcollectd-i386 += CSWlibfl2
RUNTIME_DEP_PKGS_CSWcollectd += $(RUNTIME_DEP_PKGS_CSWcollectd-$(GARCH))
+# This is for asprintf in write_sensu, please see MAPFILE clearance above
+CHECKPKG_OVERRIDES_CSWcollectd +=
forbidden-version-interface-dependencies|/opt/csw/lib/collectd/write_sensu.so|requires|forbidden|interface|version|SUNW_1.22.7|in|library|libc.so.1
+CHECKPKG_OVERRIDES_CSWcollectd +=
forbidden-version-interface-dependencies|/opt/csw/lib/sparcv9/collectd/write_sensu.so|requires|forbidden|interface|version|SUNW_1.22.7|in|library|libc.so.1
+CHECKPKG_OVERRIDES_CSWcollectd +=
forbidden-version-interface-dependencies|/opt/csw/lib/amd64/collectd/write_sensu.so|requires|forbidden|interface|version|SUNW_1.22.7|in|library|libc.so.1
+
PACKAGES += CSWcollectd-plugin-dbi
SPKG_DESC_CSWcollectd-plugin-dbi = CollectD Plugin for DBI
PKGFILES_CSWcollectd-plugin-dbi += $(call pkgfiles_lib,collectd/dbi.so)
Modified: csw/mgar/pkg/collectd/trunk/checksums
===================================================================
--- csw/mgar/pkg/collectd/trunk/checksums 2016-08-03 13:53:51 UTC (rev
25868)
+++ csw/mgar/pkg/collectd/trunk/checksums 2016-08-03 14:42:43 UTC (rev
25869)
@@ -1 +1 @@
-7237d48fa0a42e7c3ee231b9c631b36e collectd-5.5.1.1126.g37fe166.tar.bz2
+40b83343f72089e0330f53965f1140bd collectd-5.5.2.tar.bz2
Added: csw/mgar/pkg/collectd/trunk/files/0001-Forward-port-1782.patch
===================================================================
--- csw/mgar/pkg/collectd/trunk/files/0001-Forward-port-1782.patch
(rev 0)
+++ csw/mgar/pkg/collectd/trunk/files/0001-Forward-port-1782.patch
2016-08-03 14:42:43 UTC (rev 25869)
@@ -0,0 +1,71 @@
+From 0bacf0dbb15b91e4569cc89e68f7aa6ea964bbca Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <d...@opencsw.org>
+Date: Wed, 3 Aug 2016 15:29:00 +0200
+Subject: [PATCH] Forward-port #1782
+
+---
+ src/write_riemann.c | 14 +++++++-------
+ src/write_riemann_threshold.c | 8 ++++----
+ 2 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/src/write_riemann.c b/src/write_riemann.c
+index 58611a9..dbac784 100644
+--- a/src/write_riemann.c
++++ b/src/write_riemann.c
+@@ -26,6 +26,13 @@
+ * Florian octo Forster <octo at collectd.org>
+ */
+
++#include "plugin.h"
++#include "common.h"
++#include "configfile.h"
++#include "utils_cache.h"
++#include "riemann.pb-c.h"
++#include "write_riemann_threshold.h"
++
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+ #include <errno.h>
+@@ -33,13 +40,6 @@
+ #include <inttypes.h>
+ #include <pthread.h>
+
+-#include "collectd.h"
+-#include "plugin.h"
+-#include "common.h"
+-#include "configfile.h"
+-#include "utils_cache.h"
+-#include "riemann.pb-c.h"
+-#include "write_riemann_threshold.h"
+
+ #define RIEMANN_HOST "localhost"
+ #define RIEMANN_PORT "5555"
+diff --git a/src/write_riemann_threshold.c b/src/write_riemann_threshold.c
+index b1f7297..18dec69 100644
+--- a/src/write_riemann_threshold.c
++++ b/src/write_riemann_threshold.c
+@@ -25,10 +25,6 @@
+ * Andrés J. Díaz <ajdiaz at connectical.com>
+ **/
+
+-#include <assert.h>
+-#include <ltdl.h>
+-#include <pthread.h>
+-
+ #include "collectd.h"
+ #include "common.h"
+ #include "plugin.h"
+@@ -37,6 +33,10 @@
+ #include "utils_threshold.h"
+ #include "write_riemann_threshold.h"
+
++#include <assert.h>
++#include <ltdl.h>
++#include <pthread.h>
++
+ /*
+ * Threshold management
+ * ====================
+--
+2.4.0
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
