import nispor-1.1.1-2.el8_5

This commit is contained in:
CentOS Sources 2022-02-01 15:11:56 -05:00 committed by Stepan Oksanichenko
parent 07708c4442
commit 979d121b06
2 changed files with 33 additions and 1 deletions

View File

@ -0,0 +1,28 @@
diff -Nur ./nispor-1.1.1.old/src/lib/ifaces/bridge.rs nispor-1.1.1/src/lib/ifaces/bridge.rs
--- ./nispor-1.1.1.old/src/lib/ifaces/bridge.rs 2021-06-19 01:48:56.000000000 +0800
+++ nispor-1.1.1/src/lib/ifaces/bridge.rs 2022-01-07 12:33:10.492882827 +0800
@@ -363,7 +363,12 @@
data: &[u8],
) -> Result<(), NisporError> {
if let Some(ref mut port_info) = iface_state.bridge_port {
- port_info.vlans = parse_af_spec_bridge_info(data)?;
+ if let Some(cur_vlans) = parse_af_spec_bridge_info(data)? {
+ match port_info.vlans.as_mut() {
+ Some(vlans) => vlans.extend(cur_vlans),
+ None => port_info.vlans = Some(cur_vlans),
+ };
+ }
}
Ok(())
}
diff -Nur ./nispor-1.1.1.old/src/lib/ifaces/iface.rs nispor-1.1.1/src/lib/ifaces/iface.rs
--- ./nispor-1.1.1.old/src/lib/ifaces/iface.rs 2021-06-19 01:48:56.000000000 +0800
+++ nispor-1.1.1/src/lib/ifaces/iface.rs 2022-01-07 12:32:26.818695643 +0800
@@ -417,7 +417,6 @@
for nla in &nl_msg.nlas {
if let Nla::AfSpecBridge(data) = nla {
parse_bridge_vlan_info(&mut iface_state, data)?;
- break;
}
}
}

View File

@ -1,11 +1,12 @@
Name: nispor
Version: 1.1.1
Release: 1%{?dist}
Release: 2%{?dist}
Summary: API for network status querying
License: ASL 2.0
URL: https://github.com/nispor/nispor
Source: https://github.com/nispor/nispor/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: %{name}-%{version}-vendor.tar.xz
Patch1: fix_vlan_filtering_on_i40e.patch
BuildRequires: pkg-config
BuildRequires: python3-devel
BuildRequires: rust-toolset
@ -164,6 +165,9 @@ popd
%{_libdir}/pkgconfig/nispor.pc
%changelog
* Fri Jan 07 2022 Gris Ge <fge@redhat.com> - 1.1.1-2
- Fix VLAN fitler on i40e. RHBZ#2040317
* Sat Jun 19 2021 Gris Ge <fge@redhat.com> - 1.1.1-1
- Upgrade to 1.1.1. RHBZ#1942459