libnl-3.5.0 release

diff --git a/configure.ac b/configure.ac
index dfead9818eca7c866eac2b376504b24551536436..ee44d895aea74f4593e143ce86292aa85db7cfeb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@
 
 # copied from glib
 m4_define([libnl_major_version], [3])
-m4_define([libnl_minor_version], [4])
+m4_define([libnl_minor_version], [5])
 m4_define([libnl_micro_version], [0])
 m4_define([libnl_git_sha], [m4_esyscmd([ ( [ -d ./.git/ ] && [ "$(readlink -f ./.git/)" = "$(readlink -f "$(git rev-parse --git-dir 2>/dev/null)" 2>/dev/null)" ] && git rev-parse --verify -q HEAD 2>/dev/null ) || true ])])
 

diff --git a/doc/configure.ac b/doc/configure.ac
index 4539c9b20ae1bb1e905fe8e589d595d066b9d7bc..187447c91425396720b34f296a4882fd1723cc40 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], [http://www.infradead.org/~tgr/libnl/])
+AC_INIT(libnl-doc, [3.5.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 dc22c9d8186878440e99a10b52453b017e2be671..b05ce661a9065a9fe6205092f2a306378293d80f 100644 (file)
--- a/include/netlink/utils.h
+++ b/include/netlink/utils.h
@@ -294,6 +294,12 @@ enum {
        NL_CAPABILITY_ROUTE_FIX_VLAN_SET_EGRESS_MAP = 29,
 #define NL_CAPABILITY_ROUTE_FIX_VLAN_SET_EGRESS_MAP NL_CAPABILITY_ROUTE_FIX_VLAN_SET_EGRESS_MAP
 
+       /**
+        * The library version is libnl3 3.5.0 or newer. This capability should never be backported.
+        */
+       NL_CAPABILITY_VERSION_3_5_0 = 30,
+#define NL_CAPABILITY_VERSION_3_5_0 NL_CAPABILITY_VERSION_3_5_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 d4e6c8126dd2586d22e8f20a8a70155afe7d6268..496bf3b3edc499dae6a5d135651d057d20f78863 100644 (file)
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -1223,7 +1223,7 @@ int nl_has_capability (int capability)
                        NL_CAPABILITY_VERSION_3_3_0,
                        NL_CAPABILITY_VERSION_3_4_0,
                        NL_CAPABILITY_ROUTE_FIX_VLAN_SET_EGRESS_MAP,
-                       0,
+                       NL_CAPABILITY_VERSION_3_5_0,
                        0,
                        0),
                /* IMPORTANT: these capability numbers are intended to be universal and stable