[PATCH 00/10] Package Updates post 1.6

[PATCH 00/10] Package Updates post 1.6

[Saul Wold]

Richard,

Here is a batch of patches to start off the post 1.6 package
update season!

Sau!

The following changes since commit 90a955761db4724f0222527a129a3904d6d8aa6e:

  scripts/send-error-report: use a real server as the default (2014-04-19 11:04:05 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib sgw/updates
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/updates

Saul Wold (10):
  help2man update to 1.44.1
  cups: update to 1.7.2
  lsbinitscripts: update to 9.53
  man-pages: update to 3.64
  mc: update to 4.8.12
  msmtp: update to 1.4.32
  libxkbcommon: update to 0.4.1
  util-macros: update to 1.19.0
  sqlite3: Update to 3080403
  libnl: update to 3.2.24

 ...-native_1.44.1.bb => help2man-native_1.45.1.bb} |  4 +--
 .../cups/{cups_1.7.1.bb => cups_1.7.2.bb}          |  4 +--
 ...binitscripts_9.52.bb => lsbinitscripts_9.53.bb} |  6 ++--
 .../{man-pages_3.60.bb => man-pages_3.64.bb}       |  4 +--
 .../mc/{mc_4.8.10.bb => mc_4.8.12.bb}              |  6 ++--
 .../msmtp/{msmtp_1.4.31.bb => msmtp_1.4.32.bb}     |  4 +--
 ...libxkbcommon_0.4.0.bb => libxkbcommon_0.4.1.bb} |  4 +--
 ...util-macros_1.18.0.bb => util-macros_1.19.0.bb} |  6 ++--
 ...free-caused-by-freeing-link-af_data-in-rt.patch | 41 ----------------------
 .../libnl/{libnl_3.2.22.bb => libnl_3.2.24.bb}     |  9 +++--
 .../{sqlite3_3.8.3.1.bb => sqlite3_3080403.bb}     | 10 +++---
 11 files changed, 28 insertions(+), 70 deletions(-)
 rename meta/recipes-devtools/help2man/{help2man-native_1.44.1.bb => help2man-native_1.45.1.bb} (79%)
 rename meta/recipes-extended/cups/{cups_1.7.1.bb => cups_1.7.2.bb} (40%)
 rename meta/recipes-extended/lsb/{lsbinitscripts_9.52.bb => lsbinitscripts_9.53.bb} (78%)
 rename meta/recipes-extended/man-pages/{man-pages_3.60.bb => man-pages_3.64.bb} (82%)
 rename meta/recipes-extended/mc/{mc_4.8.10.bb => mc_4.8.12.bb} (92%)
 rename meta/recipes-extended/msmtp/{msmtp_1.4.31.bb => msmtp_1.4.32.bb} (82%)
 rename meta/recipes-graphics/xorg-lib/{libxkbcommon_0.4.0.bb => libxkbcommon_0.4.1.bb} (81%)
 rename meta/recipes-graphics/xorg-util/{util-macros_1.18.0.bb => util-macros_1.19.0.bb} (75%)
 delete mode 100644 meta/recipes-support/libnl/libnl/0001-fix-double-free-caused-by-freeing-link-af_data-in-rt.patch
 rename meta/recipes-support/libnl/{libnl_3.2.22.bb => libnl_3.2.24.bb} (83%)
 rename meta/recipes-support/sqlite/{sqlite3_3.8.3.1.bb => sqlite3_3080403.bb} (68%)

-- 
1.8.3.1

