diff --git a/package/libnss/0002-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch b/package/libnss/0002-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch new file mode 100644 index 0000000000..95e7b2bb56 --- /dev/null +++ b/package/libnss/0002-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch @@ -0,0 +1,26 @@ +From 2e1b003600156e4adcb88998eabf18addee45be1 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Sun, 8 Dec 2019 11:57:45 +0100 +Subject: [PATCH] Bug 1602288 - Fix build failure due to missing posix signal.h + +Signed-off-by: Giulio Benetti +--- + nss/coreconf/Linux.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nss/coreconf/Linux.mk b/nss/coreconf/Linux.mk +index d07f8a3c5..854d3ca96 100644 +--- a/nss/coreconf/Linux.mk ++++ b/nss/coreconf/Linux.mk +@@ -21,7 +21,7 @@ ifeq ($(USE_PTHREADS),1) + endif + + DEFAULT_COMPILER = gcc +-DEFINES += -D_DEFAULT_SOURCE -D_BSD_SOURCE ++DEFINES += -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE + + ifeq ($(OS_TARGET),Android) + ifndef ANDROID_NDK +-- +2.20.1 + diff --git a/package/libnss/0002-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch b/package/libnss/0003-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch similarity index 100% rename from package/libnss/0002-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch rename to package/libnss/0003-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch diff --git a/package/libnss/0004-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch b/package/libnss/0004-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch new file mode 100644 index 0000000000..631d97d11f --- /dev/null +++ b/package/libnss/0004-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch @@ -0,0 +1,29 @@ +From 1ba8516045bc8a13fd72e1a85206a04b29d96758 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Thu, 12 Dec 2019 12:57:29 +0100 +Subject: [PATCH] Bug 1603398 - Fix nsinstall.c build failure on RHEL 7 + +In Linux.mk -DLINUX and -Dlinux must be passed to DEFINES, not +OS_CFLAGS. + +Signed-off-by: Giulio Benetti +--- + nss/coreconf/Linux.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nss/coreconf/Linux.mk b/nss/coreconf/Linux.mk +index d07f8a3c5..4b45a6054 100644 +--- a/nss/coreconf/Linux.mk ++++ b/nss/coreconf/Linux.mk +@@ -132,7 +132,7 @@ endif + + OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -pipe -ffunction-sections -fdata-sections -DHAVE_STRERROR + ifeq ($(KERNEL),Linux) +- OS_CFLAGS += -DLINUX -Dlinux ++ DEFINES += -DLINUX -Dlinux + endif + OS_LIBS = $(OS_PTHREAD) -ldl -lc + +-- +2.20.1 + diff --git a/package/libnss/0005-Bug-1606119-Fix-PPC-HW-Crypto-build-failure.patch b/package/libnss/0005-Bug-1606119-Fix-PPC-HW-Crypto-build-failure.patch new file mode 100644 index 0000000000..03ca25edf7 --- /dev/null +++ b/package/libnss/0005-Bug-1606119-Fix-PPC-HW-Crypto-build-failure.patch @@ -0,0 +1,36 @@ +From ebf185f8e48b5aec622dc949cef1b19b0a7669ef Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 1 Jan 2020 12:54:45 +0100 +Subject: [PATCH] Bug 1606119 - Fix PPC HW Crypto build failure + +All Altivec *_be() functions are supported from gcc version 8.x not 5.x +so modify gcc version check that at the moment cause build failure due +to missing Altivec *_be() functions. + +Signed-off-by: Giulio Benetti +Upstream issue: https://bugzilla.mozilla.org/show_bug.cgi?id=1606119 +--- + nss/lib/freebl/gcm.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/nss/lib/freebl/gcm.h b/nss/lib/freebl/gcm.h +index 571b9ec55..aa4dee824 100644 +--- a/nss/lib/freebl/gcm.h ++++ b/nss/lib/freebl/gcm.h +@@ -41,11 +41,11 @@ + #endif + + /* +- * PPC CRYPTO requires at least gcc 5 or clang. The LE check is purely ++ * PPC CRYPTO requires at least gcc 8 or clang. The LE check is purely + * because it's only been tested on LE. If you're interested in BE, + * please send a patch. + */ +-#if (defined(__clang__) || (defined(__GNUC__) && __GNUC__ >= 5)) && \ ++#if (defined(__clang__) || (defined(__GNUC__) && __GNUC__ >= 8)) && \ + defined(IS_LITTLE_ENDIAN) + #define USE_PPC_CRYPTO + #endif +-- +2.20.1 + diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index d87ad8e3ab..b53fc6d5f0 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ # From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_48_RTM/src/SHA256SUMS -sha256 6738094dc4fd63061118a122bf3999a64fe8c7117fc52f6e81c2279181bde71d nss-3.49.tar.gz +sha256 3f9c822a86a4e3e1bfe63e2ed0f922d8b7c2e0b7cafe36774b1c627970d0f8ac nss-3.48.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 61950ade25..68389d46fc 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.49 +LIBNSS_VERSION = 3.48 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist @@ -68,7 +68,7 @@ define LIBNSS_BUILD_CMDS SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ - $(LIBNSS_BUILD_VARS) NATIVE_FLAGS="$(HOST_CFLAGS) -DLINUX" + $(LIBNSS_BUILD_VARS) NATIVE_FLAGS="$(HOST_CFLAGS)" endef define LIBNSS_INSTALL_STAGING_CMDS