1 --- nss-3.15/nss/coreconf/Linux.mk.orig 2006-04-25 03:32:16.000000000 +0200
2 +++ nss-3.15/nss/coreconf/Linux.mk 2006-05-27 21:07:22.101515500 +0200
7 -# INCLUDES += -I/usr/include -Y/usr/include/linux
8 G++INCLUDES = -I/usr/include/g++
9 +INCLUDES += -I/usr/include/nspr
12 # Always set CPU_TAG on Linux, OpenVMS, WINCE.
13 --- nss-3.15/nss/coreconf/ruleset.mk.orig 2005-09-16 18:09:23.000000000 +0100
14 +++ nss-3.15/nss/coreconf/ruleset.mk 2006-01-26 15:13:55.000000000 +0000
19 - LIBRARY = $(OBJDIR)/$(LIB_PREFIX)$(LIBRARY_NAME).$(LIB_SUFFIX)
20 + LIBRARY = $(OBJDIR)/$(LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX)
23 SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).$(DLL_SUFFIX)
24 --- nss-3.15/nss/cmd/platlibs.mk.orig 2013-06-08 07:11:01.663565564 +0200
25 +++ nss-3.15/nss/cmd/platlibs.mk 2013-06-08 07:15:25.283560068 +0200
27 DEFINES += -DNSS_USE_STATIC_LIBS
28 # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
29 ifndef NSS_USE_SYSTEM_FREEBL
30 -CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
31 -SOFTOKENLIB=$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX)
32 +CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
33 +SOFTOKENLIB=$(DIST)/lib/$(LIB_PREFIX)softokn3.$(LIB_SUFFIX)
35 # Use the system installed freebl static library and set softoken one to empty.
36 # Some tools need to link statically with freebl but none with softoken. Only
37 # the softoken shared library, not the static one, is installed in the system.
38 -CRYPTOLIB=$(FREEBL_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
39 +CRYPTOLIB=$(FREEBL_LIB_DIR)/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
41 EXTRA_SHARED_LIBS += \
42 -L$(SOFTOKEN_LIB_DIR) \
47 - $(DIST)/lib/$(LIB_PREFIX)smime.$(LIB_SUFFIX) \
48 - $(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \
49 - $(DIST)/lib/$(LIB_PREFIX)nss.$(LIB_SUFFIX) \
50 - $(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \
51 + $(DIST)/lib/$(LIB_PREFIX)smime3.$(LIB_SUFFIX) \
52 + $(DIST)/lib/$(LIB_PREFIX)ssl3.$(LIB_SUFFIX) \
53 + $(DIST)/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \
54 + $(DIST)/lib/$(LIB_PREFIX)ssl3.$(LIB_SUFFIX) \
55 $(DIST)/lib/$(LIB_PREFIX)sectool.$(LIB_SUFFIX) \
56 $(DIST)/lib/$(LIB_PREFIX)pkcs12.$(LIB_SUFFIX) \
57 $(DIST)/lib/$(LIB_PREFIX)pkcs7.$(LIB_SUFFIX) \
58 $(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
59 - $(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
60 + $(DIST)/lib/$(LIB_PREFIX)pk11wrap3.$(LIB_SUFFIX) \
61 $(DIST)/lib/$(LIB_PREFIX)cryptohi.$(LIB_SUFFIX) \
62 $(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
63 - $(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
64 - $(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
65 + $(DIST)/lib/$(LIB_PREFIX)nsspki3.$(LIB_SUFFIX) \
66 + $(DIST)/lib/$(LIB_PREFIX)pk11wrap3.$(LIB_SUFFIX) \
68 $(DIST)/lib/$(LIB_PREFIX)certdb.$(LIB_SUFFIX) \
69 - $(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
70 + $(DIST)/lib/$(LIB_PREFIX)nsspki3.$(LIB_SUFFIX) \
71 $(DIST)/lib/$(LIB_PREFIX)nssdev.$(LIB_SUFFIX) \
72 $(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
76 - $(DIST)/lib/$(LIB_PREFIX)nss.$(LIB_SUFFIX) \
77 - $(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
78 + $(DIST)/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \
79 + $(DIST)/lib/$(LIB_PREFIX)pk11wrap3.$(LIB_SUFFIX) \
80 $(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
83 --- nss-3.15/nss/lib/ssl/config.mk.orig 2012-10-22 19:40:03.822256886 +0200
84 +++ nss-3.15/nss/lib/ssl/config.mk 2012-10-22 20:42:30.725432977 +0200
86 ifdef NSS_NO_PKCS11_BYPASS
87 DEFINES += -DNO_PKCS11_BYPASS
89 -CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
90 +CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
94 --- nss-3.15/nss/lib/softoken/legacydb/config.mk.orig 2009-06-11 02:55:49.000000000 +0200
95 +++ nss-3.15/nss/lib/softoken/legacydb/config.mk 2009-08-28 22:40:40.392606747 +0200
97 # ***** END LICENSE BLOCK *****
99 # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
100 -CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
101 +CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
103 EXTRA_LIBS += $(CRYPTOLIB)
105 --- nss-3.15/nss/lib/softoken/config.mk.orig 2009-06-11 02:55:48.000000000 +0200
106 +++ nss-3.15/nss/lib/softoken/config.mk 2009-08-28 22:39:36.436608423 +0200
108 # ***** END LICENSE BLOCK *****
110 # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
111 -CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
112 +CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)