nss-Makefile.patch

   1 diff -Nur nss-3.4.rc1.orig/mozilla/security/coreconf/Linux.mk nss-3.4.rc1/mozilla/security/coreconf/Linux.mk
   2 --- nss-3.4.rc1.orig/mozilla/security/coreconf/Linux.mk Fri Feb 15 23:53:12 2002
   3 +++ nss-3.4.rc1/mozilla/security/coreconf/Linux.mk      Thu Apr 11 20:48:58 2002
   4 @@ -121,8 +121,8 @@
   5  DSO_LDOPTS             = -shared
   6  DSO_LDFLAGS            =
   7
   8 -# INCLUDES += -I/usr/include -Y/usr/include/linux
   9  G++INCLUDES            = -I/usr/include/g++
  10 +INCLUDES += -I/usr/include/nspr
  11
  12  #
  13  # Always set CPU_TAG on Linux, OpenVMS, WINCE.
  14 diff -Nur nss-3.4.rc1.orig/mozilla/security/coreconf/ruleset.mk nss-3.4.rc1/mozilla/security/coreconf/ruleset.mk
  15 --- nss-3.4.rc1.orig/mozilla/security/coreconf/ruleset.mk       Thu Feb 21 22:23:14 2002
  16 +++ nss-3.4.rc1/mozilla/security/coreconf/ruleset.mk    Thu Apr 11 20:48:26 2002
  17 @@ -114,7 +114,7 @@
  18
  19  ifdef LIBRARY_NAME
  20      ifndef LIBRARY
  21 -       LIBRARY        = $(OBJDIR)/$(LIB_PREFIX)$(LIBRARY_NAME).$(LIB_SUFFIX)
  22 +       LIBRARY        = $(OBJDIR)/$(LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX)
  23      endif
  24      ifndef SHARED_LIBRARY
  25         SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).$(DLL_SUFFIX)
  26 diff -Nur nss-3.4.rc1.orig/mozilla/security/nss/cmd/platlibs.mk nss-3.4.rc1/mozilla/security/nss/cmd/platlibs.mk
  27 --- nss-3.4.rc1.orig/mozilla/security/nss/cmd/platlibs.mk       Sat Feb 16 00:38:41 2002
  28 +++ nss-3.4.rc1/mozilla/security/nss/cmd/platlibs.mk    Thu Apr 11 20:45:49 2002
  29 @@ -82,19 +82,19 @@
  30  else
  31
  32  # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
  33 -CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
  34 +CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
  35  ifdef MOZILLA_SECURITY_BUILD
  36         CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)
  37  endif
  38  ifdef MOZILLA_BSAFE_BUILD
  39         CRYPTOLIB+=$(DIST)/lib/$(LIB_PREFIX)bsafe.$(LIB_SUFFIX)
  40 -       CRYPTOLIB+=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
  41 +       CRYPTOLIB+=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
  42  endif
  43  EXTRA_LIBS += \
  44 -       $(DIST)/lib/$(LIB_PREFIX)smime.$(LIB_SUFFIX) \
  45 -       $(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \
  46 -       $(DIST)/lib/$(LIB_PREFIX)nss.$(LIB_SUFFIX) \
  47 -       $(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \
  48 +       $(DIST)/lib/$(LIB_PREFIX)smime3.$(LIB_SUFFIX) \
  49 +       $(DIST)/lib/$(LIB_PREFIX)ssl3.$(LIB_SUFFIX) \
  50 +       $(DIST)/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \
  51 +       $(DIST)/lib/$(LIB_PREFIX)ssl3.$(LIB_SUFFIX) \
  52         $(DIST)/lib/$(LIB_PREFIX)sectool.$(LIB_SUFFIX) \
  53         $(DIST)/lib/$(LIB_PREFIX)pkcs12.$(LIB_SUFFIX) \
  54         $(DIST)/lib/$(LIB_PREFIX)pkcs7.$(LIB_SUFFIX) \
  55 @@ -104,11 +104,11 @@
  56         $(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
  57         $(DIST)/lib/$(LIB_PREFIX)cryptohi.$(LIB_SUFFIX) \
  58         $(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
  59 -       $(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
  60 +       $(DIST)/lib/$(LIB_PREFIX)nsspki3.$(LIB_SUFFIX) \
  61         $(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
  62 -       $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
  63 +       $(DIST)/lib/$(LIB_PREFIX)softokn3.$(LIB_SUFFIX) \
  64         $(DIST)/lib/$(LIB_PREFIX)certdb.$(LIB_SUFFIX) \
  65 -       $(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
  66 +       $(DIST)/lib/$(LIB_PREFIX)nsspki3.$(LIB_SUFFIX) \
  67         $(DIST)/lib/$(LIB_PREFIX)nssdev.$(LIB_SUFFIX) \
  68         $(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
  69         $(DIST)/lib/$(LIB_PREFIX)swfci.$(LIB_SUFFIX) \
  70 --- nss-3.4.rc1.orig/mozilla/security/nss/lib/softoken/config.mk        Sun Mar  3 03:34:32 2002
  71 +++ nss-3.4.rc1/mozilla/security/nss/lib/softoken/config.mk     Thu Apr 11 22:13:48 2002
  72 @@ -37,7 +37,7 @@
  73  endif
  74
  75  # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
  76 -CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
  77 +CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
  78  CRYPTODIR=../freebl
  79  ifdef MOZILLA_SECURITY_BUILD
  80         CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)
  81 --- nss-3.11/mozilla/security/nss/lib/ssl/config.mk.orig        2005-10-19 03:04:16.000000000 +0200
  82 +++ nss-3.11/mozilla/security/nss/lib/ssl/config.mk     2006-01-13 22:56:15.154701250 +0100
  83 @@ -67,7 +67,7 @@
  84  endif # NS_USE_GCC
  85
  86  # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
  87 -CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
  88 +CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
  89  CRYPTODIR=../freebl
  90  ifdef MOZILLA_SECURITY_BUILD
  91         CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)
  92 @@ -81,7 +81,7 @@
  93  else
  94
  95  # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
  96 -CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
  97 +CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
  98  CRYPTODIR=../freebl
  99  ifdef MOZILLA_SECURITY_BUILD
 100         CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)