The cirros image was rebuilt against the 3.13.0-83 kernel, drivers e1000e, igbvf...

[packages/trusty/cirros-testvm.git] / cirros-testvm / src-cirros / buildroot-2015.05 / package / dhcpdump / 0001-use-non-bsd-structures.patch

diff --git a/cirros-testvm/src-cirros/buildroot-2015.05/package/dhcpdump/0001-use-non-bsd-structures.patch b/cirros-testvm/src-cirros/buildroot-2015.05/package/dhcpdump/0001-use-non-bsd-structures.patch
new file mode 100644 (file)
index 0000000..40115fb
--- /dev/null
+++ b/cirros-testvm/src-cirros/buildroot-2015.05/package/dhcpdump/0001-use-non-bsd-structures.patch
@@ -0,0 +1,23 @@
+The udphdr structure has uh_* fields when _FAVOR_BSD is
+defined. Otherwise, the fields are just named source, dest, len and
+check. See <netinet/udp.h>.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: dhcpdump-1.8/dhcpdump.c
+===================================================================
+--- dhcpdump-1.8.orig/dhcpdump.c       2011-05-17 20:20:46.506980003 +0200
++++ dhcpdump-1.8/dhcpdump.c    2011-05-17 20:20:59.338979999 +0200
+@@ -163,10 +163,10 @@
+       strcpy(ip_origin, (u_char *)inet_ntoa(ip->ip_src));
+       strcpy(ip_destination, (u_char *)inet_ntoa(ip->ip_dst));
+ 
+-      if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->uh_ulen)))
++      if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->len)))
+               return;
+ 
+-      printdata((u_char *)(sp + offset), ntohs(udp->uh_ulen));
++      printdata((u_char *)(sp + offset), ntohs(udp->len));
+ }
+ 
+ // check for matching CHADDR (Peter Apian-Bennewitz <apian@ise.fhg.de>)