diff options
Diffstat (limited to 'security/nss')
| -rw-r--r-- | security/nss/lib/ckfw/builtins/config.mk | 7 | ||||
| -rw-r--r-- | security/nss/lib/freebl/unix_rand.c | 11 | ||||
| -rw-r--r-- | security/nss/lib/ssl/unix_err.c | 2 | ||||
| -rw-r--r-- | security/nss/macbuild/ssl.xml | 4 |
4 files changed, 20 insertions, 4 deletions
diff --git a/security/nss/lib/ckfw/builtins/config.mk b/security/nss/lib/ckfw/builtins/config.mk index 7d6df6c87..29063b0fd 100644 --- a/security/nss/lib/ckfw/builtins/config.mk +++ b/security/nss/lib/ckfw/builtins/config.mk @@ -49,3 +49,10 @@ endif ifdef BUILD_IDG DEFINES += -DNSSDEBUG endif + +# +# To create a loadable module on Darwin, we must use -bundle. +# +ifeq ($(OS_ARCH),Darwin) +DSO_LDOPTS := $(subst -dynamiclib,-bundle,$(DSO_LDOPTS)) +endif diff --git a/security/nss/lib/freebl/unix_rand.c b/security/nss/lib/freebl/unix_rand.c index 23118523a..21af5fdc6 100644 --- a/security/nss/lib/freebl/unix_rand.c +++ b/security/nss/lib/freebl/unix_rand.c @@ -78,7 +78,7 @@ static size_t CopyLowBits(void *dst, size_t dstlen, void *src, size_t srclen) } #if defined(SCO) || defined(UNIXWARE) || defined(BSDI) || defined(FREEBSD) \ - || defined(NETBSD) || defined(NTO) + || defined(NETBSD) || defined(NTO) || defined(DARWIN) #include <sys/times.h> #define getdtablesize() sysconf(_SC_OPEN_MAX) @@ -718,6 +718,11 @@ safe_pclose(FILE *fp) #if !defined(VMS) + +#ifdef DARWIN +#include <crt_externs.h> +#endif + void RNG_SystemInfoForRNG(void) { FILE *fp; @@ -725,7 +730,11 @@ void RNG_SystemInfoForRNG(void) size_t bytes; const char * const *cp; char *randfile; +#ifdef DARWIN + char **environ = *_NSGetEnviron(); +#else extern char **environ; +#endif static const char * const files[] = { "/etc/passwd", "/etc/utmp", diff --git a/security/nss/lib/ssl/unix_err.c b/security/nss/lib/ssl/unix_err.c index 0e81954bd..874db9353 100644 --- a/security/nss/lib/ssl/unix_err.c +++ b/security/nss/lib/ssl/unix_err.c @@ -48,7 +48,7 @@ #include "prerror.h" #endif -#if defined (__bsdi__) || defined(NTO) +#if defined (__bsdi__) || defined(NTO) || defined(DARWIN) #undef _PR_POLL_AVAILABLE #endif diff --git a/security/nss/macbuild/ssl.xml b/security/nss/macbuild/ssl.xml index ed6a7228b..70593ab71 100644 --- a/security/nss/macbuild/ssl.xml +++ b/security/nss/macbuild/ssl.xml @@ -850,7 +850,7 @@ <SETTING><NAME>MWPEF_olddefversion</NAME><VALUE>0</VALUE></SETTING> <SETTING><NAME>MWPEF_oldimpversion</NAME><VALUE>0</VALUE></SETTING> <SETTING><NAME>MWPEF_currentversion</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWPEF_fragmentname</NAME><VALUE></VALUE></SETTING> + <SETTING><NAME>MWPEF_fragmentname</NAME><VALUE>SSL3</VALUE></SETTING> <SETTING><NAME>MWPEF_collapsereloads</NAME><VALUE>0</VALUE></SETTING> <!-- Settings for "PPC Project" panel --> @@ -2137,7 +2137,7 @@ <SETTING><NAME>MWPEF_olddefversion</NAME><VALUE>0</VALUE></SETTING> <SETTING><NAME>MWPEF_oldimpversion</NAME><VALUE>0</VALUE></SETTING> <SETTING><NAME>MWPEF_currentversion</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWPEF_fragmentname</NAME><VALUE></VALUE></SETTING> + <SETTING><NAME>MWPEF_fragmentname</NAME><VALUE>SSL3</VALUE></SETTING> <SETTING><NAME>MWPEF_collapsereloads</NAME><VALUE>0</VALUE></SETTING> <!-- Settings for "PPC Project" panel --> |