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

diff -Nur nss-3.3.1/mozilla/security/nss/cmd/platlibs.mk nss-3.3.1/mozilla/security/nss/cmd/platlibs.mk
--- nss-3.3.1/mozilla/security/nss/cmd/platlibs.mk	Wed Jan 31 22:29:29 2001
+++ nss-3.3.1/mozilla/security/nss/cmd/platlibs.mk.new	Wed Dec 19 01:14:17 2001
@@ -79,21 +79,21 @@
 else
 
 # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
-CRYPTOLIB=$(DIST)/lib/libfreebl.$(LIB_SUFFIX)
+CRYPTOLIB=$(DIST)/lib/libfreebl_3.$(LIB_SUFFIX)
 ifdef MOZILLA_SECURITY_BUILD
 	CRYPTOLIB=$(DIST)/lib/libcrypto.$(LIB_SUFFIX)
 endif
 ifdef MOZILLA_BSAFE_BUILD
 	CRYPTOLIB+=$(DIST)/lib/libbsafe.$(LIB_SUFFIX)
-	CRYPTOLIB+=$(DIST)/lib/libfreebl.$(LIB_SUFFIX)
+	CRYPTOLIB+=$(DIST)/lib/libfreebl_03.$(LIB_SUFFIX)
 endif
 EXTRA_LIBS += \
-	$(DIST)/lib/libsmime.$(LIB_SUFFIX) \
-	$(DIST)/lib/libssl.$(LIB_SUFFIX) \
+	$(DIST)/lib/libsmime3.$(LIB_SUFFIX) \
+	$(DIST)/lib/libssl3.$(LIB_SUFFIX) \
 	$(DIST)/lib/libjar.$(LIB_SUFFIX) \
 	$(DIST)/lib/libzlib.$(LIB_SUFFIX) \
-	$(DIST)/lib/libnss.$(LIB_SUFFIX) \
-	$(DIST)/lib/libssl.$(LIB_SUFFIX) \
+	$(DIST)/lib/libnss3.$(LIB_SUFFIX) \
+	$(DIST)/lib/libssl3.$(LIB_SUFFIX) \
 	$(DIST)/lib/libsectool.$(LIB_SUFFIX) \
 	$(DIST)/lib/libpkcs12.$(LIB_SUFFIX) \
 	$(DIST)/lib/libpkcs7.$(LIB_SUFFIX) \
diff -Nur nss-3.3.1/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile nss-3.3.1/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
--- nss-3.3.1/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile	Wed Dec 19 00:32:07 2001
+++ nss-3.3.1/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile.new	Wed Dec 19 00:32:52 2001
@@ -69,14 +69,14 @@
 #	$(DIST)/lib/libdbm.a 
 #	$(DIST)/lib/libnspr3.a 
 #
-CRYPTO_LIB = $(DIST)/lib/libfreebl.$(LIB_SUFFIX) 
+CRYPTO_LIB = $(DIST)/lib/libfreebl_3.$(LIB_SUFFIX) 
 
 ifdef MOZILLA_SECURITY_BUILD
 CRYPTO_LIB = $(DIST)/lib/libcrypto.$(LIB_SUFFIX)
 endif
 ifdef MOZILLA_BSAFE_BUILD
 CRYPTO_LIB += $(DIST)/lib/libbsafe.$(LIB_SUFFIX)
-CRYPTO_LIB += $(DIST)/lib/libfreebl.$(LIB_SUFFIX)
+CRYPTO_LIB += $(DIST)/lib/libfreebl_3.$(LIB_SUFFIX)
 endif
 
 ifeq ($(OS_ARCH), OS2)
diff -Nur nss-3.3.1/mozilla/security/coreconf/ruleset.mk nss-3.3.1/mozilla/security/coreconf/ruleset.mk
--- nss-3.3.1/mozilla/security/coreconf/ruleset.mk	Sat Jun  2 08:03:14 2001
+++ nss-3.3.1/mozilla/security/coreconf/ruleset.mk.new	Wed Dec 19 00:00:36 2001
@@ -156,7 +156,7 @@
 			SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).dll
 			IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).lib
 		else
-			LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME).$(LIB_SUFFIX)
+			LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX)
 			ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1)
 				SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_shr$(JDK_DEBUG_SUFFIX).a
 			else
