diff -u collectd-4.6.2/debian/control collectd-4.6.2/debian/control --- collectd-4.6.2/debian/control +++ collectd-4.6.2/debian/control @@ -1,7 +1,8 @@ Source: collectd Section: utils Priority: optional -Maintainer: Sebastian Harl +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Sebastian Harl Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, bison, flex, autotools-dev, pkg-config, linux-libc-dev (>= 2.6.25-4) | linux-libc-dev (<< 2.6.25-1), libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev, libmysqlclient15-dev, librrd-dev | librrd2-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, libupsclient1-dev, libperl-dev, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64], libsnmp-dev | libsnmp9-dev, libvirt-dev (>= 0.4.0-6) [amd64 i386 powerpc], libxml2-dev, libhal-dev, libopenipmi-dev (>= 2.0.14-1~), libglib2.0-dev, libnotify-dev, libesmtp-dev, libpq-dev, libdbi0-dev Build-Conflicts: libpthread-dev Standards-Version: 3.8.1 diff -u collectd-4.6.2/debian/changelog collectd-4.6.2/debian/changelog --- collectd-4.6.2/debian/changelog +++ collectd-4.6.2/debian/changelog @@ -1,3 +1,12 @@ +collectd (4.6.2-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches/upstream_fix_ftbfs.dpatch + - Fix FTBFS with gcc4.4 by cherrypicking the change from + upstream's git-repository. + + -- Andreas Moog Fri, 08 May 2009 01:45:18 +0200 + collectd (4.6.2-1) unstable; urgency=low * New upstream release. @@ -99,6 +108,15 @@ -- Sebastian Harl Fri, 12 Dec 2008 10:09:48 +0100 +collectd (4.4.2-3ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #307683) + - Add ubuntu_in6-glibc28.dpatch patch, fix FTBFS. + - Add ubuntu_hardening.dpatch patch, fix FTBFS. + - Add ubuntu_perl.c.dpatch, fix FTBFS. + + -- Bhavani Shankar Sat, 20 Dec 2008 05:33:07 +0530 + collectd (4.4.2-3) unstable; urgency=low * New debconf template translation: @@ -114,6 +132,15 @@ -- Sebastian Harl Sat, 06 Dec 2008 16:53:25 +0100 +collectd (4.4.2-2ubuntu1) jaunty; urgency=low + + * Merge from Debian unstable (LP: #298828). Remaining Ubuntu changes: + * Add ubuntu_in6-glibc28.dpatch patch, fix FTBFS. + * Add ubuntu_hardening.dpatch patch, fix FTBFS. + * Add ubuntu_perl.c.dpatch, fix FTBFS. + + -- Morten Kjeldgaard Tue, 18 Nov 2008 15:54:20 +0100 + collectd (4.4.2-2) unstable; urgency=low * Removed the work around for #474087 (broken openipmi .pc files) introduced @@ -182,6 +209,13 @@ -- Sebastian Harl Mon, 07 Jul 2008 20:45:53 +0000 +collectd (4.4.1-1ubuntu1) intrepid; urgency=low + + * Add in6-glibc28.dpatch patch, fix FTBFS (LP: #255837). + * Add ubuntu_hardening.dpatch patch, fix FTBFS. + + -- Devid Antonio Filoni Thu, 07 Aug 2008 21:00:53 +0200 + collectd (4.4.1-1) unstable; urgency=low * New upstream release. diff -u collectd-4.6.2/debian/patches/00list collectd-4.6.2/debian/patches/00list --- collectd-4.6.2/debian/patches/00list +++ collectd-4.6.2/debian/patches/00list @@ -2,2 +2,4 @@ collection_conf_path.dpatch +upstream_fix_ftbfs.dpatch + only in patch2: unchanged: --- collectd-4.6.2.orig/debian/patches/upstream_fix_ftbfs.dpatch +++ collectd-4.6.2/debian/patches/upstream_fix_ftbfs.dpatch @@ -0,0 +1,56 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## upstream_fix_ftbfs.dpatch by Andreas Moog +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix a FTBFS with gcc4.4 by cherrypicking the change from upstream. + +@DPATCH@ +diff -urNad collectd-4.6.2~/src/ntpd.c collectd-4.6.2/src/ntpd.c +--- collectd-4.6.2~/src/ntpd.c 2009-04-14 04:25:31.000000000 +0200 ++++ collectd-4.6.2/src/ntpd.c 2009-05-08 01:35:06.000000000 +0200 +@@ -878,25 +878,33 @@ + + if (ptr->v6_flag) + { +- struct sockaddr_in6 *sa_ptr; +- sa_ptr = (struct sockaddr_in6 *) &sa; ++ struct sockaddr_in6 sa6; + +- sa_ptr->sin6_family = AF_INET6; +- sa_ptr->sin6_port = htons (123); +- memcpy (&sa_ptr->sin6_addr, &ptr->srcadr6, ++ assert (sizeof (sa) >= sizeof (sa6)); ++ ++ memset (&sa6, 0, sizeof (sa6)); ++ sa6.sin6_family = AF_INET6; ++ sa6.sin6_port = htons (123); ++ memcpy (&sa6.sin6_addr, &ptr->srcadr6, + sizeof (struct in6_addr)); +- sa_len = sizeof (struct sockaddr_in6); ++ sa_len = sizeof (sa6); ++ ++ memcpy (&sa, &sa6, sizeof (sa6)); + } + else + { +- struct sockaddr_in *sa_ptr; +- sa_ptr = (struct sockaddr_in *) &sa; ++ struct sockaddr_in sa4; + +- sa_ptr->sin_family = AF_INET; +- sa_ptr->sin_port = htons (123); +- memcpy (&sa_ptr->sin_addr, &ptr->srcadr, ++ assert (sizeof (sa) >= sizeof (sa4)); ++ ++ memset (&sa4, 0, sizeof (sa4)); ++ sa4.sin_family = AF_INET; ++ sa4.sin_port = htons (123); ++ memcpy (&sa4.sin_addr, &ptr->srcadr, + sizeof (struct in_addr)); +- sa_len = sizeof (struct sockaddr_in); ++ sa_len = sizeof (sa4); ++ ++ memcpy (&sa, &sa4, sizeof (sa4)); + } + + if (do_reverse_lookups == 0)