From 5824b879bf77a7626aa0a50e961894170e37c2c4 Mon Sep 17 00:00:00 2001 From: Lucian Cristian Date: Fri, 21 May 2021 00:06:23 +0300 Subject: [PATCH] nss: update to 3.65 Signed-off-by: Lucian Cristian (cherry picked from commit 0f5eadf362ab3cbd3c89a5aa6828265bcc3bc1cd) --- libs/nss/Makefile | 6 +++--- libs/nss/patches/003-openwrt_fix.patch | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/nss/Makefile b/libs/nss/Makefile index b759226379..28f107a5bc 100644 --- a/libs/nss/Makefile +++ b/libs/nss/Makefile @@ -7,14 +7,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nss -PKG_VERSION:=3.61 -PKG_RELEASE:=3 +PKG_VERSION:=3.65 +PKG_RELEASE:=1 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:=312e2d804b34ccf0fec70b57cf8cd6ac853f8ced60df53e30ebb0a7bcd0e1370 +PKG_HASH:=32170f6c188212a78bf9fdacffa2eeed0d564ef8faae63fd8ae971b208e8c637 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 fd2bf43a66..26a64ebc8d 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 -@@ -108,11 +108,6 @@ LIBC_TAG = _glibc +@@ -113,11 +113,6 @@ LIBC_TAG = _glibc endif ifdef BUILD_OPT @@ -45,7 +45,7 @@ ifdef MOZ_DEBUG_SYMBOLS ifdef MOZ_DEBUG_FLAGS OPTIMIZER += $(MOZ_DEBUG_FLAGS) -@@ -144,7 +139,8 @@ ifdef USE_PTHREADS +@@ -149,7 +144,8 @@ ifdef USE_PTHREADS DEFINES += -D_REENTRANT endif @@ -55,7 +55,7 @@ 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 -@@ -154,6 +150,7 @@ DSO_LDOPTS = -shared $(ARCHFLAG) -Wl,-- +@@ -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 @@ -63,7 +63,7 @@ # On Maemo, we need to use the -rpath-link flag for even the standard system # library directories. -@@ -195,7 +192,7 @@ RPATH = -Wl,-rpath,'$$ORIGIN:/opt/sun/pr +@@ -200,7 +197,7 @@ RPATH = -Wl,-rpath,'$$ORIGIN:/opt/sun/pr endif endif -- 2.30.2