diff -Nur nss-3.3.1/mozilla/security/coreconf/Linux.mk nss-3.3.1.new/mozilla/security/coreconf/Linux.mk
--- nss-3.3.1/mozilla/security/coreconf/Linux.mk	Thu Dec 13 13:47:56 2001
+++ nss-3.3.1.new/mozilla/security/coreconf/Linux.mk	Thu Dec 13 14:16:18 2001
@@ -106,5 +106,5 @@
 DSO_LDOPTS		= -shared
 DSO_LDFLAGS		=
 
-# INCLUDES += -I/usr/include -Y/usr/include/linux
 G++INCLUDES		= -I/usr/include/g++
+INCLUDES += -I/usr/include/nspr
diff -Nur nss-3.3.1/mozilla/security/nss/cmd/modutil/manifest.mn nss-3.3.1.new/mozilla/security/nss/cmd/modutil/manifest.mn
--- nss-3.3.1/mozilla/security/nss/cmd/modutil/manifest.mn	Thu Dec 13 13:47:50 2001
+++ nss-3.3.1.new/mozilla/security/nss/cmd/modutil/manifest.mn	Thu Dec 13 14:16:18 2001
@@ -54,6 +54,6 @@
 
 DEFINES = -DNSPR20
 
-INCLUDES =
+INCLUDES = -I$(CORE_DEPTH)/nss/lib/nss
 
 USE_STATIC_LIBS = 1
diff -Nur nss-3.3.1/mozilla/security/nss/lib/ckfw/builtins/Makefile nss-3.3.1.new/mozilla/security/nss/lib/ckfw/builtins/Makefile
--- nss-3.3.1/mozilla/security/nss/lib/ckfw/builtins/Makefile	Thu Dec 13 13:47:51 2001
+++ nss-3.3.1.new/mozilla/security/nss/lib/ckfw/builtins/Makefile	Thu Dec 13 14:16:18 2001
@@ -60,8 +60,8 @@
 EXTRA_LIBS += \
         $(DIST)/lib/libnssckfw.$(LIB_SUFFIX) \
         $(DIST)/lib/libnssb.$(LIB_SUFFIX) \
-	$(PLC_STATIC_LIB) \
-	$(PLDS_STATIC_LIB) \
+	-lplc4 \
+	-lplds4 \
 	$(NULL)
 
 endif
diff -Nur nss-3.3.1/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile nss-3.3.1.new/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
--- nss-3.3.1/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile	Thu Dec 13 13:47:55 2001
+++ nss-3.3.1.new/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile	Thu Dec 13 14:16:18 2001
@@ -92,8 +92,8 @@
 	$(DIST)/lib/libsoftoken.$(LIB_SUFFIX) \
 	$(CRYPTO_LIB) \
 	$(DIST)/lib/libsecutil.$(LIB_SUFFIX) \
-	$(PLC_STATIC_LIB) \
-	$(PLDS_STATIC_LIB) \
+	-lplc4 \
+	-lplds4 \
 	$(NULL)
 
 endif
diff -Nur nss-3.3.1/mozilla/security/nss/lib/smime/manifest.mn nss-3.3.1.new/mozilla/security/nss/lib/smime/manifest.mn
--- nss-3.3.1/mozilla/security/nss/lib/smime/manifest.mn	Thu Dec 13 13:47:54 2001
+++ nss-3.3.1.new/mozilla/security/nss/lib/smime/manifest.mn	Thu Dec 13 14:17:55 2001
@@ -70,6 +70,8 @@
 	smimever.c \
 	$(NULL)
 
+INCLUDES = -I$(CORE_DEPTH)/nss/lib/nss
+
 REQUIRES = security dbm
 
 LIBRARY_NAME = smime
diff -Nur nss-3.3.1/mozilla/security/nss/lib/ssl/manifest.mn nss-3.3.1.new/mozilla/security/nss/lib/ssl/manifest.mn
--- nss-3.3.1/mozilla/security/nss/lib/ssl/manifest.mn	Thu Dec 13 13:47:51 2001
+++ nss-3.3.1.new/mozilla/security/nss/lib/ssl/manifest.mn	Thu Dec 13 14:18:41 2001
@@ -72,6 +72,8 @@
 	nsskea.c \
 	$(NULL)
 
+INCLUDES = -I$(CORE_DEPTH)/nss/lib/nss
+
 REQUIRES = security dbm
 
 LIBRARY_NAME = ssl
