diff -Nru ntrack-016/debian/changelog ntrack-016/debian/changelog --- ntrack-016/debian/changelog 2013-12-24 12:23:38.000000000 +0100 +++ ntrack-016/debian/changelog 2013-12-26 14:41:47.000000000 +0100 @@ -1,3 +1,9 @@ +ntrack (016-1.1ubuntu2) trusty; urgency=medium + + * Fix the patch to not crash ntrack (LP: #1264293) + + -- Philip Muškovac Thu, 26 Dec 2013 14:33:08 +0100 + ntrack (016-1.1ubuntu1) trusty; urgency=medium * Apply patch from Hilko Bengen (Closes: #713454) diff -Nru ntrack-016/debian/patches/fix-ftbfs.patch ntrack-016/debian/patches/fix-ftbfs.patch --- ntrack-016/debian/patches/fix-ftbfs.patch 2013-12-24 12:24:39.000000000 +0100 +++ ntrack-016/debian/patches/fix-ftbfs.patch 2013-12-26 13:50:32.000000000 +0100 @@ -1,13 +1,15 @@ Origin: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=713454 ---- ntrack-016.orig/modules/ntrack-libnl.c -+++ ntrack-016/modules/ntrack-libnl.c +Index: b/modules/ntrack-libnl.c +=================================================================== +--- a/modules/ntrack-libnl.c ++++ b/modules/ntrack-libnl.c @@ -530,7 +530,7 @@ update_connectivity (ntrack_monitor_t *s op_default_route_disappeared ((struct _ntrack_monitor_arch*) self, nl_info); } else if (nl_info->topmost_route && topmost_route) { int diff_bits; - if ((diff_bits = (route_obj_ops.oo_id_attrs | ROUTE_ATTR_OIF -+ if ((diff_bits = (nl_object_get_id_attrs(&route_obj_ops) | ROUTE_ATTR_OIF ++ if ((diff_bits = (nl_object_get_id_attrs(nl_object_alloc(&route_obj_ops)) | ROUTE_ATTR_OIF | ROUTE_ATTR_GATEWAY) & nl_object_diff (OBJ_CAST (nl_info->topmost_route), OBJ_CAST (topmost_route)))) {