Revision: 25935
http://sourceforge.net/p/gar/code/25935
Author: dmichelsen
Date: 2016-09-11 13:37:14 +0000 (Sun, 11 Sep 2016)
Log Message:
-----------
collectd/trunk: Update to 5.6.0
Modified Paths:
--------------
csw/mgar/pkg/collectd/trunk/Makefile
csw/mgar/pkg/collectd/trunk/checksums
Removed 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-09-09 12:43:50 UTC (rev
25934)
+++ csw/mgar/pkg/collectd/trunk/Makefile 2016-09-11 13:37:14 UTC (rev
25935)
@@ -1,17 +1,18 @@
# $Id$
#
NAME = collectd
-VERSION = 5.5.2
+VERSION = 5.6.0
GARTYPE = v2
DESCRIPTION = Collects system performance statistics periodically
MASTER_SITES = http://collectd.org/files/
+# MASTER_SITES +=
https://ci.collectd.org/job/packages-prepare-tarball-collectd-5.6/lastSuccessfulBuild/artifact/
DISTFILES += $(DISTNAME).tar.bz2
DISTFILES += cswcollectd
-# Review on 5.5.3
-PATCHFILES += 0001-Forward-port-1782.patch
+PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
+PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386
VENDOR_URL = http://collectd.org/
@@ -32,21 +33,11 @@
BUILD_DEP_PKGS += CSWjdk7
BUILD_DEP_PKGS += CSWlibprotobuf-c-dev
-# 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
ISAEXEC = 1
-###EXTRA_CPPFLAGS += -D__EXTENSIONS__
-
-# GCC 5 has C standards which are too new for the headers
-#EXTRA_CFLAGS += -std=c99
-###EXTRA_CPPFLAGS += -D_XPG6
-
EXTRA_CFLAGS += -std=gnu99
CONFIGURE_ARGS += $(DIRPATHS)
@@ -58,10 +49,6 @@
# Make sure net-snmp-config is found at the correct path for both 32 and 64 bit
CONFIGURE_ARGS += --with-snmp-config=$(bindir)/net-snmp-config
-# Use only Java 8 and 64 bit until this is fixed:
-# https://github.com/collectd/collectd/issues/1007
-# Also the detection uses "find" which does not follow symlinks
-
JAVA_ARCHDIR-sparc-32 = sparc
JAVA_ARCHDIR-sparc-64 = sparcv9
JAVA_ARCHDIR-i386-32 = i386
@@ -92,6 +79,10 @@
# We need 'grep -q'
CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH)
+# Make sure we pick up the correct python
+EXTRA_CONFIGURE_EXPORTS += PYTHON_CONFIG
+CONFIGURE_ENV_PYTHON_CONFIG = /opt/csw/bin/python2.7-config
+
CONFIGURE_ARGS += --enable-java
CONFIGURE_ARGS += JAVAC="$(JAVAC)"
CONFIGURE_ARGS += JAR="$(JAR)"
@@ -104,6 +95,9 @@
# This is Linux only
# CONFIGURE_ARGS += --enable-protocols
+# No 64 bit Perl yet
+CONFIGURE_ARGS-64 += --disable-perl
+
CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
PACKAGES += CSWlibcollectdclient1
@@ -134,15 +128,12 @@
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-sparc += CSWlibintl9
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
+IPS_DEVPKG = CSWcollectd
PACKAGES += CSWcollectd-plugin-dbi
SPKG_DESC_CSWcollectd-plugin-dbi = CollectD Plugin for DBI
@@ -233,12 +224,31 @@
RUNTIME_DEP_PKGS_CSWcollectd-plugin-xmms-sparc += CSWlibgdk1-2-0
RUNTIME_DEP_PKGS_CSWcollectd-plugin-xmms-sparc += CSWlibglib1-2-0
RUNTIME_DEP_PKGS_CSWcollectd-plugin-xmms-sparc += CSWlibgtk1-2-0
-RUNTIME_DEP_PKGS_CSWcollectd-plugin-xmms-sparc += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWcollectd-plugin-xmms-sparc += CSWlibintl9
RUNTIME_DEP_PKGS_CSWcollectd-plugin-xmms +=
$(RUNTIME_DEP_PKGS_CSWcollectd-plugin-xmms-$(GARCH))
# No 64 bit XMMS yet
CHECKPKG_OVERRIDES_CSWcollectd-plugin-xmms += 64-bit-binaries-missing
+PACKAGES += CSWcollectd-plugin-lua
+SPKG_DESC_CSWcollectd-plugin-lua = CollectD Plugin for Lua
+PKGFILES_CSWcollectd-plugin-lua += $(call pkgfiles_lib,collectd/lua.so)
+PKGFILES_CSWcollectd-plugin-lua += $(mandir)/man5/collectd-lua.5
+RUNTIME_DEP_PKGS_CSWcollectd-plugin-lua += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWcollectd-plugin-lua += CSWcollectd
+CHECKPKG_OVERRIDES_CSWcollectd-plugin-lua += surplus-dependency|CSWcollectd
+RUNTIME_DEP_PKGS_CSWcollectd-plugin-lua += CSWliblua5-2
+
+PACKAGES += CSWcollectd-plugin-riemann
+SPKG_DESC_CSWcollectd-plugin-riemann = CollectD Plugin for Riemann
+PKGFILES_CSWcollectd-plugin-riemann += $(call
pkgfiles_lib,collectd/write_riemann.so)
+RUNTIME_DEP_PKGS_CSWcollectd-plugin-riemann += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWcollectd-plugin-riemann += CSWcollectd
+CHECKPKG_OVERRIDES_CSWcollectd-plugin-riemann += surplus-dependency|CSWcollectd
+RUNTIME_DEP_PKGS_CSWcollectd-plugin-riemann += CSWlibriemann-client0
+
PACKAGES += CSWcollectd-plugins-all
+
+PACKAGES += CSWcollectd-plugins-all
SPKG_DESC_CSWcollectd-plugins-all = CollectD Metapackage that pulls in all
plugins
PKGFILES_CSWcollectd-plugins-all = EMPTY
ARCHALL_CSWcollectd-plugins-all = 1
@@ -250,6 +260,8 @@
RUNTIME_DEP_PKGS_CSWcollectd-plugins-all += CSWcollectd-plugin-rrdtool
RUNTIME_DEP_PKGS_CSWcollectd-plugins-all += CSWcollectd-plugin-snmp
RUNTIME_DEP_PKGS_CSWcollectd-plugins-all += CSWcollectd-plugin-xmms
+RUNTIME_DEP_PKGS_CSWcollectd-plugins-all += CSWcollectd-plugin-lua
+RUNTIME_DEP_PKGS_CSWcollectd-plugins-all += CSWcollectd-plugin-riemann
# These are all sort of surplus as this is a meta package
CHECKPKG_OVERRIDES_CSWcollectd-plugins-all += surplus-dependency
@@ -259,6 +271,10 @@
include gar/category.mk
+xxxpost-patch:
+ cd $(WORKSRC) && autoreconf -fi
+ @$(MAKECOOKIE)
+
post-install-modulated:
mv $(DESTDIR)/opt/csw/man $(DESTDIR)$(mandir)
grm -f $(DESTDIR)/opt/csw/lib/perl/5.10.1/perllocal.pod
Modified: csw/mgar/pkg/collectd/trunk/checksums
===================================================================
--- csw/mgar/pkg/collectd/trunk/checksums 2016-09-09 12:43:50 UTC (rev
25934)
+++ csw/mgar/pkg/collectd/trunk/checksums 2016-09-11 13:37:14 UTC (rev
25935)
@@ -1 +1 @@
-40b83343f72089e0330f53965f1140bd collectd-5.5.2.tar.bz2
+572b346ca47d6466fe48e6e504b41cf0 collectd-5.6.0.tar.bz2
Deleted: csw/mgar/pkg/collectd/trunk/files/0001-Forward-port-1782.patch
===================================================================
--- csw/mgar/pkg/collectd/trunk/files/0001-Forward-port-1782.patch
2016-09-09 12:43:50 UTC (rev 25934)
+++ csw/mgar/pkg/collectd/trunk/files/0001-Forward-port-1782.patch
2016-09-11 13:37:14 UTC (rev 25935)
@@ -1,71 +0,0 @@
-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.
