commit open-lldp for openSUSE:Factory

2 Mar 2017

Hello community,

here is the log from the commit of package open-lldp for openSUSE:Factory checked in at 2017-03-01 23:39:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/open-lldp (Old)
 and      /work/SRC/openSUSE:Factory/.open-lldp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "open-lldp"

Wed Mar  1 23:39:53 2017 rev:8 rq:460918 version:1.0.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/open-lldp/open-lldp.changes	2015-04-12 00:08:35.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.open-lldp.new/open-lldp.changes	2017-03-01 23:39:55.064747537 +0100
@@ -1,0 +2,37 @@
+Tue Feb 28 11:08:53 UTC 2017 - dimstar@opensuse.org
+
+- Don't use full URL as source, as the tarball does not exist at
+  that location.
+
+-------------------------------------------------------------------
+Sat Feb 18 05:34:33 UTC 2017 - kukuk@suse.com
+
+- Remove obsolete insserv calls
+
+-------------------------------------------------------------------
+Mon Aug  3 10:24:33 CEST 2015 - hare@suse.de
+
+- Update to v1.0.1 (FATE#318849)
+  * vpd22 updates
+  * Include vpdtool
+  * Support for OUI infrastructure in vpd22
+  * Support for OUI infrastructure in vpdtool
+  * Support for Cisco-specific OUI extensions in vpd22
+  * Add vpdtool manpage
+  * Add open-lldp-1.0.1.tar.gz
+  * Remove open-lldp-0.9.46.tar.gz
+  * Patches merged with upstream
+  * Remove 0001-lldpad-print-verbose-error-messages.patch
+  * Remove 0002-Move-to-libnl3.patch
+- Update to latest git version
+  * Automake fixes
+  * Fix DCBX event generation from lldpad
+  * Make TTL TLV configurable
+  * Update open-lldp-git-update.patch.bz2
+- Correctly process return value in get_perm_hwaddr (bsc#929171)
+  * Add 0001-l2_linux_packet-correctly-process-return-value-of-ge.patch
+- lldpad: Only set Tx adminStatus if interface is not managed
+  (bsc#929171)
+  * Add 0002-lldpad-Only-set-Tx-adminStatus-if-interface-is-not-m.patch
+
+-------------------------------------------------------------------

Old:
----
  0001-lldpad-print-verbose-error-messages.patch
  0002-Move-to-libnl3.patch
  open-lldp-0.9.46.tar.gz

New:
----
  0001-l2_linux_packet-correctly-process-return-value-of-ge.patch
  0002-lldpad-Only-set-Tx-adminStatus-if-interface-is-not-m.patch
  open-lldp-1.0.1.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ open-lldp.spec ++++++
--- /var/tmp/diff_new_pack.xn2TDU/_old	2017-03-01 23:39:55.676661242 +0100
+++ /var/tmp/diff_new_pack.xn2TDU/_new	2017-03-01 23:39:55.680660678 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package open-lldp
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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 @@
 Summary:        Link Layer Discovery Protocol (LLDP) Agent
 License:        GPL-2.0
 Group:          System/Daemons
-Version:        0.9.46
+Version:        1.0.1
 Release:        0
 BuildRequires:  bison
 BuildRequires:  flex
@@ -31,10 +31,11 @@
 BuildRequires:  pkgconfig
 BuildRequires:  readline-devel
 Url:            http://open-lldp.org/
-Source:         http://ftp-osl.osuosl.org/pub/%{name}/%{name}-%{version}.tar.gz
+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-lldpad-print-verbose-error-messages.patch
-Patch2:         0002-Move-to-libnl3.patch
+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}
@@ -95,7 +96,7 @@
 ln -s service %{buildroot}%{_sbindir}/rclldpad
 
 %post
-%{fillup_and_insserv -n -i lldpad}
+%{fillup_only -n -i lldpad}
 %service_add_post lldpad.service
 
 %pre
@@ -105,7 +106,6 @@
 %service_del_preun lldpad.service
 
 %postun
-%{insserv_cleanup lldpad}
 %service_del_postun lldpad.service
 
 %post -n %libname -p /sbin/ldconfig
@@ -118,6 +118,7 @@
 %dir /var/lib/lldpad
 %{_unitdir}/*
 %{_sbindir}/*
+%{_mandir}/man3/*
 %{_mandir}/man8/*
 %config /etc/bash_completion.d/*
 

++++++ 0001-l2_linux_packet-correctly-process-return-value-of-ge.patch ++++++
...
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 ++++++
...
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

++++++ open-lldp-0.9.46.tar.gz -> open-lldp-1.0.1.tar.gz ++++++
++++ 45046 lines of diff (skipped)

++++++ open-lldp-git-update.patch.bz2 ++++++
++++ 50634 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/open-lldp/open-lldp-git-update.patch.bz2
++++ and /work/SRC/openSUSE:Factory/.open-lldp.new/open-lldp-git-update.patch.bz2

    

root＠hilbertn.suse.de

tags

participants (1)