Accepting request 694073 from home:cgiboudeaux:branches:server:monitoring

Update to 5.8.1
Add patch to fix the psql detection on Factory builds.

OBS-URL: https://build.opensuse.org/request/show/694073
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=154

9e36cd85a2bb_sigrok_Update_to_support_libsigrok_0_4.patch

@@ -14,12 +14,11 @@ Closes: collectd/collectd#1574
  configure.ac |  2 +-
  src/sigrok.c | 51 +++++++++++++++++++++++++++------------------------
  2 files changed, 28 insertions(+), 25 deletions(-)
-
 diff --git a/configure.ac b/configure.ac
-index f50df28a6d..6b7aad43ae 100644
+index 5738974..4032d84 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -5084,7 +5084,7 @@ AC_SUBST([BUILD_WITH_LIBSENSORS_LIBS])
+@@ -5058,7 +5058,7 @@ AC_SUBST([BUILD_WITH_LIBSENSORS_LIBS])
  # libsigrok {{{
  AC_SUBST([LIBSIGROK_CFLAGS])
  AC_SUBST([LIBSIGROK_LIBS])
@@ -29,7 +28,7 @@ index f50df28a6d..6b7aad43ae 100644
    [with_libsigrok="no (pkg-config could not find libsigrok)"]
  )
 diff --git a/src/sigrok.c b/src/sigrok.c
-index 8a325fe9f0..a44c95e4b8 100644
+index 8a325fe..a44c95e 100644
 --- a/src/sigrok.c
 +++ b/src/sigrok.c
 @@ -127,22 +127,22 @@ static int sigrok_config(oconfig_item_t *ci) {
@@ -97,13 +96,13 @@ index 8a325fe9f0..a44c95e4b8 100644
 @@ -248,21 +249,22 @@ static int sigrok_init_driver(struct config_device *cfdev,
    cfdev->sdi = devlist->data;
    g_slist_free(devlist);
-   ssnprintf(hwident, sizeof(hwident), "%s %s %s",
--            cfdev->sdi->vendor ? cfdev->sdi->vendor : "",
--            cfdev->sdi->model ? cfdev->sdi->model : "",
--            cfdev->sdi->version ? cfdev->sdi->version : "");
-+            sr_dev_inst_vendor_get(cfdev->sdi),
-+            sr_dev_inst_model_get(cfdev->sdi),
-+            sr_dev_inst_version_get(cfdev->sdi));
+   snprintf(hwident, sizeof(hwident), "%s %s %s",
+-           cfdev->sdi->vendor ? cfdev->sdi->vendor : "",
+-           cfdev->sdi->model ? cfdev->sdi->model : "",
+-           cfdev->sdi->version ? cfdev->sdi->version : "");
++           sr_dev_inst_vendor_get(cfdev->sdi),
++           sr_dev_inst_model_get(cfdev->sdi),
++           sr_dev_inst_version_get(cfdev->sdi));
    INFO("sigrok plugin: Device \"%s\" is a %s", cfdev->name, hwident);
  
    if (sr_dev_open(cfdev->sdi) != SR_OK)

Removed-checks-for-upper-limit-of-SENSORS_API_VERSION.patch

