Merged branch 'master' into experimental.

diff --git a/debian/README.Debian b/debian/README.Debian
index fbbb43f5d475429d6dae1e8f0fc9ad8e8cb466ca..cab3f6438cc1b39149199b0bf1a0062bbd592502 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -109,7 +109,8 @@ Building your own plugins:
 - Originally, plugins for collectd had to be written in C and linked as shared
   objects. Starting with version 4.0.0, it is also possible to use plugins
   written in the scripting language Perl or implemented as separate processes.
-  See collectd-perl(5) and collectd-exec(5) for details.
+  In later versions, support for Java and Python has been added. See the
+  appropriate collectd-<extension>(5) manual page for details.
 
 - If you want to contribute plugins to the official distribution you should
   read http://collectd.org/dev-info.shtml.

diff --git a/debian/changelog b/debian/changelog
index ba1e1d6659253db570ba7103a9eb5940cfbe5b9d..f7d674b6671fd1482b963ebcb31b2334707d61e8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,60 @@
+collectd (5.2.0-1) experimental; urgency=low
+
+  * New upstream release:
+    - ping plugin: Don't abort if ping_send fails but report an error only;
+      thanks to Bernd Zeimetz for reporting this (Closes: #630683).
+    - df plugin: Ignore "rootfs" file-system type to make sure that root
+      file-system statistics are only collected once; thanks to Florian La
+      Roche for reporting this (Closes: #657122).
+    - Fixed parse errors when using (including) empty config files; thanks to
+      Reinhard Tartler for reporting this (Closes: #592881).
+    New plugins:
+    - Aggregate multiple values lists into one: aggregation
+    - Query statistics from BSD's packet filter: pf (FreeBSD only)
+  * Uploading to experimental because of the Wheezy freeze.
+  * debian/control, debian/rules:
+    - Build-depend on kfreebsd-kernel-headers (kfreebsd-any only) and disable
+      the 'pf' plugin on non-kfreebsd systems.
+  * debian/patches:
+    - Removed migrate-4-5-df.dpatch; merged upstream.
+    - Removed rtnl_dump_filter.dpatch; merged upstream.
+    - Added myplugin_includes.dpatch -- change the example plugin include path
+      to /usr/include/collectd/core/ (see below).
+    - rrd_filter_path.dpatch: Also patch the migrate-4-5 script; while this is
+      not required for the (optional) auto-migration when updating the package
+      (the full path is passed as an argument) it helps the user to just use
+      the script without the need to add further arguments; thanks to Joey
+      Hess for reporting this (Closes: #689001).
+  * debian/rules:
+    - Fix installation paths used for Perl bindings. Upstream now passes
+      INSTALL_BASE rather than PREFIX to Makefile.PL which resulted in the
+      bindings being installed to different locations than before.
+  * debian/collectd-utils.install:
+    - Install collectd-tg(1).
+  * debian/libcollectdclient-dev.install:
+    - Install the libcollectdclient network*.h header files.
+  * Renamed libcollectclient0 to libcollectdclient1 due to the SONAME version
+    bump.
+  * debian/libcollectdclient1.symbols:
+    - Updated for 5.2.
+  * debian/collectd-dev.install:
+    - Install the collectd (daemon) headers to /usr/include/collectd/core/
+      rather than /usr/include/collectd/. The latter is used by
+      libcollectdclient which causes file conflicts.
+  * debian/collectd.conf:
+    - Let the 'df' plugin ignore 'rootfs' (else, the root file-system would
+      appear twice, causing one of the updates to fail and spam the log) and
+      the usual virtual / temporary file-systems (cf. #657122).
+  * debian/collectd-core.postrm:
+    - Source the debconf confmodule to make the db_* functions available;
+      thanks to Joey Hess and YunQiang Su for reporting this
+      (Closes: #680172, #688285).
+  * debian/po:
+    - Updated Brazilian Portuguese debconf templates; thanks to Adriano Rafael
+      Gomes (Closes: #685760).
+
+ -- Sebastian Harl <tokkee@debian.org>  Tue, 20 Nov 2012 15:40:12 +0100
+
 collectd (5.1.0-3) unstable; urgency=low
 
   * debian/patches/migrate-4-5-df.dpatch, debian/collectd-core.postinst:

diff --git a/debian/collectd-core.postrm b/debian/collectd-core.postrm
index cdeabe48b57c354aa31f2c528ee0dbe68000798a..43700cdb2756fcc257de2dbac527845be1932070 100755 (executable)
--- a/debian/collectd-core.postrm
+++ b/debian/collectd-core.postrm
@@ -17,6 +17,7 @@ set -e
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
+. /usr/share/debconf/confmodule
 
 case "$1" in
     purge)

diff --git a/debian/collectd-dev.install b/debian/collectd-dev.install
index ea6252fdeb8a5a0ed96526c2aa84d545a9bca670..5696e472171b4488e65f6b9ca4f636af6ab2c758 100644 (file)
--- a/debian/collectd-dev.install
+++ b/debian/collectd-dev.install
@@ -1,3 +1,3 @@
 src/liboconfig/oconfig.h usr/include/collectd/liboconfig
-src/*.h usr/include/collectd
+src/*.h usr/include/collectd/core
 

diff --git a/debian/collectd-utils.install b/debian/collectd-utils.install
index f77c860d4bfa77b6e3b656f9dcd516260abdad58..b8ff6b2d3d9b9b5b1da9b9c739f78b3f66dfe0f1 100644 (file)
--- a/debian/collectd-utils.install
+++ b/debian/collectd-utils.install
@@ -1,5 +1,6 @@
 usr/bin/collectdctl
 usr/bin/collectd-nagios
+usr/bin/collectd-tg
 usr/share/man/man1/collectdctl.1
 usr/share/man/man1/collectd-nagios.1
 

diff --git a/debian/collectd.conf b/debian/collectd.conf
index 210eb042d312476d20093a3a29fff9b550df0667..a422f4079d63729e7aeae7ba5a32447fa2c71c93 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -6,15 +6,38 @@
 # You should also read /usr/share/doc/collectd-core/README.Debian.plugins
 # before enabling any more plugins.
 
+##############################################################################
+# Global                                                                     #
+#----------------------------------------------------------------------------#
+# Global settings for the daemon.                                            #
+##############################################################################
+
 #Hostname "localhost"
 FQDNLookup true
 #BaseDir "/var/lib/collectd"
 #PluginDir "/usr/lib/collectd"
 #TypesDB "/usr/share/collectd/types.db" "/etc/collectd/my_types.db"
+
+#----------------------------------------------------------------------------#
+# Interval at which to query values. This may be overwritten on a per-plugin #
+# base by using the 'Interval' option of the LoadPlugin block:               #
+#   <LoadPlugin foo>                                                         #
+#       Interval 60                                                          #
+#   </LoadPlugin>                                                            #
+#----------------------------------------------------------------------------#
 #Interval 10
+
 #Timeout 2
 #ReadThreads 5
 
+##############################################################################
+# Logging                                                                    #
+#----------------------------------------------------------------------------#
+# Plugins which provide logging functions should be loaded first, so log     #
+# messages generated when loading or configuring other plugins can be        #
+# accessed.                                                                  #
+##############################################################################
+
 #LoadPlugin logfile
 LoadPlugin syslog
 
@@ -29,6 +52,13 @@ LoadPlugin syslog
        LogLevel info
 </Plugin>
 
+##############################################################################
+# LoadPlugin section                                                         #
+#----------------------------------------------------------------------------#
+# Specify what features to activate.                                         #
+##############################################################################
+
+#LoadPlugin aggregation
 #LoadPlugin amqp
 #LoadPlugin apache
 #LoadPlugin apcups
@@ -120,6 +150,33 @@ LoadPlugin users
 #LoadPlugin write_http
 #LoadPlugin write_mongodb
 
+##############################################################################
+# Plugin configuration                                                       #
+#----------------------------------------------------------------------------#
+# In this section configuration stubs for each plugin are provided. A desc-  #
+# ription of those options is available in the collectd.conf(5) manual page. #
+##############################################################################
+
+#<Plugin "aggregation">
+#      <Aggregation>
+#              #Host "unspecified"
+#              Plugin "cpu"
+#              #PluginInstance "unspecified"
+#              Type "cpu"
+#              #TypeInstance "unspecified"
+#
+#              GroupBy "Host"
+#              GroupBy "TypeInstance"
+#
+#              CalculateNum false
+#              CalculateSum false
+#              CalculateAverage true
+#              CalculateMinimum false
+#              CalculateMaximum false
+#              CalculateStddev false
+#      </Aggregation>
+#</Plugin>
+
 #<Plugin amqp>
 #      <Publish "name">
 #              Host "localhost"
@@ -286,16 +343,29 @@ LoadPlugin users
 #      </Database>
 #</Plugin>
 
-#<Plugin df>
+<Plugin df>
 #      Device "/dev/sda1"
 #      Device "192.168.0.2:/mnt/nfs"
 #      MountPoint "/home"
 #      FSType "ext3"
-#      IgnoreSelected false
+
+       # ignore rootfs; else, the root file-system would appear twice, causing
+       # one of the updates to fail and spam the log
+       FSType rootfs
+       # ignore the usual virtual / temporary file-systems
+       FSType sysfs
+       FSType proc
+       FSType devtmpfs
+       FSType devpts
+       FSType tmpfs
+       FSType fusectl
+       FSType cgroup
+       IgnoreSelected true
+
 #      ReportByDevice false
 #      ReportReserved false
 #      ReportInodes false
-#</Plugin>
+</Plugin>
 
 #<Plugin disk>
 #      Disk "hda"
@@ -444,10 +514,12 @@ LoadPlugin users
 #</Plugin>
 
 #<Plugin memcached>
-#      Socket "/var/run/memcached.sock"
+#      <Instance "local">
+#              Socket "/var/run/memcached.sock"
 # or:
-#      Host "127.0.0.1"
-#      Port "11211"
+#              Host "127.0.0.1"
+#              Port "11211"
+#      </Instance>
 #</Plugin>
 
 #<Plugin modbus>
@@ -559,6 +631,7 @@ LoadPlugin users
 #      Host "localhost"
 #      Port 123
 #      ReverseLookups false
+#      IncludeUnitID true
 #</Plugin>
 
 #<Plugin nut>
@@ -643,6 +716,12 @@ LoadPlugin users
 #              </Result>
 #      </Query>
 #
+#      <Writer sqlstore>
+#              # See /usr/share/doc/collectd-core/examples/postgresql/collectd_insert.sql for details
+#              Statement "SELECT collectd_insert($1, $2, $3, $4, $5, $6, $7, $8, $9);"
+#              StoreRates true
+#      </Writer>
+#
 #      <Database foo>
 #              Host "hostname"
 #              Port 5432
@@ -662,6 +741,13 @@ LoadPlugin users
 #              Query backend # predefined
 #              Query rt36_tickets
 #      </Database>
+#
+#      <Database qux>
+#              Service "collectd_store"
+#              Writer sqlstore
+#              # see collectd.conf(5) for details
+#              CommitInterval 30
+#      </Database>
 #</Plugin>
 
 #<Plugin powerdns>
@@ -704,6 +790,14 @@ LoadPlugin users
 #      DataDir "/var/lib/rrdcached/db/collectd"
 #      CreateFiles true
 #      CollectStatistics true
+#
+# The following settings are rather advanced
+# and should usually not be touched:
+#      StepSize 10
+#      HeartBeat 20
+#      RRARows 1200
+#      RRATimespan 158112000
+#      XFF 0.1
 #</Plugin>
 
 <Plugin rrdtool>
@@ -779,6 +873,7 @@ LoadPlugin users
 
 #<Plugin swap>
 #      ReportByDevice false
+#      ReportBytes true
 #</Plugin>
 
 #<Plugin table>

diff --git a/debian/control b/debian/control
index 7d587f1f835a2b489d82d834eb329a179d925921..6763c94aa4c72a1efb6aceca15522f8a35599fef 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel !kfreebsd-any !hurd-any],
  iptables-dev (>= 1.4.3.2-2) [linux-any],
  javahelper,
+ kfreebsd-kernel-headers [kfreebsd-any],
  libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev,
  libdbi0-dev,
  libesmtp-dev,
@@ -211,7 +212,7 @@ Architecture: any
 Priority: extra
 Depends: collectd-core (= ${binary:Version}), ${misc:Depends}
 Recommends: collectd-utils (= ${binary:Version}),
- libcollectdclient0 (= ${binary:Version})
+ libcollectdclient1 (= ${binary:Version})
 Description: statistics collection and monitoring daemon (debugging symbols)
  collectd is a small daemon which collects system information periodically and
  provides mechanisms to monitor and store the values in a variety of ways.
@@ -223,7 +224,7 @@ Description: statistics collection and monitoring daemon (debugging symbols)
 
 Package: collectd-dev
 Architecture: all
-Depends: collectd-core (>= ${source:Version}), collectd-core (<< 5.2~),
+Depends: collectd-core (>= ${source:Version}), collectd-core (<< 5.3~),
  ${misc:Depends}
 Description: statistics collection and monitoring daemon (development files)
  collectd is a small daemon which collects system information periodically and
@@ -238,7 +239,7 @@ Description: statistics collection and monitoring daemon (development files)
 Package: libcollectdclient-dev
 Section: libdevel
 Architecture: any
-Depends: libcollectdclient0 (= ${binary:Version}), ${misc:Depends}
+Depends: libcollectdclient1 (= ${binary:Version}), ${misc:Depends}
 Description: client library for collectd's control interface (development files)
  libcollectdclient provides an API to access the control interface provided by
  the unixsock plugin of collectd, a statistics collection and monitoring
@@ -248,7 +249,7 @@ Description: client library for collectd's control interface (development files)
  .
  This package contains the header files and the static library.
 
-Package: libcollectdclient0
+Package: libcollectdclient1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}

diff --git a/debian/copyright b/debian/copyright
index 97e46db7a246c4bc5cc792cbfddfdf6eb186e4d7..92adcace82d768251640d093dab61105ebcdb556 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -21,9 +21,10 @@ Copyright Holders (in alphabetical order):
        Anthony Gialluca <tonyabg@charter.net>
        Antony Dovgal <tony@daylessday.org>
        Bruno Prémont <bonbons@linux-vserver.org>
-       C-Ware, Inc.
        Clay Loveless <clay@killersoft.com>
        Clément Stenac <clement.stenac@diwi.org>
+       Cosmin Ioiart <cioiart@gmail.com>
+       C-Ware, Inc.
        Cyril Feraudet <cyril@feraudet.com>
        David Bacher <drbacher@gmail.com>
        Doug MacEachern <dougm@hyperic.com>
@@ -62,6 +63,7 @@ Copyright Holders (in alphabetical order):
        Michał Mirosław <mirq-linux@rere.qmqm.pl>
        Mirko Buffoni <briareos@eswat.org>
        Netfilter Core Team
+       Nicolas Szalay
        Niki W. Waibel <niki.waibel@newlogic.com>
        noris network AG
        Novell Inc.
@@ -73,6 +75,7 @@ Copyright Holders (in alphabetical order):
        Peter Holik <peter@holik.at>
        Peter Kese <peter.kese@ijs.si>
        Phoenix Kayo <kayo.k11.4@gmail.com>
+       Pierre-Yves Ritschard <pyr@openbsd.org>
        Red Hat Inc.
        Rodolphe Quiédeville <rquiedeville@bearstech.com>
        Scott Garrett <sgarrett@technomancer.com>
@@ -81,6 +84,7 @@ Copyright Holders (in alphabetical order):
        Simon Kuhnle <simon@blarzwurst.de>
        Sjoerd van der Berg <harekiet@users.sourceforge.net>
        Stefan Hacker <d0t@dbclan.de>
+       Stefan Rinkes <stefan.rinkes@gmail.org>
        Stefan Völkel <bd@bc-bd.org>
        Steven Clarke <steven@monmouth.demon.co.uk>
        Sven Trenkel <collectd@semidefinite.de>
@@ -105,8 +109,6 @@ Licenses:
              contrib/examples/MyPlugin.pm
              contrib/examples/myplugin.c
              contrib/cussh.pl
-             src/libcollectdclient/lcc_features.h
-             src/libcollectdclient/lcc_features.h.in
              src/collectdmon.c
              src/collectdmon.pod
              src/email.c
@@ -173,7 +175,7 @@ Licenses:
        License: GNU General Public License
 
        File src/apcups.c
-       Copyright © 2006-2007 Florian Forster <octo@verplant.org>
+       Copyright © 2006-2012 Florian Forster <octo@verplant.org>
        Copyright © 2006 Anthony Gialluca <tonyabg@charter.net>
        Copyright © 2000-2004 Kern Sibbald
        Copyright © 1996-1999 Andre M. Hedrick <andre@suse.com>
@@ -254,7 +256,7 @@ Licenses:
        Files src/disk.c
              src/interface.c
              src/load.c
-       Copyright © 2005-2008 Florian Forster <octo@verplant.org>
+       Copyright © 2005-2012 Florian Forster <octo@verplant.org>
        Copyright © 2009 Manuel Sanmartin
        License: GNU General Public License
 
@@ -344,9 +346,10 @@ Licenses:
 
        File src/memcached.c
        Copyright © 2007 Antony Dovgal
-       Copyright © 2007-2009 Florian Forster <octo@verplant.org>
+       Copyright © 2007-2012 Florian Forster <octo@verplant.org>
        Copyright © 2009 Doug MacEachern <dougm@hyperic.com>
-       Copyright © Franck Lombardi
+       Copyright © 2009 Franck Lombardi
+       Copyright © 2012 Nicolas Szalay
        License: GNU General Public License
 
        File src/memory.c
@@ -411,6 +414,7 @@ Licenses:
        Copyright © 2009 Andrés J. Díaz <ajdiaz@connectical.com>
        Copyright © 2009 Manuel Sanmartin
        Copyright © 2010 Clément Stenac <clement.stenac@diwi.org>
+       Copyright © 2012 Cosmin Ioiart <cioiart@gmail.com>
        License: GNU General Public License
 
        File src/rrdtool.c
@@ -429,7 +433,7 @@ Licenses:
        License: GNU General Public License
 
        File src/swap.c
-       Copyright © 2005-2009 Florian Forster <octo@verplant.org>
+       Copyright © 2005-2012 Florian Forster <octo@verplant.org>
        Copyright © 2009 Stefan Völkel <bd@bc-bd.org>
        Copyright © 2009 Manuel Sanmartin
        License: GNU General Public License
@@ -471,6 +475,15 @@ Licenses:
        Copyright © 2008 Oleg King <king2@kaluga.ru>
        License: GNU General Public License
 
+       File src/utils_format_graphite.c
+       Copyright © 2012 Thomas Meson <zllak@hycik.org>
+       Copyright © 2012 Florian octo Forster <octo@collectd.org>
+       License: GNU General Public License
+
+       File src/utils_format_graphite.h
+       Copyright © 2012 Thomas Meson <zllak@hycik.org>
+       License: GNU General Public License
+
        File src/utils_ignorelist.c
        Copyright © 2006 Lubos Stanek <lubek@users.sourceforge.net>
        Copyright © 2008 Florian Forster <octo@verplant.org>
@@ -659,8 +672,12 @@ can be found in `/usr/share/common-licenses/LGPL'.
        ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
        POSSIBILITY OF SUCH DAMAGE.
 
+       File contrib/postgresql/collectd_insert.sql
+       Copyright © 2012 Sebastian 'tokkee' Harl <sh@tokkee.org>
+       License: 2-clause BSD License
+
        File src/postgresql.c
-       Copyright © 2008-2009 Sebastian Harl <sh@tokkee.org>
+       Copyright © 2008-2012 Sebastian Harl <sh@tokkee.org>
        Copyright © 2009 Florian Forster <octo@verplant.org>
        License: 2-clause BSD License
 
@@ -689,18 +706,27 @@ can be found in `/usr/share/common-licenses/LGPL'.
        ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
        POSSIBILITY OF SUCH DAMAGE.
 
+       File src/amqp.c
+       Copyright © 2009 Sebastien Pahl <sebastien.pahl@dotcloud.com>
+       Copyright © 2010-2012 Florian Forster <octo@verplant.org>
+       License: MIT License
+
        Files src/collectd-python.pod
              src/cpython.h
              src/netapp.c
              src/pyconfig.c
              src/python.c
              src/pyvalues.c
-       Copyright © 2009 Sven Trenkel <collectd@semidefinite.de>
+       Copyright © 2009-2010 Sven Trenkel <collectd@semidefinite.de>
        License: MIT License
 
-       File src/amqp.c
-       Copyright © 2009 Sebastien Pahl <sebastien.pahl@dotcloud.com>
-       Copyright © 2010-2012 Florian Forster <octo@verplant.org>
+       Files src/libcollectdclient/collectd/lcc_features.h
+             src/libcollectdclient/collectd/lcc_features.h.in
+       Copyright © 2009 Sebastian Harl <sh@tokkee.org>
+       License: MIT License
+
+       Other files in src/libcollectdclient/
+       Copyright © 2005-2012 Florian octo Forster <octo@verplant.org>
        License: MIT License
 
        Permission is hereby granted, free of charge, to any person obtaining a
@@ -721,6 +747,22 @@ can be found in `/usr/share/common-licenses/LGPL'.
        FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
        DEALINGS IN THE SOFTWARE.
 
+       File src/pf.c
+       Copyright © 2010 Pierre-Yves Ritschard <pyr@openbsd.org>
+       Copyright © 2011 Stefan Rinkes <stefan.rinkes@gmail.org>
+
+       Permission to use, copy, modify, and distribute this software for any
+       purpose with or without fee is hereby granted, provided that the above
+       copyright notice and this permission notice appear in all copies.
+
+       THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+       WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+       MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+       ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+       WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+       ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+       OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
        Files contrib/SpamAssassin/*
        Copyright © 2006 Alexander Wirt <formorer@formorer.de>
 

diff --git a/debian/libcollectdclient-dev.install b/debian/libcollectdclient-dev.install
index 6cad707ff6203f0c4ae1373be9ce16b01bea5f95..60cf2bdea8dc85792f83f34e2eb25fedb08d2d8f 100644 (file)
--- a/debian/libcollectdclient-dev.install
+++ b/debian/libcollectdclient-dev.install
@@ -1,5 +1,7 @@
 usr/include/collectd/client.h usr/include/collectd
 usr/include/collectd/lcc_features.h usr/include/collectd
+usr/include/collectd/network.h usr/include/collectd
+usr/include/collectd/network_buffer.h usr/include/collectd
 usr/lib/pkgconfig/libcollectdclient.pc
 usr/lib/libcollectdclient.so
 

diff --git a/debian/libcollectdclient0.install b/debian/libcollectdclient0.install
deleted file mode 100644 (file)
index 7b98d64..0000000
--- a/debian/libcollectdclient0.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libcollectdclient.so.*
-

diff --git a/debian/libcollectdclient0.symbols b/debian/libcollectdclient0.symbols
deleted file mode 100644 (file)
index eb77b83..0000000
--- a/debian/libcollectdclient0.symbols
+++ /dev/null
@@ -1,14 +0,0 @@
-libcollectdclient.so.0 libcollectdclient0 #MINVER#
- lcc_connect@Base 4.6.0
- lcc_disconnect@Base 4.6.0
- lcc_flush@Base 4.6.0
- lcc_getval@Base 4.6.0
- lcc_identifier_to_string@Base 4.6.0
- lcc_listval@Base 4.6.0
- lcc_putval@Base 4.6.0
- lcc_sort_identifiers@Base 5.1.0
- lcc_strerror@Base 4.6.0
- lcc_string_to_identifier@Base 4.6.0
- lcc_version@Base 4.6.0
- lcc_version_extra@Base 4.6.0
- lcc_version_string@Base 4.6.0

diff --git a/debian/libcollectdclient1.install b/debian/libcollectdclient1.install
new file mode 100644 (file)
index 0000000..7b98d64
--- /dev/null
+++ b/debian/libcollectdclient1.install
@@ -0,0 +1,2 @@
+usr/lib/libcollectdclient.so.*
+

diff --git a/debian/libcollectdclient1.symbols b/debian/libcollectdclient1.symbols
new file mode 100644 (file)
index 0000000..0bc9f3f
--- /dev/null
+++ b/debian/libcollectdclient1.symbols
@@ -0,0 +1,29 @@
+libcollectdclient.so.1 libcollectdclient1 #MINVER#
+ lcc_connect@Base 4.6.0
+ lcc_disconnect@Base 4.6.0
+ lcc_flush@Base 4.6.0
+ lcc_getval@Base 4.6.0
+ lcc_identifier_compare@Base 5.2.0
+ lcc_identifier_to_string@Base 4.6.0
+ lcc_listval@Base 4.6.0
+ lcc_network_buffer_add_value@Base 5.2.0
+ lcc_network_buffer_create@Base 5.2.0
+ lcc_network_buffer_destroy@Base 5.2.0
+ lcc_network_buffer_finalize@Base 5.2.0
+ lcc_network_buffer_get@Base 5.2.0
+ lcc_network_buffer_initialize@Base 5.2.0
+ lcc_network_buffer_set_security_level@Base 5.2.0
+ lcc_network_create@Base 5.2.0
+ lcc_network_destroy@Base 5.2.0
+ lcc_network_values_send@Base 5.2.0
+ lcc_putval@Base 4.6.0
+ lcc_server_create@Base 5.2.0
+ lcc_server_destroy@Base 5.2.0
+ lcc_server_set_security_level@Base 5.2.0
+ lcc_server_set_ttl@Base 5.2.0
+ lcc_sort_identifiers@Base 5.1.0
+ lcc_strerror@Base 4.6.0
+ lcc_string_to_identifier@Base 4.6.0
+ lcc_version@Base 4.6.0
+ lcc_version_extra@Base 4.6.0
+ lcc_version_string@Base 4.6.0

diff --git a/debian/patches/00list b/debian/patches/00list
index 390f00fb1aa3cb7a06b5310b837ac85a035c15d2..23aacf62e043c084fffcce668440b01881337668 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,5 +1,4 @@
 rrd_filter_path.dpatch
 collection_conf_path.dpatch
+myplugin_includes.dpatch
 bts559801_plugin_find_fix.dpatch
-rtnl_dump_filter.dpatch
-migrate-4-5-df.dpatch

diff --git a/debian/patches/migrate-4-5-df.dpatch b/debian/patches/migrate-4-5-df.dpatch
deleted file mode 100755 (executable)
index 6c6f3a9..0000000
--- a/debian/patches/migrate-4-5-df.dpatch
+++ /dev/null
@@ -1,66 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## migrate-4-5-df.dpatch by Florian Forster <octo@collectd.org>
-##
-## DP: contrib/migrate-4-5.px: Break up "df" RRD files into multiple files.
-## DP: cf. upstream commit 605dab534eb2f0ee26446c157c9fdd2ad6e9427a
-
-@DPATCH@
-
-diff --git a/contrib/migrate-4-5.px b/contrib/migrate-4-5.px
-index d3ff796..c39b51b 100755
---- a/contrib/migrate-4-5.px
-+++ b/contrib/migrate-4-5.px
-@@ -33,6 +33,7 @@ use File::Basename ('dirname');
- 
- our $InDir = '/var/lib/collectd';
- our $RRDtool = 'rrdtool';
-+our $RRDFilter = 'rrd_filter.px';
- 
- our %TypesCounterToDerive = # {{{
- (
-@@ -184,7 +185,15 @@ sub handle_file # {{{
-   {
-     my $dir = join ('/', @path);
-     print "mkdir -p \"$dir/$plugin-$type_inst\"\n";
--    print "mv \"$path\" \"$dir/$plugin-$type_inst/$type.rrd\"\n";
-+    if (($plugin eq 'df') and ($type eq 'df'))
-+    {
-+      print "$RRDFilter --infile=\"$path\" --outfile=\"$dir/$plugin-$type_inst/df_complex-free.rrd\" --map free:value\n";
-+      print "$RRDFilter --infile=\"$path\" --outfile=\"$dir/$plugin-$type_inst/df_complex-used.rrd\" --map used:value\n";
-+    }
-+    else
-+    {
-+      print "mv \"$path\" \"$dir/$plugin-$type_inst/$type.rrd\"\n";
-+    }
-   }
- } # }}} sub handle_file
- 
-@@ -223,10 +232,12 @@ migrate-4-5.px [OPTIONS]
- 
- Valid options are:
- 
--  --indir <dir>      Source directory
--                     Default: $InDir
--  --rrdtool <path>   Path to the RRDtool binary
--                     Default: $RRDtool
-+  --indir <dir>         Source directory
-+                        Default: $InDir
-+  --rrdtool <path>      Path to the RRDtool binary
-+                        Default: $RRDtool
-+  --rrdfilter <path>    Path to the rrd_filter.px script
-+                        Default: $RRDFilter
- 
- EOF
-   exit (1);
-@@ -234,8 +245,11 @@ EOF
- 
- GetOptions ("indir|i=s" => \$InDir,
-         "rrdtool=s" => \$RRDtool,
-+        "rrdfilter=s" => \$RRDFilter,
-         "help|h" => \&exit_usage) or exit_usage ();
- 
-+print "#!/bin/bash\n\n";
-+
- scan_dir ($InDir);
- 
- # vim: set sw=2 sts=2 et fdm=marker :

diff --git a/debian/patches/myplugin_includes.dpatch b/debian/patches/myplugin_includes.dpatch
new file mode 100644 (file)
index 0000000..2b252cf
--- /dev/null
+++ b/debian/patches/myplugin_includes.dpatch
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## myplugin_includes.dpatch by Sebastian Harl <sh@tokkee.org>
+##
+## DP: Let the example plugin include the core headers from
+## DP: /usr/include/collectd/core.
+
+@DPATCH@
+
+diff a/contrib/examples/myplugin.c b/contrib/examples/myplugin.c
+--- a/contrib/examples/myplugin.c
++++ b/contrib/examples/myplugin.c
+@@ -38,9 +38,9 @@
+ 
+ #endif /* ! HAVE_CONFIG */
+ 
+-#include <collectd/collectd.h>
+-#include <collectd/common.h>
+-#include <collectd/plugin.h>
++#include <collectd/core/collectd.h>
++#include <collectd/core/common.h>
++#include <collectd/core/plugin.h>
+ 
+ /*
+  * data source definition:

diff --git a/debian/patches/rrd_filter_path.dpatch b/debian/patches/rrd_filter_path.dpatch
index 2678334692305288238b47394bdd7127fd5cef0d..4580bba4029800ad041f0d77eb1685ce0fec886a 100755 (executable)
--- a/debian/patches/rrd_filter_path.dpatch
+++ b/debian/patches/rrd_filter_path.dpatch
@@ -41,3 +41,17 @@ diff a/contrib/migrate-3-4.px b/contrib/migrate-3-4.px
  }
  
  sub exit_usage
+diff a/contrib/migrate-4-5.px b/contrib/migrate-4-5.px
+--- a/contrib/migrate-4-5.px
++++ b/contrib/migrate-4-5.px
+@@ -32,8 +32,8 @@
+ use File::Basename ('dirname');
+ 
+ our $InDir = '/var/lib/collectd';
+-our $RRDtool = 'rrdtool';
+-our $RRDFilter = 'rrd_filter.px';
++our $RRDtool = '/usr/bin/rrdtool';
++our $RRDFilter = '/usr/lib/collectd/utils/rrd_filter.px';
+ 
+ our %TypesCounterToDerive = # {{{
+ (

diff --git a/debian/patches/rtnl_dump_filter.dpatch b/debian/patches/rtnl_dump_filter.dpatch
deleted file mode 100644 (file)
index 948ac31..0000000
--- a/debian/patches/rtnl_dump_filter.dpatch
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## rtnl_dump_filter.dpatch by Gaetan Bisson
-##
-## DP: netlink: Updated the signature of rtnl_dump_filter to recent iproute2.
-
-@DPATCH@
-
-diff -Naur old/src/netlink.c new/src/netlink.c
---- old/src/netlink.c   2012-01-22 22:10:04.000000000 +1100
-+++ new/src/netlink.c   2012-02-01 17:22:54.362752065 +1100
-@@ -570,8 +570,7 @@
-     return (-1);
-   }
- 
--  if (rtnl_dump_filter (&rth, link_filter, /* arg1 = */ NULL,
--      NULL, NULL) != 0)
-+  if (rtnl_dump_filter (&rth, link_filter, /* arg1 = */ NULL) != 0)
-   {
-     ERROR ("netlink plugin: ir_read: rtnl_dump_filter failed.");
-     return (-1);
-@@ -608,8 +607,7 @@
-       continue;
-       }
- 
--      if (rtnl_dump_filter (&rth, qos_filter, (void *) &ifindex,
--          NULL, NULL) != 0)
-+      if (rtnl_dump_filter (&rth, qos_filter, (void *) &ifindex) != 0)
-       {
-       ERROR ("netlink plugin: ir_read: rtnl_dump_filter failed.");
-       continue;

diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 2009998b899587463e56e358a16b98f634c82fb8..26ce4564772f3b93beef49a75886ac952017ece2 100644 (file)
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: collectd 4.10.7-1\n"
+"Project-Id-Version: collectd 5.1.0-3\n"
 "Report-Msgid-Bugs-To: collectd@packages.debian.org\n"
 "POT-Creation-Date: 2012-05-19 17:59+0200\n"
-"PO-Revision-Date: 2012-05-20 21:50-0300\n"
+"PO-Revision-Date: 2012-08-19 10:32-0300\n"
 "Last-Translator: Adriano Rafael Gomes <adrianorg@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
 "org>\n"
@@ -83,30 +83,22 @@ msgstr ""
 #. Type: note
 #. Description
 #: ../collectd-core.templates:3001
-#, fuzzy
-#| msgid "Layout of RRD files has changed"
 msgid "Layout of RRD files has changed in version 5.0"
-msgstr "O layout dos arquivos RRD foi alterado"
+msgstr "O layout dos arquivos RRD foi alterado na versão 5.0"
 
 #. Type: note
 #. Description
 #. Type: boolean
 #. Description
 #: ../collectd-core.templates:3001 ../collectd-core.templates:4001
-#, fuzzy
-#| msgid ""
-#| "The layout of the RRD files created by collectd has changed significantly "
-#| "since version 3.x. In order to keep your old data you have to migrate it. "
-#| "This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px."
 msgid ""
 "The layout of some RRD files created by collectd has changed since version 4."
 "x. In order to keep your old data you have to migrate it. This can be done "
 "by using /usr/lib/collectd-core/utils/migrate-4-5.px."
 msgstr ""
-"O layout dos arquivos RRD criados pelo collectd foi alterado "
-"significativamente desde a versão 3.x. Para manter seus dados antigos você "
-"deve migrá-los. Isso pode ser feito usando /usr/lib/collectd-core/utils/"
-"migrate-3-4.px."
+"O layout dos arquivos RRD criados pelo collectd foi alterado desde a versão "
+"4.x. Para manter seus dados antigos você deve migrá-los. Isso pode ser feito "
+"usando /usr/lib/collectd-core/utils/migrate-4-5.px."
 
 #. Type: note
 #. Description
@@ -117,6 +109,8 @@ msgid ""
 "See /usr/share/doc/collectd-core/NEWS.Debian and the collectd wiki at "
 "<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> for details."
 msgstr ""
+"Veja /usr/share/doc/collectd-core/NEWS.Debian e o wiki do collectd em "
+"<http://collectd.org/wiki/index.php/V4_to_v5_migration_guide> para detalhes."
 
 #. Type: boolean
 #. Description
@@ -144,6 +138,6 @@ msgid ""
 "recent or custom version or if you want to keep the data for further "
 "analysis, the data should be kept."
 msgstr ""
-"Se você está expurgando o pacote collectd para substitui-lo por uma versão "
+"Se você está expurgando o pacote collectd para substituí-lo por uma versão "
 "mais recente ou personalizada, ou se você quer manter os dados para uma "
 "análise mais aprofundada, os dados deveriam ser mantidos."

diff --git a/debian/rules b/debian/rules
index 8e186fca503f58161e68ce7b29f782fb6c85366e..af70f20dc99c346a4e4cc896643194aa948b98b2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -109,6 +109,12 @@ ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
                --disable-vserver
 endif
 
+# This plugin is FreeBSD-specific.
+ifeq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
+       confflags += \
+               --disable-pf
+endif
+
 # These plugins have not been ported to FreeBSD yet.
 ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
        # Work-around an incomplete check for kvm functionality
@@ -214,6 +220,14 @@ install-arch: build
        rm -f debian/tmp/usr/lib/libcollectdclient.la
        rm -f debian/tmp/etc/collectd.conf
        
+       # this was broken by passing INSTALL_BASE rather than PREFIX to
+       # Makefile.PL
+       install -d -m 755 debian/tmp/usr/share/man/man3
+       mv debian/tmp/usr/man/man3/Collectd::Unixsock.3pm \
+               debian/tmp/usr/share/man/man3/
+       install -d -m 755 debian/tmp/usr/share/
+       mv debian/tmp/usr/lib/perl5 debian/tmp/usr/share/
+       
        dh_install -a --sourcedir=$(CURDIR)/debian/tmp --fail-missing
        
        perl ./debian/bin/gen_plugin_deps.pl
@@ -250,6 +264,7 @@ binary-arch: build install-arch
                contrib/snmp-data.conf contrib/add_rra.sh contrib/network-proxy.py \
                contrib/collectd_network.py contrib/collectd_unixsock.py \
                contrib/snmp-probe-host.px contrib/GenericJMX.conf \
+               contrib/postgresql \
                debian/collectd.conf debian/filters.conf debian/thresholds.conf
        # some upstream tarballs have been built inside a dirty working dir
        ( cd debian/collectd-core/ \

diff --git a/debian/thresholds.conf b/debian/thresholds.conf
index 53c62beebcc97c8103272212aff533e4e5c742ce..2bd4f2c0452d90a77c33c1c44875147048d1293e 100644 (file)
--- a/debian/thresholds.conf
+++ b/debian/thresholds.conf
@@ -1,6 +1,6 @@
 # Threshold configuration for collectd(1).
 #
-# See the section "THRESHOLD CONFIGURATION" in collectd.conf(5) for details.
+# See the collectd-threshold(5) manual page for details.
 
 #LoadPlugin "threshold"
 #<Plugin "threshold">