diff --git a/collectd-4.10.3.tar.bz2 b/collectd-4.10.3.tar.bz2
deleted file mode 100644
index 7f38a61..0000000
--- a/collectd-4.10.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ffd1959273301b302c144057baf68128e62c42bcff156ba941336e7389439b65
-size 1343806
diff --git a/collectd-5.0.4.tar.bz2 b/collectd-5.0.4.tar.bz2
new file mode 100644
index 0000000..53b2130
--- /dev/null
+++ b/collectd-5.0.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d55c33e411b6fe3333168654009492154b97690b1719e3808a99fdff4936101d
+size 1317954
diff --git a/collectd-df-remove-duplicates.patch b/collectd-df-remove-duplicates.patch
index 9c39fdb..cd2fab0 100644
--- a/collectd-df-remove-duplicates.patch
+++ b/collectd-df-remove-duplicates.patch
@@ -1,16 +1,14 @@
-diff --git a/src/df.c b/src/df.c
-index fc80ac3..a6cf37c 100644
---- a/src/df.c
-+++ b/src/df.c
-@@ -213,6 +213,7 @@ static int df_read (void)
+--- src/df.c.orig 2012-01-26 01:18:25.360102426 +0100
++++ src/df.c 2012-01-26 01:19:42.699099673 +0100
+@@ -183,6 +183,7 @@
{
unsigned long long blocksize;
char disk_name[256];
-+ cu_mount_t *mnt_dup_ptr;
-
- if (ignorelist_match (il_device,
- (mnt_ptr->spec_device != NULL)
-@@ -224,6 +225,20 @@ static int df_read (void)
++ cu_mount_t *mnt_dup_ptr;
+ uint64_t blk_free;
+ uint64_t blk_reserved;
+ uint64_t blk_used;
+@@ -197,6 +198,20 @@
if (ignorelist_match (il_fstype, mnt_ptr->type))
continue;
diff --git a/collectd-fix-config.patch b/collectd-fix-config.patch
index 890bc11..7710cd6 100644
--- a/collectd-fix-config.patch
+++ b/collectd-fix-config.patch
@@ -1,9 +1,9 @@
---- src/collectd.conf.in.orig 2010-07-09 12:01:59.000000000 +0200
-+++ src/collectd.conf.in 2010-07-12 01:05:24.000000000 +0200
+--- src/collectd.conf.in.orig 2012-01-26 01:12:16.191115559 +0100
++++ src/collectd.conf.in 2012-01-26 01:13:39.662112590 +0100
@@ -12,10 +12,10 @@
#Hostname "localhost"
- FQDNLookup true
+ #FQDNLookup true
-#BaseDir "@prefix@/var/lib/@PACKAGE_NAME@"
-#PIDFile "@prefix@/var/run/@PACKAGE_NAME@.pid"
-#PluginDir "@prefix@/lib/@PACKAGE_NAME@"
@@ -15,16 +15,16 @@
#Interval 10
#Timeout 2
#ReadThreads 5
-@@ -149,7 +149,7 @@
-
+@@ -173,7 +173,7 @@
#
- # URL "http://localhost/status?auto"
--# User "www-user"
-+# User "www"
- # Password "secret"
- # CACert "/etc/ssl/ca.crt"
- #
-@@ -161,7 +161,7 @@
+ #
+ # URL "http://localhost/status?auto"
+-# User "www-user"
++# User "www"
+ # Password "secret"
+ # CACert "/etc/ssl/ca.crt"
+ #
+@@ -186,7 +186,7 @@
#
# URL "http://localhost/ascent/status/"
@@ -33,7 +33,7 @@
# Password "secret"
# CACert "/etc/ssl/ca.crt"
#
-@@ -186,7 +186,7 @@
+@@ -211,7 +211,7 @@
#
#
@@ -42,7 +42,7 @@
# StoreRates false
#
-@@ -299,7 +299,7 @@
+@@ -324,7 +324,7 @@
#
#
@@ -51,7 +51,23 @@
# SocketGroup "collectd"
# SocketPerms "0770"
# MaxConns 5
-@@ -881,7 +881,7 @@
+@@ -786,13 +786,13 @@
+
+ #
+ # DaemonAddress "unix:/tmp/rrdcached.sock"
+-# DataDir "@prefix@/var/lib/@PACKAGE_NAME@/rrd"
++# DataDir "/var/lib/@PACKAGE_NAME@/rrd"
+ # CreateFiles true
+ # CollectStatistics true
+ #
+
+ #
+-# DataDir "@prefix@/var/lib/@PACKAGE_NAME@/rrd"
++# DataDir "/var/lib/@PACKAGE_NAME@/rrd"
+ # CacheTimeout 120
+ # CacheFlush 900
+ #
+@@ -913,7 +913,7 @@
#
#
@@ -59,4 +75,4 @@
+# SocketFile "/var/run/@PACKAGE_NAME@-unixsock"
# SocketGroup "collectd"
# SocketPerms "0660"
- #
+ # DeleteSocket false
diff --git a/collectd-fix_libltdl_autoreconf.patch b/collectd-fix_libltdl_autoreconf.patch
index 3ebf113..0b1855a 100644
--- a/collectd-fix_libltdl_autoreconf.patch
+++ b/collectd-fix_libltdl_autoreconf.patch
@@ -1,16 +1,16 @@
---- Makefile.in.orig 2011-04-13 22:41:49.000000000 +0200
-+++ Makefile.in 2011-04-13 22:41:57.000000000 +0200
-@@ -565,7 +565,7 @@
- subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- Makefile.in.orig 2012-01-26 01:15:11.357109327 +0100
++++ Makefile.in 2012-01-26 01:15:34.625108499 +0100
+@@ -342,7 +342,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
-ACLOCAL_AMFLAGS = -I libltdl/m4
+ACLOCAL_AMFLAGS = -I libltdl
SUBDIRS = libltdl src bindings
INCLUDES = $(LTDLINCL)
EXTRA_DIST = contrib version-gen.sh
---- Makefile.am.orig 2011-04-13 22:42:01.000000000 +0200
-+++ Makefile.am 2011-04-13 22:42:05.000000000 +0200
+--- Makefile.am.orig 2012-01-26 01:15:36.301108441 +0100
++++ Makefile.am 2012-01-26 01:15:41.577108253 +0100
@@ -1,4 +1,4 @@
-ACLOCAL_AMFLAGS = -I libltdl/m4
+ACLOCAL_AMFLAGS = -I libltdl
diff --git a/collectd-fix_new_yajl_lib.patch b/collectd-fix_new_yajl_lib.patch
deleted file mode 100644
index d6e4f10..0000000
--- a/collectd-fix_new_yajl_lib.patch
+++ /dev/null
@@ -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.");
diff --git a/collectd-fix_own_iptc.patch b/collectd-fix_own_iptc.patch
new file mode 100644
index 0000000..672f848
--- /dev/null
+++ b/collectd-fix_own_iptc.patch
@@ -0,0 +1,73 @@
+--- src/owniptc/libiptc.c.orig 2012-02-19 17:40:40.717235267 +0100
++++ src/owniptc/libiptc.c 2012-02-19 17:43:13.324229837 +0100
+@@ -81,7 +81,7 @@
+ };
+
+ /* Convenience structures */
+-struct ipt_error_target
++struct x_ipt_error_target
+ {
+ STRUCT_ENTRY_TARGET t;
+ char error[TABLE_MAXNAMELEN];
+@@ -1007,10 +1007,10 @@
+ /* Convenience structures */
+ struct iptcb_chain_start{
+ STRUCT_ENTRY e;
+- struct ipt_error_target name;
++ struct x_ipt_error_target name;
+ };
+ #define IPTCB_CHAIN_START_SIZE (sizeof(STRUCT_ENTRY) + \
+- ALIGN(sizeof(struct ipt_error_target)))
++ ALIGN(sizeof(struct x_ipt_error_target)))
+
+ struct iptcb_chain_foot {
+ STRUCT_ENTRY e;
+@@ -1021,10 +1021,10 @@
+
+ struct iptcb_chain_error {
+ STRUCT_ENTRY entry;
+- struct ipt_error_target target;
++ struct x_ipt_error_target target;
+ };
+ #define IPTCB_CHAIN_ERROR_SIZE (sizeof(STRUCT_ENTRY) + \
+- ALIGN(sizeof(struct ipt_error_target)))
++ ALIGN(sizeof(struct x_ipt_error_target)))
+
+
+
+@@ -1069,7 +1069,7 @@
+ head->e.next_offset = IPTCB_CHAIN_START_SIZE;
+ strcpy(head->name.t.u.user.name, ERROR_TARGET);
+ head->name.t.u.target_size =
+- ALIGN(sizeof(struct ipt_error_target));
++ ALIGN(sizeof(struct x_ipt_error_target));
+ strcpy(head->name.error, c->name);
+ } else {
+ repl->hook_entry[c->hooknum-1] = c->head_offset;
+@@ -1113,7 +1113,7 @@
+ if (!iptcc_is_builtin(c)) {
+ /* Chain has header */
+ *offset += sizeof(STRUCT_ENTRY)
+- + ALIGN(sizeof(struct ipt_error_target));
++ + ALIGN(sizeof(struct x_ipt_error_target));
+ (*num)++;
+ }
+
+@@ -1153,7 +1153,7 @@
+ /* Append one error rule at end of chain */
+ num++;
+ offset += sizeof(STRUCT_ENTRY)
+- + ALIGN(sizeof(struct ipt_error_target));
++ + ALIGN(sizeof(struct x_ipt_error_target));
+
+ /* ruleset size is now in offset */
+ *size = offset;
+@@ -1177,7 +1177,7 @@
+ error->entry.target_offset = sizeof(STRUCT_ENTRY);
+ error->entry.next_offset = IPTCB_CHAIN_ERROR_SIZE;
+ error->target.t.u.user.target_size =
+- ALIGN(sizeof(struct ipt_error_target));
++ ALIGN(sizeof(struct x_ipt_error_target));
+ strcpy((char *)&error->target.t.u.user.name, ERROR_TARGET);
+ strcpy((char *)&error->target.error, "ERROR");
+
diff --git a/collectd-fix_spamassassin_doc.patch b/collectd-fix_spamassassin_doc.patch
index 4ba3a2d..7a480e4 100644
--- a/collectd-fix_spamassassin_doc.patch
+++ b/collectd-fix_spamassassin_doc.patch
@@ -1,6 +1,6 @@
---- contrib/SpamAssassin/Collectd.pm.orig 2009-10-07 22:34:14.000000000 +0200
-+++ contrib/SpamAssassin/Collectd.pm 2009-10-07 22:36:50.000000000 +0200
-@@ -4,13 +4,7 @@
+--- contrib/SpamAssassin/Collectd.pm.orig 2012-02-20 15:38:06.192423142 +0100
++++ contrib/SpamAssassin/Collectd.pm 2012-02-20 15:38:14.568422853 +0100
+@@ -4,12 +4,6 @@
Collectd - plugin for filling collectd with stats
@@ -13,4 +13,3 @@
=head1 SYNOPSIS
loadplugin Mail::SpamAssassin::Plugin::Collectd
-
diff --git a/collectd-iptc.diff b/collectd-iptc.diff
deleted file mode 100644
index 2415d5f..0000000
--- a/collectd-iptc.diff
+++ /dev/null
@@ -1,155 +0,0 @@
----
- configure.in | 107 --------------------------------------------------------
- src/Makefile.am | 15 ++-----
- 2 files changed, 5 insertions(+), 117 deletions(-)
-
-Index: collectd-4.10.3/configure.in
-===================================================================
---- collectd-4.10.3.orig/configure.in
-+++ collectd-4.10.3/configure.in
-@@ -1560,113 +1560,8 @@ AM_CONDITIONAL(BUILD_WITH_LIBGCRYPT, tes
- # }}}
-
- # --with-libiptc {{{
--with_own_libiptc="no"
--AC_ARG_WITH(libiptc, [AS_HELP_STRING([--with-libiptc@<:@=PREFIX@:>@], [Path to libiptc.])],
--[
-- if test "x$withval" = "xshipped"
-- then
-- with_own_libiptc="yes"
-- with_libiptc="yes"
-- else if test "x$withval" != "xno" && test "x$withval" != "xyes"
-- then
-- LIBIPTC_CPPFLAGS="$LIBIPTC_CPPFLAGS -I$withval/include"
-- LIBIPTC_LDFLAGS="$LIBIPTC_LDFLAGS -L$withval/lib"
-- with_libiptc="yes"
-- else
-- with_libiptc="$withval"
-- fi; fi
--],
--[
-- if test "x$ac_system" = "xLinux"
-- then
-- with_libiptc="yes"
-- else
-- with_libiptc="no (Linux only)"
-- fi
--])
--SAVE_CPPFLAGS="$CPPFLAGS"
--SAVE_LDFLAGS="$LDFLAGS"
--CPPFLAGS="$CPPFLAGS $LIBIPTC_CPPFLAGS"
--LDFLAGS="$LDFLAGS $LIBIPTC_LDFLAGS"
--# check whether the header file for libiptc is available.
--if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
--then
-- AC_CHECK_HEADERS(libiptc/libiptc.h,
-- [
-- AC_DEFINE(HAVE_LIBIPTC_LIBIPTC_H, 1, [Define to 1 if you have the header file.])
-- ],
-- [
-- with_libiptc="yes"
-- with_own_libiptc="yes"
-- ])
--fi
--if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
--then
-- AC_CHECK_HEADERS(libiptc/libip6tc.h,
-- [
-- AC_DEFINE(HAVE_LIBIPTC_LIBIP6TC_H, 1, [Define to 1 if you have the header file.])
-- ],
-- [
-- with_libiptc="yes"
-- with_own_libiptc="yes"
-- ])
--fi
--# If the header file is available, check for the required type declaractions.
--# They may be missing in old versions of libiptc. In that case, they will be
--# declared in the iptables plugin.
--if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
--then
-- AC_CHECK_TYPES([iptc_handle_t, ip6tc_handle_t], [], [],
-- [
--#if OWN_LIBIPTC
--# include "$srcdir/src/owniptc/libiptc.h"
--# include "$srcdir/src/owniptc/libip6tc.h"
--#else
--# include
--# include
--#endif
-- ])
--fi
--# Check for the iptc_init symbol in the library.
--if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
--then
-- AC_CHECK_LIB(iptc, iptc_init,
-- [
-- AC_DEFINE(HAVE_LIBIPTC, 1, [Define to 1 if you have the iptc library (-liptc).])
-- ],
-- [
-- with_libiptc="yes"
-- with_own_libiptc="yes"
-- ])
--fi
--# The system wide version failed for some reason. Check if we have the required
--# headers to build the shipped version.
--if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xyes"
--then
-- AC_CHECK_HEADERS(linux/netfilter_ipv4/ip_tables.h linux/netfilter_ipv6/ip6_tables.h linux/netfilter/x_tables.h, [],
-- [
-- with_libiptc="no (Linux iptables headers not found)"
-- with_own_libiptc="no"
-- ],
-- [
--#include "$srcdir/src/owniptc/ipt_kernel_headers.h"
-- ])
--fi
-+PKG_CHECK_MODULES([libiptc], [libiptc], [with_libiptc=yes], [with_libiptc=no])
- AM_CONDITIONAL(BUILD_WITH_LIBIPTC, test "x$with_libiptc" = "xyes")
--AM_CONDITIONAL(BUILD_WITH_OWN_LIBIPTC, test "x$with_own_libiptc" = "xyes")
--if test "x$with_libiptc" = "xyes"
--then
-- BUILD_WITH_LIBIPTC_CPPFLAGS="$LIBIPTC_CPPFLAGS"
-- BUILD_WITH_LIBIPTC_LDFLAGS="$LIBIPTC_LDFLAGS"
-- AC_SUBST(BUILD_WITH_LIBIPTC_CPPFLAGS)
-- AC_SUBST(BUILD_WITH_LIBIPTC_LDFLAGS)
--fi
--if test "x$with_own_libiptc" = "xyes"
--then
-- AC_DEFINE(OWN_LIBIPTC, 1, [Define to 1 if we use the shipped iptc library.])
--fi
--CPPFLAGS="$SAVE_CPPFLAGS"
--LDFLAGS="$SAVE_LDFLAGS"
- # }}}
-
- # --with-java {{{
-Index: collectd-4.10.3/src/Makefile.am
-===================================================================
---- collectd-4.10.3.orig/src/Makefile.am
-+++ collectd-4.10.3/src/Makefile.am
-@@ -1,7 +1,4 @@
- SUBDIRS = libcollectdclient
--if BUILD_WITH_OWN_LIBIPTC
--SUBDIRS += owniptc
--endif
- if BUILD_WITH_OWN_LIBOCONFIG
- SUBDIRS += liboconfig
- endif
-@@ -413,14 +410,10 @@ endif # BUILD_PLUGIN_INTERFACE
- if BUILD_PLUGIN_IPTABLES
- pkglib_LTLIBRARIES += iptables.la
- iptables_la_SOURCES = iptables.c
--iptables_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBIPTC_CPPFLAGS)
--iptables_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBIPTC_LDFLAGS)
--if BUILD_WITH_OWN_LIBIPTC
--iptables_la_LIBADD = owniptc/libiptc.la
--iptables_la_DEPENDENCIES = owniptc/libiptc.la
--else
--iptables_la_LIBADD = -liptc
--endif
-+iptables_la_CPPFLAGS = $(AM_CPPFLAGS)
-+iptables_la_CFLAGS = ${AM_CFLAGS} ${libiptc_CFLAGS}
-+iptables_la_LDFLAGS = -module -avoid-version
-+iptables_la_LIBADD = ${libiptc_LIBS}
- collectd_LDADD += "-dlopen" iptables.la
- collectd_DEPENDENCIES += iptables.la
- endif
diff --git a/collectd-js.apache2.conf b/collectd-js.apache2.conf
index 9c88204..e1ab7ae 100644
--- a/collectd-js.apache2.conf
+++ b/collectd-js.apache2.conf
@@ -1,5 +1,5 @@
- ScriptAlias /collectd-js /srv/www/collectd-js/bin/index.cgi
+ ScriptAlias /collectd-js /srv/www/collectd-js/index.cgi
# Access control:
@@ -19,11 +19,12 @@
Order allow,deny
- # You might want to change this to avoid giving everyone
- # access to the collectd statistics, e.g.:
+ # You might want to change this to give access from
+ # different hosts to the collectd statistics, e.g.:
+ #
# Allow from all
- # Allow from localhost
# Allow from 192.168.
+ Allow from localhost
Deny from all
diff --git a/collectd-libnotify_070.patch b/collectd-libnotify_070.patch
deleted file mode 100644
index 03452b9..0000000
--- a/collectd-libnotify_070.patch
+++ /dev/null
@@ -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;
diff --git a/collectd-pkgconfig_libnotify_add_gtk.patch b/collectd-pkgconfig_libnotify_add_gtk.patch
index 70245b9..2e54a52 100644
--- a/collectd-pkgconfig_libnotify_add_gtk.patch
+++ b/collectd-pkgconfig_libnotify_add_gtk.patch
@@ -1,48 +1,53 @@
---- configure.in.orig 2011-04-15 08:06:54.000000000 +0200
-+++ configure.in 2011-04-15 08:09:05.000000000 +0200
-@@ -3833,7 +3833,7 @@
+--- configure.orig 2012-01-26 01:16:29.955106532 +0100
++++ configure 2012-01-26 01:17:57.822103406 +0100
+@@ -23690,11 +23690,11 @@
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libnotify") 2>&5
++ ($PKG_CONFIG --exists --print-errors "libnotify" "gtk+-2.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify" 2>/dev/null`
++ pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify" "gtk+-2.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -23706,11 +23706,11 @@
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libnotify") 2>&5
++ ($PKG_CONFIG --exists --print-errors "libnotify" "gtk+-2.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify" 2>/dev/null`
++ pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify" "gtk+-2.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -23730,9 +23730,9 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnotify" 2>&1`
++ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnotify" "gtk+-2.0" 2>&1`
+ else
+- LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify" 2>&1`
++ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify" "gtk+-2.0" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBNOTIFY_PKG_ERRORS" >&5
+--- configure.in.orig 2012-01-26 01:16:14.664107075 +0100
++++ configure.in 2012-01-26 01:16:28.342106589 +0100
+@@ -4184,7 +4184,7 @@
fi
# }}}
-PKG_CHECK_MODULES([LIBNOTIFY], [libnotify],
+PKG_CHECK_MODULES([LIBNOTIFY], [libnotify gtk+-2.0],
[with_libnotify="yes"],
- [with_libnotify="no ($LIBNOTIFY_PKG_ERRORS)"])
-
---- configure.orig 2011-04-15 08:09:08.000000000 +0200
-+++ configure 2011-04-15 08:10:40.000000000 +0200
-@@ -45112,7 +45112,7 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify" 2>/dev/null`
-+ pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify" "gtk+-2.0"2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -45126,11 +45126,11 @@
- else
- if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnotify\"") >&5
-- ($PKG_CONFIG --exists --print-errors "libnotify") 2>&5
-+ ($PKG_CONFIG --exists --print-errors "libnotify" "gtk+-2.0") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify" 2>/dev/null`
-+ pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify" "gtk+-2.0" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -45149,9 +45149,9 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnotify"`
-+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnotify" "gtk+-2.0"`
- else
-- LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnotify"`
-+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnotify" "gtk+-2.0"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBNOTIFY_PKG_ERRORS" >&5
+ [if test "x$LIBNOTIFY_PKG_ERRORS" = "x"; then
+ with_libnotify="no"
diff --git a/collectd-version.patch b/collectd-version.patch
index ad8a89e..d24f0a6 100644
--- a/collectd-version.patch
+++ b/collectd-version.patch
@@ -1,9 +1,9 @@
---- configure.in.orig 2009-12-20 16:36:31.000000000 +0100
-+++ configure.in 2009-12-21 20:25:07.000000000 +0100
+--- configure.in.orig 2012-01-26 01:14:21.392111105 +0100
++++ configure.in 2012-01-26 01:14:41.350110395 +0100
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(collectd, m4_esyscmd(./version-gen.sh))
+AC_INIT(collectd, @@VERSION@@)
AC_CONFIG_SRCDIR(src/collectd.c)
AC_CONFIG_HEADERS(src/config.h)
-
+ AC_CONFIG_AUX_DIR([libltdl/config])
diff --git a/collectd.apache2.conf b/collectd.apache2.conf
index 2db987e..c85fb9e 100644
--- a/collectd.apache2.conf
+++ b/collectd.apache2.conf
@@ -5,11 +5,12 @@
Order allow,deny
- # You might want to change this to avoid giving everyone
- # access to the collectd statistics, e.g.:
+ # You might want to change this to give access from
+ # different hosts to the collectd statistics, e.g.:
+ #
# Allow from all
- # Allow from localhost
# Allow from 192.168.
+ Allow from localhost
Deny from all
diff --git a/collectd.changes b/collectd.changes
index dfd53e5..076eb09 100644
--- a/collectd.changes
+++ b/collectd.changes
@@ -1,3 +1,50 @@
+-------------------------------------------------------------------
+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
+
+- changed copyright from GPL-2.0+ to GPL-2.0, see bnc#757527:
+ https://bugzilla.novell.com/show_bug.cgi?id=757527
+- added myself to the copyright header in the spec file, have been maintaining
+ this spec file since 2005 ;)
+
+-------------------------------------------------------------------
+Mon Apr 16 20:04:52 UTC 2012 - aj@suse.de
+
+- Remove modbus support since modbus is not in openSUSE:Factory.
+- Fix buildrequires: it's libxtables-devel for 12.2.
+
+-------------------------------------------------------------------
+Tue Apr 3 16:52:48 UTC 2012 - pascal.bleser@opensuse.org
+
+- update to 5.0.4
+
+-------------------------------------------------------------------
+Sun Feb 19 23:36:46 UTC 2012 - pascal.bleser@opensuse.org
+
+- add modbus support
+
+-------------------------------------------------------------------
+Sun Feb 19 17:07:34 UTC 2012 - pascal.bleser@opensuse.org
+
+- fix apache configuration for collectd-js, thanks to Bruno Friedmann
+ for reporting
+
+-------------------------------------------------------------------
+Sun Feb 19 17:04:32 UTC 2012 - pascal.bleser@opensuse.org
+
+- update to 5.0.3: too many changes to list, please read ChangeLog in the main
+ package
+
+-------------------------------------------------------------------
+Thu Jan 12 11:30:32 UTC 2012 - coolo@suse.com
+
+- change license to be in spdx.org format
+
-------------------------------------------------------------------
Mon Oct 17 09:19:25 UTC 2011 - schubi@suse.com
diff --git a/collectd.spec b/collectd.spec
index e979813..ce72454 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,7 +1,9 @@
+# vim: set sw=4 ts=4 et nu:
#
# spec file for package collectd
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2005-2012 Pascal Bleser
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +18,9 @@
#
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
%if 0%{?_with_xmms:1}0
%define xmms 1
%else
@@ -103,20 +108,19 @@
%define pinba_plugin %{nil}
%endif
-%if 0%{?suse_version} >= 1210
-%define ipvs_plugin %{nil}
-%else
%define ipvs_plugin ipvs
-%endif
%define libnetlink_version 2.6.37
+%define intree_netlink 1
-%define plugins apache apcups battery %{expand:%bind_plugin} curl %{expand:%curl_json_plugin} %{expand:%curl_xml_plugin} conntrack contextswitch cpu cpufreq csv df disk dns email entropy exec filecount fscache hddtemp interface %{expand:%ipvs_plugin} irq load logfile match_empty_counter match_hashed match_regex match_timediff match_value mbmon %{expand:%memcached_plugin} memory multimeter netlink network nfs nginx ntpd olsrd openvpn perl ping protocols powerdns processes rrdtool sensors serial swap syslog table tail target_notification target_replace target_scale target_set tcpconns teamspeak2 ted thermal unixsock uptime users uuid vmem vserver wireless write_http %{expand:%ascent_plugin} %{expand:%iptables_plugin} %{expand:%madwifi_plugin} %{expand:%rrdcached_plugin}
+%define plugins apache apcups battery %{expand:%bind_plugin} curl %{expand:%curl_json_plugin} %{expand:%curl_xml_plugin} conntrack contextswitch cpu cpufreq csv df disk dns email entropy exec filecount fscache hddtemp interface %{expand:%ipvs_plugin} irq load logfile match_empty_counter match_hashed match_regex match_timediff match_value mbmon %{expand:%memcached_plugin} memory multimeter netlink network nfs nginx ntpd olsrd openvpn perl ping protocols powerdns processes rrdtool sensors serial swap syslog table tail target_notification target_replace target_scale target_set target_v5upgrade tcpconns teamspeak2 ted thermal threshold unixsock uptime users uuid vmem vserver wireless write_http %{expand:%ascent_plugin} %{expand:%iptables_plugin} %{expand:%madwifi_plugin} %{expand:%rrdcached_plugin}
Name: collectd
-Version: 4.10.3
+Version: 5.0.4
Release: 0
Summary: Statistics Collection Daemon for filling RRD Files
+License: GPL-2.0
+Group: System/Monitoring
Source: http://collectd.org/files/collectd-%{version}.tar.bz2
Source1: collectd.suse.init
Source2: collectd.apache2.conf
@@ -145,16 +149,25 @@ Patch22: collectd-collection3.patch
Patch23: collectd-javac_target.patch
Patch24: collectd-pkgconfig_libnotify_add_gtk.patch
Patch25: collectd-df-remove-duplicates.patch
-Patch26: collectd-iptc.diff
-Patch27: collectd-libnotify_070.patch
-Patch28: collectd-fix_new_yajl_lib.patch
+Patch26: collectd-fix_own_iptc.patch
Url: http://collectd.org/
-Group: System/Monitoring
-License: GNU General Public License (GPL)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: sensors rrdtool
-BuildRequires: libpng-devel perl rrdtool sensors zlib-devel
-BuildRequires: bind-devel gettext gettext-devel intltool libstatgrab-devel
+Requires: rrdtool
+Requires: sensors
+BuildConflicts: libnetlink-devel
+BuildRequires: bind-devel
+BuildRequires: bison
+BuildRequires: flex
+BuildRequires: gettext
+BuildRequires: gettext-devel
+BuildRequires: intltool
+#BuildRequires: libmodbus-devel
+BuildRequires: libpng-devel
+BuildRequires: libstatgrab-devel
+BuildRequires: perl
+BuildRequires: rrdtool
+BuildRequires: sensors
+BuildRequires: zlib-devel
%if 0%{?suse_version} > 1020
BuildRequires: libdb-4_5-devel
%else
@@ -165,12 +178,19 @@ BuildRequires: libgcrypt-devel
%else
BuildRequires: libgcrypt
%endif
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: freetype2-devel
+BuildRequires: gcc
+BuildRequires: libart_lgpl-devel
BuildRequires: liboping-devel
-BuildRequires: autoconf automake gcc libtool make pkgconfig
-BuildRequires: freetype2-devel libart_lgpl-devel
+BuildRequires: libtool
+BuildRequires: make
+BuildRequires: pkgconfig
BuildRequires: python-devel
%if %libnotify
-BuildRequires: gtk2-devel libnotify-devel
+BuildRequires: gtk2-devel
+BuildRequires: libnotify-devel
%endif
%if %java
BuildRequires: java-devel
@@ -201,14 +221,16 @@ BuildRequires: curl-devel
BuildRequires: libxml2-devel
%if %ipmi
# for ipmi:
-BuildRequires: OpenIPMI-devel gdbm-devel
+BuildRequires: OpenIPMI-devel
+BuildRequires: gdbm-devel
%endif #ipmi
%if %snmp
# for snmp:
BuildRequires: net-snmp-devel
%endif #snmp
# for ipvs and madwifi:
-BuildRequires: kernel-source linux-kernel-headers
+BuildRequires: kernel-source
+BuildRequires: linux-kernel-headers
%if %suse_version >= 1030
BuildRequires: libpcap-devel
%endif
@@ -231,7 +253,7 @@ BuildRequires: libmemcached-devel
BuildRequires: protobuf-c
%endif
%if %suse_version >= 1210
-BuildRequires: iptables-devel
+BuildRequires: libxtables-devel
%endif
# in case we'd like to split it later:
Provides: collectd-perl = %{version}-%{release}
@@ -251,12 +273,14 @@ fine grained since the files are updated every 10 seconds.
%package web
Summary: Web Frontend for watching the %{name} Statistics
Group: System/Monitoring
-Requires: perl apache2 rrdtool
-Requires: perl(Data::Dumper)
+Requires: apache2
+Requires: perl
+Requires: rrdtool
+Requires: rrdtool
Requires: perl(CGI)
+Requires: perl(Data::Dumper)
Requires: perl(HTML::Entities)
Requires: perl(URI::Escape)
-Requires: rrdtool
%description web
Web frontend CGI for watching %{name} statistics from a browser.
@@ -266,13 +290,15 @@ Please look at /etc/apache2/conf.d/%{name}.conf on how to enable.
%package web-js
Summary: Web/JavaScript Frontend for watching %{name} Statistics
Group: System/Monitoring
-Requires: perl apache2 rrdtool
-Requires: perl(Data::Dumper)
+Requires: apache2
+Requires: perl
+Requires: rrdtool
Requires: perl(CGI)
-Requires: perl(RRDs)
+Requires: perl(Config::General)
+Requires: perl(Data::Dumper)
Requires: perl(HTML::Entities)
Requires: perl(JSON)
-Requires: perl(Config::General)
+Requires: perl(RRDs)
%description web-js
Web/JavaScript frontend CGI for watching %{name} statistics from
@@ -310,9 +336,9 @@ library, for IPMI enabled systems.
Summary: SNMP Monitoring Plugin for %{name}
Group: System/Monitoring
Requires: %{name} = %{version}-%{release}
+Requires: perl(Config::General)
Requires: perl(SNMP)
Requires: perl(Socket6)
-Requires: perl(Config::General)
%description plugin-snmp
Optional %{name} plugin to monitor devices using SNMP.
@@ -514,10 +540,8 @@ popd #iproute2
%patch22
%patch23
%patch24
-%patch25 -p1
-%patch -P 26 -p1
-%patch27 -p1
-%patch28
+%patch25
+%patch26
%__sed -i 's|@@VERSION@@|%{version}|g' configure.in
@@ -540,6 +564,7 @@ find . -name 'configure*' -o -name 'Makefile*' -exec %__sed -i 's|-Werror||g' {}
%build
export SUSE_ASNEEDED=0
+%if %intree_netlink
# build in-tree libnetlink.a
pushd "iproute2-%{libnetlink_version}"
LIBNETLINK_CFLAGS="%{optflags}"
@@ -551,8 +576,10 @@ LIBNETLINK_CFLAGS="$LIBNETLINK_CFLAGS -fPIC"
SUBDIRS="lib" \
CC="%__cc" \
OPTFLAGS="$LIBNETLINK_CFLAGS"
+%__rm -f lib/*.so.* lib/*.so
%__ln_s lib lib64
popd #iproute2
+%endif #%intree_netlink
autoreconf -fiv
@@ -580,6 +607,7 @@ export KERNEL_DIR=/usr/src/linux
--with-librrd \
%if %iptables
--enable-iptables \
+ --with-libiptc=shipped \
%else
--disable-iptables \
--without-iptc \
@@ -610,7 +638,9 @@ export KERNEL_DIR=/usr/src/linux
%else
--disable-memcached \
%endif #memcachec
+%if %intree_netlink
--with-libnetlink="$PWD/iproute2-%{libnetlink_version}/" \
+%endif
%if %suse_version < 930
--disable-mysql \
%endif
@@ -648,8 +678,10 @@ export KERNEL_DIR=/usr/src/linux
# fix bogus dependency in netlink.la, as it has been built against
# a static netlink library:
+%if %intree_netlink
%__sed -i "/^dependency_libs=/s/=.*/=''/" \
"%{buildroot}%{_libdir}/collectd/netlink.la"
+%endif
# fix permissions:
%__chmod 0755 "%{buildroot}%{_libdir}/collectd"/*.so
@@ -773,6 +805,7 @@ EOF
%config(noreplace) %{_sysconfdir}/collectd.conf
%dir %{_sysconfdir}/collectd
%{_bindir}/collectd-nagios
+%{_bindir}/collectdctl
%{_bindir}/cussh
%{_sbindir}/collectd
%{_sbindir}/collectdmon
@@ -788,6 +821,7 @@ EOF
%{perl_vendorlib}/Collectd/*
%{perl_vendorarch}/auto/Collectd
%doc %{_mandir}/man1/collectd.1%{ext_man}
+%doc %{_mandir}/man1/collectdctl.1%{ext_man}
%doc %{_mandir}/man1/collectdmon.1%{ext_man}
%doc %{_mandir}/man1/collectd-nagios.1%{ext_man}
%doc %{_mandir}/man1/cussh.1%{ext_man}
@@ -795,6 +829,7 @@ EOF
%doc %{_mandir}/man5/collectd-email.5%{ext_man}
%doc %{_mandir}/man5/collectd-exec.5%{ext_man}
%doc %{_mandir}/man5/collectd-perl.5%{ext_man}
+%doc %{_mandir}/man5/collectd-threshold.5%{ext_man}
%doc %{_mandir}/man5/collectd-unixsock.5%{ext_man}
%doc %{_mandir}/man5/types.db.5%{ext_man}
%doc %{perl_man3dir}/Collectd::Unixsock.%{perl_man3ext}%{ext_man}