forked from pool/libnl3
Accepting request 970360 from security:netfilter
- Update to release 3.6.0 OBS-URL: https://build.opensuse.org/request/show/970360 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libnl3?expand=0&rev=37
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
22bc10a4b2
@ -1,66 +0,0 @@
|
||||
From bab9e77c87d3b596e77d669b0a827b50e725bb62 Mon Sep 17 00:00:00 2001
|
||||
From: Ilya Pronin <ipronin@twitter.com>
|
||||
Date: Fri, 3 Apr 2020 20:00:37 -0700
|
||||
Subject: [PATCH] route/link: add RTNL_LINK_REASM_OVERLAPS stat
|
||||
References: https://bugzilla.suse.com/show_bug.cgi?id=1189451
|
||||
|
||||
The new stat exposes IPSTATS_MIB_REASM_OVERLAPS link stat. However, the
|
||||
original motivation for this change was fixing the issue with missing RX
|
||||
packets link stat.
|
||||
|
||||
The regression was introduced in version 3.5.0 with commit 73c1d047,
|
||||
that added a new enum constant IPSTATS_MIB_REASM_OVERLAPS. Without this
|
||||
patch, IPSTATS_MIB_REASM_OVERLAPS is missing from
|
||||
map_stat_id_from_IPSTATS_MIB_v2 and is mapped by it to 0. This tricks
|
||||
inet6_parse_protinfo() into erroneously overwriting RTNL_LINK_RX_PACKETS
|
||||
stat, which happens to have value 0, when it tries to set
|
||||
IPSTATS_MIB_REASM_OVERLAPS.
|
||||
|
||||
Fixes: 73c1d0479643 ('Sync linux headers to 4.19.66')
|
||||
|
||||
https://github.com/thom311/libnl/pull/235
|
||||
---
|
||||
include/netlink/route/link.h | 1 +
|
||||
lib/route/link.c | 1 +
|
||||
lib/route/link/inet6.c | 1 +
|
||||
3 files changed, 3 insertions(+)
|
||||
|
||||
diff --git include/netlink/route/link.h include/netlink/route/link.h
|
||||
index 516d8e1..d0d6d2b 100644
|
||||
--- include/netlink/route/link.h
|
||||
+++ include/netlink/route/link.h
|
||||
@@ -93,6 +93,7 @@ typedef enum {
|
||||
RTNL_LINK_IP6_ECT0PKTS, /*!< IPv6 SNMP InECT0Pkts */
|
||||
RTNL_LINK_IP6_CEPKTS, /*!< IPv6 SNMP InCEPkts */
|
||||
RTNL_LINK_RX_NOHANDLER, /*!< Received packets dropped on inactive device */
|
||||
+ RTNL_LINK_REASM_OVERLAPS, /*!< SNMP ReasmOverlaps */
|
||||
__RTNL_LINK_STATS_MAX,
|
||||
} rtnl_link_stat_id_t;
|
||||
|
||||
diff --git lib/route/link.c lib/route/link.c
|
||||
index 9439fe6..ed6f455 100644
|
||||
--- lib/route/link.c
|
||||
+++ lib/route/link.c
|
||||
@@ -3007,6 +3007,7 @@ static const struct trans_tbl link_stats[] = {
|
||||
__ADD(RTNL_LINK_IP6_ECT0PKTS, Ip6_InECT0Pkts),
|
||||
__ADD(RTNL_LINK_IP6_CEPKTS, Ip6_InCEPkts),
|
||||
__ADD(RTNL_LINK_RX_NOHANDLER, rx_nohandler),
|
||||
+ __ADD(RTNL_LINK_REASM_OVERLAPS, ReasmOverlaps),
|
||||
};
|
||||
|
||||
char *rtnl_link_stat2str(int st, char *buf, size_t len)
|
||||
diff --git lib/route/link/inet6.c lib/route/link/inet6.c
|
||||
index c977b61..1ad49bf 100644
|
||||
--- lib/route/link/inet6.c
|
||||
+++ lib/route/link/inet6.c
|
||||
@@ -135,6 +135,7 @@ static const uint8_t map_stat_id_from_IPSTATS_MIB_v2[__IPSTATS_MIB_MAX] = {
|
||||
[33] = RTNL_LINK_IP6_ECT1PKTS, /* IPSTATS_MIB_ECT1PKTS */
|
||||
[34] = RTNL_LINK_IP6_ECT0PKTS, /* IPSTATS_MIB_ECT0PKTS */
|
||||
[35] = RTNL_LINK_IP6_CEPKTS, /* IPSTATS_MIB_CEPKTS */
|
||||
+ [36] = RTNL_LINK_REASM_OVERLAPS, /* IPSTATS_MIB_REASM_OVERLAPS */
|
||||
};
|
||||
|
||||
static int inet6_parse_protinfo(struct rtnl_link *link, struct nlattr *attr,
|
||||
--
|
||||
2.32.0
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:352133ec9545da76f77e70ccb48c9d7e5324d67f6474744647a7ed382b5e05fa
|
||||
size 967835
|
||||
@ -1,17 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQJHBAABCAAxFiEESep8Zw4IUOdBlRT2KcI2bk38VygFAl1r1CwTHHRoYWxsZXJA
|
||||
cmVkaGF0LmNvbQAKCRApwjZuTfxXKP9XD/0Q7YiGfl38nmeTjpaNNWICLyXBvzq+
|
||||
FWODDO7lsVGgtIwai5SaNVBnu1L7jq9NF+CgnVbxxQybVhfpLEIftPsr3yZM6uop
|
||||
EbQRs6iiNaF15GeBBF+LYKCiMTz013Q1BdU8hzh/kou+ORLabUsZnidzWsToFFlW
|
||||
YBEi9mxeVxmReHthBCpFhydLRNlfB0a6Fx0g0Z50134cUJhALeYtyRH28b1YHpO8
|
||||
A/20R9NFhpyu0dFvdSjo4mh4kLUOlyCoDsSSx2XW51+wd3Atkm2zPNNtHD/0/5Ry
|
||||
vBqRj66ndgCk7FxYducw/j594K0vZxfhU85HQ4B3KPXwvBwAHNOT1CfDo19nhs+v
|
||||
fqqzRtXnqWUuCZHz1NXZqaca0e75uvVNwag2f/gc7+pcpKAf3XDOPmfI3XSU9js0
|
||||
XYbJBNGB/lTPQu3GDdGwZv3VU6/zio62+mEQD5FR9nf0ya/E1VsF6KIlu7ag5Y8l
|
||||
/A1nRi+jmGo+16HXYOvyIkQ2+fof6NFy13sYqbYLCs00oQ3Q79eEvUHetBDDmfE0
|
||||
3l4x0/UdvlkLsMO01Sfg6RYwxEmYMVPpyClC2Bucn+vOtV4ejFOLjaifNHqTthCF
|
||||
pxaWFtAh7lDR04o+VxHaJZ9Nv6AsKAfM8Ty7bhG7tMzmr2qYiBrWNcwG9Zlb1sXT
|
||||
FmHUkSWVe5d9Lg==
|
||||
=hw2f
|
||||
-----END PGP SIGNATURE-----
|
||||
3
libnl-3.6.0.tar.gz
Normal file
3
libnl-3.6.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:532155fd011e5a805bd67121b87a01c757e2bb24112ac17e69cb86013b970009
|
||||
size 981921
|
||||
17
libnl-3.6.0.tar.gz.sig
Normal file
17
libnl-3.6.0.tar.gz.sig
Normal file
@ -0,0 +1,17 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQJHBAABCAAxFiEESep8Zw4IUOdBlRT2KcI2bk38VygFAmJZMrMTHHRoYWxsZXJA
|
||||
cmVkaGF0LmNvbQAKCRApwjZuTfxXKP1uD/0eAiWs6v5GuYvxbt6NXQ8jZBVe6dCH
|
||||
afejy8UQnTNbFJz5gUz/IUAtPKQ6Xt5CfgfO7hgVqhvIRKYXq1SVb7M625AHZGgN
|
||||
sS13C3/3TP4xFZcmz3+bHdnrRgeWRAClRIDe5kKVlFqlH98wXPefqrehBdmzwUKv
|
||||
b/x9FINm2Dqk4yNsZhfEZEwS+c8gTnUUoY7H8QG9dfbthhccElvvghFKRTpUpxoR
|
||||
Tl9LJP6+Jn9uUa0SB7AYPlBtU5ONk6o3sqkt7Ne6Y1dFfiJTeGh5LW3N9u6R0rfJ
|
||||
lf0B/uUuF18QOWHAjgHL+fgP7+ODabu7HQTllFPoXc08rL+qRLUueEo/tCgcXVQN
|
||||
6/jBGfd+lNIwUuBMs6xShpYCkSKJClA/hs6+W/hb1rZG6ExxuF4wvrdiImm6RRQP
|
||||
GIPbQIkgoOrGvwuAyoIIQWnaSu10QLp/YTxZV7A5WZDbb41COmN0DVy49/oKZC32
|
||||
ZxWoaXK4xQZ3misEgi1L6ac8fx4psAzx1pEPMNwW7pnN/QtrNX+cA1ofXY2i32Bx
|
||||
Xso6/zUWk6KPElWqXw3tTulxzMkO3EYkiKxxZw0uPQAn1TXDTTApC/06RKw5L8Sl
|
||||
aPsC4rkSyUXgjOW1lun4rcxzz8GlRrIfmp6DJrUS06VTM0nxcnNpyA0iCpYzfx34
|
||||
M006Ak81zwiCaw==
|
||||
=O4u+
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 15 09:42:03 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Update to release 3.6.0
|
||||
* route/mdb: add support for MAC multicast entries
|
||||
* mdb: support bridge multicast database notification
|
||||
* Support Hardware offload capability for MACsec
|
||||
* nflog: add CT support
|
||||
* Add IPv6 GRE support
|
||||
* Add IPv6 VTI support
|
||||
* Add support for team devices
|
||||
- Drop 0001-route-link-add-RTNL_LINK_REASM_OVERLAPS-stat.patch
|
||||
(merged)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 23 22:16:10 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package libnl3
|
||||
#
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -19,8 +19,8 @@
|
||||
Name: libnl3
|
||||
%define lname libnl3-200
|
||||
%define with_tools 1
|
||||
%define uver 3_5_0
|
||||
Version: 3.5.0
|
||||
%define uver 3_6_0
|
||||
Version: 3.6.0
|
||||
Release: 0
|
||||
Summary: Convenience library for working with Netlink sockets
|
||||
License: GPL-2.0-only AND LGPL-2.1-only
|
||||
@ -31,7 +31,6 @@ URL: http://www.carisma.slowglass.com/~tgr/libnl/#(outdated)
|
||||
Source: https://github.com/thom311/libnl/releases/download/libnl%uver/libnl-%version.tar.gz
|
||||
Source2: https://github.com/thom311/libnl/releases/download/libnl%uver/libnl-%version.tar.gz.sig
|
||||
Source3: baselibs.conf
|
||||
Patch1: 0001-route-link-add-RTNL_LINK_REASM_OVERLAPS-stat.patch
|
||||
BuildRequires: bison >= 2.4
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: flex >= 2.5.19
|
||||
|
||||
Loading…
Reference in New Issue
Block a user