[PATCH 01/10] help2man update to 1.44.1

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../help2man/{help2man-native_1.44.1.bb => help2man-native_1.45.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/help2man/{help2man-native_1.44.1.bb => help2man-native_1.45.1.bb} (79%)

diff --git a/meta/recipes-devtools/help2man/help2man-native_1.44.1.bb b/meta/recipes-devtools/help2man/help2man-native_1.45.1.bb
similarity index 79%
rename from meta/recipes-devtools/help2man/help2man-native_1.44.1.bb
rename to meta/recipes-devtools/help2man/help2man-native_1.45.1.bb
index cf9a12d..dec17b5 100644
--- a/meta/recipes-devtools/help2man/help2man-native_1.44.1.bb
+++ b/meta/recipes-devtools/help2man/help2man-native_1.45.1.bb
@@ -6,8 +6,8 @@ DEPENDS = "autoconf-native automake-native"
 
 SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "a5dc6530340b41f0e492d400670dd7ae"
-SRC_URI[sha256sum] = "22de6846771921f455e389cdca07119d7f55b1877685b42dd5bbb9fc1377defb"
+SRC_URI[md5sum] = "8a8a5314284e46185e492756afdca29a"
+SRC_URI[sha256sum] = "c70fc791e6d13240327955de355244371b00bb1c9e247d5693ed601b716467c2"
 
 inherit autotools native
 
-- 
1.8.3.1

[PATCH 02/10] cups: update to 1.7.2

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/cups/{cups_1.7.1.bb => cups_1.7.2.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/cups/{cups_1.7.1.bb => cups_1.7.2.bb} (40%)

diff --git a/meta/recipes-extended/cups/cups_1.7.1.bb b/meta/recipes-extended/cups/cups_1.7.2.bb
similarity index 40%
rename from meta/recipes-extended/cups/cups_1.7.1.bb
rename to meta/recipes-extended/cups/cups_1.7.2.bb
index 9854a4d..5d19fff 100644
--- a/meta/recipes-extended/cups/cups_1.7.1.bb
+++ b/meta/recipes-extended/cups/cups_1.7.2.bb
@@ -2,5 +2,5 @@ require cups.inc
 
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c5e50cb4b8f24b04636b719683a9102d"
 
-SRC_URI[md5sum] = "55277c40fd4b7183dc3671d39c5c42b7"
-SRC_URI[sha256sum] = "f52bec893d9daf92b6029be79c07e6c516b4c85ffae3e6e01885cc85e9081681"
+SRC_URI[md5sum] = "f06a997d4b71b81b23324e27174f93e7"
+SRC_URI[sha256sum] = "315cdff436924c4efe04cb110b145fb1a6e038e2eed8445359052f86e9e95676"
-- 
1.8.3.1

[PATCH 03/10] lsbinitscripts: update to 9.53

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../lsb/{lsbinitscripts_9.52.bb => lsbinitscripts_9.53.bb}          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-extended/lsb/{lsbinitscripts_9.52.bb => lsbinitscripts_9.53.bb} (78%)

diff --git a/meta/recipes-extended/lsb/lsbinitscripts_9.52.bb b/meta/recipes-extended/lsb/lsbinitscripts_9.53.bb
similarity index 78%
rename from meta/recipes-extended/lsb/lsbinitscripts_9.52.bb
rename to meta/recipes-extended/lsb/lsbinitscripts_9.53.bb
index 11deae2..ecad90e 100644
--- a/meta/recipes-extended/lsb/lsbinitscripts_9.52.bb
+++ b/meta/recipes-extended/lsb/lsbinitscripts_9.53.bb
@@ -6,12 +6,12 @@ DEPENDS = "popt glib-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6"
 
 S="${WORKDIR}/initscripts-${PV}"
-SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-${PV}.tar.bz2/2453811ec27a781a77f309f356663d9e/initscripts-${PV}.tar.bz2 \
+SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-9.53.tar.bz2/6842b4279d67acae40ce14263e241805/initscripts-9.53.tar.bz2 \
            file://functions.patch \
           " 
 
-SRC_URI[md5sum] = "2453811ec27a781a77f309f356663d9e"
-SRC_URI[sha256sum] = "0b3bb828a5d3a3f210b8e606c0416813ba0d021a859658af14810865d2ee8867"
+SRC_URI[md5sum] = "6842b4279d67acae40ce14263e241805"
+SRC_URI[sha256sum] = "b4d97e259de34a5afc2b08bdc402201f4d0a0e02b4961f12c02ff461a5b305e1"
 
 inherit update-alternatives
 
-- 
1.8.3.1

[PATCH 04/10] man-pages: update to 3.64

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../man-pages/{man-pages_3.60.bb => man-pages_3.64.bb}                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/man-pages/{man-pages_3.60.bb => man-pages_3.64.bb} (82%)

diff --git a/meta/recipes-extended/man-pages/man-pages_3.60.bb b/meta/recipes-extended/man-pages/man-pages_3.64.bb
similarity index 82%
rename from meta/recipes-extended/man-pages/man-pages_3.60.bb
rename to meta/recipes-extended/man-pages/man-pages_3.64.bb
index a54d9b0..34ec18b 100644
--- a/meta/recipes-extended/man-pages/man-pages_3.60.bb
+++ b/meta/recipes-extended/man-pages/man-pages_3.64.bb
@@ -7,8 +7,8 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://README;md5=0422377a748010b2b738342e24f141c1"
 SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/Archive/${BP}.tar.gz"
 
-SRC_URI[md5sum] = "5e64e4361b5ee1991e0ec5d44b6c5d69"
-SRC_URI[sha256sum] = "d62d10f2d75257c883118d388021e06d2193a61ae8951f94492ac53a07d83387"
+SRC_URI[md5sum] = "6e015cd7f5afb5c9e5ec978fadb77fa8"
+SRC_URI[sha256sum] = "997fadacbe76fadd23a0a3a20aa6acd9e4bbbd18f0cd5a0a1437f4bb5d5f9209"
 
 RDEPENDS_${PN} = "man"
 
-- 
1.8.3.1

[PATCH 05/10] mc: update to 4.8.12

[Saul Wold]

Remove the disable-samba since it's been renamed to vfs_smb and disabled
by default.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/mc/{mc_4.8.10.bb => mc_4.8.12.bb} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-extended/mc/{mc_4.8.10.bb => mc_4.8.12.bb} (92%)

diff --git a/meta/recipes-extended/mc/mc_4.8.10.bb b/meta/recipes-extended/mc/mc_4.8.12.bb
similarity index 92%
rename from meta/recipes-extended/mc/mc_4.8.10.bb
rename to meta/recipes-extended/mc/mc_4.8.12.bb
index 511771a..9a43949 100644
--- a/meta/recipes-extended/mc/mc_4.8.10.bb
+++ b/meta/recipes-extended/mc/mc_4.8.12.bb
@@ -8,12 +8,12 @@ RDEPENDS_${PN} = "ncurses-terminfo"
 
 SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2"
 
-SRC_URI[md5sum] = "eb4bdc23abd4fdfa14911d53d65c8186"
-SRC_URI[sha256sum] = "5f4166fe78fbf4b42f51ed526ca7f79fea8c77d04355c2b97d4df2a6bd2a1b1a"
+SRC_URI[md5sum] = "a64c426364bfaee56b628f6c0738aade"
+SRC_URI[sha256sum] = "1054fcc27a488771cbe5b85d7c10135fa1cd1b7682a19930d44b51a023e39396"
 
 inherit autotools gettext pkgconfig
 
-EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x --without-samba"
+EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x"
 
 FILES_${PN}-dbg += "${libexecdir}/mc/.debug/"
 
-- 
1.8.3.1

Re: [PATCH 05/10] mc: update to 4.8.12

[Khem Raj]

On Tue, Apr 22, 2014 at 4:49 PM, Saul Wold <sgw@linux.intel.com> wrote:
> Remove the disable-samba since it's been renamed to vfs_smb and disabled
> by default.

can this be converted into PACKAGECONFIG while you are at it ?

Re: [PATCH 05/10] mc: update to 4.8.12

[Richard Purdie]

On Tue, 2014-04-22 at 16:49 -0700, Saul Wold wrote:
> Remove the disable-samba since it's been renamed to vfs_smb and disabled
> by default.

Will this detect the presence of samba in the sysroot and autoconfigure
itself to enabled?

Cheers,

Richard

> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  meta/recipes-extended/mc/{mc_4.8.10.bb => mc_4.8.12.bb} | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>  rename meta/recipes-extended/mc/{mc_4.8.10.bb => mc_4.8.12.bb} (92%)
> 
> diff --git a/meta/recipes-extended/mc/mc_4.8.10.bb b/meta/recipes-extended/mc/mc_4.8.12.bb
> similarity index 92%
> rename from meta/recipes-extended/mc/mc_4.8.10.bb
> rename to meta/recipes-extended/mc/mc_4.8.12.bb
> index 511771a..9a43949 100644
> --- a/meta/recipes-extended/mc/mc_4.8.10.bb
> +++ b/meta/recipes-extended/mc/mc_4.8.12.bb
> @@ -8,12 +8,12 @@ RDEPENDS_${PN} = "ncurses-terminfo"
>  
>  SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2"
>  
> -SRC_URI[md5sum] = "eb4bdc23abd4fdfa14911d53d65c8186"
> -SRC_URI[sha256sum] = "5f4166fe78fbf4b42f51ed526ca7f79fea8c77d04355c2b97d4df2a6bd2a1b1a"
> +SRC_URI[md5sum] = "a64c426364bfaee56b628f6c0738aade"
> +SRC_URI[sha256sum] = "1054fcc27a488771cbe5b85d7c10135fa1cd1b7682a19930d44b51a023e39396"
>  
>  inherit autotools gettext pkgconfig
>  
> -EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x --without-samba"
> +EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x"
>  
>  FILES_${PN}-dbg += "${libexecdir}/mc/.debug/"
>  
> -- 
> 1.8.3.1
> 

[PATCH 06/10] msmtp: update to 1.4.32

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/msmtp/{msmtp_1.4.31.bb => msmtp_1.4.32.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/msmtp/{msmtp_1.4.31.bb => msmtp_1.4.32.bb} (82%)

diff --git a/meta/recipes-extended/msmtp/msmtp_1.4.31.bb b/meta/recipes-extended/msmtp/msmtp_1.4.32.bb
similarity index 82%
rename from meta/recipes-extended/msmtp/msmtp_1.4.31.bb
rename to meta/recipes-extended/msmtp/msmtp_1.4.32.bb
index 57942ed..1ef8547 100644
--- a/meta/recipes-extended/msmtp/msmtp_1.4.31.bb
+++ b/meta/recipes-extended/msmtp/msmtp_1.4.32.bb
@@ -12,8 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 SRC_URI = "http://sourceforge.net/projects/msmtp/files/msmtp/${PV}/${BPN}-${PV}.tar.bz2 \
           "
 
-SRC_URI[md5sum] = "792ac0ffa30dc95ea1889a548128186d"
-SRC_URI[sha256sum] = "247af9a95fa22f506e85109fc4268a5d91ca03af9b17eebcc1e46b7cd64c225f"
+SRC_URI[md5sum] = "aa60e22211118f222470439cea60f795"
+SRC_URI[sha256sum] = "2bf0c5c7e78f9905f48de235a75111a1a88238793043bbeae00360b22f1a5f88"
 
 inherit gettext autotools update-alternatives
 
-- 
1.8.3.1

[PATCH 07/10] libxkbcommon: update to 0.4.1

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../xorg-lib/{libxkbcommon_0.4.0.bb => libxkbcommon_0.4.1.bb}         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libxkbcommon_0.4.0.bb => libxkbcommon_0.4.1.bb} (81%)

diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.0.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.1.bb
similarity index 81%
rename from meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.0.bb
rename to meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.1.bb
index 2ad5448..1a687c8 100644
--- a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.1.bb
@@ -9,8 +9,8 @@ DEPENDS = "util-macros flex-native bison-native"
 
 SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "bb782f1700e45b4f57c84ef513e3cf85"
-SRC_URI[sha256sum] = "2dc018e830d1befaf4822615204138318da3fff0112f78f3a7c638fa617375b8"
+SRC_URI[md5sum] = "b70f4ed97b6c9432dc956e4177f3336a"
+SRC_URI[sha256sum] = "90ee502ec919814533c65e74c208212854f5bae9b9b87932eeb96fb3876b8ff6"
 
 inherit autotools pkgconfig
 
-- 
1.8.3.1

[PATCH 08/10] util-macros: update to 1.19.0

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../xorg-util/{util-macros_1.18.0.bb => util-macros_1.19.0.bb}      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/xorg-util/{util-macros_1.18.0.bb => util-macros_1.19.0.bb} (75%)

diff --git a/meta/recipes-graphics/xorg-util/util-macros_1.18.0.bb b/meta/recipes-graphics/xorg-util/util-macros_1.19.0.bb
similarity index 75%
rename from meta/recipes-graphics/xorg-util/util-macros_1.18.0.bb
rename to meta/recipes-graphics/xorg-util/util-macros_1.19.0.bb
index 79759f6..26cf50f 100644
--- a/meta/recipes-graphics/xorg-util/util-macros_1.18.0.bb
+++ b/meta/recipes-graphics/xorg-util/util-macros_1.19.0.bb
@@ -9,11 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1970511fddd439b07a6ba789d28ff662"
 
 PE = "1"
 
+SRC_URI[md5sum] = "40e1caa49a71a26e0aa68ddd00203717"
+SRC_URI[sha256sum] = "0d4df51b29023daf2f63aebf3ebc638ea88efedfd560ab5866741ab3f92acaa1"
+
 # ${PN} is empty so we need to tweak -dev and -dbg package dependencies
 RDEPENDS_${PN}-dev = ""
 RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
 
 BBCLASSEXTEND = "native nativesdk"
-
-SRC_URI[md5sum] = "fd0ba21b3179703c071bbb4c3e5fb0f4"
-SRC_URI[sha256sum] = "cf4ab0e17bfee0f7689cdcff8c7d7f164c9a710f851f91c488f5cd81fac9c0aa"
-- 
1.8.3.1

[PATCH 09/10] sqlite3: Update to 3080403

[Saul Wold]

And rename the PV to match the upstream versioning
This requires a PE Bump to ensure package versions don't
go backwards.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../sqlite/{sqlite3_3.8.3.1.bb => sqlite3_3080403.bb}          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
 rename meta/recipes-support/sqlite/{sqlite3_3.8.3.1.bb => sqlite3_3080403.bb} (68%)

diff --git a/meta/recipes-support/sqlite/sqlite3_3.8.3.1.bb b/meta/recipes-support/sqlite/sqlite3_3080403.bb
similarity index 68%
rename from meta/recipes-support/sqlite/sqlite3_3.8.3.1.bb
rename to meta/recipes-support/sqlite/sqlite3_3080403.bb
index 4f15f5d..7793a75 100644
--- a/meta/recipes-support/sqlite/sqlite3_3.8.3.1.bb
+++ b/meta/recipes-support/sqlite/sqlite3_3080403.bb
@@ -6,15 +6,15 @@ def sqlite_download_version(d):
     pvsplit = d.getVar('PV', True).split('.')
     return pvsplit[0] + ''.join([part.rjust(2,'0') for part in pvsplit[1:]])
 
-PE = "1"
+PE = "2"
 SQLITE_PV = "${@sqlite_download_version(d)}"
-SRC_URI = "http://www.sqlite.org/2014/sqlite-autoconf-${SQLITE_PV}.tar.gz"
-
-SRC_URI[md5sum] = "509ff98d8dc9729b618b7e96612079c6"
-SRC_URI[sha256sum] = "de5dc216e9289fabf027f78dbbface32ffc8c6341b7d841d0814b1a452ffdb8c"
+SRC_URI = "http://www.sqlite.org/2014/sqlite-autoconf-${PV}.tar.gz"
 
 S = "${WORKDIR}/sqlite-autoconf-${SQLITE_PV}"
 
+SRC_URI[md5sum] = "0f5459cde43cb269e5120ecd2c671ced"
+SRC_URI[sha256sum] = "e0e995e23a324a5d6ae95d8a836240382a4d7475d09707fc469c8cafcbd48d65"
+
 # Provide column meta-data API
 BUILD_CFLAGS += "-DSQLITE_ENABLE_COLUMN_METADATA"
 TARGET_CFLAGS += "-DSQLITE_ENABLE_COLUMN_METADATA"
-- 
1.8.3.1

Re: [PATCH 09/10] sqlite3: Update to 3080403

[Paul Eggleton]

On Tuesday 22 April 2014 16:49:31 Saul Wold wrote:
> And rename the PV to match the upstream versioning
> This requires a PE Bump to ensure package versions don't
> go backwards.

Saul, we renamed this just recently and I'm pretty sure we discussed it at the 
time - the upstream version _is_ 3.8.4.3; the file naming should not determine 
the version used for the recipe because the file name version scheme does not 
match up with what upstream SQLite uses everywhere else (documentation, 
release notes, etc.). If our package reporting system can't understand this we 
should not be mangling the recipe (again) to work around it.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

[PATCH 10/10] libnl: update to 3.2.24

[Saul Wold]

Remove patch that is now in the upstream version
Add new package for idiag libraries.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 ...free-caused-by-freeing-link-af_data-in-rt.patch | 41 ----------------------
 .../libnl/{libnl_3.2.22.bb => libnl_3.2.24.bb}     |  9 +++--
 2 files changed, 4 insertions(+), 46 deletions(-)
 delete mode 100644 meta/recipes-support/libnl/libnl/0001-fix-double-free-caused-by-freeing-link-af_data-in-rt.patch
 rename meta/recipes-support/libnl/{libnl_3.2.22.bb => libnl_3.2.24.bb} (83%)

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 6d2c8ff..0000000
--- 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 <jiri@resnulli.us>
-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 <jiri@resnulli.us>
-Signed-off-by: Thomas Graf <tgraf@suug.ch>
----
- 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.24.bb
similarity index 83%
rename from meta/recipes-support/libnl/libnl_3.2.22.bb
rename to meta/recipes-support/libnl/libnl_3.2.24.bb
index a299bfb..d34ab74 100644
--- a/meta/recipes-support/libnl/libnl_3.2.22.bb
+++ b/meta/recipes-support/libnl/libnl_3.2.24.bb
@@ -13,11 +13,9 @@ 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"
+SRC_URI[md5sum] = "6e0e7bad0674749d930dd9f285343d55"
+SRC_URI[sha256sum] = "fb8d6e5dc8af5b85bc6d00a71582a68a01e6a3f7d1664d4a646e289a99dd6816"
 
 inherit autotools-brokensep pkgconfig
 
@@ -31,11 +29,12 @@ 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"
+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.* \
-- 
1.8.3.1