From 2bd484a2c9104afeb116bf0ba70c3ca5682e9f25 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 19 Jun 2014 20:07:22 +0200 Subject: update to latest upstream --- package/nss/patches/patch-nss_cmd_manifest_mn | 10 ++++++++++ package/nss/patches/patch-nss_coreconf_Linux_mk | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 package/nss/patches/patch-nss_cmd_manifest_mn (limited to 'package/nss/patches') diff --git a/package/nss/patches/patch-nss_cmd_manifest_mn b/package/nss/patches/patch-nss_cmd_manifest_mn new file mode 100644 index 000000000..98b9accae --- /dev/null +++ b/package/nss/patches/patch-nss_cmd_manifest_mn @@ -0,0 +1,10 @@ +--- nss-3.16.1.orig/nss/cmd/manifest.mn 2014-05-02 05:27:18.000000000 +0200 ++++ nss-3.16.1/nss/cmd/manifest.mn 2014-06-19 14:32:39.000000000 +0200 +@@ -22,7 +22,6 @@ DIRS = lib \ + dbtest \ + derdump \ + digest \ +- httpserv \ + $(FIPSTEST_SRCDIR) \ + $(LOWHASHTEST_SRCDIR) \ + listsuites \ diff --git a/package/nss/patches/patch-nss_coreconf_Linux_mk b/package/nss/patches/patch-nss_coreconf_Linux_mk index d07a77e0d..3f08b564b 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.15.2.orig/nss/coreconf/Linux.mk 2013-09-25 15:57:55.000000000 +0200 -+++ nss-3.15.2/nss/coreconf/Linux.mk 2013-09-27 19:08:33.000000000 +0200 +--- 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 @@ -16,9 +16,9 @@ ifeq ($(USE_PTHREADS),1) IMPL_STRATEGY = _PTH endif @@ -13,7 +13,7 @@ DEFAULT_COMPILER = gcc -@@ -144,7 +144,7 @@ DSO_LDOPTS = -shared $(ARCHFLAG) +@@ -146,7 +146,7 @@ DSO_LDOPTS = -shared $(ARCHFLAG) # 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)) -- cgit v1.2.3