Ticket #1811: firefox-1.5.0.1-system_nss-1.patch

File firefox-1.5.0.1-system_nss-1.patch, 18.3 KB (added by Chris Staub, 18 years ago)

Updated system-nss patch

  • aclocal.m4 

    Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
Date:                    2006-01-20
Initial Package Version: 1.5
Upstream Status:         Unknown
Origin:                  Fedora CVS
                         Rediffed against firefox 1.5.0.1 by Chris Staub.
Description:             Fixes the --use-system-nss and --with-nss-prefix
                         switches so that they actually work. This patch
                         allows the Mozilla products to use the system
                         installed versions of NSS and NSPR.

diff -Naur mozilla.orig/aclocal.m4 mozilla/aclocal.m4
    old new  
    88builtin(include, build/autoconf/libIDL.m4)dnl
    99builtin(include, build/autoconf/libIDL-2.m4)dnl
    1010builtin(include, build/autoconf/nspr.m4)dnl
     11builtin(include, build/autoconf/nss.m4)dnl
    1112builtin(include, build/autoconf/libart.m4)dnl
    1213builtin(include, build/autoconf/pkg.m4)dnl
    1314builtin(include, build/autoconf/freetype2.m4)dnl

  • build/autoconf/nss.m4 

    diff -Naur mozilla.orig/build/autoconf/nss.m4 mozilla/build/autoconf/nss.m4
    old new  
     1# -*- tab-width: 4; -*-
     2# Configure paths for NSS
     3# Public domain - Chris Seawood <cls@seawood.org> 2001-04-05
     4# Based upon gtk.m4 (also PD) by Owen Taylor
     5
     6dnl AM_PATH_NSS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
     7dnl Test for NSS, and define NSS_CFLAGS and NSS_LIBS
     8AC_DEFUN(AM_PATH_NSS,
     9[dnl
     10
     11AC_ARG_WITH(nss-prefix,
     12        [  --with-nss-prefix=PFX  Prefix where NSS is installed],
     13        nss_config_prefix="$withval",
     14        nss_config_prefix="")
     15
     16AC_ARG_WITH(nss-exec-prefix,
     17        [  --with-nss-exec-prefix=PFX
     18                          Exec prefix where NSS is installed],
     19        nss_config_exec_prefix="$withval",
     20        nss_config_exec_prefix="")
     21
     22        if test -n "$nss_config_exec_prefix"; then
     23                nss_config_args="$nss_config_args --exec-prefix=$nss_config_exec_prefix"
     24                if test -z "$NSS_CONFIG"; then
     25                        NSS_CONFIG=$nss_config_exec_prefix/bin/nss-config
     26                fi
     27        fi
     28        if test -n "$nss_config_prefix"; then
     29                nss_config_args="$nss_config_args --prefix=$nss_config_prefix"
     30                if test -z "$NSS_CONFIG"; then
     31                        NSS_CONFIG=$nss_config_prefix/bin/nss-config
     32                fi
     33        fi
     34
     35        unset ac_cv_path_NSS_CONFIG
     36        AC_PATH_PROG(NSS_CONFIG, nss-config, no)
     37        min_nss_version=ifelse([$1], ,3.0.0,$1)
     38        AC_MSG_CHECKING(for NSS - version >= $min_nss_version (skipping))
     39
     40        no_nss=""
     41        if test "$NSS_CONFIG" = "no"; then
     42                no_nss="yes"
     43        else
     44                NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags`
     45                NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs`
     46
     47                dnl Skip version check for now
     48                nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \
     49                        sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
     50                nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \
     51                        sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
     52                nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \
     53                        sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
     54        fi
     55
     56        if test -z "$no_nss"; then
     57                AC_MSG_RESULT(yes)
     58                ifelse([$2], , :, [$2])     
     59        else
     60                AC_MSG_RESULT(no)
     61        fi
     62
     63
     64        AC_SUBST(NSS_CFLAGS)
     65        AC_SUBST(NSS_LIBS)
     66
     67])

  • config/autoconf.mk.in 

    diff -Naur mozilla.orig/config/autoconf.mk.in mozilla/config/autoconf.mk.in
    old new  
    229229MOZ_INSURE_EXCLUDE_DIRS = @MOZ_INSURE_EXCLUDE_DIRS@
    230230
    231231MOZ_NATIVE_NSPR = @MOZ_NATIVE_NSPR@
     232MOZ_NATIVE_NSS = @MOZ_NATIVE_NSS@
    232233
    233234CROSS_COMPILE   = @CROSS_COMPILE@
    234235
    … …  
    384385NSPR_CFLAGS     = @NSPR_CFLAGS@
    385386NSPR_LIBS       = @NSPR_LIBS@
    386387
     388NSS_CONFIG      = @NSS_CONFIG@
     389NSS_CFLAGS      = @NSS_CFLAGS@
     390NSS_LIBS        = @NSS_LIBS@
     391
     392ifdef MOZ_NATIVE_NSS
     393NSS_DEP_LIBS    = \
     394        $(NULL)
     395NSS_LIBS += \
     396        -lcrmf \
     397        $(NULL)
     398else
     399NSS_DEP_LIBS    = \
     400        $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
     401        $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
     402        $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
     403        $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
     404        $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
     405        $(NULL)
     406NSS_LIBS = \
     407        $(LIBS_DIR) \
     408        $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
     409        -lsmime3 \
     410        -lssl3 \
     411        -lnss3 \
     412        -lsoftokn3 \
     413        $(NULL)
     414endif
     415
     416ifneq (,$(filter OS2 WINNT WINCE, $(OS_ARCH)))
     417ifndef GNU_CC
     418ifndef MOZ_NATIVE_NSS
     419NSS_LIBS        = \
     420        $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
     421        $(DIST)/lib/$(LIB_PREFIX)smime3.$(IMPORT_LIB_SUFFIX) \
     422        $(DIST)/lib/$(LIB_PREFIX)ssl3.$(IMPORT_LIB_SUFFIX) \
     423        $(DIST)/lib/$(LIB_PREFIX)nss3.$(IMPORT_LIB_SUFFIX) \
     424        $(DIST)/lib/$(LIB_PREFIX)softokn3.$(IMPORT_LIB_SUFFIX) \
     425        $(NULL)
     426endif
     427endif
     428endif
     429
    387430LDAP_CFLAGS     = @LDAP_CFLAGS@
    388431LDAP_LIBS       = @LDAP_LIBS@
    389432XPCOM_GLUE_LDOPTS = @XPCOM_GLUE_LDOPTS@

  • config/config.mk 

    diff -Naur mozilla.orig/config/config.mk mozilla/config/config.mk
    old new  
    138138FINAL_LINK_COMPS = $(DEPTH)/config/final-link-comps
    139139FINAL_LINK_COMP_NAMES = $(DEPTH)/config/final-link-comp-names
    140140
    141 #
    142 # NSS libs needed for final link in static build
    143 #
    144 
    145 NSS_LIBS        = \
    146         $(LIBS_DIR) \
    147         $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
    148         -lsmime3 \
    149         -lssl3 \
    150         -lnss3 \
    151         -lsoftokn3 \
    152         $(NULL)
    153 
    154 ifneq (,$(filter OS2 WINNT WINCE, $(OS_ARCH)))
    155 ifndef GNU_CC
    156 NSS_LIBS        = \
    157         $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
    158         $(DIST)/lib/$(LIB_PREFIX)smime3.$(IMPORT_LIB_SUFFIX) \
    159         $(DIST)/lib/$(LIB_PREFIX)ssl3.$(IMPORT_LIB_SUFFIX) \
    160         $(DIST)/lib/$(LIB_PREFIX)nss3.$(IMPORT_LIB_SUFFIX) \
    161         $(DIST)/lib/$(LIB_PREFIX)softokn3.$(IMPORT_LIB_SUFFIX) \
    162         $(NULL)
    163 endif
    164 endif
    165 
    166 NSS_DEP_LIBS    = \
    167         $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
    168         $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
    169         $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
    170         $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
    171         $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
    172         $(NULL)
    173 
    174141MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
    175142MOZ_REGISTRY_LIBS          = $(DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX)
    176143MOZ_WIDGET_SUPPORT_LIBS    = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX)

  • configure 

    diff -Naur mozilla.orig/configure mozilla/configure
    old new  
    4444  --with-nspr-exec-prefix=PFX
    4545                          Exec prefix where NSPR is installed"
    4646ac_help="$ac_help
     47  --with-system-nss      Use system installed NSS"
     48ac_help="$ac_help
     49  --with-nss-prefix=PFX  Prefix where NSS is installed"
     50ac_help="$ac_help
     51  --with-nss-exec-prefix=PFX
     52                          Exec prefix where NSS is installed"
     53ac_help="$ac_help
    4754  --with-system-jpeg[=PFX]
    4855                          Use system libjpeg [installed at prefix PFX]"
    4956ac_help="$ac_help
    … …  
    10231030MOZPNG=10207
    10241031MOZZLIB=1.2.3
    10251032NSPR_VERSION=4
     1033NSS_VERSION=3
    10261034
    10271035GLIB_VERSION=1.2.0
    10281036GTK_VERSION=1.2.0
    … …  
    1130811316    fi
    1130911317fi
    1131011318
     11319
     11320# Check whether --with-system-nss or --without-system-nss was given.
     11321if test "${with_system_nss+set}" = set; then
     11322  withval="$with_system_nss"
     11323  if test "$withval" = "yes"; then
     11324    _USE_SYSTEM_NSS=1
     11325  elif test "$withval" = "no"; then
     11326    :
     11327  else
     11328    { echo "configure: error: Option, system-nss, does not take an argument ($withval)." 1>&2; exit 1; }
     11329  fi
     11330fi
     11331
     11332
     11333if test -n "$_USE_SYSTEM_NSS"; then
     11334   
     11335# Check whether --with-nss-prefix or --without-nss-prefix was given.
     11336if test "${with_nss_prefix+set}" = set; then
     11337  withval="$with_nss_prefix"
     11338  nss_config_prefix="$withval"
     11339else
     11340  nss_config_prefix=""
     11341fi
     11342
     11343
     11344# Check whether --with-nss-exec-prefix or --without-nss-exec-prefix was given.
     11345if test "${with_nss_exec_prefix+set}" = set; then
     11346  withval="$with_nss_exec_prefix"
     11347  nss_config_exec_prefix="$withval"
     11348else
     11349  nss_config_exec_prefix=""
     11350fi
     11351
     11352
     11353        if test -n "$nss_config_exec_prefix"; then
     11354                nss_config_args="$nss_config_args --exec-prefix=$nss_config_exec_prefix"
     11355                if test -z "$NSS_CONFIG"; then
     11356                        NSS_CONFIG=$nss_config_exec_prefix/bin/nss-config
     11357                fi
     11358        fi
     11359        if test -n "$nss_config_prefix"; then
     11360                nss_config_args="$nss_config_args --prefix=$nss_config_prefix"
     11361                if test -z "$NSS_CONFIG"; then
     11362                        NSS_CONFIG=$nss_config_prefix/bin/nss-config
     11363                fi
     11364        fi
     11365
     11366        unset ac_cv_path_NSS_CONFIG
     11367        # Extract the first word of "nss-config", so it can be a program name with args.
     11368set dummy nss-config; ac_word=$2
     11369echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
     11370echo "configure:11363: checking for $ac_word" >&5
     11371if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then
     11372  echo $ac_n "(cached) $ac_c" 1>&6
     11373else
     11374  case "$NSS_CONFIG" in
     11375  /*)
     11376  ac_cv_path_NSS_CONFIG="$NSS_CONFIG" # Let the user override the test with a path.
     11377  ;;
     11378  ?:/*)                 
     11379  ac_cv_path_NSS_CONFIG="$NSS_CONFIG" # Let the user override the test with a dos path.
     11380  ;;
     11381  *)
     11382  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
     11383  ac_dummy="$PATH"
     11384  for ac_dir in $ac_dummy; do
     11385    test -z "$ac_dir" && ac_dir=.
     11386    if test -f $ac_dir/$ac_word; then
     11387      ac_cv_path_NSS_CONFIG="$ac_dir/$ac_word"
     11388      break
     11389    fi
     11390  done
     11391  IFS="$ac_save_ifs"
     11392  test -z "$ac_cv_path_NSS_CONFIG" && ac_cv_path_NSS_CONFIG="no"
     11393  ;;
     11394esac
     11395fi
     11396NSS_CONFIG="$ac_cv_path_NSS_CONFIG"
     11397if test -n "$NSS_CONFIG"; then
     11398  echo "$ac_t""$NSS_CONFIG" 1>&6
     11399else
     11400  echo "$ac_t""no" 1>&6
     11401fi
     11402
     11403        min_nss_version=3.0.0
     11404        echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6
     11405echo "configure:11398: checking for NSS - version >= $min_nss_version (skipping)" >&5
     11406
     11407        no_nss=""
     11408        if test "$NSS_CONFIG" = "no"; then
     11409                no_nss="yes"
     11410        else
     11411                NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags`
     11412                NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs`
     11413
     11414                                nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \
     11415                        sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
     11416                nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \
     11417                        sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
     11418                nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \
     11419                        sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
     11420        fi
     11421
     11422        if test -z "$no_nss"; then
     11423                echo "$ac_t""yes" 1>&6
     11424                MOZ_NATIVE_NSS=1     
     11425        else
     11426                echo "$ac_t""no" 1>&6
     11427        fi
     11428
     11429
     11430       
     11431       
     11432
     11433
     11434fi
     11435
    1131111436if test -z "$SKIP_LIBRARY_CHECKS"; then
    1131211437# Check whether --with-system-jpeg or --without-system-jpeg was given.
    1131311438if test "${with_system_jpeg+set}" = set; then
    … …  
    1949119616s%@NSPR_CONFIG@%$NSPR_CONFIG%g
    1949219617s%@NSPR_CFLAGS@%$NSPR_CFLAGS%g
    1949319618s%@NSPR_LIBS@%$NSPR_LIBS%g
     19619s%@NSS_CONFIG@%$NSS_CONFIG%g
     19620s%@NSS_CFLAGS@%$NSS_CFLAGS%g
     19621s%@NSS_LIBS@%$NSS_LIBS%g
    1949419622s%@GTK_CONFIG@%$GTK_CONFIG%g
    1949519623s%@GTK_CFLAGS@%$GTK_CFLAGS%g
    1949619624s%@GTK_LIBS@%$GTK_LIBS%g
    … …  
    1977119899s%@MOZ_PNG_CFLAGS@%$MOZ_PNG_CFLAGS%g
    1977219900s%@MOZ_PNG_LIBS@%$MOZ_PNG_LIBS%g
    1977319901s%@MOZ_NATIVE_NSPR@%$MOZ_NATIVE_NSPR%g
     19902s%@MOZ_NATIVE_NSS@%$MOZ_NATIVE_NSS%g
    1977419903s%@COMPILE_CFLAGS@%$COMPILE_CFLAGS%g
    1977519904s%@COMPILE_CXXFLAGS@%$COMPILE_CXXFLAGS%g
    1977619905s%@CROSS_COMPILE@%$CROSS_COMPILE%g

  • configure.in 

    diff -Naur mozilla.orig/configure.in mozilla/configure.in
    old new  
    8686MOZPNG=10207
    8787MOZZLIB=1.2.3
    8888NSPR_VERSION=4
     89NSS_VERSION=3
    8990
    9091dnl Set the minimum version of toolkit libs used by mozilla
    9192dnl ========================================================
    … …  
    34913492    fi
    34923493fi
    34933494
     3495dnl ========================================================
     3496dnl = If NSS was not detected in the system,
     3497dnl = use the one in the source tree (mozilla/security/nss)
     3498dnl ========================================================
     3499
     3500MOZ_ARG_WITH_BOOL(system-nss,
     3501[  --with-system-nss      Use system installed NSS],
     3502    _USE_SYSTEM_NSS=1 )
     3503
     3504if test -n "$_USE_SYSTEM_NSS"; then
     3505    AM_PATH_NSS(3.0.0, [MOZ_NATIVE_NSS=1], [MOZ_NATIVE_NSS=])
     3506fi
     3507
    34943508if test -z "$SKIP_LIBRARY_CHECKS"; then
    34953509dnl system JPEG support
    34963510dnl ========================================================
    … …  
    67356749AC_SUBST(NSPR_LIBS)
    67366750AC_SUBST(MOZ_NATIVE_NSPR)
    67376751
     6752AC_SUBST(NSS_CFLAGS)
     6753AC_SUBST(NSS_LIBS)
     6754AC_SUBST(MOZ_NATIVE_NSS)
     6755
    67386756AC_SUBST(CFLAGS)
    67396757AC_SUBST(CXXFLAGS)
    67406758AC_SUBST(CPPFLAGS)

  • security/manager/Makefile.in 

    diff -Naur mozilla.orig/security/manager/Makefile.in mozilla/security/manager/Makefile.in
    old new  
    4646MODULE = psm
    4747
    4848PACKAGE_FILE = psm.pkg
     49
     50ifndef MOZ_NATIVE_NSS
    4951PACKAGE_VARS += \
    5052        NSS3_LIB \
    5153        SMIME3_LIB \
    … …  
    5759        $(NULL)
    5860
    5961LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
     62endif
    6063
    6164NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
    6265SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
    … …  
    150153export:: .nss.cleaned
    151154
    152155.nss.cleaned: .nss.checkout
     156ifndef MOZ_NATIVE_NSS
    153157        $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
    154158        $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
    155159ifndef SKIP_CHK
    … …  
    157161        $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
    158162endif
    159163        touch $@
     164endif
    160165
    161166.nss.checkout:
     167ifndef MOZ_NATIVE_NSS
    162168        touch $(srcdir)/$@
     169endif
    163170
    164171dependclean export packages chrome::
    165172        $(MAKE) -C boot $@
    … …  
    170177endif
    171178
    172179libs::
     180ifndef MOZ_NATIVE_NSS
    173181        $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
     182endif
    174183ifeq ($(OS_ARCH),WINNT)
    175184        cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
    176185else
    177186        cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
    178187endif
     188ifndef MOZ_NATIVE_NSS
    179189        $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
    180190ifndef SKIP_CHK
    181191        $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
    … …  
    213223        $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
    214224endif
    215225endif
     226endif
    216227        $(MAKE) -C boot $@
    217228        $(MAKE) -C ssl $@
    218229        $(MAKE) -C locales $@
    … …  
    221232endif
    222233
    223234install::
     235ifndef MOZ_NATIVE_NSS
    224236        $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
    225237ifndef SKIP_CHK
    226238        $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
    … …  
    235247        $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir)
    236248        $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir)
    237249endif
     250endif
    238251        $(MAKE) -C boot $@
    239252        $(MAKE) -C ssl $@
    240253        $(MAKE) -C locales $@
    … …  
    249262ifdef MOZ_XUL
    250263        $(MAKE) -C pki $@
    251264endif
     265ifndef MOZ_NATIVE_NSS
    252266        $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
    253267        $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
    254268ifndef SKIP_CHK
    255269        $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
    256270        $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
    257271endif
     272endif
    258273
    259274echo-requires-recursive::
    260275        $(MAKE) -C boot $@
    261276        $(MAKE) -C ssl $@
    262277        $(MAKE) -C pki $@
    263278        $(MAKE) -C locales $@
     279

  • security/manager/ssl/src/Makefile.in 

    diff -Naur mozilla.orig/security/manager/ssl/src/Makefile.in mozilla/security/manager/ssl/src/Makefile.in
    old new  
    123123
    124124# Use local includes because they are inserted before INCLUDES
    125125# so that Mozilla's nss.h is used, not glibc's
     126ifdef MOZ_NATIVE_NSS
     127LOCAL_INCLUDES += $(NSS_CFLAGS) \
     128                  $(NULL)
     129else
    126130LOCAL_INCLUDES += -I$(DIST)/public/nss \
    127131                  $(NULL)
     132endif
    128133
    129134EXTRA_DSO_LDOPTS += \
    130135                $(MOZ_UNICHARUTIL_LIBS) \

  • security/manager/ssl/src/nsNSSComponent.cpp 

    diff -Naur mozilla.orig/security/manager/ssl/src/nsNSSComponent.cpp mozilla/security/manager/ssl/src/nsNSSComponent.cpp
    old new  
    488488}
    489489
    490490
    491 #ifdef XP_MAC
    492 #ifdef DEBUG
    493 #define LOADABLE_CERTS_MODULE NS_LITERAL_CSTRING("NSSckbiDebug.shlb")
    494 #else
    495 #define LOADABLE_CERTS_MODULE NS_LITERAL_CSTRING("NSSckbi.shlb")
    496 #endif /*DEBUG*/
    497 #endif /*XP_MAC*/
    498 
    499491static void setOCSPOptions(nsIPrefBranch * pref);
    500492
    501493NS_IMETHODIMP
    … …  
    689681
    690682    const char *possible_ckbi_locations[] = {
    691683      NS_GRE_DIR,
    692       NS_XPCOM_CURRENT_PROCESS_DIR
     684      NS_XPCOM_CURRENT_PROCESS_DIR,
     685      0
    693686    };
    694    
     687
    695688    for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) {
    696689      nsCOMPtr<nsILocalFile> mozFile;
    697       directoryService->Get( possible_ckbi_locations[il],
    698                              NS_GET_IID(nsILocalFile),
    699                              getter_AddRefs(mozFile));
     690      char *fullModuleName = nsnull;
     691
     692      if (!possible_ckbi_locations[il])
     693      {
     694        fullModuleName = PR_GetLibraryName(nsnull, "nssckbi");
     695      }
     696      else
     697      {
     698        directoryService->Get( possible_ckbi_locations[il],
     699                               NS_GET_IID(nsILocalFile),
     700                               getter_AddRefs(mozFile));
    700701   
    701       if (!mozFile) {
    702         continue;
     702        if (!mozFile) {
     703          continue;
     704        }
     705
     706        nsCAutoString processDir;
     707        mozFile->GetNativePath(processDir);
     708        fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
    703709      }
    704710
    705       char *fullModuleName = nsnull;
    706 #ifdef XP_MAC
    707       nsCAutoString nativePath;
    708       mozFile->AppendNative(NS_LITERAL_CSTRING("Essential Files"));
    709       mozFile->AppendNative(LOADABLE_CERTS_MODULE);
    710       mozFile->GetNativePath(nativePath);   
    711       fullModuleName = (char *) nativePath.get();
    712 #else
    713       nsCAutoString processDir;
    714       mozFile->GetNativePath(processDir);
    715       fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
    716 #endif
    717711      /* If a module exists with the same name, delete it. */
    718712      NS_ConvertUCS2toUTF8 modNameUTF8(modName);
    719713      int modType;
    720714      SECMOD_DeleteModule(NS_CONST_CAST(char*, modNameUTF8.get()), &modType);
    721715      SECStatus rv_add =
    722716        SECMOD_AddNewModule(NS_CONST_CAST(char*, modNameUTF8.get()), fullModuleName, 0, 0);
    723 #ifndef XP_MAC
    724       PR_Free(fullModuleName); // allocated by NSPR
    725 #endif
     717      PR_FreeLibraryName(fullModuleName); // allocated by NSPR
    726718      if (SECSuccess == rv_add) {
    727719        // found a module, no need to try other directories
    728720        break;