libnl-3.2.28 release

Signed-off-by: Thomas Haller <thaller@redhat.com>
thom311 · Jul 8, 2016 · 656f381 · 656f381
1 parent bd0e87b
commit 656f381
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],        [23])
 
 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 <tgraf@suug.ch>
 #
 
-AC_INIT(libnl-doc, [3.2.28-rc1], [http://www.infradead.org/~tgr/libnl/])
+AC_INIT(libnl-doc, [3.2.28], [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
@@ -211,6 +211,12 @@ enum {
 	NL_CAPABILITY_RTNL_ADDR_PEER_FIX = 18,
 #define NL_CAPABILITY_RTNL_ADDR_PEER_FIX NL_CAPABILITY_RTNL_ADDR_PEER_FIX
 
+	/**
+	 * The library version is libnl3 3.2.28 or newer. This capability should never be backported.
+	 */
+	NL_CAPABILITY_VERSION_3_2_28 = 19,
+#define NL_CAPABILITY_VERSION_3_2_28 NL_CAPABILITY_VERSION_3_2_28
+
 	__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
@@ -1163,7 +1163,7 @@ int nl_has_capability (int capability)
 		_NL_SET (2,
 			NL_CAPABILITY_XFRM_SA_KEY_SIZE,
 			NL_CAPABILITY_RTNL_ADDR_PEER_FIX,
-			0,
+			NL_CAPABILITY_VERSION_3_2_28,
 			0,
 			0,
 			0,