Accepting request 686420 from network:fcoe

OBS-URL: https://build.opensuse.org/request/show/686420
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/open-lldp?expand=0&rev=11
This commit is contained in:
Dominique Leuenberger 2019-03-24 13:56:30 +00:00 committed by Git OBS Bridge
commit b5fd23d5a4
3 changed files with 41 additions and 4 deletions

23
gcc9-fix-werror.patch Normal file
View File

@ -0,0 +1,23 @@
From cf1da68e3103022f93680208de24304726276936 Mon Sep 17 00:00:00 2001
From: marxin <mliska@suse.cz>
Date: Thu, 7 Mar 2019 10:33:29 +0100
Subject: [PATCH] Fix #23 by off by one strncpy value.
---
lldp_dcbx_nl.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lldp_dcbx_nl.c b/lldp_dcbx_nl.c
index 7a2dad2..357da9c 100644
--- a/lldp_dcbx_nl.c
+++ b/lldp_dcbx_nl.c
@@ -561,7 +561,8 @@ int get_dcb_numtcs(const char *ifname, u8 *pgtcs, u8 *pfctcs)
seq = nlh->nlmsg_seq;
- strncpy(name, ifname, sizeof(name));
+ strncpy(name, ifname, sizeof(name) - 1);
+ name[sizeof(name) - 1] = '\0';
add_rta(nlh, DCB_ATTR_IFNAME, (void *)name, strlen(name) + 1);
rta_parent = add_rta(nlh, DCB_ATTR_NUMTCS, NULL, 0);

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Mar 19 09:43:38 UTC 2019 - Martin Liška <mliska@suse.cz>
- Add gcc9-fix-werror.patch in order to fix bsc#1128299.
- Adjust project URL as we're using the Intel's fork.
-------------------------------------------------------------------
Mon Jan 14 15:50:43 CET 2019 - kukuk@suse.de
- Use %license instead of %doc [bsc#1082318]
-------------------------------------------------------------------
Thu Jan 10 16:32:32 CET 2019 - hare@suse.de

View File

@ -12,14 +12,14 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define libname liblldp_clif1
Name: open-lldp
Summary: Link Layer Discovery Protocol (LLDP) Agent
License: GPL-2.0
License: GPL-2.0-only
Group: System/Daemons
Version: 1.0.1+56.cb81e95
Release: 0
@ -30,8 +30,9 @@ BuildRequires: libnl3-devel
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: readline-devel
Url: http://open-lldp.org/
Url: https://github.com/intel/openlldp
Source: %{name}-v%{version}.tar.xz
Patch0: gcc9-fix-werror.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: dcbd = %{version}
Obsoletes: dcbd < %{version}
@ -69,6 +70,7 @@ with Data Center Bridging (DCB) for Intel(R) Network Connections
%prep
%setup -n %{name}-v%{version}
%patch0 -p1
%build
autoreconf -vi
@ -105,7 +107,8 @@ ln -s service %{buildroot}%{_sbindir}/rclldpad
%files
%defattr(-,root,root,-)
%doc COPYING README ChangeLog
%license COPYING
%doc README ChangeLog
%dir /var/lib/lldpad
%{_unitdir}/*
%{_sbindir}/*