summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-06-28 11:06:19 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-10 14:12:16 +0100
commit82f83f6292753c4fb35e6f5211d53e5d938f2495 (patch)
treeab010f5f0b184d33f1e8d510066870342d885088
parent969ba57b427029b3f858de187593f53c0fdd25e9 (diff)
downloadpoky-82f83f6292753c4fb35e6f5211d53e5d938f2495.tar.gz
nss: update to 3.24
Drop merged 0001-Fix-build-failure-on-opensuse-13.1.patch (From OE-Core rev: 755dda7f9a054c6069ef95e3ee4fe7d604378446) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/nss/nss/0001-Fix-build-failure-on-opensuse-13.1.patch27
-rw-r--r--meta/recipes-support/nss/nss_3.24.bb (renamed from meta/recipes-support/nss/nss_3.23.bb)7
2 files changed, 3 insertions, 31 deletions
diff --git a/meta/recipes-support/nss/nss/0001-Fix-build-failure-on-opensuse-13.1.patch b/meta/recipes-support/nss/nss/0001-Fix-build-failure-on-opensuse-13.1.patch
deleted file mode 100644
index cb3ad0068e..0000000000
--- a/meta/recipes-support/nss/nss/0001-Fix-build-failure-on-opensuse-13.1.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 8758c6a4508a5ca01505a8d69a269c912ce10bee Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 18 Jan 2016 18:26:16 +0000
4Subject: [PATCH] Fix build failure on opensuse 13.1
5
6Upstream-Status: Inappropriate [gcc 4.8 specific issue]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 nss/cmd/modutil/install-ds.h | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/nss/cmd/modutil/install-ds.h b/nss/cmd/modutil/install-ds.h
13index 3a3afb3..433efe0 100644
14--- a/nss/cmd/modutil/install-ds.h
15+++ b/nss/cmd/modutil/install-ds.h
16@@ -243,7 +243,7 @@ struct Pk11Install_Info_str {
17 Pk11Install_Info*
18 Pk11Install_Info_new();
19 void
20-Pk11Install_Info_init();
21+Pk11Install_Info_init(Pk11Install_Info* _this);
22 void
23 Pk11Install_Info_delete(Pk11Install_Info* _this);
24 /*// Returns NULL for success, error message if parse error.*/
25--
261.8.4.5
27
diff --git a/meta/recipes-support/nss/nss_3.23.bb b/meta/recipes-support/nss/nss_3.24.bb
index 2663ff7dba..95a33f27d3 100644
--- a/meta/recipes-support/nss/nss_3.23.bb
+++ b/meta/recipes-support/nss/nss_3.24.bb
@@ -15,17 +15,16 @@ LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \
15 file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" 15 file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132"
16 16
17SRC_URI = "\ 17SRC_URI = "\
18 http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_23_RTM/src/${BP}.tar.gz \ 18 http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_24_RTM/src/${BP}.tar.gz \
19 file://nss-fix-support-cross-compiling.patch \ 19 file://nss-fix-support-cross-compiling.patch \
20 file://nss-no-rpath-for-cross-compiling.patch \ 20 file://nss-no-rpath-for-cross-compiling.patch \
21 file://nss-fix-incorrect-shebang-of-perl.patch \ 21 file://nss-fix-incorrect-shebang-of-perl.patch \
22 file://nss-fix-nsinstall-build.patch \ 22 file://nss-fix-nsinstall-build.patch \
23 file://0001-Fix-build-failure-on-opensuse-13.1.patch \
24 file://nss.pc.in \ 23 file://nss.pc.in \
25 file://signlibs.sh \ 24 file://signlibs.sh \
26" 25"
27SRC_URI[md5sum] = "21c3fed84441b2ab4c50ac626f6517e7" 26SRC_URI[md5sum] = "35854c549cb02100d0f90a6ef328e2e8"
28SRC_URI[sha256sum] = "94b383e31c9671e9dfcca81084a8a813817e8f05a57f54533509b318d26e11cf" 27SRC_URI[sha256sum] = "2f0841492f91cca473b73dec6cab9cf765a485e032d48d2e8ae7261e54c419ed"
29 28
30UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" 29UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
31UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" 30UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"