[nss-softokn] Update to 3.12.7
Elio Maldonado
emaldonado at fedoraproject.org
Thu Aug 19 00:08:52 UTC 2010
commit c1523c8a8a2e35197cf3a34c91621d76e635bd8e
Author: Elio Maldonado <emaldona at redhat.com>
Date: Wed Aug 18 17:01:35 2010 -0700
Update to 3.12.7
Patch the freebl makefile and config.mk to address a 3.12.7 regression where the testing for FREEBL_NO_DEPEND
was been excuted in only some cases causing the nsslowhas.h to not been installed as a public header.
freebl-no-depend.patch | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
---
diff --git a/freebl-no-depend.patch b/freebl-no-depend.patch
new file mode 100644
index 0000000..9ea1a52
--- /dev/null
+++ b/freebl-no-depend.patch
@@ -0,0 +1,33 @@
+diff -up ./mozilla/security/nss/lib/freebl/config.mk.freeblnodepend ./mozilla/security/nss/lib/freebl/config.mk
+--- ./mozilla/security/nss/lib/freebl/config.mk.freeblnodepend 2010-08-18 14:25:43.078270077 -0700
++++ ./mozilla/security/nss/lib/freebl/config.mk 2010-08-18 14:28:27.688207452 -0700
+@@ -66,14 +66,6 @@ ALL_TRASH := $(TARGETS) $(OBJS) $(OBJ
+
+ else
+
+-ifeq ($(FREEBL_NO_DEPEND),1)
+-LOWHASH_SRCS = stubs.c nsslowhash.c
+-LOWHASH_EXPORTS = nsslowhash.h
+-MAPFILE_SOURCE = freebl_hash.def
+-else
+-MAPFILE_SOURCE = freebl.def
+-endif
+-
+ # This is a recursive child make. We build the shared lib.
+
+ TARGETS = $(SHARED_LIBRARY)
+diff -up ./mozilla/security/nss/lib/freebl/Makefile.freeblnodepend ./mozilla/security/nss/lib/freebl/Makefile
+--- ./mozilla/security/nss/lib/freebl/Makefile.freeblnodepend 2010-08-18 14:25:19.013270325 -0700
++++ ./mozilla/security/nss/lib/freebl/Makefile 2010-08-18 14:28:45.513270116 -0700
+@@ -76,6 +76,11 @@ endif
+
+ ifeq ($(FREEBL_NO_DEPEND),1)
+ DEFINES += -DFREEBL_NO_DEPEND
++ LOWHASH_SRCS = stubs.c nsslowhash.c
++ LOWHASH_EXPORTS = nsslowhash.h
++ MAPFILE_SOURCE = freebl_hash.def
++else
++ MAPFILE_SOURCE = freebl.def
+ endif
+ ifdef FREEBL_USE_PRELINK
+ DEFINES += -DFREEBL_USE_PRELINK
More information about the scm-commits
mailing list