From 31fa463cb1ebf6344aeb5295b78cd94a80ec2919 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Thu, 28 Jul 2016 23:18:44 +0200 Subject: [PATCH] patches/: Drop bts823012_librrd8.patch; merged upstream. --- debian/changelog | 1 + debian/patches/bts823012_librrd8.patch | 205 ------------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 206 deletions(-) delete mode 100644 debian/patches/bts823012_librrd8.patch diff --git a/debian/changelog b/debian/changelog index 01e1dd0..5cfe479 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ collectd (5.5.2-1) UNRELEASED; urgency=medium - bts832577-gcry-control.patch: Update for 5.5.2. Mostly part of the new upstream release, except for: Don't abort() if gcrypt initialization failed. + - Drop bts823012_librrd8.patch; merged upstream. -- Sebastian Harl Thu, 28 Jul 2016 22:56:36 +0200 diff --git a/debian/patches/bts823012_librrd8.patch b/debian/patches/bts823012_librrd8.patch deleted file mode 100644 index 67b60cf..0000000 --- a/debian/patches/bts823012_librrd8.patch +++ /dev/null @@ -1,205 +0,0 @@ -Description: rrdtool plugin: fix thread-safety detection - librrd 1.6.0 is now threadsafe and librrd_th is gone. - . - Since there doesn't seem to be a way to detect that librrd - is threadsafe, use pkg-config to check for 1.6.0 or newer instead. - . - The logic is now as follows: - Check for librrd >= 1.6.0 with pkg-config - If not found, look for rrd_update_r in librrd_th. - If not found, look for rrd_update in librrd and assume librrd is not - thread safe. -Author: Ruben Kerkhof -Origin: upstream, - commit:ef43260cd901847220c2a9de400579ff903ca13e, - commit:32c0ce39f786c56e9d13f3615253a7ae55b578e6, - commit:f7e09269879b74e61324de9178503221b2df9136, - commit:38068ecc7922ace29bb6af3f8ee5568c3fe96c08 -Bug-Debian: https://bugs.debian.org/823012 -Reviewed-By: Jean-Michel Vourgere -Last-Update: 2016-05-01 - -Index: collectd-5.5.1/configure.ac -=================================================================== ---- collectd-5.5.1.orig/configure.ac -+++ collectd-5.5.1/configure.ac -@@ -3942,76 +3942,102 @@ AM_CONDITIONAL(BUILD_WITH_LIBROUTEROS, t - # }}} - - # --with-librrd {{{ --# AC_ARG_WITH (package, help-string, [action-if-given], [action-if-not-given]) - librrd_cflags="" - librrd_ldflags="" --librrd_threadsafe="yes" -+librrd_threadsafe="no" - librrd_rrdc_update="no" --AC_ARG_WITH(librrd, [AS_HELP_STRING([--with-librrd@<:@=PREFIX@:>@], [Path to rrdtool.])], --[ if test "x$withval" != "xno" && test "x$withval" != "xyes" -- then -- librrd_cflags="-I$withval/include" -- librrd_ldflags="-L$withval/lib" -- with_librrd="yes" -- else -- with_librrd="$withval" -- fi --], [with_librrd="yes"]) -+AC_ARG_WITH(librrd, -+ [AS_HELP_STRING([--with-librrd@<:@=PREFIX@:>@], [Path to rrdtool.])], -+ [ -+ if test "x$withval" != "xno" && test "x$withval" != "xyes" -+ then -+ librrd_cflags="-I$withval/include" -+ librrd_ldflags="-L$withval/lib" -+ with_librrd="yes" -+ else -+ with_librrd="$withval" -+ fi -+ ], -+ [with_librrd="yes"] -+) -+ - if test "x$with_librrd" = "xyes" - then -- SAVE_CPPFLAGS="$CPPFLAGS" -- SAVE_LDFLAGS="$LDFLAGS" -+ SAVE_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $librrd_ldflags" -+ PKG_CHECK_MODULES([RRD], [librrd >= 1.6.0], -+ [ -+ AC_CHECK_LIB([rrd], [rrd_update_r], -+ [librrd_threadsafe="yes"], -+ [:] -+ ) -+ AC_CHECK_LIB([rrd], [rrdc_update], -+ [librrd_rrdc_update="yes"], -+ [:] -+ ) -+ ],[:] -+ ) -+ LDFLAGS="$SAVE_LDFLAGS" - -- CPPFLAGS="$CPPFLAGS $librrd_cflags" -- LDFLAGS="$LDFLAGS $librrd_ldflags" -+ SAVE_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $RRD_CFLAGS $librrd_cflags" - -- AC_CHECK_HEADERS(rrd.h,, [with_librrd="no (rrd.h not found)"]) -+ AC_CHECK_HEADERS([rrd.h],, [with_librrd="no (rrd.h not found)"]) - -- CPPFLAGS="$SAVE_CPPFLAGS" -- LDFLAGS="$SAVE_LDFLAGS" -+ CPPFLAGS="$SAVE_CPPFLAGS" - fi --if test "x$with_librrd" = "xyes" -+ -+if test "x$with_librrd" = "xyes" && test "x$librrd_threadsafe" = "xno" - then -- SAVE_CPPFLAGS="$CPPFLAGS" -- SAVE_LDFLAGS="$LDFLAGS" -+ SAVE_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $librrd_ldflags" - -- CPPFLAGS="$CPPFLAGS $librrd_cflags" -- LDFLAGS="$LDFLAGS $librrd_ldflags" -+ AC_CHECK_LIB([rrd_th], [rrd_update_r], -+ [ -+ librrd_ldflags="$librrd_ldflags -lrrd_th" -+ librrd_threadsafe="yes" -+ AC_CHECK_LIB([rrd_th], [rrdc_update], -+ [librrd_rrdc_update="yes"], -+ [:], -+ ) -+ ], -+ [:] -+ ) -+ LDFLAGS="$SAVE_LDFLAGS" -+fi - -- AC_CHECK_LIB(rrd_th, rrd_update_r, -- [with_librrd="yes" -- librrd_ldflags="$librrd_ldflags -lrrd_th -lm" -- ], -- [librrd_threadsafe="no" -- AC_CHECK_LIB(rrd, rrd_update, -- [with_librrd="yes" -- librrd_ldflags="$librrd_ldflags -lrrd -lm" -- ], -- [with_librrd="no (symbol 'rrd_update' not found)"], -- [-lm]) -- ], -- [-lm]) -- -- if test "x$librrd_threadsafe" = "xyes" -- then -- AC_CHECK_LIB(rrd_th, rrdc_update, [librrd_rrdc_update="yes"], [librrd_rrdc_update="no"]) -- else -- AC_CHECK_LIB(rrd, rrdc_update, [librrd_rrdc_update="yes"], [librrd_rrdc_update="no"]) -- fi -+if test "x$with_librrd" = "xyes" && test "x$librrd_threadsafe" = "xno" -+then -+ SAVE_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $librrd_ldflags" - -- CPPFLAGS="$SAVE_CPPFLAGS" -- LDFLAGS="$SAVE_LDFLAGS" -+ AC_CHECK_LIB([rrd], [rrd_update], -+ [ -+ librrd_ldflags="$librrd_ldflags -lrrd" -+ AC_CHECK_LIB([rrd], [rrdc_update], -+ [librrd_rrdc_update="yes"], -+ [:] -+ ) -+ ], -+ [with_librrd="no (symbol 'rrd_update' not found)"] -+ ) -+ LDFLAGS="$SAVE_LDFLAGS" - fi -+ - if test "x$with_librrd" = "xyes" - then -- BUILD_WITH_LIBRRD_CFLAGS="$librrd_cflags" -- BUILD_WITH_LIBRRD_LDFLAGS="$librrd_ldflags" -- AC_SUBST(BUILD_WITH_LIBRRD_CFLAGS) -- AC_SUBST(BUILD_WITH_LIBRRD_LDFLAGS) -+ BUILD_WITH_LIBRRD_CFLAGS="$RRD_CFLAGS $librrd_cflags" -+ BUILD_WITH_LIBRRD_LDFLAGS="$librrd_ldflags" -+ BUILD_WITH_LIBRRD_LIBS="$RRD_LIBS" -+ AC_SUBST(BUILD_WITH_LIBRRD_CFLAGS) -+ AC_SUBST(BUILD_WITH_LIBRRD_LDFLAGS) -+ AC_SUBST(BUILD_WITH_LIBRRD_LIBS) - fi - if test "x$librrd_threadsafe" = "xyes" - then -- AC_DEFINE(HAVE_THREADSAFE_LIBRRD, 1, [Define to 1 if you have the threadsafe rrd library (-lrrd_th).]) -+ AC_DEFINE([HAVE_THREADSAFE_LIBRRD], [1], -+ [Define to 1 if the rrd library is thread-safe] -+ ) - fi - # }}} - -Index: collectd-5.5.1/src/Makefile.am -=================================================================== ---- collectd-5.5.1.orig/src/Makefile.am -+++ collectd-5.5.1/src/Makefile.am -@@ -876,17 +876,17 @@ endif - if BUILD_PLUGIN_RRDCACHED - pkglib_LTLIBRARIES += rrdcached.la - rrdcached_la_SOURCES = rrdcached.c utils_rrdcreate.c utils_rrdcreate.h --rrdcached_la_LDFLAGS = $(PLUGIN_LDFLAGS) -+rrdcached_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBRRD_LDFLAGS) - rrdcached_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBRRD_CFLAGS) --rrdcached_la_LIBADD = $(BUILD_WITH_LIBRRD_LDFLAGS) -+rrdcached_la_LIBADD = $(BUILD_WITH_LIBRRD_LIBS) - endif - - if BUILD_PLUGIN_RRDTOOL - pkglib_LTLIBRARIES += rrdtool.la - rrdtool_la_SOURCES = rrdtool.c utils_rrdcreate.c utils_rrdcreate.h --rrdtool_la_LDFLAGS = $(PLUGIN_LDFLAGS) -+rrdtool_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBRRD_LDFLAGS) - rrdtool_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBRRD_CFLAGS) --rrdtool_la_LIBADD = $(BUILD_WITH_LIBRRD_LDFLAGS) -+rrdtool_la_LIBADD = $(BUILD_WITH_LIBRRD_LIBS) - endif - - if BUILD_PLUGIN_SENSORS diff --git a/debian/patches/series b/debian/patches/series index 1d66312..b3cf1fe 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ rrd_filter_path.patch collection_conf_path.patch myplugin_includes.patch -bts823012_librrd8.patch gcc6.patch -- 2.30.2