diff options
author | Joe Slater <jslater@windriver.com> | 2015-07-30 09:34:29 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-31 15:35:36 +0100 |
commit | 6a68e5d9ee6122f0ed70396569eb6cd1a3297c9d (patch) | |
tree | 3d004c153c4a09357b419b0f4b7821de05c54bf4 | |
parent | 2b7bf357e126bf272504548a4692cf764fd7f8ea (diff) | |
download | openembedded-core-6a68e5d9ee6122f0ed70396569eb6cd1a3297c9d.tar.gz openembedded-core-6a68e5d9ee6122f0ed70396569eb6cd1a3297c9d.tar.bz2 openembedded-core-6a68e5d9ee6122f0ed70396569eb6cd1a3297c9d.zip |
nss: advance to version 3.19.1
Picks up fixes for CVE-2015-2721 and CVE-2015-2730. Specify previously
overlooked license file COPYING. Fold nss.inc into recipe.
Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r-- | meta/recipes-support/nss/nss_3.17.3.bb | 7 | ||||
-rw-r--r-- | meta/recipes-support/nss/nss_3.19.1.bb (renamed from meta/recipes-support/nss/nss.inc) | 14 |
2 files changed, 10 insertions, 11 deletions
diff --git a/meta/recipes-support/nss/nss_3.17.3.bb b/meta/recipes-support/nss/nss_3.17.3.bb deleted file mode 100644 index e7d0780fb8..0000000000 --- a/meta/recipes-support/nss/nss_3.17.3.bb +++ /dev/null @@ -1,7 +0,0 @@ -require nss.inc - -SRC_URI += "\ - http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_17_3_RTM/src/${BP}.tar.gz \ -" -SRC_URI[md5sum] = "fba7489e1b26f2a0bfe5527430fd61e1" -SRC_URI[sha256sum] = "f4d5e9035a2f84f25f35c283de3b0ff60d72e918748de25eaf017ed201fa21d5" diff --git a/meta/recipes-support/nss/nss.inc b/meta/recipes-support/nss/nss_3.19.1.bb index 665e4e6a09..66b9d60aa3 100644 --- a/meta/recipes-support/nss/nss.inc +++ b/meta/recipes-support/nss/nss_3.19.1.bb @@ -10,18 +10,23 @@ SECTION = "libs" LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)" -LIC_FILES_CHKSUM = "file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ - file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=6bf96825e3d7ce4de25621ae886cc859" +LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ + file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ + file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" + SRC_URI = "\ + http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_19_1_RTM/src/${BP}.tar.gz \ file://nss-fix-support-cross-compiling.patch \ file://nss-no-rpath-for-cross-compiling.patch \ file://nss-fix-incorrect-shebang-of-perl.patch \ file://nss-fix-nsinstall-build.patch \ -" -SRC_URI_append = "\ file://nss.pc.in \ file://signlibs.sh \ " + +SRC_URI[md5sum] = "68a9c01c987b9bd92066b4e0041f3e58" +SRC_URI[sha256sum] = "b7be709551ec13206d8e3e8c065b894fa981c11573115e9478fa051029c52fff" + inherit siteinfo DEPENDS = "sqlite3 nspr zlib nss-native" @@ -215,3 +220,4 @@ FILES_${PN}-dev = "\ # FILES_${PN}-dbg is populated automatically BBCLASSEXTEND = "native nativesdk" + |