libnl-3.2.28 release

Signed-off-by: Thomas Haller <thaller@redhat.com>

diff --git a/configure.ac b/configure.ac
index b90d438c5e2366718d54fcd6a589d9512b95ecc1..bcc0a9d8c7ddae6331e155456cee18fd22a1680d 100644 (file)
--- 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
index de62438570effb6f068ad9e4c0d4f7c6af1a3ec8..8a8badb0e56e1b9a284898326448907c74e52226 100644 (file)
--- 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
index 73e978a1ee92705c644fd5a9ec2b4d971c3b7038..3b10340d73bd8f41f2fdefc7690e6858218007ab 100644 (file)
--- 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
index ecaed5ceff6d44f0798460f54bb1d7aa885e2763..3399c033d2db5d823bf2cadf9b0381b5ff4b3a19 100644 (file)
--- 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,