Commit	Line	Data
83c4960e	1	diff -Nur nss-3.3.1/mozilla/security/nss/cmd/platlibs.mk nss-3.3.1/mozilla/security/nss/cmd/platlibs.mk
	2	--- nss-3.3.1/mozilla/security/nss/cmd/platlibs.mk Wed Jan 31 22:29:29 2001
	3	+++ nss-3.3.1/mozilla/security/nss/cmd/platlibs.mk.new Wed Dec 19 01:14:17 2001
	4	@@ -79,21 +79,21 @@
	5	else
	6
	7	# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
	8	-CRYPTOLIB=$(DIST)/lib/libfreebl.$(LIB_SUFFIX)
	9	+CRYPTOLIB=$(DIST)/lib/libfreebl_3.$(LIB_SUFFIX)
	10	ifdef MOZILLA_SECURITY_BUILD
	11	CRYPTOLIB=$(DIST)/lib/libcrypto.$(LIB_SUFFIX)
	12	endif
	13	ifdef MOZILLA_BSAFE_BUILD
	14	CRYPTOLIB+=$(DIST)/lib/libbsafe.$(LIB_SUFFIX)
	15	- CRYPTOLIB+=$(DIST)/lib/libfreebl.$(LIB_SUFFIX)
	16	+ CRYPTOLIB+=$(DIST)/lib/libfreebl_03.$(LIB_SUFFIX)
	17	endif
	18	EXTRA_LIBS += \
	19	- $(DIST)/lib/libsmime.$(LIB_SUFFIX) \
	20	- $(DIST)/lib/libssl.$(LIB_SUFFIX) \
	21	+ $(DIST)/lib/libsmime3.$(LIB_SUFFIX) \
	22	+ $(DIST)/lib/libssl3.$(LIB_SUFFIX) \
	23	$(DIST)/lib/libjar.$(LIB_SUFFIX) \
	24	$(DIST)/lib/libzlib.$(LIB_SUFFIX) \
	25	- $(DIST)/lib/libnss.$(LIB_SUFFIX) \
	26	- $(DIST)/lib/libssl.$(LIB_SUFFIX) \
	27	+ $(DIST)/lib/libnss3.$(LIB_SUFFIX) \
	28	+ $(DIST)/lib/libssl3.$(LIB_SUFFIX) \
	29	$(DIST)/lib/libsectool.$(LIB_SUFFIX) \
	30	$(DIST)/lib/libpkcs12.$(LIB_SUFFIX) \
	31	$(DIST)/lib/libpkcs7.$(LIB_SUFFIX) \
	32	diff -Nur nss-3.3.1/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile nss-3.3.1/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
	33	--- nss-3.3.1/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile Wed Dec 19 00:32:07 2001
	34	+++ nss-3.3.1/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile.new Wed Dec 19 00:32:52 2001
	35	@@ -69,14 +69,14 @@
	36	# $(DIST)/lib/libdbm.a
	37	# $(DIST)/lib/libnspr3.a
	38	#
	39	-CRYPTO_LIB = $(DIST)/lib/libfreebl.$(LIB_SUFFIX)
	40	+CRYPTO_LIB = $(DIST)/lib/libfreebl_3.$(LIB_SUFFIX)
	41
	42	ifdef MOZILLA_SECURITY_BUILD
	43	CRYPTO_LIB = $(DIST)/lib/libcrypto.$(LIB_SUFFIX)
	44	endif
	45	ifdef MOZILLA_BSAFE_BUILD
	46	CRYPTO_LIB += $(DIST)/lib/libbsafe.$(LIB_SUFFIX)
	47	-CRYPTO_LIB += $(DIST)/lib/libfreebl.$(LIB_SUFFIX)
	48	+CRYPTO_LIB += $(DIST)/lib/libfreebl_3.$(LIB_SUFFIX)
	49	endif
	50
	51	ifeq ($(OS_ARCH), OS2)
6898c7c3	52	diff -Nur nss-3.3.1/mozilla/security/coreconf/ruleset.mk nss-3.3.1/mozilla/security/coreconf/ruleset.mk
	53	--- nss-3.3.1/mozilla/security/coreconf/ruleset.mk Sat Jun 2 08:03:14 2001
	54	+++ nss-3.3.1/mozilla/security/coreconf/ruleset.mk.new Wed Dec 19 00:00:36 2001
	55	@@ -156,7 +156,7 @@
	56	SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).dll
	57	IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).lib
	58	else
	59	- LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME).$(LIB_SUFFIX)
	60	+ LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX)
	61	ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1)
	62	SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_shr$(JDK_DEBUG_SUFFIX).a
	63	else
