nss-Makefile.patch

   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 @@
   4  DSO_LDFLAGS            =
   5  LDFLAGS                        += $(ARCHFLAG)
   6
   7 -# INCLUDES += -I/usr/include -Y/usr/include/linux
   8  G++INCLUDES            = -I/usr/include/g++
   9 +INCLUDES += -I/usr/include/nspr
  10
  11  #
  12  # Always set CPU_TAG on Linux, OpenVMS, WINCE.
  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 @@
  17
  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)
  25 --- nss-3.12/mozilla/security/nss/cmd/platlibs.mk.orig  2008-02-25 22:32:33.000000000 +0100
  26 +++ nss-3.12/mozilla/security/nss/cmd/platlibs.mk       2008-06-18 23:02:57.118830492 +0200
  27 @@ -50,14 +50,6 @@
  28  endif
  29  endif
  30
  31 -ifeq ($(OS_ARCH), Linux)
  32 -ifeq ($(USE_64), 1)
  33 -EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
  34 -else
  35 -EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
  36 -endif
  37 -endif
  38 -
  39  ifeq ($(OS_ARCH), HP-UX)
  40  ifeq ($(OS_TEST), ia64)
  41  EXTRA_SHARED_LIBS += -Wl,+b,'$$ORIGIN/../lib'
  42 @@ -137,13 +129,13 @@
  43  else
  44
  45  # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
  46 -CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
  47 +CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
  48  ifdef MOZILLA_SECURITY_BUILD
  49         CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)
  50  endif
  51  ifdef MOZILLA_BSAFE_BUILD
  52         CRYPTOLIB+=$(DIST)/lib/$(LIB_PREFIX)bsafe.$(LIB_SUFFIX)
  53 -       CRYPTOLIB+=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
  54 +       CRYPTOLIB+=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
  55  endif
  56
  57  PKIXLIB = \
  58 @@ -161,30 +153,30 @@
  59         $(DIST)/lib/$(LIB_PREFIX)pkixcertsel.$(LIB_SUFFIX)
  60
  61  EXTRA_LIBS += \
  62 -       $(DIST)/lib/$(LIB_PREFIX)smime.$(LIB_SUFFIX) \
  63 -       $(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \
  64 -       $(DIST)/lib/$(LIB_PREFIX)nss.$(LIB_SUFFIX) \
  65 -       $(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \
  66 +       $(DIST)/lib/$(LIB_PREFIX)smime3.$(LIB_SUFFIX) \
  67 +       $(DIST)/lib/$(LIB_PREFIX)ssl3.$(LIB_SUFFIX) \
  68 +       $(DIST)/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \
  69 +       $(DIST)/lib/$(LIB_PREFIX)ssl3.$(LIB_SUFFIX) \
  70         $(DIST)/lib/$(LIB_PREFIX)sectool.$(LIB_SUFFIX) \
  71         $(DIST)/lib/$(LIB_PREFIX)pkcs12.$(LIB_SUFFIX) \
  72         $(DIST)/lib/$(LIB_PREFIX)pkcs7.$(LIB_SUFFIX) \
  73         $(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
  74 -       $(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
  75 +       $(DIST)/lib/$(LIB_PREFIX)pk11wrap3.$(LIB_SUFFIX) \
  76         $(DIST)/lib/$(LIB_PREFIX)cryptohi.$(LIB_SUFFIX) \
  77         $(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
  78 -       $(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
  79 -       $(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
  80 -       $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
  81 +       $(DIST)/lib/$(LIB_PREFIX)nsspki3.$(LIB_SUFFIX) \
  82 +       $(DIST)/lib/$(LIB_PREFIX)pk11wrap3.$(LIB_SUFFIX) \
  83 +       $(DIST)/lib/$(LIB_PREFIX)softokn3.$(LIB_SUFFIX) \
  84         $(DIST)/lib/$(LIB_PREFIX)certdb.$(LIB_SUFFIX) \
  85 -       $(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
  86 +       $(DIST)/lib/$(LIB_PREFIX)nsspki3.$(LIB_SUFFIX) \
  87         $(DIST)/lib/$(LIB_PREFIX)nssdev.$(LIB_SUFFIX) \
  88         $(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
  89         $(CRYPTOLIB) \
  90 -       $(DIST)/lib/$(LIB_PREFIX)nssutil.$(LIB_SUFFIX) \
  91 +       $(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \
  92         $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \
  93         $(PKIXLIB) \
  94 -       $(DIST)/lib/$(LIB_PREFIX)nss.$(LIB_SUFFIX) \
  95 -       $(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
  96 +       $(DIST)/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \
  97 +       $(DIST)/lib/$(LIB_PREFIX)pk11wrap3.$(LIB_SUFFIX) \
  98         $(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
  99         $(NULL)
 100
 101 diff -Nur nss-3.11.orig/mozilla/security/nss/lib/softoken/config.mk nss-3.11/mozilla/security/nss/lib/softoken/config.mk
 102 --- nss-3.11.orig/mozilla/security/nss/lib/softoken/config.mk   2005-10-19 02:03:31.000000000 +0100
 103 +++ nss-3.11/mozilla/security/nss/lib/softoken/config.mk        2006-01-26 15:13:55.000000000 +0000
 104 @@ -36,7 +36,7 @@
 105  # ***** END LICENSE BLOCK *****
 106
 107  # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
 108 -CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
 109 +CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
 110  CRYPTODIR=../freebl
 111  ifdef MOZILLA_SECURITY_BUILD
 112         CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)
 113 diff -Nur nss-3.11.orig/mozilla/security/nss/lib/ssl/config.mk nss-3.11/mozilla/security/nss/lib/ssl/config.mk
 114 --- nss-3.11.orig/mozilla/security/nss/lib/ssl/config.mk        2005-10-19 02:04:16.000000000 +0100
 115 +++ nss-3.11/mozilla/security/nss/lib/ssl/config.mk     2006-01-26 15:13:55.000000000 +0000
 116 @@ -67,7 +67,7 @@
 117  endif # NS_USE_GCC
 118
 119  # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
 120 -CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
 121 +CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
 122  CRYPTODIR=../freebl
 123  ifdef MOZILLA_SECURITY_BUILD
 124         CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)
 125 @@ -81,7 +81,7 @@
 126  else
 127
 128  # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
 129 -CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
 130 +CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
 131  CRYPTODIR=../freebl
 132  ifdef MOZILLA_SECURITY_BUILD
 133         CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)
 134 --- nss-3.12/mozilla/security/nss/lib/softoken/legacydb/config.mk.orig  2008-02-25 19:55:40.000000000 +0100
 135 +++ nss-3.12/mozilla/security/nss/lib/softoken/legacydb/config.mk       2008-06-18 22:36:58.538010357 +0200
 136 @@ -36,7 +36,7 @@
 137  # ***** END LICENSE BLOCK *****
 138
 139  # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
 140 -CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
 141 +CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
 142  CRYPTODIR=../freebl
 143  ifdef MOZILLA_SECURITY_BUILD
 144         CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)