libnl-3.4.0 release

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

diff --git a/configure.ac b/configure.ac
index 89bc18a20333eaaa4dac7f5354af2d29375b066c..dfead9818eca7c866eac2b376504b24551536436 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,7 @@ m4_define([libnl_lt_revision],   [0])
 m4_define([libnl_lt_age],        [26])
 
 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 539963a41c617eb610f70abc5acdeb87d68f699e..4539c9b20ae1bb1e905fe8e589d595d066b9d7bc 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.4.0-rc1], [http://www.infradead.org/~tgr/libnl/])
+AC_INIT(libnl-doc, [3.4.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
index f61ef4f42f4d64d2cf4a83c0e956562273b59a0f..10e76ce4ee27e3c13bb33b9beba262be0cb7ce4e 100644 (file)
--- a/include/netlink/utils.h
+++ b/include/netlink/utils.h
@@ -280,6 +280,12 @@ enum {
        NL_CAPABILITY_VERSION_3_3_0 = 27,
 #define NL_CAPABILITY_VERSION_3_3_0 NL_CAPABILITY_VERSION_3_3_0
 
+       /**
+        * The library version is libnl3 3.4.0 or newer. This capability should never be backported.
+        */
+       NL_CAPABILITY_VERSION_3_4_0 = 28,
+#define NL_CAPABILITY_VERSION_3_4_0 NL_CAPABILITY_VERSION_3_4_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
index 704dc7a8529756515b108375a593f26f165cfc47..544feda03a73d720f4776bc8be27cbbfc4b57493 100644 (file)
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -1220,7 +1220,7 @@ int nl_has_capability (int capability)
                        NL_CAPABILITY_VERSION_3_2_29,
                        NL_CAPABILITY_XFRM_SP_SEC_CTX_LEN,
                        NL_CAPABILITY_VERSION_3_3_0,
-                       0,
+                       NL_CAPABILITY_VERSION_3_4_0,
                        0,
                        0,
                        0,