aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Berton <fabio.berton@ossystems.com.br>2015-11-05 14:45:11 -0200
committerJoe MacDonald <joe_macdonald@mentor.com>2015-11-30 12:57:31 -0500
commitd2b204d21a7867270a1546561d0ba8a87124ee72 (patch)
treebcea36073f12d4d38170947e59c9310a7816ce04
parentddbbcf93c15197226d7952fc662c6e34c0def21a (diff)
downloadmeta-openembedded-d2b204d21a7867270a1546561d0ba8a87124ee72.tar.gz
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 <fabio.berton@ossystems.com.br> Acked-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
-rw-r--r--meta-networking/recipes-daemons/lldpd/files/fix-libevent-configure.patch39
-rw-r--r--meta-networking/recipes-daemons/lldpd/lldpd_0.7.19.bb (renamed from meta-networking/recipes-daemons/lldpd/lldpd_0.7.17.bb)5
2 files changed, 2 insertions, 42 deletions
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 <fabio.berton@ossystems.com.br>
----
- 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.19.bb
index 47d3c38ed0..7d5462625a 100644
--- a/meta-networking/recipes-daemons/lldpd/lldpd_0.7.17.bb
+++ b/meta-networking/recipes-daemons/lldpd/lldpd_0.7.19.bb
@@ -9,11 +9,10 @@ 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"
+SRC_URI[md5sum] = "4e924420e00ccd5dc289506f43221820"
+SRC_URI[sha256sum] = "aac11cb1fdc037709517372c70c9bf89c752ab8e5eaab9ce140b84ed5a0507c8"
inherit autotools update-rc.d useradd systemd pkgconfig