nspr: update to 4.36

update to latest 4.36
Signed-off-by: Lucian CRISTIAN <[email protected]>

diff --git a/libs/nspr/Makefile b/libs/nspr/Makefile
index 41a9d52032c7f0203f72a8393d6ab49b9bd6c2bf..03727ddc890f89661c635ffae23002c4ec9659c4 100644 (file)
--- a/libs/nspr/Makefile
+++ b/libs/nspr/Makefile
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nspr
-PKG_VERSION:=4.35
-PKG_RELEASE:=2
+PKG_VERSION:=4.36
+PKG_RELEASE:=1
 PKG_MAINTAINER:=Lucian Cristian <[email protected]>
 PKG_LICENSE:=MPL-2.0
 PKG_CPE_ID:=cpe:/a:mozilla:netscape_portable_runtime
@@ -17,7 +17,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:= \
     https://download.cdn.mozilla.net/pub/$(PKG_NAME)/releases/v$(PKG_VERSION)/src/ \
     https://archive.mozilla.org/pub/$(PKG_NAME)/releases/v$(PKG_VERSION)/src/
-PKG_HASH:=7ea3297ea5969b5d25a5dd8d47f2443cda88e9ee746301f6e1e1426f8a6abc8f
+PKG_HASH:=55dec317f1401cd2e5dba844d340b930ab7547f818179a4002bce62e6f1c6895
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1

diff --git a/libs/nspr/patches/001-Makefile.in_rm_BUILD_STRING_and_BUILD_TIME.patch b/libs/nspr/patches/001-Makefile.in_rm_BUILD_STRING_and_BUILD_TIME.patch
deleted file mode 100644 (file)
index 4b4b6fb..0000000
--- a/libs/nspr/patches/001-Makefile.in_rm_BUILD_STRING_and_BUILD_TIME.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 8a592e4ead4ed6befe6044da3dd2dc7523c33905 Mon Sep 17 00:00:00 2001
-From: Mingli Yu <[email protected]>
-Date: Fri, 16 Nov 2018 13:52:49 +0800
-Subject: [PATCH] Makefile.in: remove _BUILD_STRING and _BUILD_TIME
-
-Remove _BUILD_STRING and _BUILD_TIME to avoid
-adding timestamp to _pl_bld.h which can result
-in adding timestamp in library file such as
-libnspr4.so.
- $ readelf --wide --decompress --hex-dump=.rodata libnspr4.so
- [snip]
-  0x00004000 32303138 2d31312d 31352030 353a3439 2018-11-15 05:49
- [snip]
-
-Upstream-Status: Pending
-
-Signed-off-by: Mingli Yu <[email protected]>
----
- lib/ds/Makefile.in        | 8 +-------
- lib/libc/src/Makefile.in  | 8 +-------
- lib/prstreams/Makefile.in | 8 +-------
- pr/src/Makefile.in        | 8 +-------
- 4 files changed, 4 insertions(+), 28 deletions(-)
-
---- a/nspr/lib/ds/Makefile.in
-+++ b/nspr/lib/ds/Makefile.in
-@@ -110,13 +110,7 @@ GARBAGE += $(TINC)
- 
- $(TINC):
-       @$(MAKE_OBJDIR)
--      @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC)
--      @if test ! -z "$(SH_NOW)"; then \
--          $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \
--      else \
--          true; \
--      fi
--      @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC)
-+      @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC)
- 
- 
- $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
---- a/nspr/lib/libc/src/Makefile.in
-+++ b/nspr/lib/libc/src/Makefile.in
-@@ -112,13 +112,7 @@ GARBAGE += $(TINC)
- 
- $(TINC):
-       @$(MAKE_OBJDIR)
--      @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC)
--      @if test ! -z "$(SH_NOW)"; then \
--          $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \
--      else \
--          true; \
--      fi
--      @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC)
-+      @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC)
- 
- 
- $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
---- a/nspr/lib/prstreams/Makefile.in
-+++ b/nspr/lib/prstreams/Makefile.in
-@@ -110,13 +110,7 @@ endif
- 
- $(TINC):
-       @$(MAKE_OBJDIR)
--      @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC)
--      @if test ! -z "$(SH_NOW)"; then \
--          $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \
--      else \
--          true; \
--      fi
--      @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC)
-+      @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC)
- 
- 
- $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
---- a/nspr/pr/src/Makefile.in
-+++ b/nspr/pr/src/Makefile.in
-@@ -306,13 +306,7 @@ GARBAGE += $(TINC)
- 
- $(TINC):
-       @$(MAKE_OBJDIR)
--      @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC)
--      @if test ! -z "$(SH_NOW)"; then \
--          $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \
--      else \
--          true; \
--      fi
--      @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC)
-+      @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC)
- 
- 
- $(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC)

diff --git a/libs/nspr/patches/002-native_and_musl_fix.patch b/libs/nspr/patches/002-native_and_musl_fix.patch
index d2c2d73bd3f9327bdd98706cad698633eeed5a8b..8b00073da5d366bedaba7e4b22ca96d7aeea724a 100644 (file)
--- a/libs/nspr/patches/002-native_and_musl_fix.patch
+++ b/libs/nspr/patches/002-native_and_musl_fix.patch
@@ -12,12 +12,12 @@
  ifeq ($(MOZ_UNICODE),1)
 --- a/nspr/config/Makefile.in
 +++ b/nspr/config/Makefile.in
-@@ -30,7 +30,7 @@ CSRCS        = now.c
+@@ -28,7 +28,7 @@ include $(topsrcdir)/config/config.mk
+ 
+ CSRCS = now.c
  
- # This version hasn't been ported for us; the one in mozilla/config has
- ifneq ($(OS_ARCH),OS2)
 -CSRCS  += nsinstall.c
 +#CSRCS  += nsinstall.c
-  
  PLSRCS        = nfspwd.pl
- endif
+ 
+ ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH)))