From 438574c348f4c282d86b614fe74de667905a4411 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sat, 19 Dec 2020 10:19:16 +0000 Subject: [PATCH] nss: updated to 3.60 --- packages/security/nss/package.mk | 10 ++++---- .../patches/nss-02_3.15.5-standalone-1.patch | 20 ++++++++------- .../nss/patches/nss-04-skip_shlibsign.patch | 9 ++++--- .../patches/nss-06-always-include-fstar.patch | 15 ----------- .../nss-08-tests-broken-since-3.47.patch | 25 ------------------- 5 files changed, 21 insertions(+), 58 deletions(-) delete mode 100644 packages/security/nss/patches/nss-06-always-include-fstar.patch delete mode 100644 packages/security/nss/patches/nss-08-tests-broken-since-3.47.patch diff --git a/packages/security/nss/package.mk b/packages/security/nss/package.mk index 60cf565857..70a032ecd2 100644 --- a/packages/security/nss/package.mk +++ b/packages/security/nss/package.mk @@ -3,11 +3,11 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="nss" -PKG_VERSION="3.47.1" -PKG_SHA256="07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64" +PKG_VERSION="3.60" +PKG_SHA256="850deb3f4d49703618b64ca5c0ca92d2f195e0e41d7124f7b2149a6ca9eaae1f" PKG_LICENSE="Mozilla Public License" PKG_SITE="http://ftp.mozilla.org/" -PKG_URL="http://ftp.mozilla.org/pub/security/nss/releases/NSS_3_47_1_RTM/src/nss-3.47.1-with-nspr-4.23.tar.gz" +PKG_URL="https://ftp.mozilla.org/pub/security/nss/releases/NSS_${PKG_VERSION/./_}_RTM/src/nss-${PKG_VERSION}-with-nspr-$(get_pkg_version nspr).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" @@ -25,6 +25,7 @@ make_host() { PREFIX=$TOOLCHAIN \ NSPR_INCLUDE_DIR=$TOOLCHAIN/include/nspr \ USE_SYSTEM_ZLIB=1 ZLIB_LIBS="-lz -L$TOOLCHAIN/lib" \ + NSS_BUILD_UTIL_ONLY=1 \ SKIP_SHLIBSIGN=1 \ NSS_TESTS="dummy" \ CC=$CC LDFLAGS="$LDFLAGS -L$TOOLCHAIN/lib" \ @@ -35,7 +36,6 @@ makeinstall_host() { cd $PKG_BUILD $STRIP dist/Linux*/lib/*.so cp -L dist/Linux*/lib/*.so $TOOLCHAIN/lib - cp -L dist/Linux*/lib/libcrmf.a $TOOLCHAIN/lib mkdir -p $TOOLCHAIN/include/nss cp -RL dist/{public,private}/nss/* $TOOLCHAIN/include/nss cp -L dist/Linux*/lib/pkgconfig/nss.pc $TOOLCHAIN/lib/pkgconfig @@ -56,6 +56,7 @@ make_target() { NSPR_INCLUDE_DIR=$SYSROOT_PREFIX/usr/include/nspr \ NSS_USE_SYSTEM_SQLITE=1 \ USE_SYSTEM_ZLIB=1 ZLIB_LIBS=-lz \ + NSS_BUILD_UTIL_ONLY=1 \ SKIP_SHLIBSIGN=1 \ OS_TEST=$TARGET_ARCH \ NSS_TESTS="dummy" \ @@ -70,7 +71,6 @@ makeinstall_target() { cd $PKG_BUILD $STRIP dist/Linux*/lib/*.so cp -L dist/Linux*/lib/*.so $SYSROOT_PREFIX/usr/lib - cp -L dist/Linux*/lib/libcrmf.a $SYSROOT_PREFIX/usr/lib mkdir -p $SYSROOT_PREFIX/usr/include/nss cp -RL dist/{public,private}/nss/* $SYSROOT_PREFIX/usr/include/nss cp -L dist/Linux*/lib/pkgconfig/nss.pc $SYSROOT_PREFIX/usr/lib/pkgconfig diff --git a/packages/security/nss/patches/nss-02_3.15.5-standalone-1.patch b/packages/security/nss/patches/nss-02_3.15.5-standalone-1.patch index b82c25d0d8..46cc6c0321 100644 --- a/packages/security/nss/patches/nss-02_3.15.5-standalone-1.patch +++ b/packages/security/nss/patches/nss-02_3.15.5-standalone-1.patch @@ -220,22 +220,24 @@ Description: Adds auto-generated nss.pc and nss-config script, and a +Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@ +Cflags: -I${includedir} + ---- a/nss/Makefile 2013-05-28 23:43:24.000000000 +0200 -+++ b/nss/Makefile 2013-07-02 14:52:58.328084334 +0200 -@@ -46,7 +46,7 @@ - # (7) Execute "local" rules. (OPTIONAL). # +--- a/nss/Makefile.orig 2020-12-19 09:07:22.015285016 +0000 ++++ a/nss/Makefile 2020-12-19 09:17:06.966350898 +0000 +@@ -48,7 +48,6 @@ ####################################################################### --nss_build_all: build_nspr all latest -+nss_build_all: all latest - - nss_clean_all: clobber_nspr clobber + nss_build_all: +- $(MAKE) build_nspr + $(MAKE) all + $(MAKE) latest --- a/nss/manifest.mn 2013-05-28 23:43:24.000000000 +0200 +++ b/nss/manifest.mn 2013-07-02 14:52:58.331417666 +0200 -@@ -10,4 +10,4 @@ +@@ -10,7 +10,7 @@ RELEASE = nss -DIRS = coreconf lib cmd cpputil gtests +DIRS = coreconf lib cmd config + + HAVE_ALL_TARGET := 1 + diff --git a/packages/security/nss/patches/nss-04-skip_shlibsign.patch b/packages/security/nss/patches/nss-04-skip_shlibsign.patch index dfee7cd0ed..54234a54d3 100644 --- a/packages/security/nss/patches/nss-04-skip_shlibsign.patch +++ b/packages/security/nss/patches/nss-04-skip_shlibsign.patch @@ -1,12 +1,13 @@ diff -Naur nss-3.29.5.orig/nss/cmd/shlibsign/Makefile nss-3.29.5/nss/cmd/shlibsign/Makefile --- nss-3.29.5.orig/nss/cmd/shlibsign/Makefile 2017-09-08 10:56:01.663876686 +0200 +++ nss-3.29.5/nss/cmd/shlibsign/Makefile 2017-09-08 10:57:19.659306831 +0200 -@@ -95,5 +95,7 @@ +@@ -95,7 +95,9 @@ endif endif --libs install :: $(CHECKLOC) +ifndef SKIP_SHLIBSIGN -+ libs install :: $(CHECKLOC) + libs: install + ifdef CHECKLOC + $(MAKE) $(CHECKLOC) + endif +endif - diff --git a/packages/security/nss/patches/nss-06-always-include-fstar.patch b/packages/security/nss/patches/nss-06-always-include-fstar.patch deleted file mode 100644 index 60c0766dc6..0000000000 --- a/packages/security/nss/patches/nss-06-always-include-fstar.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile -index bff11c7..0c714c8 100644 ---- a/nss/lib/freebl/Makefile -+++ b/nss/lib/freebl/Makefile -@@ -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) # diff --git a/packages/security/nss/patches/nss-08-tests-broken-since-3.47.patch b/packages/security/nss/patches/nss-08-tests-broken-since-3.47.patch deleted file mode 100644 index 795ad4885c..0000000000 --- a/packages/security/nss/patches/nss-08-tests-broken-since-3.47.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 674faa792fc6c1bd391915fb9aacef2fcfd6426f Mon Sep 17 00:00:00 2001 -From: MilhouseVH -Date: Mon, 25 Nov 2019 04:59:08 +0000 -Subject: [PATCH] tests are broken when cross-compiling - ---- - nss/lib/ckfw/builtins/manifest.mn | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/nss/lib/ckfw/builtins/manifest.mn b/nss/lib/ckfw/builtins/manifest.mn -index 5e6740f..00bcdc0 100644 ---- a/nss/lib/ckfw/builtins/manifest.mn -+++ b/nss/lib/ckfw/builtins/manifest.mn -@@ -5,7 +5,7 @@ - - CORE_DEPTH = ../../.. - --DIRS = testlib -+#DIRS = testlib - - MODULE = nss - MAPFILE = $(OBJDIR)/nssckbi.def --- -2.7.4 -