Revision: 26815
http://sourceforge.net/p/gar/code/26815
Author: dmichelsen
Date: 2021-11-22 14:23:03 +0000 (Mon, 22 Nov 2021)
Log Message:
-----------
collectd/trunk: Update to 5.12.0
Modified Paths:
--------------
csw/mgar/pkg/collectd/trunk/Makefile
csw/mgar/pkg/collectd/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/collectd/trunk/files/0001-Fix-include-order-for-64-bit-file-offsets.patch
Modified: csw/mgar/pkg/collectd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/collectd/trunk/Makefile 2021-11-22 13:05:03 UTC (rev
26814)
+++ csw/mgar/pkg/collectd/trunk/Makefile 2021-11-22 14:23:03 UTC (rev
26815)
@@ -1,7 +1,7 @@
# $Id$
#
NAME = collectd
-VERSION = 5.10.0
+VERSION = 5.12.0
GARTYPE = v2
DESCRIPTION = Collects system performance statistics periodically
@@ -14,6 +14,8 @@
# WORKSRC = $(WORKDIR)/collectd-$(DISTNAME)
+PATCHFILES += 0001-Fix-include-order-for-64-bit-file-offsets.patch
+
VENDOR_URL = http://collectd.org/
# Lots of others missing
@@ -27,7 +29,6 @@
BUILD_DEP_PKGS += CSWlibcurl-dev
BUILD_DEP_PKGS += CSWlibdbi-dev
BUILD_DEP_PKGS += CSWpostgresql-dev
-BUILD_DEP_PKGS += CSWlibxmms-dev
BUILD_DEP_PKGS += CSWlibpsl-dev
BUILD_DEP_PKGS += CSWlibesmtp-dev
BUILD_DEP_PKGS += CSWjdk7
@@ -124,6 +125,7 @@
RUNTIME_DEP_PKGS_CSWcollectd += CSWlibxml2-2
RUNTIME_DEP_PKGS_CSWcollectd += CSWperl
RUNTIME_DEP_PKGS_CSWcollectd += CSWlibyajl2
+RUNTIME_DEP_PKGS_CSWcollectd += CSWlibjansson4
RUNTIME_DEP_PKGS_CSWcollectd += CSWliboping0
RUNTIME_DEP_PKGS_CSWcollectd += CSWlibldap2-4-2
RUNTIME_DEP_PKGS_CSWcollectd += CSWlibesmtp6
@@ -130,7 +132,6 @@
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 += CSWlibintl9
RUNTIME_DEP_PKGS_CSWcollectd-i386 += CSWlibmemcached8
RUNTIME_DEP_PKGS_CSWcollectd-i386 += CSWlibfl2
RUNTIME_DEP_PKGS_CSWcollectd += $(RUNTIME_DEP_PKGS_CSWcollectd-$(GARCH))
@@ -205,7 +206,7 @@
RUNTIME_DEP_PKGS_CSWcollectd-plugin-rrdtool += CSWlibgcc-s1
RUNTIME_DEP_PKGS_CSWcollectd-plugin-rrdtool += CSWcollectd
CHECKPKG_OVERRIDES_CSWcollectd-plugin-rrdtool += surplus-dependency|CSWcollectd
-RUNTIME_DEP_PKGS_CSWcollectd-plugin-rrdtool += CSWlibrrd-th4
+RUNTIME_DEP_PKGS_CSWcollectd-plugin-rrdtool += CSWlibrrd8
PACKAGES += CSWcollectd-plugin-snmp
SPKG_DESC_CSWcollectd-plugin-snmp = CollectD Plugin for NetSNMP
@@ -216,22 +217,6 @@
CHECKPKG_OVERRIDES_CSWcollectd-plugin-snmp += surplus-dependency|CSWcollectd
RUNTIME_DEP_PKGS_CSWcollectd-plugin-snmp += CSWlibnetsnmp30
-PACKAGES += CSWcollectd-plugin-xmms
-SPKG_DESC_CSWcollectd-plugin-xmms = CollectD Plugin for XMMS
-PKGFILES_CSWcollectd-plugin-xmms += $(call pkgfiles_lib,collectd/xmms.so)
-RUNTIME_DEP_PKGS_CSWcollectd-plugin-xmms += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWcollectd-plugin-xmms += CSWcollectd
-CHECKPKG_OVERRIDES_CSWcollectd-plugin-xmms += surplus-dependency|CSWcollectd
-RUNTIME_DEP_PKGS_CSWcollectd-plugin-xmms += CSWlibxmms1
-# This is due to a linker anomaly, these are pulled in also from libxmms.so.1
-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 += 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)
@@ -262,7 +247,6 @@
RUNTIME_DEP_PKGS_CSWcollectd-plugins-all += CSWcollectd-plugin-python
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
Modified: csw/mgar/pkg/collectd/trunk/checksums
===================================================================
--- csw/mgar/pkg/collectd/trunk/checksums 2021-11-22 13:05:03 UTC (rev
26814)
+++ csw/mgar/pkg/collectd/trunk/checksums 2021-11-22 14:23:03 UTC (rev
26815)
@@ -1 +1 @@
-a8344a199b124711bdbec57f1c0b624f collectd-5.10.0.tar.bz2
+2b23a65960bc323d065234776a542e04 collectd-5.12.0.tar.bz2
Added:
csw/mgar/pkg/collectd/trunk/files/0001-Fix-include-order-for-64-bit-file-offsets.patch
===================================================================
---
csw/mgar/pkg/collectd/trunk/files/0001-Fix-include-order-for-64-bit-file-offsets.patch
(rev 0)
+++
csw/mgar/pkg/collectd/trunk/files/0001-Fix-include-order-for-64-bit-file-offsets.patch
2021-11-22 14:23:03 UTC (rev 26815)
@@ -0,0 +1,26 @@
+From 59dc6850657408a7496510c80753e1d58b551db6 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <d...@opencsw.org>
+Date: Thu, 18 Nov 2021 16:01:42 +0100
+Subject: [PATCH] Fix include order for 64 bit file offsets
+
+---
+ src/utils/message_parser/message_parser_test.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/utils/message_parser/message_parser_test.c
b/src/utils/message_parser/message_parser_test.c
+index 8cb5dc1..ee84ca1 100644
+--- a/src/utils/message_parser/message_parser_test.c
++++ b/src/utils/message_parser/message_parser_test.c
+@@ -25,8 +25,8 @@
+ * Marcin Mozejko <marcinx.moze...@intel.com>
+ **/
+
+-#include "testing.h"
+ #include "utils/message_parser/message_parser.c"
++#include "testing.h"
+
+ #define TEST_PATTERN_NAME "test_pattern_name"
+ #define TEST_REGEX "test_regex"
+--
+2.4.0
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
