[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)
--- nss-3.12.4/mozilla/security/nss/cmd/platlibs.mk.orig	2009-08-28 22:37:12.708606747 +0200
+++ nss-3.12.4/mozilla/security/nss/cmd/platlibs.mk	2009-08-28 22:39:19.888606747 +0200
@@ -50,22 +50,6 @@
 endif
 endif
 
-ifeq ($(OS_ARCH), Linux)
-ifeq ($(BUILD_SUN_PKG), 1)
-ifeq ($(USE_64), 1)
-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib'
-else
-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib'
-endif
-else
-ifeq ($(USE_64), 1)
-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
-else
-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
-endif
-endif
-endif
-
 ifeq ($(OS_ARCH), HP-UX) 
 ifeq ($(OS_TEST), ia64)
 EXTRA_SHARED_LIBS += -Wl,+b,'$$ORIGIN/../lib'
@@ -144,7 +128,7 @@
 else
 
 # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
-CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
+CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
 
 PKIXLIB = \
 	$(DIST)/lib/$(LIB_PREFIX)pkixtop.$(LIB_SUFFIX) \
@@ -161,29 +145,29 @@
 	$(DIST)/lib/$(LIB_PREFIX)pkixcertsel.$(LIB_SUFFIX)
 
 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)softokn.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)nsspki3.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)pk11wrap3.$(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) \
 	$(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.12.4/mozilla/security/nss/lib/ssl/config.mk.orig	2009-06-11 02:55:52.000000000 +0200
+++ nss-3.12.4/mozilla/security/nss/lib/ssl/config.mk	2009-08-28 22:40:25.676607585 +0200
@@ -83,7 +83,7 @@
 DEFINES += -DNSS_SURVIVE_DOUBLE_BYPASS_FAILURE
 endif
 
-CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
+CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
 
 EXTRA_LIBS += \
 	$(CRYPTOLIB) \
--- nss-3.12.4/mozilla/security/nss/lib/softoken/legacydb/config.mk.orig	2009-06-11 02:55:49.000000000 +0200
+++ nss-3.12.4/mozilla/security/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.12.4/mozilla/security/nss/lib/softoken/config.mk.orig	2009-06-11 02:55:48.000000000 +0200
+++ nss-3.12.4/mozilla/security/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
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)
76a68ca3 JB	25	--- nss-3.12.4/mozilla/security/nss/cmd/platlibs.mk.orig 2009-08-28 22:37:12.708606747 +0200
	26	+++ nss-3.12.4/mozilla/security/nss/cmd/platlibs.mk 2009-08-28 22:39:19.888606747 +0200
	27	@@ -50,22 +50,6 @@
7a9a6b6d JB	28	endif
	29	endif
	30
	31	-ifeq ($(OS_ARCH), Linux)
76a68ca3 JB	32	-ifeq ($(BUILD_SUN_PKG), 1)
	33	-ifeq ($(USE_64), 1)
	34	-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib'
	35	-else
	36	-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib'
	37	-endif
	38	-else
7a9a6b6d JB	39	-ifeq ($(USE_64), 1)
	40	-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
	41	-else
	42	-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
	43	-endif
	44	-endif
76a68ca3	45	-endif
7a9a6b6d JB	46	-
	47	ifeq ($(OS_ARCH), HP-UX)
	48	ifeq ($(OS_TEST), ia64)
	49	EXTRA_SHARED_LIBS += -Wl,+b,'$$ORIGIN/../lib'
