File 0001-use-libnl3.patch of Package netcontrol

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-use-libnl3.patch of Package netcontrol (Revision 87fe7939ee8eb0c670f42d8dd62cc8fd)

Currently displaying revision 87fe7939ee8eb0c670f42d8dd62cc8fd , Show latest

Index: netcontrol-0.2.8/src/nlutils.c
===================================================================
--- netcontrol-0.2.8.orig/src/nlutils.c
+++ netcontrol-0.2.8/src/nlutils.c
@@ -55,7 +55,7 @@ nc_netlink_close(nc_netlink_t **nl)
 			return;
 
 		if((*nl)->handle)
-			nl_handle_destroy((*nl)->handle);
+			nl_socket_free((*nl)->handle);
 		if((*nl)->cb)
 			nl_cb_put((*nl)->cb);
 		free(*nl);
@@ -80,7 +80,7 @@ nc_netlink_open()
 		nc_netlink_close(&nl);
 	}
 
-	nl->handle = nl_handle_alloc_cb(nl->cb);
+	nl->handle = nl_socket_alloc_cb(nl->cb);
 	if(!nl->handle) {
 		nc_error("Cannot allocate netlink handle: %m");
 		nc_netlink_close(&nl);
Index: netcontrol-0.2.8/configure.ac
===================================================================
--- netcontrol-0.2.8.orig/configure.ac
+++ netcontrol-0.2.8/configure.ac
@@ -36,7 +36,8 @@ if test "X$ax_pthread_ok" = "Xyes" ; the
 elif test "X$enable_pthreads" = "Xyes" ; then
 	AC_MSG_ERROR([unable to detect pthread support])
 fi
-PKG_CHECK_MODULES([LIBNL], [libnl-1])
+PKG_CHECK_MODULES([LIBNL], [libnl-3.0])
+PKG_CHECK_MODULES([LIBNL_ROUTE], [libnl-route-3.0])
 
 AC_ARG_ENABLE(network-service,
 	      [AS_HELP_STRING([--enable-network-service],
Index: netcontrol-0.2.8/src/Makefile.am
===================================================================
--- netcontrol-0.2.8.orig/src/Makefile.am
+++ netcontrol-0.2.8/src/Makefile.am
@@ -17,7 +17,8 @@ nctest_DEPENDENCIES	= $(nctest_LDADD)
 
 lib_LTLIBRARIES		= libnetcontrol.la
 
-libnetcontrol_la_LDFLAGS = $(LIBNL_LIBS) \
+libnetcontrol_la_CFLAGS = $(LIBNL_CFLAGS)
+libnetcontrol_la_LDFLAGS = $(LIBNL_LIBS) $(LIBNL_ROUTE_LIBS) \
 			   -Wl,--version-script=$(builddir)/netcontrol.syms \
 			   -version-info $(LIBNETCONTROL_VERSION_INFO)
 libnetcontrol_la_DEPENDENCIES = netcontrol.syms

Places

File 0001-use-libnl3.patch of Package netcontrol (Revision 87fe7939ee8eb0c670f42d8dd62cc8fd)

Places