@@ -0,0 +1,83 @@
+From d5a3c020d33cc33ee8049f54c7b4dffcd123bf83 Mon Sep 17 00:00:00 2001
+From: Pavel Rochnyack <pavel2000@ngs.ru>
+Date: Mon, 3 Dec 2018 18:34:14 +0700
+Subject: [PATCH] sensors: Removed checks for upper limit of
+ SENSORS_API_VERSION
+
+That makes no more sense after lm-sensors got new maintainers.
+
+Closes: #3006
+---
+ src/sensors.c | 17 ++++++-----------
+ 1 file changed, 6 insertions(+), 11 deletions(-)
+
+diff --git a/src/sensors.c b/src/sensors.c
+index f4ecda5e49..33982e061a 100644
+--- a/src/sensors.c
++++ b/src/sensors.c
+@@ -149,7 +149,7 @@ typedef struct featurelist {
+ static char *conffile = SENSORS_CONF_PATH;
+ /* #endif SENSORS_API_VERSION < 0x400 */
+ 
+-#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
++#elif (SENSORS_API_VERSION >= 0x400)
+ typedef struct featurelist {
+   const sensors_chip_name *chip;
+   const sensors_feature *feature;
+@@ -159,11 +159,6 @@ typedef struct featurelist {
+ 
+ static char *conffile = NULL;
+ static _Bool use_labels = 0;
+-/* #endif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
+-
+-#else /* if SENSORS_API_VERSION >= 0x500 */
+-#error "This version of libsensors is not supported yet. Please report this " \
+-	"as bug."
+ #endif
+ 
+ static featurelist_t *first_feature = NULL;
+@@ -223,7 +218,7 @@ static int sensors_config(const char *key, const char *value) {
+     if (IS_TRUE(value))
+       ignorelist_set_invert(sensor_list, 0);
+   }
+-#if (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
++#if (SENSORS_API_VERSION >= 0x400)
+   else if (strcasecmp(key, "UseLabels") == 0) {
+     use_labels = IS_TRUE(value) ? 1 : 0;
+   }
+@@ -353,7 +348,7 @@ static int sensors_load_conf(void) {
+   }   /* while sensors_get_detected_chips */
+ /* #endif SENSORS_API_VERSION < 0x400 */
+ 
+-#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
++#elif (SENSORS_API_VERSION >= 0x400)
+   chip_num = 0;
+   while ((chip = sensors_get_detected_chips(NULL, &chip_num)) != NULL) {
+     const sensors_feature *feature;
+@@ -410,7 +405,7 @@ static int sensors_load_conf(void) {
+       } /* while (subfeature) */
+     }   /* while (feature) */
+   }     /* while (chip) */
+-#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
++#endif /* (SENSORS_API_VERSION >= 0x400) */
+ 
+   if (first_feature == NULL) {
+     sensors_cleanup();
+@@ -485,7 +480,7 @@ static int sensors_read(void) {
+   } /* for fl = first_feature .. NULL */
+ /* #endif SENSORS_API_VERSION < 0x400 */
+ 
+-#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
++#elif (SENSORS_API_VERSION >= 0x400)
+   for (featurelist_t *fl = first_feature; fl != NULL; fl = fl->next) {
+     double value;
+     int status;
+@@ -528,7 +523,7 @@ static int sensors_read(void) {
+ 
+     sensors_submit(plugin_instance, type, type_instance, value);
+   } /* for fl = first_feature .. NULL */
+-#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
++#endif /* (SENSORS_API_VERSION >= 0x400) */
+ 
+   return 0;
+ } /* int sensors_read */

avoid-pg-config.patch

@@ -0,0 +1,111 @@
+diff --git a/configure.ac b/configure.ac
+index 4032d84..284192d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4272,18 +4272,10 @@ AC_SUBST([PERL_LIBS])
+ # }}}
+ 
+ # --with-libpq {{{
+-with_pg_config="pg_config"
+ AC_ARG_WITH([libpq],
+-  [AS_HELP_STRING([--with-libpq@<:@=PREFIX@:>@], [Path to libpq.])],
++  [AS_HELP_STRING([--with-libpq], [Build using pgsql])],
+   [
+-    if test "x$withval" = "xno" || test "x$withval" = "xyes"; then
+-      with_libpq="$withval"
+-    else
+-      if test -f "$withval" && test -x "$withval"; then
+-        with_pg_config="$withval"
+-      else if test -x "$withval/bin/pg_config"; then
+-        with_pg_config="$withval/bin/pg_config"
+-      fi; fi
++    if test "x$withval" != "xno" || test "x$withval" != "xyes"; then
+       with_libpq="yes"
+     fi
+   ],
+@@ -4291,66 +4283,42 @@ AC_ARG_WITH([libpq],
+ )
+ 
+ if test "x$with_libpq" = "xyes"; then
+-  with_libpq_includedir=`$with_pg_config --includedir 2> /dev/null`
+-  pg_config_status=$?
+-
+-  if test $pg_config_status -eq 0; then
+-    if test -n "$with_libpq_includedir"; then
+-      for dir in $with_libpq_includedir; do
+-        with_libpq_cppflags="$with_libpq_cppflags -I$dir"
+-      done
+-    fi
+-  else
+-    AC_MSG_WARN([$with_pg_config returned with status $pg_config_status])
++  $PKG_CONFIG --exists 'libpq' 2>/dev/null
++  if test $? -ne 0; then
++    with_libpq="no (pkg-config doesn't know libpq)"
+   fi
+-
+-  SAVE_CPPFLAGS="$CPPFLAGS"
+-  CPPFLAGS="$CPPFLAGS $with_libpq_cppflags"
+-
+-  AC_CHECK_HEADERS([libpq-fe.h],
+-    [with_libpq="yes"],
+-    [with_libpq="no (libpq-fe.h not found)"]
+-  )
+-
+-  CPPFLAGS="$SAVE_CPPFLAGS"
+ fi
+ 
+ if test "x$with_libpq" = "xyes"; then
+-  with_libpq_libdir=`$with_pg_config --libdir 2> /dev/null`
+-  pg_config_status=$?
+-
+-  if test $pg_config_status -eq 0
+-  then
+-    if test -n "$with_libpq_libdir"; then
+-      for dir in $with_libpq_libdir; do
+-        with_libpq_ldflags="$with_libpq_ldflags -L$dir"
+-      done
+-    fi
+-  else
+-    AC_MSG_WARN([$with_pg_config returned with status $pg_config_status])
+-  fi
++  with_libpq_cflags="`$PKG_CONFIG --cflags libpq`"
++  with_libpq_ldflags="`$PKG_CONFIG --libs-only-L libpq`"
++  with_libpq_libs="`$PKG_CONFIG --libs libpq`"
++fi
+ 
+-  SAVE_LDFLAGS="$LDFLAGS"
+-  LDFLAGS="$LDFLAGS $with_libpq_ldflags"
++if test "x$with_libpq" = "xyes"; then
++  SAVE_CPPFLAGS="$CPPFLAGS"
++  CPPFLAGS="$CPPFLAGS $with_libpq_cflags"
+ 
+-  AC_CHECK_LIB([pq], [PQserverVersion],
+-    [with_libpq="yes"],
+-    [with_libpq="no (symbol 'PQserverVersion' not found)"])
++  # Look for libpq-fe.h
++  AC_CHECK_HEADERS([libpq-fe.h pgsql/libpq-fe.h],
++  [with_libpq="yes"],
++  [with_libpq="no (libpq-fe.h not found)"]
++  )
+ 
+-  LDFLAGS="$SAVE_LDFLAGS"
++  CPPFLAGS="$SAVE_CPPFLAGS"
+ fi
+ 
+ if test "x$with_libpq" = "xyes"; then
+-  BUILD_WITH_LIBPQ_CPPFLAGS="$with_libpq_cppflags"
++  BUILD_WITH_LIBPQ_CPPFLAGS="$with_libpq_cflags"
+   BUILD_WITH_LIBPQ_LDFLAGS="$with_libpq_ldflags"
+-  BUILD_WITH_LIBPQ_LIBS="-lpq"
++  BUILD_WITH_LIBPQ_LIBS="$with_libpq_libs"
+ fi
+ 
+ AC_SUBST([BUILD_WITH_LIBPQ_CPPFLAGS])
+-AC_SUBST([BUILD_WITH_LIBPQ_LDFLAGS])
+ AC_SUBST([BUILD_WITH_LIBPQ_LIBS])
+ # }}}
+ 
++
+ # --with-libpqos {{{
+ AC_ARG_WITH([libpqos],
+   [AS_HELP_STRING([--with-libpqos@<:@=PREFIX@:>@], [Path to libpqos.])],

collectd-5.7.2.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9d20a0221569a8d6b80bbc52b86e5e84965f5bafdbf5dfc3790e0fed0763e592
-size 1798777

collectd-5.8.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e796fda27ce06377f491ad91aa286962a68c2b54076aa77a29673d53204453da
+size 1789228

collectd-fix-config.patch

@@ -1,6 +1,8 @@
---- src/collectd.conf.in.orig	2013-06-04 02:22:35.386712789 +0200
-+++ src/collectd.conf.in	2013-06-04 02:24:33.579744915 +0200
-@@ -211,7 +211,7 @@
+Index: src/collectd.conf.in
+===================================================================
+--- src/collectd.conf.in.orig
++++ src/collectd.conf.in
+@@ -272,7 +272,7 @@
  #<Plugin apache>
  #  <Instance "local">
  #    URL "http://localhost/status?auto"
@@ -9,7 +11,7 @@
  #    Password "secret"
  #    CACert "/etc/ssl/ca.crt"
  #  </Instance>
-@@ -225,7 +225,7 @@
+@@ -291,7 +291,7 @@
  
  #<Plugin ascent>
  #	URL "http://localhost/ascent/status/"

collectd-fix_broken_perl-5.10.patch

@@ -1,6 +1,8 @@
---- src/perl.c.orig
-+++ src/perl.c
-@@ -2504,7 +2504,12 @@ static int perl_config_loadplugin(pTHX_
+diff --git a/src/perl.c b/src/perl.c
+index 8df8fd4..94e21d2 100644
+--- a/src/perl.c
++++ b/src/perl.c
+@@ -2516,7 +2516,12 @@ static int perl_config_loadplugin(pTHX_ oconfig_item_t *ci) {
  
    log_debug("perl_config: Loading Perl plugin \"%s\"", value);
    load_module(PERL_LOADMOD_NOIMPORT, newSVpv(module_name, strlen(module_name)),

collectd-fix_collectd_config_path_in_snmp_probe.patch

@@ -1,6 +1,8 @@
---- contrib/snmp-probe-host.px.orig	2009-10-07 22:55:23.000000000 +0200
-+++ contrib/snmp-probe-host.px	2009-10-07 22:57:45.000000000 +0200
-@@ -290,7 +290,7 @@
+diff --git a/contrib/snmp-probe-host.px b/contrib/snmp-probe-host.px
+index d1a7a88..bc94e5c 100755
+--- a/contrib/snmp-probe-host.px
++++ b/contrib/snmp-probe-host.px
+@@ -320,7 +320,7 @@ This is a bit a hack, but works for now.
  =cut
  
  my $host;

collectd-fix_collection_cgi.patch

@@ -1,6 +1,8 @@
---- contrib/collection.cgi.orig	2010-04-22 11:30:07.000000000 +0200
-+++ contrib/collection.cgi	2010-05-20 18:23:38.000000000 +0200
-@@ -11,7 +11,7 @@
+diff --git a/contrib/collection.cgi b/contrib/collection.cgi
+index 5ff259f..e0848e0 100755
+--- a/contrib/collection.cgi
++++ b/contrib/collection.cgi
+@@ -32,7 +32,7 @@ use URI::Escape ('uri_escape');
  use RRDs ();
  use Data::Dumper ();
  
@@ -9,8 +11,10 @@
  our @DataDirs = ();
  our @DontShowTypes = ();
  our $LibDir;
---- contrib/collection.conf.orig	2010-04-22 11:29:35.000000000 +0200
-+++ contrib/collection.conf	2010-05-20 18:23:38.000000000 +0200
+diff --git a/contrib/collection.conf b/contrib/collection.conf
+index e8444f5..063141f 100644
+--- a/contrib/collection.conf
++++ b/contrib/collection.conf
 @@ -1,3 +1,2 @@
 -datadir: "/opt/collectd/var/lib/collectd/rrd/"
 -libdir: "/opt/collectd/lib/collectd/"

collectd-javac_target.patch

@@ -1,30 +0,0 @@
-diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
-index 8d2e49d..549d81a 100644
---- a/bindings/java/Makefile.am
-+++ b/bindings/java/Makefile.am
-@@ -25,8 +25,8 @@ EXTRA_DIST = org/collectd/api/CollectdConfigInterface.java \
- 	     org/collectd/java/JMXMemory.java
- 
- java-build-stamp: $(srcdir)/org/collectd/api/*.java $(srcdir)/org/collectd/java/*.java
--	$(JAVAC) -d "." "$(srcdir)/org/collectd/api"/*.java
--	$(JAVAC) -d "." "$(srcdir)/org/collectd/java"/*.java
-+	$(JAVAC) $(JAVAC_TARGET) -d "." "$(srcdir)/org/collectd/api"/*.java
-+	$(JAVAC) $(JAVAC_TARGET) -d "." "$(srcdir)/org/collectd/java"/*.java
- 	mkdir -p .libs
- 	$(JAR) cf .libs/collectd-api.jar "org/collectd/api"/*.class
- 	$(JAR) cf .libs/generic-jmx.jar "org/collectd/java"/*.class
-diff --git a/bindings/java/Makefile.in b/bindings/java/Makefile.in
-index 1c57558..c8ab086 100644
---- a/bindings/java/Makefile.in
-+++ b/bindings/java/Makefile.in
-@@ -597,8 +597,8 @@ uninstall-am: uninstall-local
- 
- 
- java-build-stamp: $(srcdir)/org/collectd/api/*.java $(srcdir)/org/collectd/java/*.java
--	$(JAVAC) -d "." "$(srcdir)/org/collectd/api"/*.java
--	$(JAVAC) -d "." "$(srcdir)/org/collectd/java"/*.java
-+	$(JAVAC) $(JAVAC_TARGET) -d "." "$(srcdir)/org/collectd/api"/*.java
-+	$(JAVAC) $(JAVAC_TARGET) -d "." "$(srcdir)/org/collectd/java"/*.java
- 	mkdir -p .libs
- 	$(JAR) cf .libs/collectd-api.jar "org/collectd/api"/*.class
- 	$(JAR) cf .libs/generic-jmx.jar "org/collectd/java"/*.class

collectd-perl-vendor.patch

@@ -1,7 +1,9 @@
---- bindings/Makefile.am.orig	2013-06-04 02:26:20.688776802 +0200
-+++ bindings/Makefile.am	2013-06-04 02:26:33.551780804 +0200
-@@ -29,7 +29,7 @@
- 
+diff --git a/Makefile.am b/Makefile.am
+index 2ef2442..145e98c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2000,7 +2000,7 @@ uninstall-hook:
+ all-local: @PERL_BINDINGS@
  
  install-exec-local:
 -	[ ! -f buildperl/Makefile ] || ( cd buildperl && $(MAKE) install )

collectd-rpmlintrc

@@ -7,3 +7,6 @@ addFilter('macro-in-comment')
 
 #There no fsf address in that file
 addFilter('incorrect-fsf-address /usr/share/doc/packages/collectd/contrib/network-proxy.py')
+
+# Can't delete this file in the post section
+addFilter('suse-filelist-forbidden-backup-file')

collectd-split_README.patch

@@ -1,56 +0,0 @@
---- contrib/README.orig
-+++ contrib/README
-@@ -33,22 +33,6 @@
- `/var/lib/collectd/' and generate an HTML file and a directory containing
- several PNG files which are graphs of the RRD files found.
- 
--collection.cgi
----------------
--  Sample CGI script that creates graphs on the fly. The Perl modules `RRDs'
--(Debian package `librrds-perl'), `URI:Escape' (package liburi-perl),
--`HTML::Entities' (package libhtml-parser-perl) and a CGI capable web server
--(e.g. apache2 or boa) are needed. Simply install the script to a place where
--the webserver will treat it as a CGI script (/usr/lib/cgi-bin/ by default) and
--visit that page in a browser (http://localhost/cgi-bin/collection.cgi by
--default). Please refer to your webserver's documentation for more details.
--
--  Starting with version 4, collection.cgi requires a small config file, which
--should look something like this:
--
--  datadir: "/var/lib/collectd/rrd/"
--  libdir: "/usr/lib/collectd/"
--
- exec-munin.px
- -------------
-   Script to be used with the exec-plugin (see collectd-exec(5) for details)
-@@ -70,11 +54,6 @@
- RRD-file that should have been in multiple RRD-files instead. Is is used by
- `migrate-3-4.px' to split up the cpu-, nfs-, swap-files and possibly others.
- 
--GenericJMX.conf
-----------------
--  Example configuration file for the ‘GenericJMX’ Java plugin. Please read the
--documentation at the beginning of the file for more details.
--
- migrate-3-4.px
- --------------
-   Migration-script to ease the switch from version 3 to version 4. Many
-@@ -84,10 +63,6 @@
- may still need to do some things by hand, read `README.migration' for more
- details.
- 
--redhat/
---------
--  Spec-file and affiliated files to build an RedHat RPM package of collectd.
--
- snmp-data.conf
- --------------
-   Sample configuration for the SNMP plugin. This config includes a few standard
-@@ -97,7 +72,3 @@
- whatever people have send in. If you have some more definitions please send
- them in, so others can profit from it.
- 
--solaris-smf
-------------
--  Manifest file for the Solaris SMF system and detailed information on how to
--register collectd as a service with this system.

collectd-version.patch

@@ -7,4 +7,4 @@
 +AC_INIT([collectd],[@@VERSION@@])
  AC_CONFIG_SRCDIR(src/target_set.c)
  AC_CONFIG_HEADERS(src/config.h)
- AC_CONFIG_AUX_DIR([libltdl/config])
+ AC_CONFIG_AUX_DIR([build-aux])

collectd.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Sun Apr 14 12:37:27 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 5.8.1:
+  * collectd: Fix "BaseDir" option.
+  * collectd: improve error handling, check return values.
+  * Build System: use "kstat.h", when available.
+  * Build System: Out-of-tree builds have been fixed.
+  * Configuration: Error handling in the config parsing code has been
+    improved.
+  * collectd: The core daemon is now completely licensed under the
+    MIT license.
+  * Build system: Dependency on libltdl has been removed, support for
+    libtool 1 has been dropped.
+  Check the ChangeLog file for the complete list of changes.
+- Add Removed-checks-for-upper-limit-of-SENSORS_API_VERSION.patch
+- Add avoid-pg-config.patch to use pkg-config instead of pg_config
+- Refresh patches
+- Drop Patches:
+  * collectd-split_README.patch (merged upstream)
+  * collectd-javac_target.patch (doesn't applies)
+
 -------------------------------------------------------------------
 Sat Dec 29 14:59:06 UTC 2018 - mardnh@gmx.de
 

collectd.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package collectd
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2005-2013 Pascal Bleser <pascal.bleser@opensuse.org>
 #
 # All modifications and additions to the file contributed by third parties
@@ -13,7 +13,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -42,29 +42,30 @@
 %define sensors_plugin %{nil}
 %endif
 Name:           collectd
-Version:        5.7.2
+Version:        5.8.1
 Release:        0
 Summary:        Statistics Collection Daemon for filling RRD Files
-License:        GPL-2.0-only
+License:        GPL-2.0-only AND MIT
 Group:          System/Monitoring
-Url:            http://collectd.org/
+URL:            http://collectd.org/
 Source:         http://collectd.org/files/collectd-%{version}.tar.bz2
 Source1:        collectd.suse.init
 Source2:        collectd.apache2.conf
 Source3:        collectd-js.apache2.conf
 Source99:       collectd-rpmlintrc
-Patch7:         collectd-fix-config.patch
-Patch9:         collectd-version.patch
-Patch10:        collectd-perl-vendor.patch
+Patch1:         collectd-fix-config.patch
+Patch2:         collectd-version.patch
+Patch3:         collectd-perl-vendor.patch
 # see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=467072
-Patch11:        collectd-fix_broken_perl-5.10.patch
-Patch18:        collectd-fix_collection_cgi.patch
-Patch19:        collectd-fix_spamassassin_doc.patch
-Patch20:        collectd-split_README.patch
-Patch21:        collectd-fix_collectd_config_path_in_snmp_probe.patch
-Patch23:        collectd-javac_target.patch
-Patch24:        9e36cd85a2bb_sigrok_Update_to_support_libsigrok_0_4.patch
-Patch25:        0001-gps-plugin-fix-build-with-newer-gpsd.patch
+Patch4:         collectd-fix_broken_perl-5.10.patch
+Patch5:         collectd-fix_collection_cgi.patch
+Patch6:         collectd-fix_spamassassin_doc.patch
+Patch7:         collectd-fix_collectd_config_path_in_snmp_probe.patch
+Patch8:         9e36cd85a2bb_sigrok_Update_to_support_libsigrok_0_4.patch
+Patch9:         0001-gps-plugin-fix-build-with-newer-gpsd.patch
+Patch10:        Removed-checks-for-upper-limit-of-SENSORS_API_VERSION.patch
+# PATCH-FIX-OPENSUSE avoid-pg-config.patch avoid pg_config if possible
+Patch11:        avoid-pg-config.patch
 # for /etc/apache2/... ownership (rpmlint):
 BuildRequires:  apache2
 BuildRequires:  autoconf
@@ -117,6 +118,7 @@ BuildRequires:  pkgconfig(libmicrohttpd)
 BuildRequires:  pkgconfig(libmnl)
 BuildRequires:  pkgconfig(libnotify)
 BuildRequires:  pkgconfig(liboping)
+BuildRequires:  pkgconfig(libpq)
 BuildRequires:  pkgconfig(librrd)
 BuildRequires:  pkgconfig(libsigrok)
 BuildRequires:  pkgconfig(libstatgrab)
@@ -338,13 +340,37 @@ Requires:       lua
 Optional %{name} Lua API in order to write %{name} plugins in Lua.
 
 %package plugin-gps
-Summary:        gpsd monitoring plugin for %{name}
+Summary:        GPSD monitoring plugin for %{name}
 Group:          System/Monitoring
 Requires:       %{name} = %{version}-%{release}
 
 %description plugin-gps
 Optional %{name} plugin to monitor gpsd.
 
+%package plugin-mcelog
+Summary:        Machine Check Exceptions plugin for %{name}
+Group:          System/Monitoring
+Requires:       %{name} = %{version}-%{release}
+
+%description plugin-mcelog
+Optional %{name} plugin to monitor machine check exceptions.
+
+%package plugin-ovs
+Summary:        Open vSwitch (OVS) plugin for %{name}
+Group:          System/Monitoring
+Requires:       %{name} = %{version}-%{release}
+
+%description plugin-ovs
+Optional %{name} plugin to monitor an OVS database.
+
+%package plugin-synproxy
+Summary:        Synproxy stats plugin for %{name}
+Group:          System/Monitoring
+Requires:       %{name} = %{version}-%{release}
+
+%description plugin-synproxy
+Optional %{name} plugin to monitor Synproxy stats.
+
 %package plugins-all
 Summary:        All Monitoring Plugins for %{name}
 Group:          System/Monitoring
@@ -355,16 +381,19 @@ Requires:       %{name}-plugin-ipmi = %{version}-%{release}
 Requires:       %{name}-plugin-java = %{version}-%{release}
 Requires:       %{name}-plugin-lua = %{version}-%{release}
 Requires:       %{name}-plugin-lvm = %{version}-%{release}
+Requires:       %{name}-plugin-mcelog = %{version}-%{release}
 Requires:       %{name}-plugin-memcachec = %{version}-%{release}
 Requires:       %{name}-plugin-mysql = %{version}-%{release}
 Requires:       %{name}-plugin-notify-desktop = %{version}-%{release}
 Requires:       %{name}-plugin-openldap = %{version}-%{release}
+Requires:       %{name}-plugin-ovs = %{version}-%{release}
 Requires:       %{name}-plugin-pinba = %{version}-%{release}
 Requires:       %{name}-plugin-postgresql = %{version}-%{release}
 Requires:       %{name}-plugin-python3 = %{version}-%{release}
 Requires:       %{name}-plugin-sigrok = %{version}-%{release}
 Requires:       %{name}-plugin-smart = %{version}-%{release}
 Requires:       %{name}-plugin-snmp = %{version}-%{release}
+Requires:       %{name}-plugin-synproxy = %{version}-%{release}
 Requires:       %{name}-plugin-virt = %{version}-%{release}
 Requires:       %{name}-web = %{version}-%{release}
 Requires:       %{name}-web-js = %{version}-%{release}
@@ -408,19 +437,19 @@ to write %{name} unixsock clients.
 
 %prep
 %setup -q -n "collectd-%{version}"
-%patch7
-%patch9 -p1
-%patch10
-%patch11
-%patch18
-%patch19
-%patch20
-%patch21
-%patch23 -p1
+%patch1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6
+%patch7 -p1
 %if 0%{?suse_version} > 1320
-%patch24 -p1
+%patch8 -p1
 %endif
-%patch25 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 sed -i 's|@@VERSION@@|%{version}|g' configure.ac
 
@@ -428,7 +457,6 @@ perl -p -i -e 's|(-L\$withval/lib)\b|${1}64|g' configure.ac configure
 
 # unneeded files:
 rm -fr \
-     contrib/fedora \
      contrib/solaris-smf \
      contrib/redhat \
      contrib/sles*
@@ -496,7 +524,7 @@ mv contrib/collection3/lib/* "%{buildroot}%{_libexecdir}/collectd-js/"
 
 install -D -m 0644 contrib/collection3%{_sysconfdir}/collection.conf \
      "%{buildroot}%{_sysconfdir}/collectd/collection-js.conf"
-rm -fr contrib/collection3/etc
+rm -fr contrib/collection3%{_sysconfdir}
 install -D -m 0644 "%{SOURCE3}" "%{buildroot}%{_sysconfdir}/apache2/conf.d/%{name}-js.conf"
 
 # spamassassin (_must_ be installed _after_ perl_process_packlist)
@@ -549,7 +577,7 @@ cat <<EOF >README.plugins-all
 This package is empty but depends on all collectd plugin subpackages.
 EOF
 
-install -d -m 0755 "%{buildroot}%{_prefix}/sbin"
+install -d -m 0755 "%{buildroot}%{_sbindir}"
 install -D -m0644 contrib/systemd.collectd.service %{buildroot}%{_unitdir}/collectd.service
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 
@@ -570,7 +598,8 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 %postun -n libcollectdclient1 -p /sbin/ldconfig
 
 %files -f plugins.lst
-%doc AUTHORS ChangeLog COPYING README
+%license COPYING
+%doc AUTHORS ChangeLog README
 %doc contrib
 %config(noreplace) %{_sysconfdir}/collectd.conf
 %dir %{_sysconfdir}/collectd
@@ -590,19 +619,19 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 %dir %{perl_vendorlib}/Collectd
 %{perl_vendorlib}/Collectd/*
 %{perl_vendorarch}/auto/Collectd
-%{_mandir}/man1/collectd.1%{ext_man}
-%{_mandir}/man1/collectdctl.1%{ext_man}
-%{_mandir}/man1/collectdmon.1%{ext_man}
-%{_mandir}/man1/collectd-tg.1%{ext_man}
-%{_mandir}/man1/collectd-nagios.1%{ext_man}
-%{_mandir}/man1/cussh.1%{ext_man}
-%{_mandir}/man5/collectd.conf.5%{ext_man}
-%{_mandir}/man5/collectd-email.5%{ext_man}
-%{_mandir}/man5/collectd-exec.5%{ext_man}
-%{_mandir}/man5/collectd-perl.5%{ext_man}
-%{_mandir}/man5/collectd-threshold.5%{ext_man}
-%{_mandir}/man5/collectd-unixsock.5%{ext_man}
-%{_mandir}/man5/types.db.5%{ext_man}
+%{_mandir}/man1/collectd.1%{?ext_man}
+%{_mandir}/man1/collectdctl.1%{?ext_man}
+%{_mandir}/man1/collectdmon.1%{?ext_man}
+%{_mandir}/man1/collectd-tg.1%{?ext_man}
+%{_mandir}/man1/collectd-nagios.1%{?ext_man}
+%{_mandir}/man1/cussh.1%{?ext_man}
+%{_mandir}/man5/collectd.conf.5%{?ext_man}
+%{_mandir}/man5/collectd-email.5%{?ext_man}
+%{_mandir}/man5/collectd-exec.5%{?ext_man}
+%{_mandir}/man5/collectd-perl.5%{?ext_man}
+%{_mandir}/man5/collectd-threshold.5%{?ext_man}
+%{_mandir}/man5/collectd-unixsock.5%{?ext_man}
+%{_mandir}/man5/types.db.5%{?ext_man}
 %doc %{perl_man3dir}/Collectd::Unixsock.%{perl_man3ext}%{ext_man}
 %dir %{_localstatedir}/lib/collectd
 %{_unitdir}/collectd.service
@@ -632,10 +661,10 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 %files plugin-snmp
 %doc _rpmdoc_/snmp/*
 %{_bindir}/collectd-snmp-probe-host
-%{_mandir}/man1/collectd-snmp-probe-host.1%{ext_man}
-%{_libdir}/collectd/snmp.so
-%{_libdir}/collectd/snmp.la
-%{_mandir}/man5/collectd-snmp.5%{ext_man}
+%{_mandir}/man1/collectd-snmp-probe-host.1%{?ext_man}
+%{_libdir}/collectd/snmp*.so
+%{_libdir}/collectd/snmp*.la
+%{_mandir}/man5/collectd-snmp.5%{?ext_man}
 
 %files plugin-lvm
 %{_libdir}/collectd/lvm.so
@@ -657,14 +686,14 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 %files plugin-python3
 %{_libdir}/collectd/python.so
 %{_libdir}/collectd/python.la
-%{_mandir}/man5/collectd-python.5%{ext_man}
+%{_mandir}/man5/collectd-python.5%{?ext_man}
 
 %files plugin-java
 %doc _rpmdoc_/java/GenericJMX.conf
 %{_libdir}/collectd/java.so
 %{_libdir}/collectd/java.la
 %{_datadir}/collectd/java
-%{_mandir}/man5/collectd-java.5%{ext_man}
+%{_mandir}/man5/collectd-java.5%{?ext_man}
 
 %files plugin-virt
 %{_libdir}/collectd/virt.so
@@ -689,7 +718,7 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 %files plugin-lua
 %{_libdir}/collectd/lua.so
 %{_libdir}/collectd/lua.la
-%{_mandir}/man5/collectd-lua.5%{ext_man}
+%{_mandir}/man5/collectd-lua.5%{?ext_man}
 
 %files plugin-gps
 %{_libdir}/collectd/gps.so
@@ -699,6 +728,18 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 %{_libdir}/collectd/openldap.so
 %{_libdir}/collectd/openldap.la
 
+%files plugin-mcelog
+%{_libdir}/collectd/mcelog.so
+%{_libdir}/collectd/mcelog.la
+
+%files plugin-ovs
+%{_libdir}/collectd/ovs_*.so
+%{_libdir}/collectd/ovs_*.la
+
+%files plugin-synproxy
+%{_libdir}/collectd/synproxy.so
+%{_libdir}/collectd/synproxy.la
+
 %if 0%{?suse_version} >= 1330
 %files plugin-nut
 %{_libdir}/collectd/nut.so