Added build_ldadd patch adding ALL_LIBS to rrdcached_LDADD.

This is required to ensure that rrdcached links against libglib.

Build-depend on and use dh-autoreconf to rebuild the build system.

diff --git a/debian/changelog b/debian/changelog
index 8d80086ce6fcf574faaaf1de237f40e216ff0f80..67dd8f140deaefb2b23d8c3fdc83e79d276dd56e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,10 @@ rrdtool (1.4.8-1) UNRELEASED; urgency=medium
     - Added CVE-2013-2131; upstream patch fixing a format string vulnerability
       in rrdgraph; thanks to Henri Salo for reporting this (Closes: #708866).
       Raised urgency to medium for this.
+  * debian/patches, debian/rules, debian/control:
+    - Added build_ldadd; patch Makefile to pass $ALL_LIBS to rrdcached's
+      linker flags to ensure it's going to be linked against libglib.
+    - Build-depend on and use dh-autoreconf to manage the build_ldadd patch.
   * debian/control:
     - Optionally recommend fonts-dejavu-core as (the preferred) alternative to
       ttf-dejavu-core; thanks to Martin-Éric Racine for reporting this

diff --git a/debian/patches/build_ldadd b/debian/patches/build_ldadd
new file mode 100644 (file)
index 0000000..a68132c
--- /dev/null
+++ b/debian/patches/build_ldadd
@@ -0,0 +1,13 @@
+Index: pkg-rrdtool/src/Makefile.am
+===================================================================
+--- pkg-rrdtool.orig/src/Makefile.am   2014-04-26 00:39:30.566538157 +0200
++++ pkg-rrdtool/src/Makefile.am        2014-04-26 00:40:52.842539392 +0200
+@@ -116,7 +116,7 @@
+ rrdcached_SOURCES = rrd_daemon.c
+ rrdcached_DEPENDENCIES = librrd_th.la
+ rrdcached_CPPFLAGS = -DVERSION='"$(VERSION)"' -DLOCALSTATEDIR='"$(localstatedir)"'
+-rrdcached_LDADD = librrd_th.la
++rrdcached_LDADD = librrd_th.la $(ALL_LIBS)
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = librrd.pc

diff --git a/debian/patches/series b/debian/patches/series
index 32223097c378c816926d5e3e5611cfd7d9a79d43..7911eca7b5d8cd6487331dec16bbc276cb9fcd9a 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+build_ldadd
 bts428778-floating-point-exception
 setup.py-module-name
 no-rpath-for-ruby

diff --git a/debian/rules b/debian/rules
index 5c0aa75467148c88047694246d951b0a5c9ddd4f..390eb8d46a8a4f39240c20df6c5edac4a62feb45 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -72,6 +72,8 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" ""
        cp -f /usr/share/misc/config.guess config.guess
 endif
 
+       dh_autoreconf
+
        LDFLAGS="$(LINKER_FLAGS)" \
        CFLAGS="$(CFLAGS)" \
        RRDDOCDIR=/usr/share/doc/rrdtool \
@@ -127,6 +129,8 @@ endif
        rm -f src/librrd.sym
        rm -f config.h
 
+       dh_autoreconf_clean
+
        dh_clean
 
 clean-python%: unpatch