From 407db800da02032e07e94b0b837a89cfb3e204a0 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 22 Apr 2014 16:49:32 -0700 Subject: libnl: update to 3.2.24 Remove patch that is now in the upstream version Add new package for idiag libraries. Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- ...free-caused-by-freeing-link-af_data-in-rt.patch | 41 -------------------- meta/recipes-support/libnl/libnl_3.2.22.bb | 44 ---------------------- meta/recipes-support/libnl/libnl_3.2.24.bb | 43 +++++++++++++++++++++ 3 files changed, 43 insertions(+), 85 deletions(-) delete mode 100644 meta/recipes-support/libnl/libnl/0001-fix-double-free-caused-by-freeing-link-af_data-in-rt.patch delete mode 100644 meta/recipes-support/libnl/libnl_3.2.22.bb create mode 100644 meta/recipes-support/libnl/libnl_3.2.24.bb diff --git a/meta/recipes-support/libnl/libnl/0001-fix-double-free-caused-by-freeing-link-af_data-in-rt.patch b/meta/recipes-support/libnl/libnl/0001-fix-double-free-caused-by-freeing-link-af_data-in-rt.patch deleted file mode 100644 index 6d2c8ff72d..0000000000 --- a/meta/recipes-support/libnl/libnl/0001-fix-double-free-caused-by-freeing-link-af_data-in-rt.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6f37b439af7e96104aadd8ec3ae8d3882df8d102 Mon Sep 17 00:00:00 2001 -From: Jiri Pirko -Date: Wed, 21 Aug 2013 14:40:34 +0200 -Subject: [PATCH] fix double free caused by freeing link af_data in - rtnl_link_set_family() - -Introduced by commit 8026fe2e3a9089eff3f5a06ee6e3cc78d96334ed ("link: -Free and realloc af specific data upon rtnl_link_set_family()") - -link->l_af_data[link->l_af_ops->ao_family] is freed here but not set to -zero. That leads to double free made by link_free_data->do_foreach_af. - -Fix this by setting link->l_af_data[link->l_af_ops->ao_family] to zero -rigth after free. - -Signed-off-by: Jiri Pirko -Signed-off-by: Thomas Graf ---- - lib/route/link.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/route/link.c b/lib/route/link.c -index a73e1db..0bb90a0 100644 ---- a/lib/route/link.c -+++ b/lib/route/link.c -@@ -1762,9 +1762,11 @@ void rtnl_link_set_family(struct rtnl_link *link, int family) - link->l_family = family; - link->ce_mask |= LINK_ATTR_FAMILY; - -- if (link->l_af_ops) -+ if (link->l_af_ops) { - af_free(link, link->l_af_ops, - link->l_af_data[link->l_af_ops->ao_family], NULL); -+ link->l_af_data[link->l_af_ops->ao_family] = NULL; -+ } - - link->l_af_ops = af_lookup_and_alloc(link, family); - } --- -1.8.4 - diff --git a/meta/recipes-support/libnl/libnl_3.2.22.bb b/meta/recipes-support/libnl/libnl_3.2.22.bb deleted file mode 100644 index a299bfbe7b..0000000000 --- a/meta/recipes-support/libnl/libnl_3.2.22.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY = "A library for applications dealing with netlink sockets" -HOMEPAGE = "http://www.infradead.org/~tgr/libnl/" -SECTION = "libs/network" - -PE = "1" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = "flex-native bison-native" - -SRC_URI = "http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \ - file://fix-pktloc_syntax_h-race.patch \ - file://fix-pc-file.patch \ - file://fix-lib-cache_mngr.c-two-parentheses-bugs.patch \ - file://0001-fix-double-free-caused-by-freeing-link-af_data-in-rt.patch \ - " - -SRC_URI[md5sum] = "2e1c889494d274aca24ce5f6a748e66e" -SRC_URI[sha256sum] = "c7c5f267dfeae0c1a530bf96b71fb7c8dbbb07d54beef49b6712d8d6166f629b" - -inherit autotools-brokensep pkgconfig - -FILES_${PN} = "${libdir}/libnl-3.so.* \ - ${libdir}/libnl.so.* \ - ${sysconfdir}" -RREPLACES_${PN} = "libnl2" -RCONFLICTS_${PN} = "libnl2" -FILES_${PN}-dbg += "${libdir}/libnl/cli/*/.debug" -FILES_${PN}-dev += "${libdir}/libnl/cli/*/*.so \ - ${libdir}/libnl/cli/*/*.la" -FILES_${PN}-staticdev += "${libdir}/libnl/cli/*/*.a" - -PACKAGES += "${PN}-cli ${PN}-route ${PN}-nf ${PN}-genl" -FILES_${PN}-cli = "${libdir}/libnl-cli-3.so.* \ - ${libdir}/libnl/cli/*/*.so.* \ - ${sbindir}/nl-*" -FILES_${PN}-route = "${libdir}/libnl-route-3.so.*" -FILES_${PN}-nf = "${libdir}/libnl-nf-3.so.*" -FILES_${PN}-genl = "${libdir}/libnl-genl-3.so.* \ - ${libdir}/libnl-genl.so.* \ - ${sbindir}/genl-ctrl-list" -RREPLACES_${PN}-genl = "libnl-genl2 libnl-genl-3-200" -RCONFLICTS_${PN}-genl = "libnl-genl2 libnl-genl-3-200" diff --git a/meta/recipes-support/libnl/libnl_3.2.24.bb b/meta/recipes-support/libnl/libnl_3.2.24.bb new file mode 100644 index 0000000000..d34ab74eac --- /dev/null +++ b/meta/recipes-support/libnl/libnl_3.2.24.bb @@ -0,0 +1,43 @@ +SUMMARY = "A library for applications dealing with netlink sockets" +HOMEPAGE = "http://www.infradead.org/~tgr/libnl/" +SECTION = "libs/network" + +PE = "1" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "flex-native bison-native" + +SRC_URI = "http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \ + file://fix-pktloc_syntax_h-race.patch \ + file://fix-pc-file.patch \ + file://fix-lib-cache_mngr.c-two-parentheses-bugs.patch \ + " +SRC_URI[md5sum] = "6e0e7bad0674749d930dd9f285343d55" +SRC_URI[sha256sum] = "fb8d6e5dc8af5b85bc6d00a71582a68a01e6a3f7d1664d4a646e289a99dd6816" + +inherit autotools-brokensep pkgconfig + +FILES_${PN} = "${libdir}/libnl-3.so.* \ + ${libdir}/libnl.so.* \ + ${sysconfdir}" +RREPLACES_${PN} = "libnl2" +RCONFLICTS_${PN} = "libnl2" +FILES_${PN}-dbg += "${libdir}/libnl/cli/*/.debug" +FILES_${PN}-dev += "${libdir}/libnl/cli/*/*.so \ + ${libdir}/libnl/cli/*/*.la" +FILES_${PN}-staticdev += "${libdir}/libnl/cli/*/*.a" + +PACKAGES += "${PN}-cli ${PN}-route ${PN}-nf ${PN}-genl ${PN}-idiag" +FILES_${PN}-cli = "${libdir}/libnl-cli-3.so.* \ + ${libdir}/libnl/cli/*/*.so.* \ + ${sbindir}/nl-*" +FILES_${PN}-route = "${libdir}/libnl-route-3.so.*" +FILES_${PN}-idiag = "${libdir}/libnl-idiag-3.so.*" +FILES_${PN}-nf = "${libdir}/libnl-nf-3.so.*" +FILES_${PN}-genl = "${libdir}/libnl-genl-3.so.* \ + ${libdir}/libnl-genl.so.* \ + ${sbindir}/genl-ctrl-list" +RREPLACES_${PN}-genl = "libnl-genl2 libnl-genl-3-200" +RCONFLICTS_${PN}-genl = "libnl-genl2 libnl-genl-3-200" -- cgit v1.2.3