From d2b204d21a7867270a1546561d0ba8a87124ee72 Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Thu, 5 Nov 2015 14:45:11 -0200 Subject: lldpd: Update to version 0.7.19 The new release has following important changes, worth noticing: - fix-libevent-configure patch has been applied upstream - fix for CVE-2015-8012 Signed-off-by: Fabio Berton Acked-by: Otavio Salvador Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- .../lldpd/files/fix-libevent-configure.patch | 39 ------------- .../recipes-daemons/lldpd/lldpd_0.7.17.bb | 68 ---------------------- .../recipes-daemons/lldpd/lldpd_0.7.19.bb | 67 +++++++++++++++++++++ 3 files changed, 67 insertions(+), 107 deletions(-) delete mode 100644 meta-networking/recipes-daemons/lldpd/files/fix-libevent-configure.patch delete mode 100644 meta-networking/recipes-daemons/lldpd/lldpd_0.7.17.bb create mode 100644 meta-networking/recipes-daemons/lldpd/lldpd_0.7.19.bb (limited to 'meta-networking/recipes-daemons/lldpd') diff --git a/meta-networking/recipes-daemons/lldpd/files/fix-libevent-configure.patch b/meta-networking/recipes-daemons/lldpd/files/fix-libevent-configure.patch deleted file mode 100644 index 42d6b290ae..0000000000 --- a/meta-networking/recipes-daemons/lldpd/files/fix-libevent-configure.patch +++ /dev/null @@ -1,39 +0,0 @@ -Upstream-Status: Submitted [https://github.com/vincentbernat/lldpd/issues/133] - -Subject: [PATCH] fix libevent configure - -Signed-off-by: Fabio Berton ---- - m4/libevent.m4 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/m4/libevent.m4 b/m4/libevent.m4 -index 275e5a5..dcd3309 100644 ---- a/m4/libevent.m4 -+++ b/m4/libevent.m4 -@@ -45,13 +45,11 @@ AC_DEFUN([lldp_CHECK_LIBEVENT], [ - AC_MSG_ERROR([*** libevent not found]) - fi - ]) -- fi - - if test x"$LIBEVENT_EMBEDDED" != x; then - unset LIBEVENT_LIBS - LIBEVENT_CFLAGS="-I\$(top_srcdir)/libevent/include -I\$(top_builddir)/libevent/include" - LIBEVENT_LDFLAGS="\$(top_builddir)/libevent/libevent.la" -- fi - - # Call ./configure in libevent. Need it for make dist... - libevent_configure_args="$libevent_configure_args --disable-libevent-regress" -@@ -64,6 +62,8 @@ AC_DEFUN([lldp_CHECK_LIBEVENT], [ - libevent_configure_args="$libevent_configure_args --with-pic" - libevent_configure_args="$libevent_configure_args --enable-static" - lldp_CONFIG_SUBDIRS([libevent], [$libevent_configure_args]) -+ fi -+ fi - - AM_CONDITIONAL([LIBEVENT_EMBEDDED], [test x"$LIBEVENT_EMBEDDED" != x]) - AC_SUBST([LIBEVENT_LIBS]) --- -2.1.4 - diff --git a/meta-networking/recipes-daemons/lldpd/lldpd_0.7.17.bb b/meta-networking/recipes-daemons/lldpd/lldpd_0.7.17.bb deleted file mode 100644 index 47d3c38ed0..0000000000 --- a/meta-networking/recipes-daemons/lldpd/lldpd_0.7.17.bb +++ /dev/null @@ -1,68 +0,0 @@ -SUMMARY = "A 802.1ab implementation (LLDP) to help you locate neighbors of all your equipments" -SECTION = "net/misc" -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d" - -DEPENDS = "libbsd libevent" - -SRC_URI = "\ - http://media.luffy.cx/files/${PN}/${PN}-${PV}.tar.gz \ - file://lldpd.init.d \ - file://lldpd.default \ - file://fix-libevent-configure.patch \ - " - -SRC_URI[md5sum] = "8cb74065956bc32a575ee5203b0e0fb5" -SRC_URI[sha256sum] = "6b50b8aa47d1424a93ba3df55af26da41f7d5718db8d25e99291c4a6cd09c20e" - -inherit autotools update-rc.d useradd systemd pkgconfig - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system -g lldpd --shell /bin/false lldpd" -GROUPADD_PARAM_${PN} = "--system lldpd" - -EXTRA_OECONF += "--without-embedded-libevent \ - --disable-oldies \ - --with-privsep-user=lldpd \ - --with-privsep-group=lldpd" - -PACKAGECONFIG ??= "cdp fdp edp sonmp lldpmed dot1 dot3" -PACKAGECONFIG[json] = "--with-json,--without-json,jansson" -PACKAGECONFIG[xml] = "--with-xml,--without-xml,libxm2" -PACKAGECONFIG[snmp] = "--with-snmp,--without-snmp,net-snmp" -PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" -PACKAGECONFIG[seccomp] = "--with-seccomp,--without-seccomp,libseccomp" -PACKAGECONFIG[cdp] = "--enable-cdp,--disable-cdp" -PACKAGECONFIG[fdp] = "--enable-fdp,--disable-fdp" -PACKAGECONFIG[edp] = "--enable-edp,--disable-edp" -PACKAGECONFIG[sonmp] = "--enable-sonmp,--disable-sonmp" -PACKAGECONFIG[lldpmed] = "--enable-lldpmed,--disable-lldpmed" -PACKAGECONFIG[dot1] = "--enable-dot1,--disable-dot1" -PACKAGECONFIG[dot3] = "--enable-dot3,--disable-dot3" -PACKAGECONFIG[custom] = "--enable-custom,--disable-custom" - -INITSCRIPT_NAME = "lldpd" -INITSCRIPT_PARAMS = "defaults" - -SYSTEMD_SERVICE_${PN} = "lldpd.service" - -do_install_append() { - install -Dm 0755 ${WORKDIR}/lldpd.init.d ${D}${sysconfdir}/init.d/lldpd - install -Dm 0644 ${WORKDIR}/lldpd.default ${D}${sysconfdir}/default/lldpd - # Make an empty configuration file - touch ${D}${sysconfdir}/lldpd.conf -} - -PACKAGES =+ "${PN}-bash-completion ${PN}-zsh-completion" - -FILES_${PN} += "${libdir}/sysusers.d" -RDEPENDS_${PN} += "os-release" - -FILES_${PN}-bash-completion += "${sysconfdir}/bash_completion.d/ \ - ${datadir}/bash-completion/ \ - " -RDEPENDS_${PN}-bash-completion += "bash" - -FILES_${PN}-zsh-completion += "${datadir}/zsh/" -# FIXME: zsh is broken in meta-oe so this cannot be enabled for now -#RDEPENDS_${PN}-zsh-completion += "zsh" diff --git a/meta-networking/recipes-daemons/lldpd/lldpd_0.7.19.bb b/meta-networking/recipes-daemons/lldpd/lldpd_0.7.19.bb new file mode 100644 index 0000000000..7d5462625a --- /dev/null +++ b/meta-networking/recipes-daemons/lldpd/lldpd_0.7.19.bb @@ -0,0 +1,67 @@ +SUMMARY = "A 802.1ab implementation (LLDP) to help you locate neighbors of all your equipments" +SECTION = "net/misc" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d" + +DEPENDS = "libbsd libevent" + +SRC_URI = "\ + http://media.luffy.cx/files/${PN}/${PN}-${PV}.tar.gz \ + file://lldpd.init.d \ + file://lldpd.default \ + " + +SRC_URI[md5sum] = "4e924420e00ccd5dc289506f43221820" +SRC_URI[sha256sum] = "aac11cb1fdc037709517372c70c9bf89c752ab8e5eaab9ce140b84ed5a0507c8" + +inherit autotools update-rc.d useradd systemd pkgconfig + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system -g lldpd --shell /bin/false lldpd" +GROUPADD_PARAM_${PN} = "--system lldpd" + +EXTRA_OECONF += "--without-embedded-libevent \ + --disable-oldies \ + --with-privsep-user=lldpd \ + --with-privsep-group=lldpd" + +PACKAGECONFIG ??= "cdp fdp edp sonmp lldpmed dot1 dot3" +PACKAGECONFIG[json] = "--with-json,--without-json,jansson" +PACKAGECONFIG[xml] = "--with-xml,--without-xml,libxm2" +PACKAGECONFIG[snmp] = "--with-snmp,--without-snmp,net-snmp" +PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" +PACKAGECONFIG[seccomp] = "--with-seccomp,--without-seccomp,libseccomp" +PACKAGECONFIG[cdp] = "--enable-cdp,--disable-cdp" +PACKAGECONFIG[fdp] = "--enable-fdp,--disable-fdp" +PACKAGECONFIG[edp] = "--enable-edp,--disable-edp" +PACKAGECONFIG[sonmp] = "--enable-sonmp,--disable-sonmp" +PACKAGECONFIG[lldpmed] = "--enable-lldpmed,--disable-lldpmed" +PACKAGECONFIG[dot1] = "--enable-dot1,--disable-dot1" +PACKAGECONFIG[dot3] = "--enable-dot3,--disable-dot3" +PACKAGECONFIG[custom] = "--enable-custom,--disable-custom" + +INITSCRIPT_NAME = "lldpd" +INITSCRIPT_PARAMS = "defaults" + +SYSTEMD_SERVICE_${PN} = "lldpd.service" + +do_install_append() { + install -Dm 0755 ${WORKDIR}/lldpd.init.d ${D}${sysconfdir}/init.d/lldpd + install -Dm 0644 ${WORKDIR}/lldpd.default ${D}${sysconfdir}/default/lldpd + # Make an empty configuration file + touch ${D}${sysconfdir}/lldpd.conf +} + +PACKAGES =+ "${PN}-bash-completion ${PN}-zsh-completion" + +FILES_${PN} += "${libdir}/sysusers.d" +RDEPENDS_${PN} += "os-release" + +FILES_${PN}-bash-completion += "${sysconfdir}/bash_completion.d/ \ + ${datadir}/bash-completion/ \ + " +RDEPENDS_${PN}-bash-completion += "bash" + +FILES_${PN}-zsh-completion += "${datadir}/zsh/" +# FIXME: zsh is broken in meta-oe so this cannot be enabled for now +#RDEPENDS_${PN}-zsh-completion += "zsh" -- cgit 1.2.3-korg