summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.1.bb (renamed from meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.0.bb)4
-rw-r--r--meta/recipes-support/nss/nss/0001-Bug-1432455-Build-FStar.c-when-not-building-with-int.patch112
-rw-r--r--meta/recipes-support/nss/nss/Fix-compilation-for-X32.patch33
-rw-r--r--meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch8
-rw-r--r--meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch8
-rw-r--r--meta/recipes-support/nss/nss_3.37.1.bb (renamed from meta/recipes-support/nss/nss_3.36.1.bb)6
6 files changed, 125 insertions, 46 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.1.bb
index d327a3b42e..dc31890f69 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.1.bb
@@ -10,7 +10,7 @@ advanced features of the touchpad to become available."
10 10
11LIC_FILES_CHKSUM = "file://COPYING;md5=55aacd3535a741824955c5eb8f061398" 11LIC_FILES_CHKSUM = "file://COPYING;md5=55aacd3535a741824955c5eb8f061398"
12 12
13SRC_URI[md5sum] = "58e5b7722a402114093bf193962d1e3a" 13SRC_URI[md5sum] = "cfb79d3c975151f9bbf30b727c260cb9"
14SRC_URI[sha256sum] = "afba3289d7a40217a19d90db98ce181772f9ca6d77e1898727b0afcf02073b5a" 14SRC_URI[sha256sum] = "7af83526eff1c76e8b9e1553b34245c203d029028d8044dd9dcf71eef1001576"
15 15
16DEPENDS += "libxi mtdev libxtst libevdev" 16DEPENDS += "libxi mtdev libxtst libevdev"
diff --git a/meta/recipes-support/nss/nss/0001-Bug-1432455-Build-FStar.c-when-not-building-with-int.patch b/meta/recipes-support/nss/nss/0001-Bug-1432455-Build-FStar.c-when-not-building-with-int.patch
new file mode 100644
index 0000000000..f14792306c
--- /dev/null
+++ b/meta/recipes-support/nss/nss/0001-Bug-1432455-Build-FStar.c-when-not-building-with-int.patch
@@ -0,0 +1,112 @@
1From fe5fd11f3f02d3625b37f8e3c592e5c3e84c1798 Mon Sep 17 00:00:00 2001
2From: Mike Hommey <mh@glandium.org>
3Date: Sun, 27 May 2018 16:20:00 +0200
4Subject: [PATCH] Bug 1432455 - Build FStar.c when not building with int128
5 support. r=fkiefer
6
7--HG--
8extra : amend_source : b3f739de2f592ecb9ae1f1ce5ee4fb0e04df22cb
9
10Upstream-Status: Backport
11https://hg.mozilla.org/projects/nss/rev/2209bddb98b8d105159998b9be91a155aa6bd283
12
13NSS bug https://bugzilla.mozilla.org/show_bug.cgi?format=default&id=1459739
14
15Signed-off-by: Armin Kuster <akuster808@gmail.com>
16
17---
18 lib/freebl/Makefile | 6 +++++-
19 lib/freebl/freebl.gyp | 29 +++++++++++++++++------------
20 lib/freebl/freebl_base.gypi | 4 +++-
21 3 files changed, 25 insertions(+), 14 deletions(-)
22
23Index: nss-3.37.1/nss/lib/freebl/Makefile
24===================================================================
25--- nss-3.37.1.orig/nss/lib/freebl/Makefile
26+++ nss-3.37.1/nss/lib/freebl/Makefile
27@@ -541,12 +541,16 @@ ifeq (,$(filter-out i386 x386 x86 x86_64
28 # All intel architectures get the 64 bit version
29 # With custom uint128 if necessary (faster than generic 32 bit version).
30 ECL_SRCS += curve25519_64.c
31- VERIFIED_SRCS += Hacl_Curve25519.c FStar.c
32+ VERIFIED_SRCS += Hacl_Curve25519.c
33 else
34 # All non intel architectures get the generic 32 bit implementation (slow!)
35 ECL_SRCS += curve25519_32.c
36 endif
37
38+ifndef HAVE_INT128_SUPPORT
39+ VERIFIED_SRCS += FStar.c
40+endif
41+
42 #######################################################################
43 # (5) Execute "global" rules. (OPTIONAL) #
44 #######################################################################
45Index: nss-3.37.1/nss/lib/freebl/freebl.gyp
46===================================================================
47--- nss-3.37.1.orig/nss/lib/freebl/freebl.gyp
48+++ nss-3.37.1/nss/lib/freebl/freebl.gyp
49@@ -277,18 +277,10 @@
50 'MP_IS_LITTLE_ENDIAN',
51 ],
52 }],
53- [ 'OS!="win"', {
54- 'conditions': [
55- [ 'target_arch=="x64" or target_arch=="arm64" or target_arch=="aarch64"', {
56- 'defines': [
57- # The Makefile does version-tests on GCC, but we're not doing that here.
58- 'HAVE_INT128_SUPPORT',
59- ],
60- }, {
61- 'defines': [
62- 'KRML_NOUINT128',
63- ],
64- }],
65+ [ 'have_int128_support==1', {
66+ 'defines': [
67+ # The Makefile does version-tests on GCC, but we're not doing that here.
68+ 'HAVE_INT128_SUPPORT',
69 ],
70 }, {
71 'defines': [
72@@ -350,5 +342,18 @@
73 },
74 'variables': {
75 'module': 'nss',
76+ 'conditions': [
77+ [ 'OS!="win"', {
78+ 'conditions': [
79+ [ 'target_arch=="x64" or target_arch=="arm64" or target_arch=="aarch64"', {
80+ 'have_int128_support%': 1,
81+ }, {
82+ 'have_int128_support%': 0,
83+ }],
84+ ],
85+ }, {
86+ 'have_int128_support%': 0,
87+ }],
88+ ],
89 }
90 }
91Index: nss-3.37.1/nss/lib/freebl/freebl_base.gypi
92===================================================================
93--- nss-3.37.1.orig/nss/lib/freebl/freebl_base.gypi
94+++ nss-3.37.1/nss/lib/freebl/freebl_base.gypi
95@@ -60,7 +60,6 @@
96 'shvfy.c',
97 'sysrand.c',
98 'tlsprfalg.c',
99- 'verified/FStar.c',
100 ],
101 'conditions': [
102 [ 'OS=="linux" or OS=="android"', {
103@@ -220,6 +219,9 @@
104 }],
105 ],
106 }],
107+ [ 'have_int128_support==0', {
108+ 'sources': [ 'verified/FStar.c' ],
109+ }],
110 ],
111 'ldflags': [
112 '-Wl,-Bsymbolic'
diff --git a/meta/recipes-support/nss/nss/Fix-compilation-for-X32.patch b/meta/recipes-support/nss/nss/Fix-compilation-for-X32.patch
deleted file mode 100644
index 80b86908e5..0000000000
--- a/meta/recipes-support/nss/nss/Fix-compilation-for-X32.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From c8eadfcdfbc1d5a4799e9a264b0f859cb5954c05 Mon Sep 17 00:00:00 2001
2From: Christopher Larson <chris_larson@mentor.com>
3Date: Tue, 13 Dec 2016 11:40:47 -0700
4Subject: [PATCH 7/7] Fix compilation for X32
5
6X32 uses 32-bit pointers, not 64-bit.
7
8Signed-off-by: Christopher Larson <chris_larson@mentor.com>
9
10Upstream-Status: Pending
11---
12 nss/lib/freebl/poly1305-donna-x64-sse2-incremental-source.c | 4 ++++
13 1 file changed, 4 insertions(+)
14
15diff --git a/nss/lib/freebl/poly1305-donna-x64-sse2-incremental-source.c b/nss/lib/freebl/poly1305-donna-x64-sse2-incremental-source.c
16index 2a3301e..d4ade41 100644
17--- a/nss/lib/freebl/poly1305-donna-x64-sse2-incremental-source.c
18+++ b/nss/lib/freebl/poly1305-donna-x64-sse2-incremental-source.c
19@@ -87,7 +87,11 @@ static poly1305_state_internal INLINE
20 *
21 poly1305_aligned_state(poly1305_state *state)
22 {
23+#ifdef __ILP32__
24+ return (poly1305_state_internal *)(((uint32_t)state + 63) & ~63);
25+#else
26 return (poly1305_state_internal *)(((uint64_t)state + 63) & ~63);
27+#endif
28 }
29
30 /* copy 0-63 bytes */
31--
322.8.0
33
diff --git a/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch b/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch
index 86b1b60556..de812d27ba 100644
--- a/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch
+++ b/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch
@@ -18,11 +18,11 @@ for more details
18Signed-off-by: Khem Raj <raj.khem@gmail.com> 18Signed-off-by: Khem Raj <raj.khem@gmail.com>
19Upstream-Status: Pending 19Upstream-Status: Pending
20 20
21Index: nss-3.24/nss/coreconf/Werror.mk 21Index: nss-3.37.1/nss/coreconf/Werror.mk
22=================================================================== 22===================================================================
23--- nss-3.24.orig/nss/coreconf/Werror.mk 23--- nss-3.37.1.orig/nss/coreconf/Werror.mk
24+++ nss-3.24/nss/coreconf/Werror.mk 24+++ nss-3.37.1/nss/coreconf/Werror.mk
25@@ -54,7 +54,7 @@ ifndef WARNING_CFLAGS 25@@ -56,7 +56,7 @@ ifndef WARNING_CFLAGS
26 ifdef CC_IS_CLANG 26 ifdef CC_IS_CLANG
27 # -Qunused-arguments : clang objects to arguments that it doesn't understand 27 # -Qunused-arguments : clang objects to arguments that it doesn't understand
28 # and fixing this would require rearchitecture 28 # and fixing this would require rearchitecture
diff --git a/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch
index 9942bf1926..3a817faaa6 100644
--- a/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch
+++ b/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch
@@ -6,11 +6,11 @@ pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression
6 6
7Signed-off-by: Khem Raj <raj.khem@gmail.com> 7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8Upstream-Status: Pending 8Upstream-Status: Pending
9Index: nss-3.24/nss/lib/freebl/pqg.c 9Index: nss-3.37.1/nss/lib/freebl/pqg.c
10=================================================================== 10===================================================================
11--- nss-3.24.orig/nss/lib/freebl/pqg.c 11--- nss-3.37.1.orig/nss/lib/freebl/pqg.c
12+++ nss-3.24/nss/lib/freebl/pqg.c 12+++ nss-3.37.1/nss/lib/freebl/pqg.c
13@@ -322,8 +322,8 @@ generate_h_candidate(SECItem *hit, mp_in 13@@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_in
14 14
15 static SECStatus 15 static SECStatus
16 addToSeed(const SECItem *seed, 16 addToSeed(const SECItem *seed,
diff --git a/meta/recipes-support/nss/nss_3.36.1.bb b/meta/recipes-support/nss/nss_3.37.1.bb
index 780a7ab088..0e8b5be365 100644
--- a/meta/recipes-support/nss/nss_3.36.1.bb
+++ b/meta/recipes-support/nss/nss_3.37.1.bb
@@ -25,11 +25,11 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO
25 file://nss-fix-nsinstall-build.patch \ 25 file://nss-fix-nsinstall-build.patch \
26 file://disable-Wvarargs-with-clang.patch \ 26 file://disable-Wvarargs-with-clang.patch \
27 file://pqg.c-ULL_addend.patch \ 27 file://pqg.c-ULL_addend.patch \
28 file://Fix-compilation-for-X32.patch \ 28 file://0001-Bug-1432455-Build-FStar.c-when-not-building-with-int.patch \
29 " 29 "
30 30
31SRC_URI[md5sum] = "814d8fe3ec89006cf62078e2a56cf2f9" 31SRC_URI[md5sum] = "e9526d7217d02afa96b90b89924c38df"
32SRC_URI[sha256sum] = "6025441d528ff6a7f1a4b673b6ee7d3540731ada3f78d5acd5c3b3736b222bff" 32SRC_URI[sha256sum] = "097b30e436479ad737b3703b25b6198b6513e202731085c6f097d8853dd20405"
33 33
34UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" 34UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
35UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" 35UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"