76a68ca3	50	@@ -144,7 +128,7 @@
c0839d1d	51	else
0fb65667	52
c0839d1d	53	# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
76a68ca3 JB	54	-CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
76a68ca3 JB	55	+CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
7a9a6b6d JB	56
7a9a6b6d JB	57	PKIXLIB = \
76a68ca3 JB	58	$(DIST)/lib/$(LIB_PREFIX)pkixtop.$(LIB_SUFFIX) \
76a68ca3 JB	59	@@ -161,29 +145,29 @@
7a9a6b6d JB	60	$(DIST)/lib/$(LIB_PREFIX)pkixcertsel.$(LIB_SUFFIX)
7a9a6b6d JB	61
c0839d1d JB	62	EXTRA_LIBS += \
	63	- $(DIST)/lib/$(LIB_PREFIX)smime.$(LIB_SUFFIX) \
	64	- $(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \
c0839d1d JB	65	- $(DIST)/lib/$(LIB_PREFIX)nss.$(LIB_SUFFIX) \
c0839d1d JB	66	- $(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \
8f656124 JB	67	+ $(DIST)/lib/$(LIB_PREFIX)smime3.$(LIB_SUFFIX) \
8f656124 JB	68	+ $(DIST)/lib/$(LIB_PREFIX)ssl3.$(LIB_SUFFIX) \
c0839d1d JB	69	+ $(DIST)/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \
	70	+ $(DIST)/lib/$(LIB_PREFIX)ssl3.$(LIB_SUFFIX) \
	71	$(DIST)/lib/$(LIB_PREFIX)sectool.$(LIB_SUFFIX) \
	72	$(DIST)/lib/$(LIB_PREFIX)pkcs12.$(LIB_SUFFIX) \
	73	$(DIST)/lib/$(LIB_PREFIX)pkcs7.$(LIB_SUFFIX) \
7a9a6b6d JB	74	$(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
	75	- $(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
	76	+ $(DIST)/lib/$(LIB_PREFIX)pk11wrap3.$(LIB_SUFFIX) \
985ee8fc JB	77	$(DIST)/lib/$(LIB_PREFIX)cryptohi.$(LIB_SUFFIX) \
	78	$(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
	79	- $(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
7a9a6b6d	80	- $(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
985ee8fc	81	- $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
7a9a6b6d JB	82	+ $(DIST)/lib/$(LIB_PREFIX)nsspki3.$(LIB_SUFFIX) \
7a9a6b6d JB	83	+ $(DIST)/lib/$(LIB_PREFIX)pk11wrap3.$(LIB_SUFFIX) \
985ee8fc JB	84	+ $(DIST)/lib/$(LIB_PREFIX)softokn3.$(LIB_SUFFIX) \
	85	$(DIST)/lib/$(LIB_PREFIX)certdb.$(LIB_SUFFIX) \
	86	- $(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
	87	+ $(DIST)/lib/$(LIB_PREFIX)nsspki3.$(LIB_SUFFIX) \
	88	$(DIST)/lib/$(LIB_PREFIX)nssdev.$(LIB_SUFFIX) \
	89	$(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
a76c0d50	90	$(CRYPTOLIB) \
fc4077b9	91	$(DBMLIB) \
7a9a6b6d JB	92	$(PKIXLIB) \
	93	- $(DIST)/lib/$(LIB_PREFIX)nss.$(LIB_SUFFIX) \
	94	- $(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
	95	+ $(DIST)/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \
	96	+ $(DIST)/lib/$(LIB_PREFIX)pk11wrap3.$(LIB_SUFFIX) \
	97	$(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
	98	$(NULL)
	99
76a68ca3 JB	100	--- nss-3.12.4/mozilla/security/nss/lib/ssl/config.mk.orig 2009-06-11 02:55:52.000000000 +0200
	101	+++ nss-3.12.4/mozilla/security/nss/lib/ssl/config.mk 2009-08-28 22:40:25.676607585 +0200
	102	@@ -83,7 +83,7 @@
1015f127 SS	103	DEFINES += -DNSS_SURVIVE_DOUBLE_BYPASS_FAILURE
1015f127 SS	104	endif
76a68ca3	105
76a68ca3 JB	106	-CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
	107	+CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
	108
	109	EXTRA_LIBS += \
	110	$(CRYPTOLIB) \
	111	--- nss-3.12.4/mozilla/security/nss/lib/softoken/legacydb/config.mk.orig 2009-06-11 02:55:49.000000000 +0200
	112	+++ nss-3.12.4/mozilla/security/nss/lib/softoken/legacydb/config.mk 2009-08-28 22:40:40.392606747 +0200
a76c0d50	113	@@ -36,7 +36,7 @@
a76c0d50	114	# *** END LICENSE BLOCK ***
985ee8fc JB	115
	116	# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
	117	-CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
6434b473	118	+CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
985ee8fc	119
76a68ca3	120	EXTRA_LIBS += $(CRYPTOLIB)
985ee8fc	121
76a68ca3 JB	122	--- nss-3.12.4/mozilla/security/nss/lib/softoken/config.mk.orig 2009-06-11 02:55:48.000000000 +0200
76a68ca3 JB	123	+++ nss-3.12.4/mozilla/security/nss/lib/softoken/config.mk 2009-08-28 22:39:36.436608423 +0200
7a9a6b6d JB	124	@@ -36,7 +36,7 @@
	125	# *** END LICENSE BLOCK ***
	126
	127	# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
	128	-CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
	129	+CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
76a68ca3 JB	130
	131	EXTRA_LIBS += \
	132	$(CRYPTOLIB) \