-
Committer:
Bazaar Package Importer
-
Author(s):
Kees Cook
-
Date:
2007-05-17 11:37:31 UTC
-
mfrom:
(1.1.4 upstream)
-
Revision ID:
james.westby@ubuntu.com-20070517113731-tpukbvebcipvbfsw
Tags: 0.99.7-2ubuntu1
* Merge from debian unstable, remaining changes:
- debian/rules: use bash as shell
- debian/quagga.prerm: handle upgrades more gracefully
- debian/patches/81_32bit_u64.dpatch: Define __u64 as uint64_t
before including the netlink headers, since that symbol does not exist
by default on 32 bit arches. Fixes i386/powerpc FTBFS.
- debian/patches/83_ifaddr_defs.dpatch:
zebra/rt_netlink.c: #include <linux/if_addr.h> and define IF[L]A_RTA
macros, so that the file compiles again with our kernel headers.
- debian/patches/20_ht-20061217-0.99.6-bgp-md5.dpatch: updated for
linux kernel 2.6.20.