← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/collectd/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/in6-glibc28.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Morten Kjeldgaard
  • Date: 2008-11-18 15:54:20 UTC
  • mfrom: (1.1.5 upstream) (3.1.1 lenny)
  • Revision ID: james.westby@ubuntu.com-20081118155420-sc2mxv2pebafkmon
Tags: 4.4.2-2ubuntu1
https://launchpad.net/bugs/298828
* 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.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/in6-glibc28.dpatch
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
2
 
## in6-glibc28.dpatch by Devid Antonio Filoni <d.filoni@ubuntu.com>
3
 
## DP: Fix FTBFS caused by glibc 2.8.
4
 
 
5
 
@DPATCH@
6
 
diff -urNad collectd-4.4.1~/src/libiptc/libip6tc.c collectd-4.4.1/src/libiptc/libip6tc.c
7
 
--- collectd-4.4.1~/src/libiptc/libip6tc.c      2008-05-27 17:52:32.000000000 +0200
8
 
+++ collectd-4.4.1/src/libiptc/libip6tc.c       2008-08-07 21:05:31.000000000 +0200
9
 
@@ -131,7 +131,7 @@
10
 
 #include "libiptc.c"
11
 
 
12
 
 #define BIT6(a, l) \
13
 
- ((ntohl(a->in6_u.u6_addr32[(l) / 32]) >> (31 - ((l) & 31))) & 1)
14
 
+ ((ntohl(a->s6_addr32[(l) / 32]) >> (31 - ((l) & 31))) & 1)
15
 
 
16
 
 int
17
 
 ipv6_prefix_length(const struct in6_addr *a)