[ptxdist] [PATCH 1/2] libbsd: Version bump 0.11.7 -> 0.12.2

[ptxdist] [PATCH 1/2] libbsd: Version bump 0.11.7 -> 0.12.2

[Lars Alex Pedersen]

* COPYING: Copyright years updated
* COPYING: Cleanup for man/arc4random.3bsd
* New configure options --enable-sanitize and --enable-year2038

Signed-off-by: Lars Alex Pedersen <lapeddk@gmail.com>
---
 rules/libbsd.make | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/rules/libbsd.make b/rules/libbsd.make
index 85e9718e8..f7fbb30e5 100644
--- a/rules/libbsd.make
+++ b/rules/libbsd.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBBSD) += libbsd
 #
 # Paths and names
 #
-LIBBSD_VERSION	:= 0.11.7
-LIBBSD_MD5	:= 2c5e63b5bb7771bbe4f572c7788e0bb8
+LIBBSD_VERSION	:= 0.12.2
+LIBBSD_MD5	:= 1aa07d44ee00e2cc1ae3ac10baae7a68
 LIBBSD		:= libbsd-$(LIBBSD_VERSION)
 LIBBSD_SUFFIX	:= tar.xz
 LIBBSD_URL	:= http://libbsd.freedesktop.org/releases/$(LIBBSD).$(LIBBSD_SUFFIX)
@@ -23,7 +23,7 @@ LIBBSD_SOURCE	:= $(SRCDIR)/$(LIBBSD).$(LIBBSD_SUFFIX)
 LIBBSD_DIR	:= $(BUILDDIR)/$(LIBBSD)
 LIBBSD_LICENSE	:= BSD-4-Clause AND BSD-3-Clause AND BSD-2-Clause-NetBSD AND ISC AND MIT AND Beerware AND public_domain
 LIBBSD_LICENSE_FILES := \
-	file://COPYING;md5=75e85c5a558f86d10fbd5abc567ea5e6
+	file://COPYING;md5=9b087a0981a1fcad42efbba6d4925a0f
 
 # ----------------------------------------------------------------------------
 # Prepare
@@ -38,6 +38,8 @@ LIBBSD_CONF_OPT	:= \
 	$(GLOBAL_LARGE_FILE_OPTION) \
 	--enable-shared \
 	--disable-static \
+	--enable-sanitize \
+	--$(call ptx/endis, PTXDIST_Y2038)-year2038 \
 	--with-gnu-ld
 
 # ----------------------------------------------------------------------------

base-commit: df9923bad3649c7149af65eed63735df91e08480
-- 
2.51.0

[ptxdist] [PATCH 2/2] lldpd: Version bump 1.0.13 -> 1.0.19

[Lars Alex Pedersen]

* New configure options explicitly set default or disabled, except for
  LLDPD_CTL_SOCKET and LLDPD_PID_FILE, which can be changed.

Signed-off-by: Lars Alex Pedersen <lapeddk@gmail.com>
---
 rules/lldpd.in   | 10 ++++++++++
 rules/lldpd.make | 28 ++++++++++++++++++++++++----
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/rules/lldpd.in b/rules/lldpd.in
index 8b253ba83..5e99254d0 100644
--- a/rules/lldpd.in
+++ b/rules/lldpd.in
@@ -36,6 +36,16 @@ config LLDPD_PRIVSEP_CHROOT
 	prompt "Which directory to use to chroot lldpd"
 	default "/var/run/lldpd"
 
+config LLDPD_CTL_SOCKET
+	string
+	prompt "Path to socket for communication with lldpd"
+	default "/var/run/lldpd.socket"
+
+config LLDPD_PID_FILE
+	string
+	prompt "Path to lldpd PID file"
+	default "/var/run/lldpd.pid"
+
 config LLDPD_CDP
 	bool
 	prompt "Enable Cisco Discovery Protocol"
diff --git a/rules/lldpd.make b/rules/lldpd.make
index b6e321a7c..b419ebe4b 100644
--- a/rules/lldpd.make
+++ b/rules/lldpd.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LLDPD) += lldpd
 #
 # Paths and names
 #
-LLDPD_VERSION	:= 1.0.13
-LLDPD_MD5	:= 40fab1279e4203191dd32d2057f1c3fe
+LLDPD_VERSION	:= 1.0.19
+LLDPD_MD5	:= c05268312d4bf19bad995406c3c30418
 LLDPD		:= lldpd-$(LLDPD_VERSION)
 LLDPD_SUFFIX	:= tar.gz
 LLDPD_URL	:= http://media.luffy.cx/files/lldpd//$(LLDPD).$(LLDPD_SUFFIX)
@@ -31,8 +31,19 @@ LLDPD_LICENSE	:= ISC
 LLDPD_CONF_TOOL	:= autoconf
 LLDPD_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
 	--disable-doxygen-doc \
+	--disable-doxygen-dot \
+	--disable-doxygen-man \
+	--disable-doxygen-rtf \
+	--disable-doxygen-xml \
+	--disable-doxygen-chm \
+	--disable-doxygen-chi \
+	--disable-doxygen-html \
+	--disable-doxygen-ps \
+	--disable-doxygen-pdf \
 	--enable-hardening \
+	--enable-pie \
 	--disable-sanitizers \
+	--disable-fuzzer \
 	--disable-gcov \
 	--disable-json0 \
 	--disable-dtrace \
@@ -46,16 +57,25 @@ LLDPD_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
 	--$(call ptx/endis, PTXCONF_LLDPD_DOT3)-dot3 \
 	--$(call ptx/endis, PTXCONF_LLDPD_CUSTOM_TLV)-custom \
 	--$(call ptx/endis, PTXCONF_LLDPD_OLDIES)-oldies \
+	--with-libbsd \
 	--without-embedded-libevent \
 	--with-readline \
 	--$(call ptx/wwo, PTXCONF_LLDPD_SNMP)-snmp \
 	--$(call ptx/wwo, PTXCONF_LLDPD_XML)-xml \
 	--without-seccomp \
-	--with-libbsd \
+	--without-launchddaemonsdir \
 	--with-systemdsystemunitdir=/usr/lib/systemd/system \
+	--without-sysusersdir \
+	--without-apparmordir \
 	--with-privsep-user="$(PTXCONF_LLDPD_PRIVSEP_USER)" \
 	--with-privsep-group="$(PTXCONF_LLDPD_PRIVSEP_GROUP)" \
-	--with-privsep-chroot="$(PTXCONF_LLDPD_PRIVSEP_CHROOT)"
+	--with-privsep-chroot="$(PTXCONF_LLDPD_PRIVSEP_CHROOT)" \
+	--with-lldpd-ctl-socket="$(PTXCONF_LLDPD_CTL_SOCKET)" \
+	--with-lldpd-pid-file="$(PTXCONF_LLDPD_PID_FILE)" \
+	--with-netlink-max-receive-bufsize=1048576 \
+	--with-netlink-receive-bufsize=0 \
+	--with-netlink-send-bufsize=0
+
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.51.0