Accepting request 673290 from network:fcoe

- 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/request/show/673290
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/open-lldp?expand=0&rev=10

0001-l2_linux_packet-correctly-process-return-value-of-ge.patch

@@ -1,35 +0,0 @@
-From 795b363c15d145e8cad21e8ba11d817efc329bf7 Mon Sep 17 00:00:00 2001
-From: Johannes Thumshirn <jthumshirn@suse.de>
-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 <jthumshirn@suse.de>
----
- 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
-

0002-lldpad-Only-set-Tx-adminStatus-if-interface-is-not-m.patch

@@ -1,54 +0,0 @@
-From 9b4bcd1631cdd8dd4fd9421c3a2fd662fb9f3478 Mon Sep 17 00:00:00 2001
-From: Johannes Thumshirn <jthumshirn@suse.de>
-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 <jthumshirn@suse.de>
----
- 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
-

_service

@@ -0,0 +1,16 @@
+<services>
+  <service name="tar_scm" mode="disabled">
+    <param name="scm">git</param>
+    <param name="url">https://github.com/openSUSE/lldpad.git</param>
+    <param name="subdir"></param>
+    <param name="filename">open-lldp</param>
+    <param name="version">v1.0.1</param>
+    <param name="versionformat">v1.0.1+@TAG_OFFSET@.%h</param>
+    <param name="match-tag">v1.[0-9].[0-9]</param>
+    <param name="changesgenerate">enable</param>
+  </service>
+  <service name="recompress" mode="disabled">
+    <param name="file">*open-lldp*.tar</param>
+    <param name="compression">xz</param>
+  </service>
+</services>

_servicedata

@@ -0,0 +1,4 @@
+<servicedata>
+<service name="tar_scm">
+                <param name="url">https://github.com/openSUSE/lldpad.git</param>
+              <param name="changesrevision">cb81e9541b51b3f104106979e7727c72d090fd8d</param></service></servicedata>

open-lldp-1.0.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a630fcd806750a37d63518b269abd1ff749fd573ed00b878222a426a3aa6131a
-size 400712

open-lldp-gcc5.patch

@@ -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 

open-lldp-git-update.patch.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:05fee39fe4edd1901dafee09cdef599080ee6213a161a0be58f72505d725a8ac
-size 37737

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

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
 

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:         %{name}-v%{version}.tar.xz
-#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
 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
+%setup -n %{name}-v%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 autoreconf -vi