Accepting request 881365 from home:lee_duncan:branches:network:fcoe
- Update to version 1.0.34 (fixing bsc#1182804), which replaces the source tarball, and removes these two patches, which are fixed upstream: * Handle-NIC-names-longer-than-7-characters.patch * fcoe-utils-fix-arm.patch OBS-URL: https://build.opensuse.org/request/show/881365 OBS-URL: https://build.opensuse.org/package/show/network:fcoe/fcoe-utils?expand=0&rev=48
This commit is contained in:
Lee Duncan
committed by
Git OBS Bridge
Git OBS Bridge
parent
c811757451
commit
75792026aa
@@ -1,36 +0,0 @@
|
||||
From e2392944cc779b2305bdbb7e6b9d9bb57d5398ee Mon Sep 17 00:00:00 2001
|
||||
From: Lee Duncan <lduncan@suse.com>
|
||||
Date: Tue, 9 Jun 2020 11:22:50 -0700
|
||||
Subject: [PATCH] Handle NIC names longer than 7 characters.
|
||||
|
||||
The output of "fcoeadm -s" assumed a short NIC name,
|
||||
so handle up to 15 characters, the current standard.
|
||||
---
|
||||
fcoeadm_display.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/fcoeadm_display.c b/fcoeadm_display.c
|
||||
index f7e6c43806ad..7d29422e91fa 100644
|
||||
--- a/fcoeadm_display.c
|
||||
+++ b/fcoeadm_display.c
|
||||
@@ -455,7 +455,7 @@ static void scan_device_map(char *rport, enum disp_style style)
|
||||
static void show_port_stats_header(const char *ifname, int interval)
|
||||
{
|
||||
printf("\n");
|
||||
- printf("%-7s interval: %-2d Err Inv "
|
||||
+ printf("%-15s interval: %-2d Err Inv "
|
||||
"IvTx Link Cntl Input Input Output Output\n",
|
||||
ifname, interval);
|
||||
printf("Seconds TxFrames TxBytes RxFrames RxBytes "
|
||||
@@ -893,7 +893,7 @@ static void
|
||||
print_interface_fcoe_lesb_stats_header(const char *ifname, int interval)
|
||||
{
|
||||
printf("\n");
|
||||
- printf("%-7s interval: %-2d\n", ifname, interval);
|
||||
+ printf("%-15s interval: %-2d\n", ifname, interval);
|
||||
printf("LinkFail VLinkFail MissFKA SymbErr ErrBlkCnt FCSErrCnt\n");
|
||||
printf("-------- --------- ------- ------- --------- ---------\n");
|
||||
}
|
||||
--
|
||||
2.26.2
|
||||
|
||||
4
_service
4
_service
@@ -3,8 +3,8 @@
|
||||
<param name="url">https://github.com/openSUSE/fcoe-utils.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="filename">fcoe-utils</param>
|
||||
<param name="versionformat">1.0.33</param>
|
||||
<param name="revision">v1.0.33</param>
|
||||
<param name="versionformat">1.0.34</param>
|
||||
<param name="revision">v1.0.34</param>
|
||||
<param name="exclude">.git</param>
|
||||
</service>
|
||||
<service name="recompress" mode="disabled">
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:55fcb7ba7d6605b7db9347ca72dc721e87b615064f83f694bd677d56675b331a
|
||||
size 121980
|
||||
BIN
fcoe-utils-1.0.34.tar.xz
(Stored with Git LFS)
Normal file
BIN
fcoe-utils-1.0.34.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
@@ -1,11 +0,0 @@
|
||||
--- fcoe-utils-1.0.33.orig/fcnsq.c 2020-08-20 09:43:36.227637286 +0000
|
||||
+++ fcoe-utils-1.0.33/fcnsq.c 2020-08-20 09:43:50.307246472 +0000
|
||||
@@ -381,7 +381,7 @@ int main(int argc, char *argv[])
|
||||
u64 wwnn = 0;
|
||||
int rc = 0;
|
||||
enum commands cmd = 0;
|
||||
- char c;
|
||||
+ signed char c;
|
||||
uintmax_t wwnn_tmp = 0;
|
||||
|
||||
while(1) {
|
||||
@@ -1,3 +1,39 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 25 17:09:14 UTC 2021 - Lee Duncan <lduncan@suse.com>
|
||||
|
||||
- Update to version 1.0.34 (fixing bsc#1182804), which replaces the
|
||||
source tarball, and removes these two patches, which are fixed
|
||||
upstream:
|
||||
* Handle-NIC-names-longer-than-7-characters.patch
|
||||
* fcoe-utils-fix-arm.patch
|
||||
|
||||
Change summary:
|
||||
Chris Leech (6):
|
||||
21 string-op truncation, format truncation, and format overflow errors
|
||||
use of uninitialized values detected during LTO
|
||||
Revert "Make gcc compiler happy about ifname string truncation."
|
||||
fix VLAN device name overflow check
|
||||
fix regressions caused by safe_makepath change in libopenfcoe.c
|
||||
minor fcoeadm output issues
|
||||
|
||||
Guillaume Gardet (1):
|
||||
char can be unsigned on arm, so set signed explicitly as the check expects it can be negative
|
||||
|
||||
Lee Duncan (6):
|
||||
Handle NIC names longer than 7 characters.
|
||||
Change debug->log message if daemon running
|
||||
Remove references to open-fcoe.org
|
||||
Fix two gcc-11 compiler warnings.
|
||||
Remove comment that doesn't match code.
|
||||
Preparing for version v1.0.34
|
||||
|
||||
Lily Nie (1):
|
||||
fix one bug introduced by commit b06c3df
|
||||
|
||||
Nitin U. Yewale (1):
|
||||
Exit fcoemon command if fcoemon daemon is already running.
|
||||
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 20 09:49:22 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package fcoe-utils
|
||||
#
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -31,15 +31,12 @@ Requires: iproute
|
||||
Requires: open-lldp
|
||||
Requires: pkgconfig(systemd)
|
||||
%systemd_ordering
|
||||
Version: 1.0.33
|
||||
Version: 1.0.34
|
||||
Release: 0
|
||||
Summary: FCoE userspace management tools
|
||||
License: GPL-2.0-only
|
||||
Group: System/Daemons
|
||||
Source: %{name}-%{version}.tar.xz
|
||||
Patch1: Handle-NIC-names-longer-than-7-characters.patch
|
||||
# PATCH-FIX-UPSTREAM - https://github.com/openSUSE/fcoe-utils/pull/14
|
||||
Patch2: fcoe-utils-fix-arm.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%{?systemd_requires}
|
||||
|
||||
@@ -50,8 +47,6 @@ connections.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
autoreconf -vi
|
||||
|
||||
Reference in New Issue
Block a user