diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-11-11 12:22:42 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-11-11 12:23:33 +0100 |
| commit | 6cd35c98fcdc6acd5f165ec69c969c5c407f1943 (patch) | |
| tree | 185b83ff4e7dd853f5d79766383c4bd1fbb710f3 | |
| parent | 0ba8db1172d7e781410dcb1e89ab53049c3f88ff (diff) | |
| download | ptxdist-6cd35c98fcdc6acd5f165ec69c969c5c407f1943.tar.gz ptxdist-6cd35c98fcdc6acd5f165ec69c969c5c407f1943.tar.xz | |
nss: version bump 3.37 -> 3.40
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/nss-3.37/0003-unconditionally-add-FStar-to-Makefile.patch | 31 | ||||
| -rw-r--r-- | patches/nss-3.40/0001-nss-fix-nsinstall-build.patch (renamed from patches/nss-3.37/0001-nss-fix-nsinstall-build.patch) | 0 | ||||
| -rw-r--r-- | patches/nss-3.40/0002-add-nss.pc.in.patch (renamed from patches/nss-3.37/0002-add-nss.pc.in.patch) | 0 | ||||
| -rw-r--r-- | patches/nss-3.40/series (renamed from patches/nss-3.37/series) | 3 | ||||
| -rw-r--r-- | rules/nss.make | 4 |
5 files changed, 3 insertions, 35 deletions
diff --git a/patches/nss-3.37/0003-unconditionally-add-FStar-to-Makefile.patch b/patches/nss-3.37/0003-unconditionally-add-FStar-to-Makefile.patch deleted file mode 100644 index 177db5920..000000000 --- a/patches/nss-3.37/0003-unconditionally-add-FStar-to-Makefile.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Lucas Stach <l.stach@pengutronix.de> -Date: Fri, 11 May 2018 15:21:26 +0200 -Subject: [PATCH] unconditionally add FStar to Makefile - -This unit provides helper functions that are used by multiple other -units. Fixes freebl lib build with old build system. - -Signed-off-by: Lucas Stach <l.stach@pengutronix.de> ---- - nss/lib/freebl/Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile -index e6a94d35c45a..58c75da95dba 100644 ---- a/nss/lib/freebl/Makefile -+++ b/nss/lib/freebl/Makefile -@@ -535,12 +535,13 @@ ifeq (,$(filter-out i386 x386 x86 x86_64 aarch64,$(CPU_ARCH))) - # All intel architectures get the 64 bit version - # With custom uint128 if necessary (faster than generic 32 bit version). - ECL_SRCS += curve25519_64.c -- VERIFIED_SRCS += Hacl_Curve25519.c FStar.c -+ VERIFIED_SRCS += Hacl_Curve25519.c - else - # All non intel architectures get the generic 32 bit implementation (slow!) - ECL_SRCS += curve25519_32.c - endif - -+ EXTRA_SRCS += FStar.c - ####################################################################### - # (5) Execute "global" rules. (OPTIONAL) # - ####################################################################### diff --git a/patches/nss-3.37/0001-nss-fix-nsinstall-build.patch b/patches/nss-3.40/0001-nss-fix-nsinstall-build.patch index ab3f9133e..ab3f9133e 100644 --- a/patches/nss-3.37/0001-nss-fix-nsinstall-build.patch +++ b/patches/nss-3.40/0001-nss-fix-nsinstall-build.patch diff --git a/patches/nss-3.37/0002-add-nss.pc.in.patch b/patches/nss-3.40/0002-add-nss.pc.in.patch index addc805b5..addc805b5 100644 --- a/patches/nss-3.37/0002-add-nss.pc.in.patch +++ b/patches/nss-3.40/0002-add-nss.pc.in.patch diff --git a/patches/nss-3.37/series b/patches/nss-3.40/series index 0911f0e5e..15cc5cf3f 100644 --- a/patches/nss-3.37/series +++ b/patches/nss-3.40/series @@ -2,5 +2,4 @@ #tag:base --start-number 1 0001-nss-fix-nsinstall-build.patch 0002-add-nss.pc.in.patch -0003-unconditionally-add-FStar-to-Makefile.patch -# cb80c96f8dfb2ff5ef65b90b5cf05ab5 - git-ptx-patches magic +# 9b53c047a21dbd46d849e90d773bd0d8 - git-ptx-patches magic diff --git a/rules/nss.make b/rules/nss.make index bcdcaeee3..1179759ca 100644 --- a/rules/nss.make +++ b/rules/nss.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_NSS) += nss # # Paths and names # -NSS_VERSION := 3.37 -NSS_MD5 := f86a8c5b15aa12a1deb05995726257dd +NSS_VERSION := 3.40 +NSS_MD5 := f7aec858d192ae03d0e9a35a730c70fa NSS := nss-$(NSS_VERSION) NSS_SUFFIX := tar.gz NSS_URL := https://ftp.mozilla.org/pub/security/nss/releases/NSS_$(subst .,_,$(NSS_VERSION))_RTM/src/$(NSS).$(NSS_SUFFIX) |