tags 614439 +patch
thanks

Hi

Ubuntu fixed this bug by applying the following patch.

Cheers

Luk

diff -pruN 4.10.1-2.1/debian/changelog 4.10.1-2.1ubuntu1/debian/changelog
--- 4.10.1-2.1/debian/changelog 2011-04-01 22:43:16.000000000 +0100
+++ 4.10.1-2.1ubuntu1/debian/changelog  2011-04-01 22:40:25.000000000 +0100
@@ -1,3 +1,10 @@
+collectd (4.10.1-2.1ubuntu1) natty; urgency=low
+
+  * fix-detection-libiptc-1.4.10.dpatch: fix detection of libiptc
1.4.10. This
+    fixes a FTBFS.
+
+ -- Fabrice Coutadeur <fabric...@ubuntu.com>  Thu, 31 Mar 2011 19:32:02
+0000
+
 collectd (4.10.1-2.1) unstable; urgency=high

   * Non-maintainer upload by the security team
diff -pruN 4.10.1-2.1/debian/control 4.10.1-2.1ubuntu1/debian/control
--- 4.10.1-2.1/debian/control   2011-04-01 22:43:16.000000000 +0100
+++ 4.10.1-2.1ubuntu1/debian/control    2011-04-01 22:40:25.000000000 +0100
@@ -1,7 +1,8 @@
 Source: collectd
 Section: utils
 Priority: optional
-Maintainer: Sebastian Harl <tok...@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
+XSBC-Original-Maintainer: Sebastian Harl <tok...@debian.org>
 Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  bison, flex, autotools-dev, libltdl-dev, pkg-config,
  iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel
!kfreebsd-i386 !kfreebsd-amd64],
diff -pruN 4.10.1-2.1/debian/patches/00list
4.10.1-2.1ubuntu1/debian/patches/00list
--- 4.10.1-2.1/debian/patches/00list    2011-04-01 22:43:16.000000000 +0100
+++ 4.10.1-2.1ubuntu1/debian/patches/00list     2011-04-01
22:40:25.000000000 +0100
@@ -5,3 +5,4 @@ bts595756-notify_email-segfault.dpatch
 bts592623-curl_json-file.dpatch
 bts596128-reheap-fix.dpatch
 CVE-2010-4336.dpatch
+fix-detection-libiptc-1.4.10.dpatch
diff -pruN 4.10.1-2.1/debian/patches/fix-detection-libiptc-1.4.10.dpatch
4.10.1-2.1ubuntu1/debian/patches/fix-detection-libiptc-1.4.10.dpatch
--- 4.10.1-2.1/debian/patches/fix-detection-libiptc-1.4.10.dpatch
1970-01-01 01:00:00.000000000 +0100
+++
4.10.1-2.1ubuntu1/debian/patches/fix-detection-libiptc-1.4.10.dpatch
2011-04-01 22:40:25.000000000 +0100
@@ -0,0 +1,40 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-detection-libiptc-1.4.10.dpatch by Fabrice Coutadeur
<fabric...@ubuntu.com>
+##
+## DP: iptc_init function has been moved to libip4tc, so configure and
+## DP: configure.in has to be updated to reflect that change
+
+@DPATCH@
+
+diff collectd-4.10.1.orig/configure collectd-4.10.1/configure
+--- collectd-4.10.1.orig/configure
++++ collectd-4.10.1/configure
+@@ -18672,13 +18672,13 @@
+ # Check for the iptc_init symbol in the library.
+ if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
+ then
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iptc_init in
-liptc" >&5
+-$as_echo_n "checking for iptc_init in -liptc... " >&6; }
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iptc_init in
-lip4tc" >&5
++$as_echo_n "checking for iptc_init in -lip4tc... " >&6; }
+ if test "${ac_cv_lib_iptc_iptc_init+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-liptc  $LIBS"
++LIBS="-lip4tc  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+
+diff collectd-4.10.1.orig/configure.in collectd-4.10.1/configure.in
+--- collectd-4.10.1.orig/configure.in
++++ collectd-4.10.1/configure.in
+@@ -1626,7 +1626,7 @@
+ # Check for the iptc_init symbol in the library.
+ if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
+ then
+-      AC_CHECK_LIB(iptc, iptc_init,
++      AC_CHECK_LIB(ip4tc, iptc_init,
+       [
+               AC_DEFINE(HAVE_LIBIPTC, 1, [Define to 1 if you have the iptc 
library
(-liptc).])
+       ],



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to