libnl-3.2.29 release

Signed-off-by: Thomas Haller <[email protected]>

Author: thom311

configure.ac

@@ -40,7 +40,7 @@ m4_define([libnl_lt_revision],   [0])
 m4_define([libnl_lt_age],        [24])
 
 m4_define([libnl_version],
-	  [libnl_major_version.libnl_minor_version.libnl_micro_version-rc1])
+	  [libnl_major_version.libnl_minor_version.libnl_micro_version])
 
 AC_INIT(libnl, [libnl_version], [], [], [http://www.infradead.org/~tgr/libnl/])
 AC_CONFIG_HEADERS([lib/defs.h])

doc/configure.ac

@@ -9,7 +9,7 @@
 # Copyright (c) 2003-2013 Thomas Graf <[email protected]>
 #
 
-AC_INIT(libnl-doc, [3.2.29-rc1], [http://www.infradead.org/~tgr/libnl/])
+AC_INIT(libnl-doc, [3.2.29], [http://www.infradead.org/~tgr/libnl/])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([foreign])

include/netlink/utils.h

@@ -261,6 +261,12 @@ enum {
 	NL_CAPABILITY_NL_RECVMSGS_PEEK_BY_DEFAULT = 24,
 #define NL_CAPABILITY_NL_RECVMSGS_PEEK_BY_DEFAULT NL_CAPABILITY_NL_RECVMSGS_PEEK_BY_DEFAULT
 
+	/**
+	 * The library version is libnl3 3.2.29 or newer. This capability should never be backported.
+	 */
+	NL_CAPABILITY_VERSION_3_2_29 = 25,
+#define NL_CAPABILITY_VERSION_3_2_29 NL_CAPABILITY_VERSION_3_2_29
+
 	__NL_CAPABILITY_MAX,
 	NL_CAPABILITY_MAX = (__NL_CAPABILITY_MAX - 1),
 #define NL_CAPABILITY_MAX NL_CAPABILITY_MAX

lib/utils.c

@@ -1193,6 +1193,15 @@ int nl_has_capability (int capability)
 			NL_CAPABILITY_XFRM_SEC_CTX_LEN,
 			NL_CAPABILITY_LINK_BUILD_ADD_REQUEST_SET_CHANGE,
 			NL_CAPABILITY_NL_RECVMSGS_PEEK_BY_DEFAULT),
+		_NL_SET (3,
+			NL_CAPABILITY_VERSION_3_2_29,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0),
 		/* IMPORTANT: these capability numbers are intended to be universal and stable
 		 * for libnl3. Don't allocate new numbers on your own that differ from upstream
 		 * libnl3.