From a71ade6e9481e34746a743d27290e444110ca181 Mon Sep 17 00:00:00 2001 From: Lucian Cristian Date: Mon, 30 May 2022 20:25:08 +0300 Subject: [PATCH] nss: update to 3.78 Signed-off-by: Lucian Cristian --- libs/nss/Makefile | 4 ++-- libs/nss/patches/003-openwrt_fix.patch | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libs/nss/Makefile b/libs/nss/Makefile index 5857aa7bb..cc0213abb 100644 --- a/libs/nss/Makefile +++ b/libs/nss/Makefile @@ -7,14 +7,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nss -PKG_VERSION:=3.76 +PKG_VERSION:=3.78 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= \ https://download.cdn.mozilla.net/pub/security/$(PKG_NAME)/releases/NSS_$(subst .,_,$(PKG_VERSION))_RTM/src \ https://archive.mozilla.org/pub/security/$(PKG_NAME)/releases/NSS_$(subst .,_,$(PKG_VERSION))_RTM/src -PKG_HASH:=1b8e0310add364d2ade40620cde0f1c37f4f00a6999b2d3e7ea8dacda4aa1630 +PKG_HASH:=f455f341e787c1167328e80a84f77b9a557d595066dda6486a1874d72da68800 PKG_MAINTAINER:=Lucian Cristian PKG_LICENCE:=MPL-2.0 diff --git a/libs/nss/patches/003-openwrt_fix.patch b/libs/nss/patches/003-openwrt_fix.patch index 26a64ebc8..598e2f41b 100644 --- a/libs/nss/patches/003-openwrt_fix.patch +++ b/libs/nss/patches/003-openwrt_fix.patch @@ -33,7 +33,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET))) --- a/nss/coreconf/Linux.mk +++ b/nss/coreconf/Linux.mk -@@ -113,11 +113,6 @@ LIBC_TAG = _glibc +@@ -114,11 +114,6 @@ LIBC_TAG = _glibc endif ifdef BUILD_OPT @@ -45,7 +45,7 @@ ifdef MOZ_DEBUG_SYMBOLS ifdef MOZ_DEBUG_FLAGS OPTIMIZER += $(MOZ_DEBUG_FLAGS) -@@ -149,7 +144,8 @@ ifdef USE_PTHREADS +@@ -150,7 +145,8 @@ ifdef USE_PTHREADS DEFINES += -D_REENTRANT endif @@ -55,15 +55,15 @@ DSO_LDOPTS = -shared $(ARCHFLAG) -Wl,--gc-sections # The linker on Red Hat Linux 7.2 and RHEL 2.1 (GNU ld version 2.11.90.0.8) # incorrectly reports undefined references in the libraries we link with, so -@@ -159,6 +155,7 @@ DSO_LDOPTS = -shared $(ARCHFLAG) -Wl,-- - ZDEFS_FLAG = -Wl,-z,defs - DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG)) - LDFLAGS += $(ARCHFLAG) -z noexecstack +@@ -166,6 +162,7 @@ LDFLAGS += $(ARCHFLAG) -z noexecstac + ifdef _SBOX_DIR + LDFLAGS += -Wl,-rpath-link,/usr/lib:/lib + endif +endif - # On Maemo, we need to use the -rpath-link flag for even the standard system - # library directories. -@@ -200,7 +197,7 @@ RPATH = -Wl,-rpath,'$$ORIGIN:/opt/sun/pr + G++INCLUDES = -I/usr/include/g++ + +@@ -201,7 +198,7 @@ RPATH = -Wl,-rpath,'$$ORIGIN:/opt/sun/pr endif endif