diff options
| author | Thomas Haller <thaller@redhat.com> | 2022-07-06 17:22:36 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2022-07-06 17:22:36 +0200 |
| commit | 1bb416213c7038d0da9a6f5141c611f6dbcefedc (patch) | |
| tree | 74644b0e790417b79f49c80ea97762e3761bc891 | |
| parent | 897ec9c9c5be971810b1303b5920aab90d055481 (diff) | |
| download | libnl-1bb416213c7038d0da9a6f5141c611f6dbcefedc.tar.gz | |
libnl-3.7.0 release
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/configure.ac | 2 | ||||
| -rw-r--r-- | include/netlink/utils.h | 6 | ||||
| -rw-r--r-- | lib/utils.c | 9 |
4 files changed, 17 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 0fd1cc0f..b6bdceca 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ # copied from glib m4_define([libnl_major_version], [3]) -m4_define([libnl_minor_version], [6]) +m4_define([libnl_minor_version], [7]) 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 925c8050..4fb3cc3d 100644 --- a/doc/configure.ac +++ b/doc/configure.ac @@ -3,7 +3,7 @@ # Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch> # -AC_INIT(libnl-doc, [3.6.0], [http://www.infradead.org/~tgr/libnl/]) +AC_INIT(libnl-doc, [3.7.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 62652b16..c62df828 100644 --- a/include/netlink/utils.h +++ b/include/netlink/utils.h @@ -313,6 +313,12 @@ enum { NL_CAPABILITY_VERSION_3_6_0 = 32, #define NL_CAPABILITY_VERSION_3_6_0 NL_CAPABILITY_VERSION_3_6_0 + /** + * The library version is libnl3 3.7.0 or newer. This capability should never be backported. + */ + NL_CAPABILITY_VERSION_3_7_0 = 33, +#define NL_CAPABILITY_VERSION_3_7_0 NL_CAPABILITY_VERSION_3_7_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 124a458e..a20f36c7 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -1219,6 +1219,15 @@ int nl_has_capability (int capability) NL_CAPABILITY_VERSION_3_5_0, NL_CAPABILITY_NL_OBJECT_IDENTICAL_PARTIAL, NL_CAPABILITY_VERSION_3_6_0), + _NL_SET (4, + NL_CAPABILITY_VERSION_3_7_0, + 0, + 0, + 0, + 0, + 0, + 0, + 0), /* IMPORTANT: these capability numbers are intended to be universal and stable * for libnl3. Don't allocate new numbers on your own that differ from upstream * libnl3. |