summaryrefslogtreecommitdiff
path: root/package/nss
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-02-06 17:38:29 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2015-02-06 17:48:48 +0100
commitc481446c0210205deca32bef6e199b5dd84f7b11 (patch)
tree2375cf3650f2d8312d1aa77172cac997671ea5d0 /package/nss
parent27a65fefdbebf3f0b3a5e860126de7edc82b2e18 (diff)
update firefox, partially working.
Diffstat (limited to 'package/nss')
-rw-r--r--package/nss/Makefile10
-rw-r--r--package/nss/patches/patch-nss_coreconf_Linux_mk6
-rw-r--r--package/nss/patches/patch-nss_coreconf_command_mk6
-rw-r--r--package/nss/patches/patch-nss_manifest_mn9
4 files changed, 17 insertions, 14 deletions
diff --git a/package/nss/Makefile b/package/nss/Makefile
index 1ebc13824..305b9d707 100644
--- a/package/nss/Makefile
+++ b/package/nss/Makefile
@@ -4,12 +4,12 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= nss
-PKG_VERSION:= 3.16.1
-PKG_RELEASE:= 2
+PKG_VERSION:= 3.17.4
+PKG_RELEASE:= 1
PKG_MAJ_VERSION:= 3
-PKG_MIN_VERSION:= 16
-PKG_PATCH_VERSION:= 1
-PKG_HASH:= fab750f7d34c09cf34df25da1924a9a8f4c7f1768e2d456f8be767ecbbe84a6e
+PKG_MIN_VERSION:= 17
+PKG_PATCH_VERSION:= 4
+PKG_HASH:= 1d98ad1881a4237ec98cbe472fc851480f0b0e954dfe224d047811fb96ff9d79
PKG_DESCR:= network security services library
PKG_SECTION:= libs/crypto
PKG_BUILDDEP:= nspr zlib sqlite
diff --git a/package/nss/patches/patch-nss_coreconf_Linux_mk b/package/nss/patches/patch-nss_coreconf_Linux_mk
index 3f08b564b..90b0ab023 100644
--- a/package/nss/patches/patch-nss_coreconf_Linux_mk
+++ b/package/nss/patches/patch-nss_coreconf_Linux_mk
@@ -1,5 +1,5 @@
---- nss-3.16.1.orig/nss/coreconf/Linux.mk 2014-05-02 05:27:18.000000000 +0200
-+++ nss-3.16.1/nss/coreconf/Linux.mk 2014-06-19 14:09:55.000000000 +0200
+--- 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
@@ -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)
+@@ -146,7 +146,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))
diff --git a/package/nss/patches/patch-nss_coreconf_command_mk b/package/nss/patches/patch-nss_coreconf_command_mk
index 91c922000..8470fdbc5 100644
--- a/package/nss/patches/patch-nss_coreconf_command_mk
+++ b/package/nss/patches/patch-nss_coreconf_command_mk
@@ -1,6 +1,6 @@
---- nss-3.15.2.orig/nss/coreconf/command.mk 2013-09-25 15:57:55.000000000 +0200
-+++ nss-3.15.2/nss/coreconf/command.mk 2013-09-27 19:07:39.000000000 +0200
-@@ -16,7 +16,7 @@ LINK_EXE = $(LINK) $(OS_LFLAGS) $(L
+--- 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
+@@ -15,7 +15,7 @@ LINK_DLL = $(LINK) $(OS_DLLFLAGS) $
CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
$(XCFLAGS)
PERL = perl
diff --git a/package/nss/patches/patch-nss_manifest_mn b/package/nss/patches/patch-nss_manifest_mn
index 91fc45073..e0881672c 100644
--- a/package/nss/patches/patch-nss_manifest_mn
+++ b/package/nss/patches/patch-nss_manifest_mn
@@ -1,8 +1,11 @@
---- nss-3.15.2.orig/nss/manifest.mn 2013-09-25 15:57:55.000000000 +0200
-+++ nss-3.15.2/nss/manifest.mn 2013-09-30 16:02:15.000000000 +0200
-@@ -10,4 +10,4 @@ IMPORTS = nspr20/v4.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 \
RELEASE = nss
-DIRS = coreconf lib cmd
+DIRS = coreconf lib cmd config
+
+ ifdef NSS_BUILD_GTESTS
+ DIRS += external_tests