0fb65667	64	diff -Nur nss-3.3.1/mozilla/security/coreconf/Linux.mk nss-3.3.1.new/mozilla/security/coreconf/Linux.mk
	65	--- nss-3.3.1/mozilla/security/coreconf/Linux.mk Thu Dec 13 13:47:56 2001
	66	+++ nss-3.3.1.new/mozilla/security/coreconf/Linux.mk Thu Dec 13 14:16:18 2001
	67	@@ -106,5 +106,5 @@
	68	DSO_LDOPTS = -shared
	69	DSO_LDFLAGS =
	70
	71	-# INCLUDES += -I/usr/include -Y/usr/include/linux
	72	G++INCLUDES = -I/usr/include/g++
97f2db88	73	+INCLUDES += -I/usr/include/nspr
0fb65667	74	diff -Nur nss-3.3.1/mozilla/security/nss/cmd/modutil/manifest.mn nss-3.3.1.new/mozilla/security/nss/cmd/modutil/manifest.mn
	75	--- nss-3.3.1/mozilla/security/nss/cmd/modutil/manifest.mn Thu Dec 13 13:47:50 2001
	76	+++ nss-3.3.1.new/mozilla/security/nss/cmd/modutil/manifest.mn Thu Dec 13 14:16:18 2001
	77	@@ -54,6 +54,6 @@
	78
	79	DEFINES = -DNSPR20
	80
	81	-INCLUDES =
	82	+INCLUDES = -I$(CORE_DEPTH)/nss/lib/nss
	83
	84	USE_STATIC_LIBS = 1
	85	diff -Nur nss-3.3.1/mozilla/security/nss/lib/ckfw/builtins/Makefile nss-3.3.1.new/mozilla/security/nss/lib/ckfw/builtins/Makefile
	86	--- nss-3.3.1/mozilla/security/nss/lib/ckfw/builtins/Makefile Thu Dec 13 13:47:51 2001
	87	+++ nss-3.3.1.new/mozilla/security/nss/lib/ckfw/builtins/Makefile Thu Dec 13 14:16:18 2001
	88	@@ -60,8 +60,8 @@
	89	EXTRA_LIBS += \
	90	$(DIST)/lib/libnssckfw.$(LIB_SUFFIX) \
	91	$(DIST)/lib/libnssb.$(LIB_SUFFIX) \
	92	- $(PLC_STATIC_LIB) \
	93	- $(PLDS_STATIC_LIB) \
	94	+ -lplc4 \
	95	+ -lplds4 \
	96	$(NULL)
	97
	98	endif
	99	diff -Nur nss-3.3.1/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile nss-3.3.1.new/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
	100	--- nss-3.3.1/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile Thu Dec 13 13:47:55 2001
	101	+++ nss-3.3.1.new/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile Thu Dec 13 14:16:18 2001
	102	@@ -92,8 +92,8 @@
	103	$(DIST)/lib/libsoftoken.$(LIB_SUFFIX) \
	104	$(CRYPTO_LIB) \
	105	$(DIST)/lib/libsecutil.$(LIB_SUFFIX) \
	106	- $(PLC_STATIC_LIB) \
	107	- $(PLDS_STATIC_LIB) \
	108	+ -lplc4 \
	109	+ -lplds4 \
	110	$(NULL)
	111
	112	endif
	113	diff -Nur nss-3.3.1/mozilla/security/nss/lib/smime/manifest.mn nss-3.3.1.new/mozilla/security/nss/lib/smime/manifest.mn
	114	--- nss-3.3.1/mozilla/security/nss/lib/smime/manifest.mn Thu Dec 13 13:47:54 2001
	115	+++ nss-3.3.1.new/mozilla/security/nss/lib/smime/manifest.mn Thu Dec 13 14:17:55 2001
	116	@@ -70,6 +70,8 @@
	117	smimever.c \
	118	$(NULL)
	119
	120	+INCLUDES = -I$(CORE_DEPTH)/nss/lib/nss
	121	+
	122	REQUIRES = security dbm
	123
	124	LIBRARY_NAME = smime
	125	diff -Nur nss-3.3.1/mozilla/security/nss/lib/ssl/manifest.mn nss-3.3.1.new/mozilla/security/nss/lib/ssl/manifest.mn
	126	--- nss-3.3.1/mozilla/security/nss/lib/ssl/manifest.mn Thu Dec 13 13:47:51 2001
	127	+++ nss-3.3.1.new/mozilla/security/nss/lib/ssl/manifest.mn Thu Dec 13 14:18:41 2001
	128	@@ -72,6 +72,8 @@
	129	nsskea.c \
	130	$(NULL)
	131
	132	+INCLUDES = -I$(CORE_DEPTH)/nss/lib/nss
	133	+
	134	REQUIRES = security dbm
	135
	136	LIBRARY_NAME = ssl