From 0b531d2d72536b532645b7dcbea832b0dca634069e88dabb68bba5fa20d17594 Mon Sep 17 00:00:00 2001 From: Hannes Reinecke Date: Mon, 11 Feb 2019 11:09:01 +0000 Subject: [PATCH] - Update to git commit cb81e9541b5 (FATE#326034,bug#1104011) * 8021qaz: Remove unused variable * 8021qaz: Honor willing value from config file * lldpad: Support DSCP selectors in APP TLV's * Fix application tlv display * basman_clif: print the OID properly * ecp22: deinit l2_packet_data before freeing ecp22 * DCB set state operation return value check * memleak on received TLVs from modules * Use interface index instead of name in libconfig * Fix 'is_valid_mac' to include mcast mac address * lldpad: Fix segfault in lldptool * Fixup disabling PG + open-lldp-v1.0.1+56.cb81e95.tar.xz - Remove superseded files - open-lldp-1.0.1.tar.gz - open-lldp-git-update.patch.bz2 - open-lldp-gcc5.patch - 0001-l2_linux_packet-correctly-process-return-value-of-ge.patch - 0002-lldpad-Only-set-Tx-adminStatus-if-interface-is-not-m.patch OBS-URL: https://build.opensuse.org/package/show/network:fcoe/open-lldp?expand=0&rev=26 --- ...correctly-process-return-value-of-ge.patch | 35 ------------ ...Tx-adminStatus-if-interface-is-not-m.patch | 54 ------------------- _service | 16 ++++++ _servicedata | 4 ++ open-lldp-1.0.1.tar.gz | 3 -- open-lldp-gcc5.patch | 11 ---- open-lldp-git-update.patch.bz2 | 3 -- open-lldp-v1.0.1+56.cb81e95.tar.xz | 3 ++ open-lldp.changes | 24 +++++++++ open-lldp.spec | 17 ++---- 10 files changed, 51 insertions(+), 119 deletions(-) delete mode 100644 0001-l2_linux_packet-correctly-process-return-value-of-ge.patch delete mode 100644 0002-lldpad-Only-set-Tx-adminStatus-if-interface-is-not-m.patch create mode 100644 _service create mode 100644 _servicedata delete mode 100644 open-lldp-1.0.1.tar.gz delete mode 100644 open-lldp-gcc5.patch delete mode 100644 open-lldp-git-update.patch.bz2 create mode 100644 open-lldp-v1.0.1+56.cb81e95.tar.xz diff --git a/0001-l2_linux_packet-correctly-process-return-value-of-ge.patch b/0001-l2_linux_packet-correctly-process-return-value-of-ge.patch deleted file mode 100644 index dc86684..0000000 --- a/0001-l2_linux_packet-correctly-process-return-value-of-ge.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 795b363c15d145e8cad21e8ba11d817efc329bf7 Mon Sep 17 00:00:00 2001 -From: Johannes Thumshirn -Date: Tue, 19 May 2015 15:34:46 +0200 -Subject: l2_linux_packet: correctly process return value of get_perm_hwaddr - -On success get_perm_hwaddr() returns the number of bytes read from the -netlink socket. - -However, l2_packet_init() only checks for 0 as a successful return value. - -Adopt get_perm_hwaddr() to return 0 on success. - -Reference: bsc#929171 - -Signed-off-by: Johannes Thumshirn ---- - lldp_rtnl.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/lldp_rtnl.c b/lldp_rtnl.c -index 33b4d19..8d4f0cc 100644 ---- a/lldp_rtnl.c -+++ b/lldp_rtnl.c -@@ -322,6 +322,8 @@ int get_perm_hwaddr(const char *ifname, u8 *buf_perm, u8 *buf_san) - - memcpy(buf_perm, RTA_DATA(rta), ETH_ALEN); - memcpy(buf_san, RTA_DATA(rta) + ETH_ALEN, ETH_ALEN); -+ -+ rc = 0; - out: - close(s); - out_nosock: --- -1.8.4.5 - diff --git a/0002-lldpad-Only-set-Tx-adminStatus-if-interface-is-not-m.patch b/0002-lldpad-Only-set-Tx-adminStatus-if-interface-is-not-m.patch deleted file mode 100644 index e0e5448..0000000 --- a/0002-lldpad-Only-set-Tx-adminStatus-if-interface-is-not-m.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 9b4bcd1631cdd8dd4fd9421c3a2fd662fb9f3478 Mon Sep 17 00:00:00 2001 -From: Johannes Thumshirn -Date: Wed, 20 May 2015 15:16:36 +0200 -Subject: lldpad: Only set Tx adminStatus if interface is not managed - -Only set the adminStatus of an interface to Tx if its DCB status -is not managed by the LLDD itself. - -Reference: bsc#929171 - -Signed-off-by: Johannes Thumshirn ---- - lldp_8021qaz.c | 4 ++++ - lldp_dcbx.c | 2 +- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/lldp_8021qaz.c b/lldp_8021qaz.c -index 094676d..a26422e 100644 ---- a/lldp_8021qaz.c -+++ b/lldp_8021qaz.c -@@ -1973,13 +1973,17 @@ int ieee8021qaz_rchange(struct port *port, struct lldp_agent *agent, - * if current configuration is RXOnly and - * not persistant (i.e. default) - */ -+ __u8 dcbx = 0; - int adminstatus; -+ -+ (void) get_dcbx_hw(qaz_tlvs->ifname, &dcbx); - if (qaz_tlvs->ieee8021qazdu && - get_config_setting(qaz_tlvs->ifname, - agent->type, - ARG_ADMINSTATUS, - &adminstatus, - CONFIG_TYPE_INT) && -+ !(dcbx & DCB_CAP_DCBX_LLD_MANAGED) && - get_lldp_agent_admin(qaz_tlvs->ifname, - agent->type) == - enabledRxOnly) { -diff --git a/lldp_dcbx.c b/lldp_dcbx.c -index 9999e33..026ed83 100644 ---- a/lldp_dcbx.c -+++ b/lldp_dcbx.c -@@ -354,7 +354,7 @@ struct packed_tlv* dcbx_gettlv(struct port *port, struct lldp_agent *agent) - if (agent->type != NEAREST_BRIDGE) - return NULL; - -- if (!check_port_dcb_mode(port->ifname)) -+ if (!check_port_dcb_mode(port->ifname)) - return NULL; - - tlvs = dcbx_data(port->ifname); --- -1.8.4.5 - diff --git a/_service b/_service new file mode 100644 index 0000000..340929c --- /dev/null +++ b/_service @@ -0,0 +1,16 @@ + + + git + https://github.com/openSUSE/lldpad.git + + open-lldp + v1.0.1 + v1.0.1+@TAG_OFFSET@.%h + v1.[0-9].[0-9] + enable + + + *open-lldp*.tar + xz + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..f4d5d5c --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://github.com/openSUSE/lldpad.git + cb81e9541b51b3f104106979e7727c72d090fd8d \ No newline at end of file diff --git a/open-lldp-1.0.1.tar.gz b/open-lldp-1.0.1.tar.gz deleted file mode 100644 index 2801dc2..0000000 --- a/open-lldp-1.0.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a630fcd806750a37d63518b269abd1ff749fd573ed00b878222a426a3aa6131a -size 400712 diff --git a/open-lldp-gcc5.patch b/open-lldp-gcc5.patch deleted file mode 100644 index 85ba7e8..0000000 --- a/open-lldp-gcc5.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- open-lldp-0.9.46.orig/Makefile.am -+++ open-lldp-0.9.46/Makefile.am -@@ -16,7 +16,7 @@ ACLOCAL_AMFLAGS = -I m4 - parse_cli.o: CFLAGS+=-U_FORTIFY_SOURCE -Wno-error - - ## system requires a shared libconfig --AM_CFLAGS = -Wall -Werror -Wextra -Wformat=2 $(LIBCONFIG_CFLAGS) $(LIBNL_CFLAGS) -+AM_CFLAGS = -Wall -fgnu89-inline -Wextra -Wformat=2 $(LIBCONFIG_CFLAGS) $(LIBNL_CFLAGS) - AM_LDFLAGS = $(LIBCONFIG_LIBS) $(LIBNL_LIBS) - - ## header files to be installed, for programs using the client interface to lldpad diff --git a/open-lldp-git-update.patch.bz2 b/open-lldp-git-update.patch.bz2 deleted file mode 100644 index 3ab6b29..0000000 --- a/open-lldp-git-update.patch.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:05fee39fe4edd1901dafee09cdef599080ee6213a161a0be58f72505d725a8ac -size 37737 diff --git a/open-lldp-v1.0.1+56.cb81e95.tar.xz b/open-lldp-v1.0.1+56.cb81e95.tar.xz new file mode 100644 index 0000000..f7b1f8e --- /dev/null +++ b/open-lldp-v1.0.1+56.cb81e95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3fb37c852a6618683e6dc2eddcabb842a445a41fdd1c08ebe9df1cb6751ed5a +size 310384 diff --git a/open-lldp.changes b/open-lldp.changes index 97c90df..541fa98 100644 --- a/open-lldp.changes +++ b/open-lldp.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Thu Jan 10 16:32:32 CET 2019 - hare@suse.de + +- Update to git commit cb81e9541b5 (FATE#326034,bug#1104011) + * 8021qaz: Remove unused variable + * 8021qaz: Honor willing value from config file + * lldpad: Support DSCP selectors in APP TLV's + * Fix application tlv display + * basman_clif: print the OID properly + * ecp22: deinit l2_packet_data before freeing ecp22 + * DCB set state operation return value check + * memleak on received TLVs from modules + * Use interface index instead of name in libconfig + * Fix 'is_valid_mac' to include mcast mac address + * lldpad: Fix segfault in lldptool + * Fixup disabling PG + + open-lldp-v1.0.1+56.cb81e95.tar.xz +- Remove superseded files + - open-lldp-1.0.1.tar.gz + - open-lldp-git-update.patch.bz2 + - open-lldp-gcc5.patch + - 0001-l2_linux_packet-correctly-process-return-value-of-ge.patch + - 0002-lldpad-Only-set-Tx-adminStatus-if-interface-is-not-m.patch + ------------------------------------------------------------------- Mon Dec 11 13:31:53 UTC 2017 - dimstar@opensuse.org diff --git a/open-lldp.spec b/open-lldp.spec index 350c0ae..7ffb65c 100644 --- a/open-lldp.spec +++ b/open-lldp.spec @@ -1,7 +1,7 @@ # # spec file for package open-lldp # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ Name: open-lldp Summary: Link Layer Discovery Protocol (LLDP) Agent License: GPL-2.0 Group: System/Daemons -Version: 1.0.1 +Version: 1.0.1+56.cb81e95 Release: 0 BuildRequires: bison BuildRequires: flex @@ -31,12 +31,7 @@ BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: readline-devel Url: http://open-lldp.org/ -Source: %{name}-%{version}.tar.gz -#Source: http://ftp-osl.osuosl.org/pub/%{name}/%{name}-%{version}.tar.gz -Patch0: %{name}-git-update.patch.bz2 -Patch1: 0001-l2_linux_packet-correctly-process-return-value-of-ge.patch -Patch2: 0002-lldpad-Only-set-Tx-adminStatus-if-interface-is-not-m.patch -Patch3: open-lldp-gcc5.patch +Source: %{name}-v%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: dcbd = %{version} Obsoletes: dcbd < %{version} @@ -73,11 +68,7 @@ with Data Center Bridging (DCB) for Intel(R) Network Connections 'lldpad' plus the configuration tools 'dcbtool' and 'lldptool'. %prep -%setup -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%setup -n %{name}-v%{version} %build autoreconf -vi