Browse Source

nss: update to latest stable version

Waldemar Brodkorb 9 years ago
parent
commit
d7fd46bb3e

+ 4 - 5
package/nss/Makefile

@@ -4,18 +4,17 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		nss
-PKG_VERSION:=		3.20.1
+PKG_VERSION:=		3.23
 PKG_RELEASE:=		1
 PKG_MAJ_VERSION:=	3
-PKG_MIN_VERSION:=	20
-PKG_PATCH_VERSION:=	1
-PKG_HASH:=		ad3c8f11dfd9570c2d04a6140d5ef7c2bdd0fe30d6c9e5548721a4251a5e8c97
+PKG_MIN_VERSION:=	23
+PKG_HASH:=		94b383e31c9671e9dfcca81084a8a813817e8f05a57f54533509b318d26e11cf
 PKG_DESCR:=		network security services library
 PKG_SECTION:=		libs/crypto
 PKG_BUILDDEP:=		nspr zlib sqlite
 PKG_DEPENDS:=		nspr zlib libsqlite
 PKG_URL:=		http://www.mozilla.org/projects/security/pki/nss/
-PKG_SITES:=		https://ftp.mozilla.org/pub/security/nss/releases/NSS_${PKG_MAJ_VERSION}_${PKG_MIN_VERSION}_${PKG_PATCH_VERSION}_RTM/src/
+PKG_SITES:=		https://ftp.mozilla.org/pub/security/nss/releases/NSS_${PKG_MAJ_VERSION}_${PKG_MIN_VERSION}_RTM/src/
 PKG_NOPARALLEL:=	1
 
 PKG_HOST_DEPENDS:=	!cygwin

+ 3 - 3
package/nss/patches/patch-nss_coreconf_Linux_mk

@@ -1,5 +1,5 @@
---- nss-3.17.4.orig/nss/coreconf/Linux.mk	2015-01-22 20:49:26.000000000 +0100
-+++ nss-3.17.4/nss/coreconf/Linux.mk	2015-01-29 15:49:15.000000000 +0100
+--- nss-3.23.orig/nss/coreconf/Linux.mk	2016-02-26 21:51:11.000000000 +0100
++++ nss-3.23/nss/coreconf/Linux.mk	2016-03-12 19:34:11.236877389 +0100
 @@ -16,9 +16,9 @@ ifeq ($(USE_PTHREADS),1)
  	IMPL_STRATEGY = _PTH
  endif
@@ -13,7 +13,7 @@
  
  DEFAULT_COMPILER = gcc
  
-@@ -146,7 +146,7 @@ DSO_LDOPTS		= -shared $(ARCHFLAG) -Wl,--
+@@ -155,7 +155,7 @@ DSO_LDOPTS		= -shared $(ARCHFLAG) -Wl,--
  # we don't use -z defs there.
  ZDEFS_FLAG		= -Wl,-z,defs
  DSO_LDOPTS		+= $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG))

+ 4 - 4
package/nss/patches/patch-nss_coreconf_command_mk

@@ -1,8 +1,8 @@
---- nss-3.17.4.orig/nss/coreconf/command.mk	2015-01-22 20:49:26.000000000 +0100
-+++ nss-3.17.4/nss/coreconf/command.mk	2015-01-29 15:49:15.000000000 +0100
+--- nss-3.23.orig/nss/coreconf/command.mk	2016-02-26 21:51:11.000000000 +0100
++++ nss-3.23/nss/coreconf/command.mk	2016-03-12 19:34:11.232877235 +0100
 @@ -15,7 +15,7 @@ LINK_DLL      = $(LINK) $(OS_DLLFLAGS) $
- CFLAGS        = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
- 		$(XCFLAGS)
+ CFLAGS        = $(OPTIMIZER) $(OS_CFLAGS) $(WARNING_CFLAGS) $(XP_DEFINE) \
+                 $(DEFINES) $(INCLUDES) $(XCFLAGS)
  PERL          = perl
 -RANLIB        = echo
 +RANLIB        = ranlib

+ 4 - 7
package/nss/patches/patch-nss_manifest_mn

@@ -1,11 +1,8 @@
---- nss-3.17.4.orig/nss/manifest.mn	2015-01-22 20:49:26.000000000 +0100
-+++ nss-3.17.4/nss/manifest.mn	2015-01-29 15:57:46.000000000 +0100
-@@ -10,7 +10,7 @@ IMPORTS =	nspr20/v4.8 \
+--- nss-3.23.orig/nss/manifest.mn	2016-02-26 21:51:11.000000000 +0100
++++ nss-3.23/nss/manifest.mn	2016-03-12 19:42:48.660823505 +0100
+@@ -10,4 +10,4 @@ IMPORTS =	nspr20/v4.8 \
  
  RELEASE = nss
  
--DIRS = coreconf lib cmd
+-DIRS = coreconf lib cmd external_tests
 +DIRS = coreconf lib cmd config
- 
- ifdef NSS_BUILD_GTESTS
- DIRS += external_tests