[packages/nss.git] / nss-Makefile.patch

--- nss-3.15/nss/coreconf/Linux.mk.orig	2006-04-25 03:32:16.000000000 +0200
+++ nss-3.15/nss/coreconf/Linux.mk	2006-05-27 21:07:22.101515500 +0200
@@ -169,8 +169,8 @@
 DSO_LDFLAGS		=
 LDFLAGS			+= $(ARCHFLAG)
 
-# INCLUDES += -I/usr/include -Y/usr/include/linux
 G++INCLUDES		= -I/usr/include/g++
+INCLUDES += -I/usr/include/nspr
 
 #
 # Always set CPU_TAG on Linux, OpenVMS, WINCE.
--- nss-3.15/nss/coreconf/ruleset.mk.orig	2005-09-16 18:09:23.000000000 +0100
+++ nss-3.15/nss/coreconf/ruleset.mk	2006-01-26 15:13:55.000000000 +0000
@@ -118,7 +118,7 @@
 
 ifdef LIBRARY_NAME
     ifndef LIBRARY
-	LIBRARY        = $(OBJDIR)/$(LIB_PREFIX)$(LIBRARY_NAME).$(LIB_SUFFIX)
+	LIBRARY        = $(OBJDIR)/$(LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX)
     endif
     ifndef SHARED_LIBRARY
 	SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).$(DLL_SUFFIX)
--- nss-3.15/nss/cmd/platlibs.mk.orig	2013-06-08 07:11:01.663565564 +0200
+++ nss-3.15/nss/cmd/platlibs.mk	2013-06-08 07:15:25.283560068 +0200
@@ -37,13 +37,13 @@
 DEFINES += -DNSS_USE_STATIC_LIBS
 # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
 ifndef NSS_USE_SYSTEM_FREEBL
-CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
-SOFTOKENLIB=$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX)
+CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
+SOFTOKENLIB=$(DIST)/lib/$(LIB_PREFIX)softokn3.$(LIB_SUFFIX)
 else
 # Use the system installed freebl static library and set softoken one to empty.
 # Some tools need to link statically with freebl but none with softoken. Only
 # the softoken shared library, not the static one, is installed in the system.
-CRYPTOLIB=$(FREEBL_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
+CRYPTOLIB=$(FREEBL_LIB_DIR)/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
 SOFTOKENLIB=
 EXTRA_SHARED_LIBS += \
 	-L$(SOFTOKEN_LIB_DIR) \
@@ -102,29 +102,29 @@
 else
 
 EXTRA_LIBS += \
-	$(DIST)/lib/$(LIB_PREFIX)smime.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)nss.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)smime3.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)ssl3.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)ssl3.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)sectool.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)pkcs12.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)pkcs7.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)pk11wrap3.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)cryptohi.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)nsspki3.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)pk11wrap3.$(LIB_SUFFIX) \
 	$(SOFTOKENLIB) \
 	$(DIST)/lib/$(LIB_PREFIX)certdb.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)nsspki3.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)nssdev.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
 	$(CRYPTOLIB) \
 	$(DBMLIB) \
 	$(PKIXLIB) \
-	$(DIST)/lib/$(LIB_PREFIX)nss.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)pk11wrap3.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
 	$(NULL)
 
--- nss-3.15/nss/lib/ssl/config.mk.orig	2012-10-22 19:40:03.822256886 +0200
+++ nss-3.15/nss/lib/ssl/config.mk	2012-10-22 20:42:30.725432977 +0200
@@ -14,7 +14,7 @@
 ifdef NSS_NO_PKCS11_BYPASS
 DEFINES += -DNO_PKCS11_BYPASS
 else
-CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
+CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
 
 EXTRA_LIBS += \
 	$(CRYPTOLIB) \
--- nss-3.15/nss/lib/softoken/legacydb/config.mk.orig	2009-06-11 02:55:49.000000000 +0200
+++ nss-3.15/nss/lib/softoken/legacydb/config.mk	2009-08-28 22:40:40.392606747 +0200
@@ -36,7 +36,7 @@
 # ***** END LICENSE BLOCK *****
 
 # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
-CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
+CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
 
 EXTRA_LIBS +=	$(CRYPTOLIB) 
 
--- nss-3.15/nss/lib/softoken/config.mk.orig	2009-06-11 02:55:48.000000000 +0200
+++ nss-3.15/nss/lib/softoken/config.mk	2009-08-28 22:39:36.436608423 +0200
@@ -36,7 +36,7 @@
 # ***** END LICENSE BLOCK *****
 
 # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
-CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
+CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
 
 EXTRA_LIBS += \
 	$(CRYPTOLIB) \
Commit	Line	Data
180376d6 JB	1	--- nss-3.15/nss/coreconf/Linux.mk.orig 2006-04-25 03:32:16.000000000 +0200
180376d6 JB	2	+++ nss-3.15/nss/coreconf/Linux.mk 2006-05-27 21:07:22.101515500 +0200
0ce5d339	3	@@ -169,8 +169,8 @@
0fb65667	4	DSO_LDFLAGS =
a76c0d50	5	LDFLAGS += $(ARCHFLAG)
0fb65667	6
	7	-# INCLUDES += -I/usr/include -Y/usr/include/linux
	8	G++INCLUDES = -I/usr/include/g++
97f2db88	9	+INCLUDES += -I/usr/include/nspr
0fb65667	10
c0839d1d JB	11	#
c0839d1d JB	12	# Always set CPU_TAG on Linux, OpenVMS, WINCE.
180376d6 JB	13	--- nss-3.15/nss/coreconf/ruleset.mk.orig 2005-09-16 18:09:23.000000000 +0100
180376d6 JB	14	+++ nss-3.15/nss/coreconf/ruleset.mk 2006-01-26 15:13:55.000000000 +0000
a76c0d50	15	@@ -118,7 +118,7 @@
0fb65667	16
c0839d1d JB	17	ifdef LIBRARY_NAME
	18	ifndef LIBRARY
	19	- LIBRARY = $(OBJDIR)/$(LIB_PREFIX)$(LIBRARY_NAME).$(LIB_SUFFIX)
	20	+ LIBRARY = $(OBJDIR)/$(LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX)
	21	endif
	22	ifndef SHARED_LIBRARY
	23	SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).$(DLL_SUFFIX)
180376d6 JB	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
	26	@@ -37,13 +37,13 @@
	27	DEFINES += -DNSS_USE_STATIC_LIBS
c0839d1d	28	# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
180376d6 JB	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)
	34	else
	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)
	40	SOFTOKENLIB=
	41	EXTRA_SHARED_LIBS += \
	42	-L$(SOFTOKEN_LIB_DIR) \
	43	@@ -102,29 +102,29 @@
	44	else
7a9a6b6d	45
c0839d1d JB	46	EXTRA_LIBS += \
	47	- $(DIST)/lib/$(LIB_PREFIX)smime.$(LIB_SUFFIX) \
	48	- $(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \
c0839d1d JB	49	- $(DIST)/lib/$(LIB_PREFIX)nss.$(LIB_SUFFIX) \
c0839d1d JB	50	- $(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \
8f656124 JB	51	+ $(DIST)/lib/$(LIB_PREFIX)smime3.$(LIB_SUFFIX) \
8f656124 JB	52	+ $(DIST)/lib/$(LIB_PREFIX)ssl3.$(LIB_SUFFIX) \
c0839d1d JB	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) \
7a9a6b6d JB	58	$(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
	59	- $(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
	60	+ $(DIST)/lib/$(LIB_PREFIX)pk11wrap3.$(LIB_SUFFIX) \
985ee8fc JB	61	$(DIST)/lib/$(LIB_PREFIX)cryptohi.$(LIB_SUFFIX) \
	62	$(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
	63	- $(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
7a9a6b6d	64	- $(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
7a9a6b6d JB	65	+ $(DIST)/lib/$(LIB_PREFIX)nsspki3.$(LIB_SUFFIX) \
7a9a6b6d JB	66	+ $(DIST)/lib/$(LIB_PREFIX)pk11wrap3.$(LIB_SUFFIX) \
180376d6	67	$(SOFTOKENLIB) \
985ee8fc JB	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) \
a76c0d50	73	$(CRYPTOLIB) \
fc4077b9	74	$(DBMLIB) \
7a9a6b6d JB	75	$(PKIXLIB) \
	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) \
	81	$(NULL)
	82
180376d6 JB	83	--- nss-3.15/nss/lib/ssl/config.mk.orig 2012-10-22 19:40:03.822256886 +0200
180376d6 JB	84	+++ nss-3.15/nss/lib/ssl/config.mk 2012-10-22 20:42:30.725432977 +0200
7625b558 JB	85	@@ -14,7 +14,7 @@
	86	ifdef NSS_NO_PKCS11_BYPASS
	87	DEFINES += -DNO_PKCS11_BYPASS
	88	else
76a68ca3 JB	89	-CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
	90	+CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
	91
	92	EXTRA_LIBS += \
	93	$(CRYPTOLIB) \
180376d6 JB	94	--- nss-3.15/nss/lib/softoken/legacydb/config.mk.orig 2009-06-11 02:55:49.000000000 +0200
180376d6 JB	95	+++ nss-3.15/nss/lib/softoken/legacydb/config.mk 2009-08-28 22:40:40.392606747 +0200
a76c0d50	96	@@ -36,7 +36,7 @@
a76c0d50	97	# *** END LICENSE BLOCK ***
985ee8fc JB	98
	99	# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
	100	-CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
6434b473	101	+CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
985ee8fc	102
76a68ca3	103	EXTRA_LIBS += $(CRYPTOLIB)
985ee8fc	104
180376d6 JB	105	--- nss-3.15/nss/lib/softoken/config.mk.orig 2009-06-11 02:55:48.000000000 +0200
180376d6 JB	106	+++ nss-3.15/nss/lib/softoken/config.mk 2009-08-28 22:39:36.436608423 +0200
7a9a6b6d JB	107	@@ -36,7 +36,7 @@
	108	# *** END LICENSE BLOCK ***
	109
	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)
76a68ca3 JB	113
	114	EXTRA_LIBS += \
	115	$(CRYPTOLIB) \