Commit a8311e1c authored by Adam Wujek's avatar Adam Wujek

Merge wr-switch-sw-v6.0.1

Signed-off-by: 's avatarAdam Wujek <dev_public@wujek.eu>
parents 00cc01b1 a5f22860
Pipeline #1889 failed with stage
in 0 seconds
stages:
- wrs_sw_compile
job_wrs_compile:
stage: wrs_sw_compile
script:
- cd ..
- echo "Using `grep -c ^processor /proc/cpuinfo` parallel jobs"
- MAKEFLAGS="-j `grep -c ^processor /proc/cpuinfo`" wr-switch-sw/build/wrs_build-all > ${CI_PROJECT_DIR}/log_${CI_JOB_ID}.txt
- cp *.tar ${CI_PROJECT_DIR}
artifacts:
name: "wrs_sw_ci_${CI_JOB_ID}"
paths:
- log_${CI_JOB_ID}.txt
- ./*.tar
tags:
- wrs_sw
......@@ -616,7 +616,7 @@ config PTP_OPT_DOMAIN_NUMBER
other as defined by the PTP protocol. A domain defines the scope of
PTP message communication, state, operations, data sets, and
timescale. PTP devices may participate in multiple domains.
For more details please refer to the IEEE 1588-2008 standard.
For more details please refer to the IEEE 1588-2019 standard.
config PTP_OPT_PRIORITY1
int "priority1"
......@@ -625,7 +625,7 @@ config PTP_OPT_PRIORITY1
help
A user configurable designation that a clock belongs to an ordered
set of PTP devices from which a PTP Master is selected.
For more details please refer to the IEEE 1588-2008 standard
For more details please refer to the IEEE 1588-2019 standard
config PTP_OPT_PRIORITY2
int "priority2"
......@@ -634,7 +634,7 @@ config PTP_OPT_PRIORITY2
help
A user configurable designation that provides finer grained ordering
among otherwise equivalent PTP devices.
For more details please refer to the IEEE 1588-2008 standard
For more details please refer to the IEEE 1588-2019 standard
config PTP_OPT_CLOCK_CLASS
int "clock-class"
......@@ -652,7 +652,7 @@ config PTP_OPT_CLOCK_CLASS
An attribute defining the TAI traceability, synchronization state and
expected performance of the time or frequency distributed by a
Boundary Clock or Ordinary Clock.
For more details please refer to the IEEE 1588-2008 standard.
For more details please refer to the IEEE 1588-2019 standard.
config PTP_OPT_OVERWRITE_ATTRIBUTES
boolean "Overwrite default PTP device attributes"
......@@ -673,7 +673,7 @@ config PTP_OPT_CLOCK_ACCURACY
help
An attribute defining the accuracy of the Local Clock (e.g. local
oscillator) of a Boundary Clock or Ordinary Clock.
For more details please refer to the IEEE 1588-2008 standard.
For more details please refer to the IEEE 1588-2019 standard.
config PTP_OPT_CLOCK_ALLAN_VARIANCE
int "clock-allan-variance/offsetScaledLogVariance"
......@@ -684,7 +684,7 @@ config PTP_OPT_CLOCK_ALLAN_VARIANCE
help
An attribute defining the stability of the Local Clock of a
Boundary Clock or Ordinary Clock.
For more details please refer to the IEEE 1588-2008 standard.
For more details please refer to the IEEE 1588-2019 standard.
config PTP_OPT_TIME_SOURCE
int "time-source"
......@@ -1124,6 +1124,62 @@ config LLDPD_MINIMUM_FRAME_SIZE
which require low latency.
endmenu
menu "Radius-vlan options"
config RVLAN_ENABLE
bool "Run the 'radius-vlan' authorization daemon"
help
If the program runs, it implements a subset of 802.1X
config RVLAN_PMASK
string "A port mask, as hex number, to be monitored by radiusvlan"
depends on RVLAN_ENABLE
default "ffffffff"
help
The string must be a number, with or without leading 0x.
Port "wri1" is selected by bit 0 and so on until bit 17.
The mask is used to disable monitoring on some ports.
All ports not configured as 'access' are never monitored,
irrespective of this mask.
config RVLAN_AUTH_VLAN
int "Default vlan to be used for ports during radius authorization"
depends on RVLAN_ENABLE
range 1 4094
default 4094
config RVLAN_NOAUTH_VLAN
int "Vlan to be used for ports whose authorization is denied"
depends on RVLAN_ENABLE
range 1 4094
default 4094
config RVLAN_OBEY_DOTCONFIG
bool "When auth is ok, ignore radius' vlan and obey dot-cofig instead"
depends on RVLAN_ENABLE
default N
help
In some installations the radius server os only used to allow/deny
a port to be configured in the WR network. When this happens,
the vlan number it returns must be ignored, and we obey what
is configured in dot-config instead (e.g. CONFIG_VLANS_PORT03_VID)
config RVLAN_RADIUS_SERVERS
string "IP Address(es) of the radius server(s)"
depends on RVLAN_ENABLE
default "192.168.16.181,192.168.16.182"
help
This is an IPV4 address or a list of them.
e.g. "192.168.16.181,192.168.16.182"
config RVLAN_RADIUS_SECRET
string "The shared secret to encrypt radius queries"
depends on RVLAN_ENABLE
default "our-secret"
help
The secret string used by radclient as called by radiusvlan
endmenu
config HTTPD_DISABLE
bool "Disable web interface"
default n
......@@ -1239,5 +1295,3 @@ config RTU_HP_MASK_VAL
endmenu
source Kconfig_vlans.in
......@@ -6,7 +6,7 @@ config PTP_OPT_EXT_PORT_CONFIG_ENABLED
help
This option is used by the high accuracy profile to force the port state.
When set, BMCA is disabled.
For more details please refer to the IEEE 1588-20019 (clause 17.6.2)
For more details please refer to the IEEE 1588-2019 (clause 17.6.2)
config PTP_SLAVE_ONLY
depends on PTP_OPT_EXT_PORT_CONFIG_ENABLED="n"
......@@ -15,7 +15,7 @@ config PTP_SLAVE_ONLY
help
A slaveOnly Ordinary Clock utilizes the slaveOnly state machine
which does not enable transition to MASTER state.
For more details please refer to the IEEE 1588-20019 (clause 9.2.2.1)
For more details please refer to the IEEE 1588-2019 (clause 9.2.2.1)
menu "PORT 1"
......
This diff is collapsed.
......@@ -1707,6 +1707,7 @@ BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS=y
#
# BR2_PACKAGE_FLICKCURL is not set
# BR2_PACKAGE_FREERADIUS_CLIENT is not set
BR2_PACKAGE_FREERADIUS_UTILS=y
# BR2_PACKAGE_GEOIP is not set
# BR2_PACKAGE_GLIB_NETWORKING is not set
# BR2_PACKAGE_GSSDP is not set
......@@ -2227,7 +2228,7 @@ BR2_PACKAGE_NETSNMP=y
BR2_PACKAGE_NETSNMP_SERVER=y
BR2_PACKAGE_NETSNMP_CLIENTS=y
# BR2_PACKAGE_NETSNMP_ENABLE_MIBS is not set
BR2_PACKAGE_NETSNMP_WITH_MIB_MODULES="host ucd-snmp/dlmod if-mib/ifXTable agentx"
BR2_PACKAGE_NETSNMP_WITH_MIB_MODULES="host ucd-snmp/dlmod if-mib/ifXTable agentx ip-mib"
BR2_PACKAGE_NETSNMP_WITHOUT_MIB_MODULES="disman/event disman/schedule utilities"
# BR2_PACKAGE_NETSNMP_ENABLE_DEBUGGING is not set
# BR2_PACKAGE_NETSTAT_NAT is not set
......
This diff is collapsed.
......@@ -170,7 +170,7 @@ Additionally, the @t{wrs-firmware.tar} containing corrupted file is renamed to
the next successful update.
When checksums in the @t{wrs-firmware.tar} are not available
(for example during downgrading to version pre-@value{release_version}) appropriate warning
(for example during downgrading to version pre-v5.0) appropriate warning
message is printed to the console.
If this method of upgrading firmware works for you, you can ignore the rest of
......@@ -315,6 +315,8 @@ the behavior of the WR Switch. Here are highlights:
frame, translates into additional 0.8us latency introduced by protocol
frames.}.} If you
do not use LLDP and latency is of concern, you should disable LLDP option.
Alternatively consider use of the option to limit LLDP frame size to about
60-70 bytes.
@item @b{Disable web interface} - web interface is now disabled by default
and considered deprecated (no effort was put in making sure it works
properly). @b{Users are strongly discouraged from using the web interface}.
......@@ -1526,6 +1528,17 @@ appropriate way, before the respective service is started.
For details please refer to the @ref{VLANs Configuration}
@item CONFIG_VLANS_PORT@i{xx}_LLDP_TX_VID
@itemx CONFIG_VLANS_PORT@i{xx}_LLDP_TX_PRIO
Notify lldpd which VLAN shall it use for sending LLDP frames.
Incoming LLDP frames are accepted on all VLANs.
This parameter is available for @t{MODE_TRUNK}, @t{MODE_DISABLED} and
@t{MODE_UNQUALIFIED} modes.
The range of a valid VID is from 0 to 4094.
@t{VLANS_PORTxx_LLDP_TX_PRIO} defines the priority to be inserted into
a VLAN tag of LLDP frames sent by lldpd.
@item CONFIG_VLANS_RAW_PORT_CONFIG
Expert mode. Allow to control all VLAN parameters (CONFIG_VLANS_PORT@i{xx}_PTP_VID,
......
......@@ -772,6 +772,7 @@ list of faults leading to a data error.
\snmpadd{WR-SWITCH-MIB::wrsStartCntLldpd}\\
\snmpadd{WR-SWITCH-MIB::wrsStartCntSPLL}\\
\snmpadd{WR-SWITCH-MIB::wrsStartCntLdap}\\
\snmpadd{WR-SWITCH-MIB::wrsStartCntRvlan}\\
\snmpadd{WR-SWITCH-MIB::wrsBootUserspaceDaemonsMissing}\\
\snmpadd{WR-SWITCH-MIB::wrsBootSuccessful} \\
\snmpadd{WR-SWITCH-MIB::wrsOSStatus}\\
......
This diff is collapsed.
--- ./package/monit/0002-sysdep_LINUX-avoid-GLOB_ONLYDIR-missin-in-libmusl.patch.orig 2017-01-13 10:56:04.777413556 +0100
+++ ./package/monit/0002-sysdep_LINUX-avoid-GLOB_ONLYDIR-missin-in-libmusl.patch 2017-01-13 10:55:21.384411938 +0100
From 4e8487e7fcd521648ee2541cf091364fac4ab5fe Mon Sep 17 00:00:00 2001
From: Alessandro Rubini <rubini@gnudd.com>
Date: Tue, 6 Oct 2020 06:27:45 +0200
Subject: [PATCH 06/22] fix monit for libmusl
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
---
...INUX-avoid-GLOB_ONLYDIR-missin-in-libmusl.patch | 29 ++++++++++++++++++++++
1 file changed, 29 insertions(+)
create mode 100644 package/monit/0002-sysdep_LINUX-avoid-GLOB_ONLYDIR-missin-in-libmusl.patch
diff --git a/package/monit/0002-sysdep_LINUX-avoid-GLOB_ONLYDIR-missin-in-libmusl.patch b/package/monit/0002-sysdep_LINUX-avoid-GLOB_ONLYDIR-missin-in-libmusl.patch
new file mode 100644
index 0000000..442f7eb
--- /dev/null
+++ b/package/monit/0002-sysdep_LINUX-avoid-GLOB_ONLYDIR-missin-in-libmusl.patch
@@ -0,0 +1,29 @@
+From de586dd21587d52001635dd6be7c70b85a24800f Mon Sep 17 00:00:00 2001
+From: Alessandro Rubini <rubini@gnudd.com>
......@@ -30,3 +44,6 @@
+--
+2.1.4
+
--
2.1.4
--- ./package/gdb/7.9.1/0007-move-__SIGRTMIN.patch.orig 2017-01-13 12:28:21.690620042 +0100
+++ ./package/gdb/7.9.1/0007-move-__SIGRTMIN.patch 2017-01-13 12:28:10.544619626 +0100
From 216ff083f3d268847356233804cafc43441fc301 Mon Sep 17 00:00:00 2001
From: Alessandro Rubini <rubini@gnudd.com>
Date: Tue, 6 Oct 2020 06:28:48 +0200
Subject: [PATCH 07/22] fix gdb build with musl
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
---
package/gdb/7.9.1/0007-move-__SIGRTMIN.patch | 58 ++++++++++++++++++++++++++++
1 file changed, 58 insertions(+)
create mode 100644 package/gdb/7.9.1/0007-move-__SIGRTMIN.patch
diff --git a/package/gdb/7.9.1/0007-move-__SIGRTMIN.patch b/package/gdb/7.9.1/0007-move-__SIGRTMIN.patch
new file mode 100644
index 0000000..38ba1f0
--- /dev/null
+++ b/package/gdb/7.9.1/0007-move-__SIGRTMIN.patch
@@ -0,0 +1,58 @@
+From 682b25469e66ea45b214e95962671373983c118f Mon Sep 17 00:00:00 2001
+From: Doug Evans <dje@google.com>
......@@ -59,3 +73,6 @@
+--
+1.9.4
+
--
2.1.4
--- ./package/gdb/7.9.1/0006-musl-Move-W_STOPCODE-to-common-gdb_wait-h.patch.orig 2017-01-16 09:24:23.097874596 +0100
+++ ./package/gdb/7.9.1/0006-musl-Move-W_STOPCODE-to-common-gdb_wait-h.patch 2016-10-18 02:43:07.221913059 +0200
From 2297fe5126561d3966642f5d4ae3015b6420577e Mon Sep 17 00:00:00 2001
From: Alessandro Rubini <rubini@gnudd.com>
Date: Tue, 6 Oct 2020 06:30:58 +0200
Subject: [PATCH 08/22] fix gdb musl more
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
---
...musl-Move-W_STOPCODE-to-common-gdb_wait-h.patch | 63 ++++++++++++++++++++++
1 file changed, 63 insertions(+)
create mode 100644 package/gdb/7.9.1/0006-musl-Move-W_STOPCODE-to-common-gdb_wait-h.patch
diff --git a/package/gdb/7.9.1/0006-musl-Move-W_STOPCODE-to-common-gdb_wait-h.patch b/package/gdb/7.9.1/0006-musl-Move-W_STOPCODE-to-common-gdb_wait-h.patch
new file mode 100644
index 0000000..60c357c
--- /dev/null
+++ b/package/gdb/7.9.1/0006-musl-Move-W_STOPCODE-to-common-gdb_wait-h.patch
@@ -0,0 +1,63 @@
+From 963843d4d07aef6caa296dacf191f8adc9518596 Mon Sep 17 00:00:00 2001
+From: Doug Evans <dje@google.com>
......@@ -64,3 +78,6 @@
+--
+1.9.4
+
--
2.1.4
From f6ac6fde47cedd2b0a92412b39f9b9a014d637a7 Mon Sep 17 00:00:00 2001
From: Adam Wujek <adam.wujek@cern.ch>
Date: Tue, 4 Sep 2018 10:48:30 +0200
Subject: [PATCH] add libkrb5
From 7c6cef81955d9cefe9efb132af5f9d5f0c6ec9c1 Mon Sep 17 00:00:00 2001
From: Alessandro Rubini <rubini@gnudd.com>
Date: Tue, 6 Oct 2020 06:33:39 +0200
Subject: [PATCH 10/22] add libkrb5
Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
---
package/Config.in | 1 +
package/libkrb5/Config.in | 18 ++++++++++++++++
package/libkrb5/libkrb5.hash | 5 +++++
package/libkrb5/libkrb5.mk | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++
package/libkrb5/Config.in | 18 ++++++++++++++
package/libkrb5/libkrb5.hash | 5 ++++
package/libkrb5/libkrb5.mk | 59 ++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 83 insertions(+)
create mode 100644 package/libkrb5/Config.in
create mode 100644 package/libkrb5/libkrb5.hash
......@@ -127,5 +127,5 @@ index 0000000..d9d7160
+
+$(eval $(autotools-package))
--
1.9.1
2.1.4
From 75de386f758249d89c003a6ff0accbfee21c3129 Mon Sep 17 00:00:00 2001
From: Alessandro Rubini <rubini@gnudd.com>
Date: Tue, 6 Oct 2020 06:35:13 +0200
Subject: [PATCH 11/22] port to perl-5.22 and later
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
---
.../0002-port-to-perl-5.22-and-later.patch | 23 ++++++++++++++++++++++
1 file changed, 23 insertions(+)
create mode 100644 package/automake/0002-port-to-perl-5.22-and-later.patch
diff --git a/package/automake/0002-port-to-perl-5.22-and-later.patch b/package/automake/0002-port-to-perl-5.22-and-later.patch
new file mode 100644
index 0000000..a7213d4
index 0000000..14f01b8
--- /dev/null
+++ b/package/automake/0002-port-to-perl-5.22-and-later.patch
@@ -0,0 +1,23 @@
@@ -0,0 +1,23 @@
+Without this change, Perl 5.22 complains "Unescaped left brace in
+regex is deprecated" and this is planned to become a hard error in
+Perl 5.26. See:
......@@ -27,3 +38,6 @@ index 0000000..a7213d4
++ $text =~ s/\$[{]([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
+ return $text;
+ }
--
2.1.4
From c988207d3ffff7521d590cab58a0dc412c4bb5d7 Mon Sep 17 00:00:00 2001
From: Kinga W <dev_public@wujek.eu>
Date: Tue, 7 Jul 2020 00:22:45 +0200
Subject: [PATCH] lldpd: use readline for lldpcli
Signed-off-by: Kinga Wujek <dev_public@wujek.eu>
---
package/lldpd/lldpd.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/lldpd/lldpd.mk b/package/lldpd/lldpd.mk
index 5ee5122..af941cd 100644
--- a/package/lldpd/lldpd.mk
+++ b/package/lldpd/lldpd.mk
@@ -29,7 +29,7 @@ LLDPD_CONF_ENV = ac_cv_prog_cc_c99=-std=gnu99
LLDPD_CONF_ENV += NETSNMP_CONFIG=$(STAGING_DIR)/usr/bin/net-snmp-config
LLDPD_CONF_OPTS = \
- --without-readline \
+ --with-readline \
--without-embedded-libevent \
--with-snmp \
--without-xml \
--
2.7.4
From c9c24e10805d5aaef085940f732f74b214567517 Mon Sep 17 00:00:00 2001
From: Michal Wasiak <michal.wasiak@gmail.com>
Date: Sun, 12 Jul 2020 22:58:42 +0200
Subject: [PATCH 1/3] Uplift lldpd to 1.0.5
Signed-off-by: Michal Wasiak <michal.wasiak@gmail.com>
---
...generation-of-atom-glue-compatible-with-o.patch | 43 ---------------
.../0002-configure-do-not-check-for-libbsd.patch | 61 ----------------------
package/lldpd/lldpd.hash | 7 ++-
package/lldpd/lldpd.mk | 52 +++++++++++-------
4 files changed, 38 insertions(+), 125 deletions(-)
delete mode 100644 package/lldpd/0001-build-make-generation-of-atom-glue-compatible-with-o.patch
delete mode 100644 package/lldpd/0002-configure-do-not-check-for-libbsd.patch
diff --git a/package/lldpd/0001-build-make-generation-of-atom-glue-compatible-with-o.patch b/package/lldpd/0001-build-make-generation-of-atom-glue-compatible-with-o.patch
deleted file mode 100644
index d5675d3..0000000
--- a/package/lldpd/0001-build-make-generation-of-atom-glue-compatible-with-o.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 106aa50d4e5b336f7dd2d5cf4d882e692d205e91 Mon Sep 17 00:00:00 2001
-From: Vincent Bernat <vincent@bernat.im>
-Date: Sat, 18 Jun 2016 22:18:41 +0200
-Subject: [PATCH] build: make generation of atom-glue compatible with older gcc
- versions
-
-With old versions, cpp doesn't accept several files as input. See #186.
-
-Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
----
- src/lib/Makefile.am | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
-index 250e32a..2a5cdb3 100644
---- a/src/lib/Makefile.am
-+++ b/src/lib/Makefile.am
-@@ -20,8 +20,9 @@ nodist_liblldpctl_la_SOURCES = atom-glue.c
- liblldpctl_la_LIBADD = $(top_builddir)/src/libcommon-daemon-lib.la libfixedpoint.la
-
- atom-glue.c: $(ATOM_FILES) Makefile
-- $(AM_V_GEN)($(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ATOM_FILES:%=$(srcdir)/%) | \
-+ $(AM_V_GEN)(for f in $(ATOM_FILES:%=$(srcdir)/%); do \
-+ $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $$f; done | \
- $(SED) -n 's+^void init_atom_builder_\([^(]*\)().*, \([0-9]*\)).*+\2 \1+p' | \
- sort | \
- $(AWK) '{ atoms[$$2] = 1 } \
-@@ -30,8 +31,9 @@ atom-glue.c: $(ATOM_FILES) Makefile
- print " static int init = 0; if (init) return; init++;"; \
- for (atom in atoms) { print " init_atom_builder_"atom"();" } \
- print "}"; }' && \
-+ for f in $(ATOM_FILES:%=$(srcdir)/%); do \
- $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ATOM_FILES:%=$(srcdir)/%) | \
-+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $$f; done | \
- $(SED) -n 's+^void init_atom_map_\([^(]*\)().*, \([0-9]*\)).*+\2 \1+p' | \
- sort -n | \
- $(AWK) '{ atoms[$$2] = 1 } \
---
-2.9.0
-
diff --git a/package/lldpd/0002-configure-do-not-check-for-libbsd.patch b/package/lldpd/0002-configure-do-not-check-for-libbsd.patch
deleted file mode 100644
index 4d63274..0000000
--- a/package/lldpd/0002-configure-do-not-check-for-libbsd.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 0801a066cd4a24a858ddfa7c62c7802e0f5533a8 Mon Sep 17 00:00:00 2001
-From: "Yann E. MORIN" <yann.morin.1998@free.fr>
-Date: Sun, 14 Aug 2016 12:15:17 +0200
-Subject: [PATCH] configure: do not check for libbsd
-
-libbsd causes build issues because its libbsd-overlay.pc file is borked:
-it contains -isystem in CFLAGS, which is not munged by pkgconf, so we
-end up using the headers of the build machine, causing all sorts of
-hard-to-debug trouble at build time.
-
-lldpd uses libbsd-overlay for a few helper functions, but has fallbacks
-in case it is not available. The only feature that is lost when not using
-it is that the neighbour name is no longer displayed in /proc/self/cmdline.
-As the author of lldpd said on IRC: "people should survive! ;-)"
-
-So we just remove the detection of libbsd altogether.
-
-Fixes:
- http://autobuild.buildroot.org/results/6b7/6b70fa379e834ec71cc260ba6af771b531ca3511/
- http://autobuild.buildroot.org/results/769/769074c4bb67336ae6679f2c1cd2a8220d2bec24/
- http://autobuild.buildroot.org/results/c8a/c8a6001f437701ecc75f6c9252935645bda8a8c8/
- [...]
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
----
- configure.ac | 19 -------------------
- 1 file changed, 19 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index dd723b0..45498ce 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -165,25 +165,6 @@ AC_FUNC_MALLOC
- AC_FUNC_REALLOC
- AC_FUNC_FORK
-
--# Some functions can be in libbsd
--PKG_CHECK_MODULES([libbsd], [libbsd-overlay], [
-- _save_CFLAGS="$CFLAGS"
-- _save_LIBS="$LIBS"
-- CFLAGS="$CFLAGS $libbsd_CFLAGS"
-- LIBS="$LIBS $libbsd_LIBS"
-- AC_MSG_CHECKING([if libbsd can be linked correctly])
-- AC_LINK_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],
-- [
-- AC_MSG_RESULT(yes)
-- LLDP_CFLAGS="$LLDP_CFLAGS $libbsd_CFLAGS"
-- LLDP_LDFLAGS="$LLDP_LDFLAGS $libbsd_LIBS"
-- ],[
-- AC_MSG_RESULT(no)
-- CFLAGS="$_save_CFLAGS"
-- LIBS="$_save_LIBS"
-- ])
--], [:])
--
- # setproctitle may have an _init function
- AC_REPLACE_FUNCS([setproctitle])
- AC_CHECK_FUNCS([setproctitle_init])
---
-2.7.4
-
diff --git a/package/lldpd/lldpd.hash b/package/lldpd/lldpd.hash
index fc3d21f..4283b4a 100644
--- a/package/lldpd/lldpd.hash
+++ b/package/lldpd/lldpd.hash
@@ -1,2 +1,5 @@
-# Locally computed
-sha256 eb1f5beff2ff5c13c5e0342b5b9da815ed4a63866262445e1168a79ee65c9079 lldpd-0.9.4.tar.gz
+# Locally computed after checking gpg key
+# https://media.luffy.cx/files/lldpd/lldpd-1.0.5.tar.gz.gpg
+# using key AEF2348766F371C689A7360095A42FE8353525F9
+sha256 2dd3b212f4dbabfcbb2794c0010b245f9f8e74b387984e757be6243a74c6cb99 lldpd-1.0.5.tar.gz
+sha256 0e96a5aea65f16e2239231ce4ab90497f8bc3bb8fe6abe9299aade4726ff7c8d LICENSE
diff --git a/package/lldpd/lldpd.mk b/package/lldpd/lldpd.mk
index af941cd..585d1ed 100644
--- a/package/lldpd/lldpd.mk
+++ b/package/lldpd/lldpd.mk
@@ -4,21 +4,16 @@
#
################################################################################
-LLDPD_VERSION = 0.9.4
-LLDPD_SITE = http://media.luffy.cx/files/lldpd
-LLDPD_DEPENDENCIES = host-pkgconf libevent netsnmp
+LLDPD_VERSION = 1.0.5
+LLDPD_SITE = https://media.luffy.cx/files/lldpd
+LLDPD_DEPENDENCIES = \
+ $(if $(BR2_PACKAGE_CHECK),check) \
+ host-pkgconf \
+ $(if $(BR2_PACKAGE_LIBCAP),libcap) \
+ libevent \
+ $(if $(BR2_PACKAGE_VALGRIND),valgrind)
LLDPD_LICENSE = ISC
-LLDPD_LICENSE_FILES = README.md
-# 0002-configure-do-not-check-for-libbsd.patch
-LLDPD_AUTORECONF = YES
-
-ifeq ($(BR2_PACKAGE_CHECK),y)
-LLDPD_DEPENDENCIES += check
-endif
-
-ifeq ($(BR2_PACKAGE_VALGRIND),y)
-LLDPD_DEPENDENCIES += valgrind
-endif
+LLDPD_LICENSE_FILES = LICENSE
# Detection of c99 support in configure fails without WCHAR. To enable
# automatic detection of c99 support by configure, we need to enable
@@ -26,15 +21,11 @@ endif
# runtime. So requesting WCHAR in toolchain just for automatic detection
# will be overkill. To solve this, explicitly -specify c99 here.
LLDPD_CONF_ENV = ac_cv_prog_cc_c99=-std=gnu99
-LLDPD_CONF_ENV += NETSNMP_CONFIG=$(STAGING_DIR)/usr/bin/net-snmp-config
LLDPD_CONF_OPTS = \
- --with-readline \
--without-embedded-libevent \
- --with-snmp \
- --without-xml \
- --without-json \
--without-seccomp \
+ --without-libbsd \
--disable-hardening \
--disable-privsep \
$(if $(BR2_PACKAGE_LLDPD_CDP),--enable-cdp,--disable-cdp) \
@@ -46,6 +37,29 @@ LLDPD_CONF_OPTS = \
$(if $(BR2_PACKAGE_LLDPD_DOT3),--enable-dot3,--disable-dot3) \
$(if $(BR2_PACKAGE_LLDPD_CUSTOM_TLV),--enable-custom,--disable-custom)
+ifeq ($(BR2_PACKAGE_LIBXML2),y)
+LLDPD_CONF_OPTS += --with-xml
+LLDPD_DEPENDENCIES += libxml2
+else
+LLDPD_CONF_OPTS += --without-xml
+endif
+
+ifeq ($(BR2_PACKAGE_NETSNMP),y)
+LLDPD_CONF_OPTS += --with-snmp
+LLDPD_DEPENDENCIES += netsnmp
+LLDPD_CONF_ENV += \
+ ac_cv_path_NETSNMP_CONFIG=$(STAGING_DIR)/usr/bin/net-snmp-config
+else
+LLDPD_CONF_OPTS += --without-snmp
+endif
+
+ifeq ($(BR2_PACKAGE_READLINE),y)
+LLDPD_CONF_OPTS += --with-readline
+LLDPD_DEPENDENCIES += readline
+else
+LLDPD_CONF_OPTS += --without-readline