mozilla-firefox-nss.patch

   1 --- mozilla/config/config.mk~   Wed Apr 23 02:54:06 2003
   2 +++ mozilla/config/config.mk    Thu May 15 10:23:19 2003
   3 @@ -169,7 +169,7 @@
   4
   5  NSS_LIBS       = \
   6         $(LIBS_DIR) \
   7 -       $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
   8 +       -lcrmf \
   9         -lsmime3 \
  10         -lssl3 \
  11         -lnss3 \
  12 @@ -189,11 +189,6 @@
  13  endif
  14
  15  NSS_DEP_LIBS   = \
  16 -       $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
  17 -       $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
  18 -       $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
  19 -       $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
  20 -       $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
  21         $(NULL)
  22
  23  MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
  24 --- mozilla/security/manager/Makefile.in~       Wed Apr 23 02:54:08 2003
  25 +++ mozilla/security/manager/Makefile.in        Thu May 15 10:25:59 2003
  26 @@ -116,37 +116,6 @@
  27  else
  28         cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
  29  endif
  30 -       $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
  31 -       $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
  32 -       $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
  33 -ifndef DISABLE_DIST_GRE
  34 -       $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST)
  35 -       $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST)
  36 -       $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST)
  37 -       $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST)
  38 -       $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST)
  39 -       $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST)
  40 -ifdef HAVE_FREEBL_MODULES
  41 -       $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST)
  42 -       $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST)
  43 -       $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST)
  44 -       $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST)
  45 -endif
  46 -endif
  47 -ifndef _SKIP_OLD_GRE_INSTALL
  48 -       $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
  49 -       $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
  50 -       $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
  51 -       $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
  52 -       $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
  53 -       $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
  54 -ifdef HAVE_FREEBL_MODULES
  55 -       $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin
  56 -       $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin
  57 -       $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin
  58 -       $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
  59 -endif
  60 -endif
  61         $(MAKE) -C boot $@
  62         $(MAKE) -C ssl $@
  63  ifdef MOZ_XUL
  64 --- mozilla/security/manager/ssl/src/Makefile.in~       Fri Apr 11 02:56:20 2003
  65 +++ mozilla/security/manager/ssl/src/Makefile.in        Thu May 15 10:27:52 2003
  66 @@ -114,7 +114,7 @@
  67
  68  # Use local includes because they are inserted before INCLUDES
  69  # so that Mozilla's nss.h is used, not glibc's
  70 -LOCAL_INCLUDES += -I$(DIST)/public/nss \
  71 +LOCAL_INCLUDES += -I/usr/include/nss \
  72                    $(NULL)
  73
  74  EXTRA_DSO_LDOPTS += \