From 6b2533c02813ce21b27ea8318fbe1af95652a39e Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 29 Aug 2023 10:00:24 +0200 Subject: [PATCH] libnl-3.8.0 release --- configure.ac | 2 +- doc/configure.ac | 2 +- include/netlink/utils.h | 6 ++++++ lib/utils.c | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 185523b37..2f2306966 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], [7]) +m4_define([libnl_minor_version], [8]) 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 5e9f6ffec..cc995b647 100644 --- a/doc/configure.ac +++ b/doc/configure.ac @@ -3,7 +3,7 @@ # Copyright (c) 2003-2013 Thomas Graf # -AC_INIT(libnl-doc, [3.7.0], [http://www.infradead.org/~tgr/libnl/]) +AC_INIT(libnl-doc, [3.8.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 c62df828e..6c65b1f18 100644 --- a/include/netlink/utils.h +++ b/include/netlink/utils.h @@ -319,6 +319,12 @@ enum { NL_CAPABILITY_VERSION_3_7_0 = 33, #define NL_CAPABILITY_VERSION_3_7_0 NL_CAPABILITY_VERSION_3_7_0 + /** + * The library version is libnl3 3.8.0 or newer. This capability should never be backported. + */ + NL_CAPABILITY_VERSION_3_8_0 = 34, +#define NL_CAPABILITY_VERSION_3_8_0 NL_CAPABILITY_VERSION_3_8_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 5281c4180..a1204906c 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -1283,7 +1283,7 @@ int nl_has_capability (int capability) NL_CAPABILITY_VERSION_3_6_0), _NL_SET (4, NL_CAPABILITY_VERSION_3_7_0, - 0, + NL_CAPABILITY_VERSION_3_8_0, 0, 0, 0,