Bug 642148 - Upgrade Mozilla to NSPR 4.8.8 beta 3 and NSS 3.12.10 beta 1, r=wtc, r=kaie (f24340e7) · Commits · Tommy Webb / Tor Browser

nsprpub/TAG-INFO

+1 −1

Original line number	Diff line number	Diff line
		NSPR_4_8_8_BETA2
		NSPR_4_8_8_BETA3

nsprpub/config/prdepend.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -42,3 +42,4 @@
		*/

		#error "Do not include this header file."

nsprpub/configure

+25 −23

Original line number	Diff line number	Diff line
		@@ -3541,10 +3541,12 @@ EOF
		CC="$CC -arch x86_64"
		else
		CPU_ARCH=i386
		CC="$CC -arch i386"
		fi
		;;
		*)
		CPU_ARCH=ppc
		CC="$CC -arch ppc"
		;;
		esac
		DSO_CFLAGS=-fPIC
		@@ -4739,17 +4741,17 @@ EOF
		_OPTIMIZE_FLAGS="$_OPTIMIZE_FLAGS -Olimit 4000"
		ac_safe=`echo "machine/builtins.h" \| sed 'y%./+-%__p_%'`
		echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6
		echo "configure:4743: checking for machine/builtins.h" >&5
		echo "configure:4745: checking for machine/builtins.h" >&5
		if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
		echo $ac_n "(cached) $ac_c" 1>&6
		else
		cat > conftest.$ac_ext <<EOF
		#line 4748 "configure"
		#line 4750 "configure"
		#include "confdefs.h"
		#include <machine/builtins.h>
		EOF
		ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
		{ (eval echo configure:4753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
		{ (eval echo configure:4755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
		ac_err=`grep -v '^ *+' conftest.out \| grep -v "^conftest.${ac_ext}\$"`
		if test -z "$ac_err"; then
		rm -rf conftest*
		@@ -5398,7 +5400,7 @@ case $target in
		;;
		*)
		echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
		echo "configure:5402: checking for dlopen in -ldl" >&5
		echo "configure:5404: checking for dlopen in -ldl" >&5
		ac_lib_var=`echo dl'_'dlopen \| sed 'y%./+-%__p_%'`
		if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
		echo $ac_n "(cached) $ac_c" 1>&6
		@@ -5406,7 +5408,7 @@ else
		ac_save_LIBS="$LIBS"
		LIBS="-ldl $LIBS"
		cat > conftest.$ac_ext <<EOF
		#line 5410 "configure"
		#line 5412 "configure"
		#include "confdefs.h"
		/* Override any gcc2 internal prototype to avoid an error. */
		/* We use char because int might match the return type of a gcc2
		@@ -5417,7 +5419,7 @@ int main() {
		dlopen()
		; return 0; }
		EOF
		if { (eval echo configure:5421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
		if { (eval echo configure:5423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
		rm -rf conftest*
		eval "ac_cv_lib_$ac_lib_var=yes"
		else
		@@ -5434,17 +5436,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
		echo "$ac_t""yes" 1>&6
		ac_safe=`echo "dlfcn.h" \| sed 'y%./+-%__p_%'`
		echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
		echo "configure:5438: checking for dlfcn.h" >&5
		echo "configure:5440: checking for dlfcn.h" >&5
		if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
		echo $ac_n "(cached) $ac_c" 1>&6
		else
		cat > conftest.$ac_ext <<EOF
		#line 5443 "configure"
		#line 5445 "configure"
		#include "confdefs.h"
		#include <dlfcn.h>
		EOF
		ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
		{ (eval echo configure:5448: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
		{ (eval echo configure:5450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
		ac_err=`grep -v '^ *+' conftest.out \| grep -v "^conftest.${ac_ext}\$"`
		if test -z "$ac_err"; then
		rm -rf conftest*
		@@ -5477,13 +5479,13 @@ esac

		if test $ac_cv_prog_gcc = yes; then
		echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
		echo "configure:5481: checking whether ${CC-cc} needs -traditional" >&5
		echo "configure:5483: checking whether ${CC-cc} needs -traditional" >&5
		if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
		echo $ac_n "(cached) $ac_c" 1>&6
		else
		ac_pattern="Autoconf.*'x'"
		cat > conftest.$ac_ext <<EOF
		#line 5487 "configure"
		#line 5489 "configure"
		#include "confdefs.h"
		#include <sgtty.h>
		Autoconf TIOCGETP
		@@ -5501,7 +5503,7 @@ rm -f conftest*

		if test $ac_cv_prog_gcc_traditional = no; then
		cat > conftest.$ac_ext <<EOF
		#line 5505 "configure"
		#line 5507 "configure"
		#include "confdefs.h"
		#include <termio.h>
		Autoconf TCGETA
		@@ -5525,12 +5527,12 @@ fi
		for ac_func in lchown strerror
		do
		echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
		echo "configure:5529: checking for $ac_func" >&5
		echo "configure:5531: checking for $ac_func" >&5
		if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
		echo $ac_n "(cached) $ac_c" 1>&6
		else
		cat > conftest.$ac_ext <<EOF
		#line 5534 "configure"
		#line 5536 "configure"
		#include "confdefs.h"
		/* System header to define __stub macros and hopefully few prototypes,
		which can conflict with char $ac_func(); below. */
		@@ -5553,7 +5555,7 @@ $ac_func();

		; return 0; }
		EOF
		if { (eval echo configure:5557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
		if { (eval echo configure:5559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
		rm -rf conftest*
		eval "ac_cv_func_$ac_func=yes"
		else
		@@ -5604,7 +5606,7 @@ do
		# Extract the first word of "$ac_prog", so it can be a program name with args.
		set dummy $ac_prog; ac_word=$2
		echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
		echo "configure:5608: checking for $ac_word" >&5
		echo "configure:5610: checking for $ac_word" >&5
		if eval "test \"`echo '$''{'ac_cv_path_CCACHE'+set}'`\" = set"; then
		echo $ac_n "(cached) $ac_c" 1>&6
		else
		@@ -5663,7 +5665,7 @@ hpux*)
		if test -z "$GNU_CC"; then

		echo $ac_n "checking for +Olit support""... $ac_c" 1>&6
		echo "configure:5667: checking for +Olit support" >&5
		echo "configure:5669: checking for +Olit support" >&5
		if eval "test \"`echo '$''{'ac_cv_hpux_usable_olit_option'+set}'`\" = set"; then
		echo $ac_n "(cached) $ac_c" 1>&6
		else
		@@ -5705,7 +5707,7 @@ wince*)
		*)

		echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
		echo "configure:5709: checking for pthread_create in -lpthreads" >&5
		echo "configure:5711: checking for pthread_create in -lpthreads" >&5
		echo "
		#include <pthread.h>
		void foo(void v) { return v; }
		@@ -5727,7 +5729,7 @@ echo "
		echo "$ac_t""no" 1>&6

		echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
		echo "configure:5731: checking for pthread_create in -lpthread" >&5
		echo "configure:5733: checking for pthread_create in -lpthread" >&5
		echo "
		#include <pthread.h>
		void foo(void v) { return v; }
		@@ -5749,7 +5751,7 @@ echo "
		echo "$ac_t""no" 1>&6

		echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
		echo "configure:5753: checking for pthread_create in -lc_r" >&5
		echo "configure:5755: checking for pthread_create in -lc_r" >&5
		echo "
		#include <pthread.h>
		void foo(void v) { return v; }
		@@ -5771,7 +5773,7 @@ echo "
		echo "$ac_t""no" 1>&6

		echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
		echo "configure:5775: checking for pthread_create in -lc" >&5
		echo "configure:5777: checking for pthread_create in -lc" >&5
		echo "
		#include <pthread.h>
		void foo(void v) { return v; }
		@@ -5889,7 +5891,7 @@ if test -n "$USE_PTHREADS"; then
		rm -f conftest*
		ac_cv_have_dash_pthread=no
		echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6
		echo "configure:5893: checking whether ${CC-cc} accepts -pthread" >&5
		echo "configure:5895: checking whether ${CC-cc} accepts -pthread" >&5
		echo 'int main() { return 0; }' \| cat > conftest.c
		${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1
		if test $? -eq 0; then
		@@ -5912,7 +5914,7 @@ echo "configure:5893: checking whether ${CC-cc} accepts -pthread" >&5
		ac_cv_have_dash_pthreads=no
		if test "$ac_cv_have_dash_pthread" = "no"; then
		echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6
		echo "configure:5916: checking whether ${CC-cc} accepts -pthreads" >&5
		echo "configure:5918: checking whether ${CC-cc} accepts -pthreads" >&5
		echo 'int main() { return 0; }' \| cat > conftest.c
		${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1
		if test $? -eq 0; then

nsprpub/configure.in

+2 −0

Original line number	Diff line number	Diff line
		@@ -1144,10 +1144,12 @@ case "$target" in
		CC="$CC -arch x86_64"
		else
		CPU_ARCH=i386
		CC="$CC -arch i386"
		fi
		;;
		*)
		CPU_ARCH=ppc
		CC="$CC -arch ppc"
		;;
		esac
		DSO_CFLAGS=-fPIC

nsprpub/pr/include/prio.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -142,6 +142,9 @@ typedef enum PRTransmitFileFlags {
		#define PR_AF_INET6 100
		#endif

		#define PR_AF_INET_SDP 101
		#define PR_AF_INET6_SDP 102

		#ifndef PR_AF_UNSPEC
		#define PR_AF_UNSPEC 0
		#endif