Skip to content

Fix ntrack for latest libnl release #1319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
7c6f434c merged 1 commit into from
Dec 7, 2013
Merged

Fix ntrack for latest libnl release #1319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion pkgs/development/libraries/ntrack/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@ stdenv.mkDerivation rec {

configureFlags = "--without-gobject CFLAGS=--std=gnu99";

patchPhase = ''sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c'';
# Remove this patch after version 016
patches = [ ./libnl-fix.patch ];

postPatch = ''
sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c
'';

meta = {
description = "Network Connectivity Tracking library for Desktop Applications";
Expand Down
11 changes: 11 additions & 0 deletions pkgs/development/libraries/ntrack/libnl-fix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- ./modules/ntrack-libnl.c.orig 2013-12-02 11:31:54.749215448 -0600
+++ ./modules/ntrack-libnl.c 2013-12-02 11:34:46.597684553 -0600
@@ -530,7 +530,7 @@
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(OBJ_CAST(topmost_route)) | ROUTE_ATTR_OIF
| ROUTE_ATTR_GATEWAY) &
nl_object_diff (OBJ_CAST (nl_info->topmost_route),
OBJ_CAST (topmost_route)))) {