libnl-3.3.0 release

Signed-off-by: Thomas Haller <[email protected]>
thom311 · May 3, 2017 · 2e0c4ad · 2e0c4ad
1 parent 54344bc
commit 2e0c4ad
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/configure.ac b/configure.ac
@@ -40,7 +40,7 @@ m4_define([libnl_lt_revision],   [0])
 m4_define([libnl_lt_age],        [25])
 
 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])

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

diff --git a/include/netlink/utils.h b/include/netlink/utils.h
@@ -274,6 +274,12 @@ enum {
 	NL_CAPABILITY_XFRM_SP_SEC_CTX_LEN = 26,
 #define NL_CAPABILITY_XFRM_SP_SEC_CTX_LEN NL_CAPABILITY_XFRM_SP_SEC_CTX_LEN
 
+	/**
+	 * The library version is libnl3 3.3.0 or newer. This capability should never be backported.
+	 */
+	NL_CAPABILITY_VERSION_3_3_0 = 27,
+#define NL_CAPABILITY_VERSION_3_3_0 NL_CAPABILITY_VERSION_3_3_0
+
 	__NL_CAPABILITY_MAX,
 	NL_CAPABILITY_MAX = (__NL_CAPABILITY_MAX - 1),
 #define NL_CAPABILITY_MAX NL_CAPABILITY_MAX

diff --git a/lib/utils.c b/lib/utils.c
@@ -1219,7 +1219,7 @@ int nl_has_capability (int capability)
 		_NL_SET (3,
 			NL_CAPABILITY_VERSION_3_2_29,
 			NL_CAPABILITY_XFRM_SP_SEC_CTX_LEN,
-			0,
+			NL_CAPABILITY_VERSION_3_3_0,
 			0,
 			0,
 			0,