From 58652ed54f636401d4b78da9294a0b8df093f371 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 12 Jun 2019 22:27:55 +0100 Subject: [PATCH] nss: update to nss-3.44 --- packages/security/nss/package.mk | 7 ++++--- .../patches/nss-06-always-include-fstar.patch | 19 +++++++------------ 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/packages/security/nss/package.mk b/packages/security/nss/package.mk index 540ccf7e9a..8b3fd439b1 100644 --- a/packages/security/nss/package.mk +++ b/packages/security/nss/package.mk @@ -1,12 +1,13 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="nss" -PKG_VERSION="3.37.1" -PKG_SHA256="5ac4a388b06b2785fb7f4f0ae3c909d8cbb2ab370147ff61fe2517cc5bf3c685" +PKG_VERSION="3.44" +PKG_SHA256="298d86e18e96660d3c98476274b5857b48c135d809a10d6528d8661bdf834a49" PKG_LICENSE="Mozilla Public License" PKG_SITE="http://ftp.mozilla.org/" -PKG_URL="http://ftp.mozilla.org/pub/security/nss/releases/NSS_3_37_1_RTM/src/nss-3.37.1-with-nspr-4.19.tar.gz" +PKG_URL="http://ftp.mozilla.org/pub/security/nss/releases/NSS_3_44_RTM/src/nss-3.44-with-nspr-4.21.tar.gz" PKG_DEPENDS_HOST="nspr:host zlib:host" PKG_DEPENDS_TARGET="toolchain nss:host nspr zlib sqlite" PKG_LONGDESC="The Network Security Services (NSS) package is a set of libraries designed to support cross-platform development of security-enabled client and server applications" diff --git a/packages/security/nss/patches/nss-06-always-include-fstar.patch b/packages/security/nss/patches/nss-06-always-include-fstar.patch index 3490e6f3f8..60c0766dc6 100644 --- a/packages/security/nss/patches/nss-06-always-include-fstar.patch +++ b/packages/security/nss/patches/nss-06-always-include-fstar.patch @@ -1,20 +1,15 @@ diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile -index e6a94d35c..0c714c85c 100644 +index bff11c7..0c714c8 100644 --- a/nss/lib/freebl/Makefile +++ b/nss/lib/freebl/Makefile -@@ -535,12 +535,14 @@ 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!) +@@ -541,9 +541,7 @@ else ECL_SRCS += curve25519_32.c endif - + +-ifndef HAVE_INT128_SUPPORT +- VERIFIED_SRCS += FStar.c +-endif +VERIFIED_SRCS += FStar.c -+ + ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # - #######################################################################