package/lldpd: update license file
PATCH 1/6 package/lldpd: update license file
- Instead of README.md, use LICENSE file that has been added in version 0.9.5 with
https://github.com/vincentbernat/lldpd/commit/4d534a60ee33aa2431acb6bfe6d499d2e72d66d5
- Add hash of license file
--- package/lldpd/lldpd.hash | 1 + package/lldpd/lldpd.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
package/lldpd/lldpd.hash +1 -0
@@ -1,2 +1,3 @@ # Locally computed sha256 450b622aac7ae1758f1ef82f3b7b94ec47f2ff33abfb0e6ac82555b9ee55f151 lldpd-1.0.1.tar.gz +sha256 0e96a5aea65f16e2239231ce4ab90497f8bc3bb8fe6abe9299aade4726ff7c8d LICENSE
package/lldpd/lldpd.mk +1 -1
@@ -8,7 +8,7 @@ LLDPD_VERSION = 1.0.1 LLDPD_SITE = http://media.luffy.cx/files/lldpd LLDPD_DEPENDENCIES = host-pkgconf libevent LLDPD_LICENSE = ISC -LLDPD_LICENSE_FILES = README.md +LLDPD_LICENSE_FILES = LICENSE # 0002-configure-do-not-check-for-libbsd.patch / 0003-configure-remove-check-on-CXX-compiler.patch LLDPD_AUTORECONF = YES
Signature · 1 line
2.20.1
PATCH 2/6 package/lldpd: remove --without-json
json option has been removed in version 0.9.7 with
https://github.com/vincentbernat/lldpd/commit/06987a24ce053cbb57f8853bbf544bc7c067c8aa
--- package/lldpd/lldpd.mk | 1 - 1 file changed, 1 deletion(-)
package/lldpd/lldpd.mk +0 -1
@@ -31,7 +31,6 @@ LLDPD_CONF_OPTS = \ --without-embedded-libevent \ --without-snmp \ --without-xml \ - --without-json \ --without-seccomp \ --without-libbsd \ --disable-hardening \
Signature · 1 line
2.20.1
PATCH 2/6 package/lldpd: remove --without-json
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
json option has been removed in version 0.9.7 with
https://github.com/vincentbernat/lldpd/commit/06987a24ce053cbb57f8853bbf544bc7c067c8aaSigned-off-by Fabrice Fontaine <[email protected]>
Committed to 2019.02.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 3/6 package/lldpd: add optional netsnmp dependency
In reply to Fabrice Fontaine--- package/lldpd/lldpd.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
package/lldpd/lldpd.mk +9 -1
@@ -29,7 +29,6 @@ LLDPD_CONF_ENV = ac_cv_prog_cc_c99=-std=gnu99 LLDPD_CONF_OPTS = \ --without-embedded-libevent \ - --without-snmp \ --without-xml \ --without-seccomp \ --without-libbsd \
@@ -44,6 +43,15 @@ 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_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
Signature · 1 line
2.20.1
PATCH 4/6 package/lldpd: add optional libxml2 dependency
In reply to Fabrice Fontaine--- package/lldpd/lldpd.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
package/lldpd/lldpd.mk +7 -1
@@ -29,7 +29,6 @@ LLDPD_CONF_ENV = ac_cv_prog_cc_c99=-std=gnu99 LLDPD_CONF_OPTS = \ --without-embedded-libevent \ - --without-xml \ --without-seccomp \ --without-libbsd \ --disable-hardening \
@@ -43,6 +42,13 @@ 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
Signature · 1 line
2.20.1
PATCH 5/6 package/lldpd: bump to version 1.0.3
In reply to Fabrice Fontaine- Remove patch (already in version)
- Drop autoreconf as patch has been removed
--- ...o-disable-libbsd-with-without-libbsd.patch | 106 ------------------ package/lldpd/lldpd.hash | 2 +- package/lldpd/lldpd.mk | 4 +- 3 files changed, 2 insertions(+), 110 deletions(-) delete mode 100644 package/lldpd/0001-build-ability-to-disable-libbsd-with-without-libbsd.patch
package/lldpd/0001-build-ability-to-disable-libbsd-with-without-libbsd.patch deleted +0 -106
@@ -1,106 +0,0 @@ -From ff3dcc4ad71c1105bd8ea11afe7e07efd48c038d Mon Sep 17 00:00:00 2001 -From: Vincent Bernat <[email protected]> -Date: Tue, 25 Sep 2018 10:57:49 +0200 -Subject: [PATCH] build: ability to disable libbsd with --without-libbsd - -This is useful when user wants to ensure reproducibility of the build -whatever libbsd is present or not. - -Signed-off-by: Trent Piepho <[email protected]> ---- - configure.ac | 59 +++++++++++++++++++++++++++++++++++++++-------------------- - src/marshal.h | 1 + - 2 files changed, 40 insertions(+), 20 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9b40473..589cd96 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -173,26 +173,44 @@ 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_TRY_LINK([ --@%:@include <sys/time.h> --@%:@include <sys/types.h> --],[], -- [ -- 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" -- ]) --], [:]) -+AC_ARG_WITH([libbsd], -+ AS_HELP_STRING( -+ [--with-libbsd], -+ [Use libbsd @<:@default=auto@:>@]), -+ [], -+ [with_libbsd=auto]) -+if test x"$with_libbsd" != x"no"; then -+ 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_TRY_LINK([ -+ @%:@include <sys/time.h> -+ @%:@include <sys/types.h> -+ ],[], -+ [ -+ AC_MSG_RESULT(yes) -+ LLDP_CFLAGS="$LLDP_CFLAGS $libbsd_CFLAGS" -+ LLDP_LDFLAGS="$LLDP_LDFLAGS $libbsd_LIBS" -+ with_libbsd=yes -+ ],[ -+ AC_MSG_RESULT(no) -+ CFLAGS="$_save_CFLAGS" -+ LIBS="$_save_LIBS" -+ if test x"$with_libbsd" = x"yes"; then -+ AC_MSG_FAILURE([*** no libbsd support found]) -+ fi -+ with_libbsd=no -+ ]) -+ ], [ -+ if test x"$with_libbsd" = x"yes"; then -+ AC_MSG_FAILURE([*** no libbsd support found]) -+ fi -+ with_libbsd=no -+ ]) -+fi - - # setproctitle may have an _init function - AC_REPLACE_FUNCS([setproctitle]) -@@ -412,6 +430,7 @@ cat <<EOF - XML output.....: ${with_xml-no} - Oldies support.: $enable_oldies - seccomp........: ${with_seccomp-no} -+ libbsd.........: ${with_libbsd-no} - - Privilege separation: - Enabled........: $enable_privsep -diff --git a/src/marshal.h b/src/marshal.h -index b0e8032..0a782d5 100644 ---- a/src/marshal.h -+++ b/src/marshal.h -@@ -19,6 +19,7 @@ - #define _MARSHAL_H - - #include <stddef.h> -+#include <stdint.h> - #include <sys/types.h> - - struct marshal_info; --- -2.14.4 -
package/lldpd/lldpd.hash +1 -1
@@ -1,3 +1,3 @@ # Locally computed -sha256 450b622aac7ae1758f1ef82f3b7b94ec47f2ff33abfb0e6ac82555b9ee55f151 lldpd-1.0.1.tar.gz +sha256 39fced395168015416bfe78b95414facf066f841f349024433aa20ab54e4c360 lldpd-1.0.3.tar.gz sha256 0e96a5aea65f16e2239231ce4ab90497f8bc3bb8fe6abe9299aade4726ff7c8d LICENSE
package/lldpd/lldpd.mk +1 -3
@@ -4,13 +4,11 @@ # ################################################################################ -LLDPD_VERSION = 1.0.1 +LLDPD_VERSION = 1.0.3 LLDPD_SITE = http://media.luffy.cx/files/lldpd LLDPD_DEPENDENCIES = host-pkgconf libevent LLDPD_LICENSE = ISC LLDPD_LICENSE_FILES = LICENSE -# 0002-configure-do-not-check-for-libbsd.patch / 0003-configure-remove-check-on-CXX-compiler.patch -LLDPD_AUTORECONF = YES ifeq ($(BR2_PACKAGE_CHECK),y) LLDPD_DEPENDENCIES += check
Signature · 1 line
2.20.1
PATCH 6/6 package/lldpd: add libcap optional dependency
In reply to Fabrice Fontainelibcap optional dependency has been added in version 1.0.2 with
https://github.com/vincentbernat/lldpd/commit/f6933edaf2edea12ef72ef7c70958c2a617f6a1f
Also refactor check and valgrind optional dependencies to put them on a single line
--- package/lldpd/lldpd.mk | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
package/lldpd/lldpd.mk +6 -9
@@ -6,18 +6,15 @@ LLDPD_VERSION = 1.0.3 LLDPD_SITE = http://media.luffy.cx/files/lldpd -LLDPD_DEPENDENCIES = host-pkgconf libevent +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 = LICENSE -ifeq ($(BR2_PACKAGE_CHECK),y) -LLDPD_DEPENDENCIES += check -endif - -ifeq ($(BR2_PACKAGE_VALGRIND),y) -LLDPD_DEPENDENCIES += valgrind -endif - # Detection of c99 support in configure fails without WCHAR. To enable # automatic detection of c99 support by configure, we need to enable # WCHAR in toolchain. But actually we do not need WCHAR at lldpd
Signature · 1 line
2.20.1
PATCH 1/6 package/lldpd: update license file
In reply to Fabrice FontaineFabrice, all,
Le dim. 7 avr. 2019 ? 21:58, Fabrice Fontaine <[email protected]> a ?crit :
Quoted 12 lines
- Instead of README.md, use LICENSE file that has been added in version 0.9.5 with
https://github.com/vincentbernat/lldpd/commit/4d534a60ee33aa2431acb6bfe6d499d2e72d66d5
- Add hash of license fileSigned-off-by Fabrice Fontaine <[email protected]>--- package/lldpd/lldpd.hash | 1 + package/lldpd/lldpd.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
For this entire series,
Acked-by: Julien Floret <julien.floret at 6wind.com <[email protected]>>
Quoted 1 line
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190408/f4d4c80b/attachment.html>
PATCH 1/6 package/lldpd: update license file
Quoted 2 lines
For this entire series,
Acked-by Julien Floret <[email protected]>
And urgh, apologies for the html mess of my previous mail :-/
PATCH 1/6 package/lldpd: update license file
In reply to Fabrice FontaineQuoted 10 lines · On Sun, 7 Apr 2019 21:58:28 +0200 Fabrice Fontaine…
- Instead of README.md, use LICENSE file that has been added in version 0.9.5 with
https://github.com/vincentbernat/lldpd/commit/4d534a60ee33aa2431acb6bfe6d499d2e72d66d5
- Add hash of license fileSigned-off-by Fabrice Fontaine <[email protected]>--- package/lldpd/lldpd.hash | 1 + package/lldpd/lldpd.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
Series applied. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/6 package/lldpd: update license file
In reply to Fabrice FontaineQuoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
- Instead of README.md, use LICENSE file that has been added in version 0.9.5 with
https://github.com/vincentbernat/lldpd/commit/4d534a60ee33aa2431acb6bfe6d499d2e72d66d5
- Add hash of license fileSigned-off-by Fabrice Fontaine <[email protected]>
Committed to 2019.02.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard