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

--- nss-3.11.1/mozilla/security/coreconf/Linux.mk.orig	2006-04-25 03:32:16.000000000 +0200
+++ nss-3.11.1/mozilla/security/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.
diff -Nur nss-3.11.orig/mozilla/security/coreconf/ruleset.mk nss-3.11/mozilla/security/coreconf/ruleset.mk
--- nss-3.11.orig/mozilla/security/coreconf/ruleset.mk	2005-09-16 18:09:23.000000000 +0100
+++ nss-3.11/mozilla/security/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)
diff -Nur nss-3.11.orig/mozilla/security/nss/cmd/platlibs.mk nss-3.11/mozilla/security/nss/cmd/platlibs.mk
--- nss-3.11.orig/mozilla/security/nss/cmd/platlibs.mk	2005-11-15 18:19:18.000000000 +0000
+++ nss-3.11/mozilla/security/nss/cmd/platlibs.mk	2006-01-26 15:13:55.000000000 +0000
@@ -84,19 +84,19 @@
 else
 
 # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
-CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
+CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
 ifdef MOZILLA_SECURITY_BUILD
 	CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)
 endif
 ifdef MOZILLA_BSAFE_BUILD
 	CRYPTOLIB+=$(DIST)/lib/$(LIB_PREFIX)bsafe.$(LIB_SUFFIX)
-	CRYPTOLIB+=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
+	CRYPTOLIB+=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
 endif
 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) \
@@ -104,11 +104,11 @@
 	$(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(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)nsspki3.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)softokn3.$(LIB_SUFFIX) \
 	$(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) \
diff -Nur nss-3.11.orig/mozilla/security/nss/lib/softoken/config.mk nss-3.11/mozilla/security/nss/lib/softoken/config.mk
--- nss-3.11.orig/mozilla/security/nss/lib/softoken/config.mk	2005-10-19 02:03:31.000000000 +0100
+++ nss-3.11/mozilla/security/nss/lib/softoken/config.mk	2006-01-26 15:13:55.000000000 +0000
@@ -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)
 CRYPTODIR=../freebl
 ifdef MOZILLA_SECURITY_BUILD
 	CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)
diff -Nur nss-3.11.orig/mozilla/security/nss/lib/ssl/config.mk nss-3.11/mozilla/security/nss/lib/ssl/config.mk
--- nss-3.11.orig/mozilla/security/nss/lib/ssl/config.mk	2005-10-19 02:04:16.000000000 +0100
+++ nss-3.11/mozilla/security/nss/lib/ssl/config.mk	2006-01-26 15:13:55.000000000 +0000
@@ -67,7 +67,7 @@
 endif # NS_USE_GCC
 
 # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
-CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
+CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
 CRYPTODIR=../freebl
 ifdef MOZILLA_SECURITY_BUILD
 	CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)
@@ -81,7 +81,7 @@
 else
 
 # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
-CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
+CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
 CRYPTODIR=../freebl
 ifdef MOZILLA_SECURITY_BUILD
 	CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)
Commit	Line	Data
0ce5d339 JB	1	--- nss-3.11.1/mozilla/security/coreconf/Linux.mk.orig 2006-04-25 03:32:16.000000000 +0200
	2	+++ nss-3.11.1/mozilla/security/coreconf/Linux.mk 2006-05-27 21:07:22.101515500 +0200
	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.
a76c0d50	13	diff -Nur nss-3.11.orig/mozilla/security/coreconf/ruleset.mk nss-3.11/mozilla/security/coreconf/ruleset.mk
	14	--- nss-3.11.orig/mozilla/security/coreconf/ruleset.mk 2005-09-16 18:09:23.000000000 +0100
	15	+++ nss-3.11/mozilla/security/coreconf/ruleset.mk 2006-01-26 15:13:55.000000000 +0000
	16	@@ -118,7 +118,7 @@
0fb65667	17
c0839d1d JB	18	ifdef LIBRARY_NAME
	19	ifndef LIBRARY
	20	- LIBRARY = $(OBJDIR)/$(LIB_PREFIX)$(LIBRARY_NAME).$(LIB_SUFFIX)
	21	+ LIBRARY = $(OBJDIR)/$(LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX)
	22	endif
	23	ifndef SHARED_LIBRARY
	24	SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).$(DLL_SUFFIX)
a76c0d50	25	diff -Nur nss-3.11.orig/mozilla/security/nss/cmd/platlibs.mk nss-3.11/mozilla/security/nss/cmd/platlibs.mk
	26	--- nss-3.11.orig/mozilla/security/nss/cmd/platlibs.mk 2005-11-15 18:19:18.000000000 +0000
	27	+++ nss-3.11/mozilla/security/nss/cmd/platlibs.mk 2006-01-26 15:13:55.000000000 +0000
	28	@@ -84,19 +84,19 @@
