rpms/nispor
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import nispor-1.2.3-1.el8

Browse Source
This commit is contained in:
CentOS Sources 2022-05-10 03:06:44 -04:00 committed by Stepan Oksanichenko
parent 979d121b06
commit 3543abe520
4 changed files with 20 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -1,2 +1,2 @@
SOURCES/nispor-1.1.1-vendor.tar.xz
SOURCES/nispor-1.1.1.tar.gz
SOURCES/nispor-1.2.3-vendor.tar.xz
SOURCES/nispor-1.2.3.tar.gz

4
.nispor.metadata
View File

@ -1,2 +1,2 @@
ab6b879911102b36b276d080de78967279016b02 SOURCES/nispor-1.1.1-vendor.tar.xz
c4bff5488cde6eaf881d510e463f6c3f0e13aae2 SOURCES/nispor-1.1.1.tar.gz
4039cb26a70f6206115f6ee6ceeb7b276d0fd624 SOURCES/nispor-1.2.3-vendor.tar.xz
00ec407c09267d98575c845e2de80f21e486c24e SOURCES/nispor-1.2.3.tar.gz

28
SOURCES/fix_vlan_filtering_on_i40e.patch
View File

@ -1,28 +0,0 @@
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;
}
}
}

21
SPECS/nispor.spec
View File

@ -1,12 +1,11 @@
Name: nispor
Version: 1.1.1
Release: 2%{?dist}
Version: 1.2.3
Release: 1%{?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
@ -165,8 +164,20 @@ 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
* Thu Jan 13 2022 - 1.2.3-1
- Update to 1.2.3. RHBZ#1996619
* Fri Jan 07 2022 Gris Ge <fge@redhat.com> - 1.2.2-2
- Fix bridge vlan filtering on i40e. RHBZ#2026621
* Tue Nov 30 2021 Gris Ge <fge@redhat.com> - 1.2.2-1
- Upgrade to 1.2.2. RHBZ#1996619
* Thu Nov 25 2021 Gris Ge <fge@redhat.com> - 1.2.1-1
- Upgrade to 1.2.1. RHBZ#1996619
* Wed Nov 24 2021 Gris Ge <fge@redhat.com> - 1.2.0-1
- Upgrade to 1.2.0. RHBZ#1996619
* Sat Jun 19 2021 Gris Ge <fge@redhat.com> - 1.1.1-1
- Upgrade to 1.1.1. RHBZ#1942459