Hello community, here is the log from the commit of package collectd for openSUSE:Factory checked in at 2012-05-03 10:54:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/collectd (Old) and /work/SRC/openSUSE:Factory/.collectd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "collectd", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/collectd/collectd.changes 2011-10-18 14:10:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.collectd.new/collectd.changes 2012-05-03 10:54:46.000000000 +0200 @@ -1,0 +2,47 @@ +Mon Apr 23 10:56:57 UTC 2012 - [email protected] + +- 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 - [email protected] + +- 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 - [email protected] + +- 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 - [email protected] + +- update to 5.0.4 + +------------------------------------------------------------------- +Sun Feb 19 23:36:46 UTC 2012 - [email protected] + +- add modbus support + +------------------------------------------------------------------- +Sun Feb 19 17:07:34 UTC 2012 - [email protected] + +- fix apache configuration for collectd-js, thanks to Bruno Friedmann + <[email protected]> for reporting + +------------------------------------------------------------------- +Sun Feb 19 17:04:32 UTC 2012 - [email protected] + +- 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 - [email protected] + +- change license to be in spdx.org format + +------------------------------------------------------------------- Old: ---- collectd-4.10.3.tar.bz2 collectd-fix_new_yajl_lib.patch collectd-iptc.diff collectd-libnotify_070.patch New: ---- collectd-5.0.4.tar.bz2 collectd-fix_own_iptc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ collectd.spec ++++++ --- /var/tmp/diff_new_pack.tdYuJ2/_old 2012-05-03 10:54:48.000000000 +0200 +++ /var/tmp/diff_new_pack.tdYuJ2/_new 2012-05-03 10:54:48.000000000 +0200 @@ -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 <[email protected]> # # 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 @@ 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 @@ %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: 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: 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 @@ %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 @@ %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 @@ 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 @@ %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 @@ %build export SUSE_ASNEEDED=0 +%if %intree_netlink # build in-tree libnetlink.a pushd "iproute2-%{libnetlink_version}" LIBNETLINK_CFLAGS="%{optflags}" @@ -551,8 +576,10 @@ 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 @@ --with-librrd \ %if %iptables --enable-iptables \ + --with-libiptc=shipped \ %else --disable-iptables \ --without-iptc \ @@ -610,7 +638,9 @@ %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 @@ # 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 @@ %config(noreplace) %{_sysconfdir}/collectd.conf %dir %{_sysconfdir}/collectd %{_bindir}/collectd-nagios +%{_bindir}/collectdctl %{_bindir}/cussh %{_sbindir}/collectd %{_sbindir}/collectdmon @@ -788,6 +821,7 @@ %{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 @@ %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} ++++++ collectd-4.10.3.tar.bz2 -> collectd-5.0.4.tar.bz2 ++++++ ++++ 217928 lines of diff (skipped) ++++++ collectd-df-remove-duplicates.patch ++++++ --- /var/tmp/diff_new_pack.tdYuJ2/_old 2012-05-03 10:54:48.000000000 +0200 +++ /var/tmp/diff_new_pack.tdYuJ2/_new 2012-05-03 10:54:48.000000000 +0200 @@ -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; ++++++ collectd-fix-config.patch ++++++ --- /var/tmp/diff_new_pack.tdYuJ2/_old 2012-05-03 10:54:48.000000000 +0200 +++ /var/tmp/diff_new_pack.tdYuJ2/_new 2012-05-03 10:54:48.000000000 +0200 @@ -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/@[email protected]" -#PluginDir "@prefix@/lib/@PACKAGE_NAME@" @@ -15,16 +15,16 @@ #Interval 10 #Timeout 2 #ReadThreads 5 -@@ -149,7 +149,7 @@ - +@@ -173,7 +173,7 @@ #<Plugin apache> - # URL "http://localhost/status?auto"; --# User "www-user" -+# User "www" - # Password "secret" - # CACert "/etc/ssl/ca.crt" - #</Plugin> -@@ -161,7 +161,7 @@ + # <Instance "local"> + # URL "http://localhost/status?auto"; +-# User "www-user" ++# User "www" + # Password "secret" + # CACert "/etc/ssl/ca.crt" + # </Instance> +@@ -186,7 +186,7 @@ #<Plugin ascent> # URL "http://localhost/ascent/status/"; @@ -33,7 +33,7 @@ # Password "secret" # CACert "/etc/ssl/ca.crt" #</Plugin> -@@ -186,7 +186,7 @@ +@@ -211,7 +211,7 @@ #</Plugin> #<Plugin csv> @@ -42,7 +42,7 @@ # StoreRates false #</Plugin> -@@ -299,7 +299,7 @@ +@@ -324,7 +324,7 @@ #</Plugin> #<Plugin email> @@ -51,7 +51,23 @@ # SocketGroup "collectd" # SocketPerms "0770" # MaxConns 5 -@@ -881,7 +881,7 @@ +@@ -786,13 +786,13 @@ + + #<Plugin rrdcached> + # DaemonAddress "unix:/tmp/rrdcached.sock" +-# DataDir "@prefix@/var/lib/@PACKAGE_NAME@/rrd" ++# DataDir "/var/lib/@PACKAGE_NAME@/rrd" + # CreateFiles true + # CollectStatistics true + #</Plugin> + + #<Plugin rrdtool> +-# DataDir "@prefix@/var/lib/@PACKAGE_NAME@/rrd" ++# DataDir "/var/lib/@PACKAGE_NAME@/rrd" + # CacheTimeout 120 + # CacheFlush 900 + #</Plugin> +@@ -913,7 +913,7 @@ #</Plugin> #<Plugin unixsock> @@ -59,4 +75,4 @@ +# SocketFile "/var/run/@PACKAGE_NAME@-unixsock" # SocketGroup "collectd" # SocketPerms "0660" - #</Plugin> + # DeleteSocket false ++++++ collectd-fix_libltdl_autoreconf.patch ++++++ --- /var/tmp/diff_new_pack.tdYuJ2/_old 2012-05-03 10:54:48.000000000 +0200 +++ /var/tmp/diff_new_pack.tdYuJ2/_new 2012-05-03 10:54:48.000000000 +0200 @@ -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 ++++++ collectd-fix_own_iptc.patch ++++++ --- 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"); ++++++ collectd-fix_spamassassin_doc.patch ++++++ --- /var/tmp/diff_new_pack.tdYuJ2/_old 2012-05-03 10:54:48.000000000 +0200 +++ /var/tmp/diff_new_pack.tdYuJ2/_new 2012-05-03 10:54:48.000000000 +0200 @@ -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 - ++++++ collectd-js.apache2.conf ++++++ --- /var/tmp/diff_new_pack.tdYuJ2/_old 2012-05-03 10:54:48.000000000 +0200 +++ /var/tmp/diff_new_pack.tdYuJ2/_new 2012-05-03 10:54:48.000000000 +0200 @@ -1,5 +1,5 @@ <IfModule mod_cgi.c> - ScriptAlias /collectd-js /srv/www/collectd-js/bin/index.cgi + ScriptAlias /collectd-js /srv/www/collectd-js/index.cgi # Access control: <Directory "/srv/www/collectd-js"> @@ -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 </Directory> ++++++ collectd-pkgconfig_libnotify_add_gtk.patch ++++++ --- /var/tmp/diff_new_pack.tdYuJ2/_old 2012-05-03 10:54:49.000000000 +0200 +++ /var/tmp/diff_new_pack.tdYuJ2/_new 2012-05-03 10:54:49.000000000 +0200 @@ -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 @@ - 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 @@ +--- 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=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $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` ++ 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 +@@ -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=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $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 -@@ -45149,9 +45149,9 @@ +@@ -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 --errors-to-stdout --print-errors "libnotify"` -+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnotify" "gtk+-2.0"` +- 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 --errors-to-stdout --print-errors "libnotify"` -+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnotify" "gtk+-2.0"` +- 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"], + [if test "x$LIBNOTIFY_PKG_ERRORS" = "x"; then + with_libnotify="no" ++++++ collectd-version.patch ++++++ --- /var/tmp/diff_new_pack.tdYuJ2/_old 2012-05-03 10:54:49.000000000 +0200 +++ /var/tmp/diff_new_pack.tdYuJ2/_new 2012-05-03 10:54:49.000000000 +0200 @@ -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]) ++++++ collectd.apache2.conf ++++++ --- /var/tmp/diff_new_pack.tdYuJ2/_old 2012-05-03 10:54:49.000000000 +0200 +++ /var/tmp/diff_new_pack.tdYuJ2/_new 2012-05-03 10:54:49.000000000 +0200 @@ -5,11 +5,12 @@ <Directory "/srv/www/collectd"> 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 </Directory> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