c0839d1d	29	else
0fb65667	30
c0839d1d JB	31	# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
c0839d1d JB	32	-CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
6434b473	33	+CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
c0839d1d JB	34	ifdef MOZILLA_SECURITY_BUILD
c0839d1d JB	35	CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)
0fb65667	36	endif
c0839d1d JB	37	ifdef MOZILLA_BSAFE_BUILD
	38	CRYPTOLIB+=$(DIST)/lib/$(LIB_PREFIX)bsafe.$(LIB_SUFFIX)
	39	- CRYPTOLIB+=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
6434b473	40	+ CRYPTOLIB+=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
0fb65667	41	endif
c0839d1d JB	42	EXTRA_LIBS += \
	43	- $(DIST)/lib/$(LIB_PREFIX)smime.$(LIB_SUFFIX) \
	44	- $(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \
c0839d1d JB	45	- $(DIST)/lib/$(LIB_PREFIX)nss.$(LIB_SUFFIX) \
c0839d1d JB	46	- $(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \
8f656124 JB	47	+ $(DIST)/lib/$(LIB_PREFIX)smime3.$(LIB_SUFFIX) \
8f656124 JB	48	+ $(DIST)/lib/$(LIB_PREFIX)ssl3.$(LIB_SUFFIX) \
c0839d1d JB	49	+ $(DIST)/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \
	50	+ $(DIST)/lib/$(LIB_PREFIX)ssl3.$(LIB_SUFFIX) \
	51	$(DIST)/lib/$(LIB_PREFIX)sectool.$(LIB_SUFFIX) \
	52	$(DIST)/lib/$(LIB_PREFIX)pkcs12.$(LIB_SUFFIX) \
	53	$(DIST)/lib/$(LIB_PREFIX)pkcs7.$(LIB_SUFFIX) \
985ee8fc JB	54	@@ -104,11 +104,11 @@
	55	$(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
	56	$(DIST)/lib/$(LIB_PREFIX)cryptohi.$(LIB_SUFFIX) \
	57	$(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
	58	- $(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
	59	+ $(DIST)/lib/$(LIB_PREFIX)nsspki3.$(LIB_SUFFIX) \
	60	$(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
	61	- $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
	62	+ $(DIST)/lib/$(LIB_PREFIX)softokn3.$(LIB_SUFFIX) \
	63	$(DIST)/lib/$(LIB_PREFIX)certdb.$(LIB_SUFFIX) \
	64	- $(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
	65	+ $(DIST)/lib/$(LIB_PREFIX)nsspki3.$(LIB_SUFFIX) \
	66	$(DIST)/lib/$(LIB_PREFIX)nssdev.$(LIB_SUFFIX) \
	67	$(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
a76c0d50	68	$(CRYPTOLIB) \
	69	diff -Nur nss-3.11.orig/mozilla/security/nss/lib/softoken/config.mk nss-3.11/mozilla/security/nss/lib/softoken/config.mk
	70	--- nss-3.11.orig/mozilla/security/nss/lib/softoken/config.mk 2005-10-19 02:03:31.000000000 +0100
	71	+++ nss-3.11/mozilla/security/nss/lib/softoken/config.mk 2006-01-26 15:13:55.000000000 +0000
	72	@@ -36,7 +36,7 @@
	73	# *** END LICENSE BLOCK ***
985ee8fc JB	74
	75	# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
	76	-CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
6434b473	77	+CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
985ee8fc JB	78	CRYPTODIR=../freebl
	79	ifdef MOZILLA_SECURITY_BUILD
	80	CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)
a76c0d50	81	diff -Nur nss-3.11.orig/mozilla/security/nss/lib/ssl/config.mk nss-3.11/mozilla/security/nss/lib/ssl/config.mk
	82	--- nss-3.11.orig/mozilla/security/nss/lib/ssl/config.mk 2005-10-19 02:04:16.000000000 +0100
	83	+++ nss-3.11/mozilla/security/nss/lib/ssl/config.mk 2006-01-26 15:13:55.000000000 +0000
6434b473 JB	84	@@ -67,7 +67,7 @@
6434b473 JB	85	endif # NS_USE_GCC
985ee8fc	86
6434b473 JB	87	# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
	88	-CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
	89	+CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
	90	CRYPTODIR=../freebl
	91	ifdef MOZILLA_SECURITY_BUILD
	92	CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)
	93	@@ -81,7 +81,7 @@
	94	else
985ee8fc	95
6434b473 JB	96	# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
	97	-CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
	98	+CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
	99	CRYPTODIR=../freebl
	100	ifdef MOZILLA_SECURITY_BUILD
	101	CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)