Hello community, here is the log from the commit of package collectd for openSUSE:Factory checked in at Tue Oct 18 13:59:45 CEST 2011.
-------- --- openSUSE:Factory/collectd/collectd.changes 2011-09-23 01:53:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/collectd/collectd.changes 2011-10-17 11:20:43.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Oct 17 09:19:25 UTC 2011 - [email protected] + +- fixed build ( new yajl lib API ) + +------------------------------------------------------------------- +Fri Sep 16 14:35:10 UTC 2011 - [email protected] + +- adding patch from jengelh to fix build + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- collectd-libip4tc.patch New: ---- collectd-fix_new_yajl_lib.patch collectd-iptc.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ collectd.spec ++++++ --- /var/tmp/diff_new_pack.zbDFyi/_old 2011-10-18 13:59:33.000000000 +0200 +++ /var/tmp/diff_new_pack.zbDFyi/_new 2011-10-18 13:59:33.000000000 +0200 @@ -115,7 +115,7 @@ Name: collectd Version: 4.10.3 -Release: 1 +Release: 0 Summary: Statistics Collection Daemon for filling RRD Files Source: http://collectd.org/files/collectd-%{version}.tar.bz2 Source1: collectd.suse.init @@ -126,6 +126,7 @@ # workaround for missing pthread.pc on openSUSE, required by OpenIPMIpthread.pc # see https://bugzilla.novell.com/show_bug.cgi?id=388026 Source20: collectd-pthread.pc +Source99: collectd-rpmlintrc Patch4: collectd-lib64.patch Patch7: collectd-fix-config.patch Patch9: collectd-version.patch @@ -144,9 +145,9 @@ Patch23: collectd-javac_target.patch Patch24: collectd-pkgconfig_libnotify_add_gtk.patch Patch25: collectd-df-remove-duplicates.patch -Patch26: collectd-libip4tc.patch +Patch26: collectd-iptc.diff Patch27: collectd-libnotify_070.patch -Source99: collectd-rpmlintrc +Patch28: collectd-fix_new_yajl_lib.patch Url: http://collectd.org/ Group: System/Monitoring License: GNU General Public License (GPL) @@ -247,15 +248,7 @@ files it's very fast and easy on the system. Also, the statistics are very fine grained since the files are updated every 10 seconds. - - - -Authors: --------- - Florian octo Forster <[email protected]> - %package web - Summary: Web Frontend for watching the %{name} Statistics Group: System/Monitoring Requires: perl apache2 rrdtool @@ -271,7 +264,6 @@ 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 @@ -292,7 +284,6 @@ %if %libnotify %package plugin-notify-desktop - Summary: Desktop Notification Plugin for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} @@ -304,7 +295,6 @@ %if %ipmi %package plugin-ipmi - Summary: OpenIPMI Monitoring Plugin for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} @@ -317,7 +307,6 @@ %if %snmp %package plugin-snmp - Summary: SNMP Monitoring Plugin for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} @@ -332,7 +321,6 @@ %if %with_mysql %package plugin-mysql - Summary: MySQL Monitoring Plugin for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} @@ -344,7 +332,6 @@ %if %with_pgsql %package plugin-postgresql - Summary: PostgreSQL Monitoring Plugin for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} @@ -354,7 +341,6 @@ %endif #with_pgsql %package plugin-python - Summary: Python API for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} @@ -366,7 +352,6 @@ %if %java %package plugin-java - Summary: Java API for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} @@ -379,7 +364,6 @@ %if %virt %package plugin-virt - Summary: Virtual Machine Statistics Plugin for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} @@ -392,7 +376,6 @@ %if %xmms %package plugin-xmms - Summary: XMMS Monitoring Plugin for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} @@ -405,7 +388,6 @@ %if %dbi %package plugin-dbi - Summary: DBI Storage Plugin for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} @@ -418,7 +400,6 @@ %if %memcachec %package plugin-memcachec - Summary: Memcache Daemon Monitoring Plugin for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} @@ -430,7 +411,6 @@ %if %protobuf %package plugin-pinba - Summary: Pinba Collector Plugin for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} @@ -441,7 +421,6 @@ %endif #protobuf %package plugins-all - Summary: All Monitoring Plugins for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} @@ -484,7 +463,6 @@ monitoring plugin subpackages, except %{name}-plugin-xmms %package spamassassin - Summary: Spamassassin Monitoring for %{name} Group: System/Monitoring Requires: %{name} = %{version}-%{release} @@ -495,7 +473,6 @@ SpamAsssassin anti-spam engine. %package -n libcollectdclient0 - Summary: Library for %{name} clients Group: System/Monitoring Provides: libcollectdclient = %{version}-%{release} @@ -505,7 +482,6 @@ unixsock plugin for clients. %package -n libcollectdclient-devel - Summary: Development Environment for %{name} clients Group: Development/Libraries/C and C++ Requires: libcollectdclient0 = %{version}-%{release} @@ -539,8 +515,9 @@ %patch23 %patch24 %patch25 -p1 -%patch26 -p1 +%patch -P 26 -p1 %patch27 -p1 +%patch28 %__sed -i 's|@@VERSION@@|%{version}|g' configure.in ++++++ collectd-fix_new_yajl_lib.patch ++++++ --- 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."); ++++++ collectd-iptc.diff ++++++ --- 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 <libiptc/libiptc.h> 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 <libiptc/libip6tc.h> 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 <libiptc/libiptc.h> -# include <libiptc/libip6tc.h> -#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 continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
