From c7edc38f8e335c18c5e17451d2cb19b9b8d0b48f Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 30 Oct 2024 08:13:01 +0100
Subject: libnl-3.11.0 release
---
configure.ac | 2 +-
doc/configure.ac | 2 +-
include/netlink/utils.h | 6 ++++++
lib/utils.c | 4 ++--
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 91d4ae3..1556ea4 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], [10])
+m4_define([libnl_minor_version], [11])
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 5b4fd4e..3317d62 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.10.0], [http://www.infradead.org/~tgr/libnl/])
+AC_INIT(libnl-doc, [3.11.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 ac91d4c..9085c39 100644
--- a/include/netlink/utils.h
+++ b/include/netlink/utils.h
@@ -355,6 +355,12 @@ enum {
NL_CAPABILITY_VERSION_3_13_0 = 39,
#define NL_CAPABILITY_VERSION_3_13_0 NL_CAPABILITY_VERSION_3_13_0
+ /**
+ * The library version is libnl3 3.14.0 or newer. This capability should never be backported.
+ */
+ NL_CAPABILITY_VERSION_3_14_0 = 40,
+#define NL_CAPABILITY_VERSION_3_14_0 NL_CAPABILITY_VERSION_3_14_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 41ff8eb..1cee863 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -1285,10 +1285,10 @@ int nl_has_capability (int capability)
NL_CAPABILITY_VERSION_3_8_0,
NL_CAPABILITY_VERSION_3_9_0,
NL_CAPABILITY_VERSION_3_10_0,
- 0, /* NL_CAPABILITY_VERSION_3_11_0 */
+ NL_CAPABILITY_VERSION_3_11_0,
0, /* NL_CAPABILITY_VERSION_3_12_0 */
0, /* NL_CAPABILITY_VERSION_3_13_0 */
- 0),
+ 0), /* NL_CAPABILITY_VERSION_3_14_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.
--
cgit v0.12