- Update to 2.32

Submitted by:	Jan Beich
MFH:		2015Q1
Security:	http://www.vuxml.org/freebsd/bd62c640-9bb9-11e4-a5ad-000c297fb80f.html

8 files changed, 181 insertions, 76 deletions

diff --git a/www/seamonkey/files/patch-bug1073709 b/www/seamonkey/files/patch-bug1073709
deleted file mode 100644
index 054ed2725747..000000000000
--- a/www/seamonkey/files/patch-bug1073709
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git mfbt/Atomics.h mfbt/Atomics.h
-index 495a9d3..c7f7601 100644
---- mozilla/mfbt/Atomics.h
-+++ mozilla/mfbt/Atomics.h
-@@ -34,10 +34,12 @@
-     * loose typing of the atomic builtins. GCC 4.5 and 4.6 lacks inline
-     * definitions for unspecialized std::atomic and causes linking errors.
-     * Therefore, we require at least 4.7.0 for using libstdc++.
-+    *
-+    * libc++ <atomic> is only functional with clang.
-     */
- #  if MOZ_USING_LIBSTDCXX && MOZ_LIBSTDCXX_VERSION_AT_LEAST(4, 7, 0)
- #    define MOZ_HAVE_CXX11_ATOMICS
--#  elif MOZ_USING_LIBCXX
-+#  elif MOZ_USING_LIBCXX && defined(__clang__)
- #    define MOZ_HAVE_CXX11_ATOMICS
- #  endif
- /*
diff --git a/www/seamonkey/files/patch-bug1112904 b/www/seamonkey/files/patch-bug1112904
new file mode 100644
index 000000000000..96fa3a4a1c74
--- /dev/null
+++ b/www/seamonkey/files/patch-bug1112904
@@ -0,0 +1,161 @@
+diff --git a/c-sdk/config/FreeBSD.mk b/c-sdk/config/FreeBSD.mk
+--- ldap/sdks/c-sdk/config/FreeBSD.mk
++++ ldap/sdks/c-sdk/config/FreeBSD.mk
+@@ -79,8 +79,8 @@ DLL_SUFFIX		= so.1.0
+ endif
+ 
+ DSO_CFLAGS		= -fPIC
+-DSO_LDOPTS		= -Bshareable
++DSO_LDOPTS		= -shared -Wl,-soname,$(notdir $@)
+ 
+-MKSHLIB			= $(LD) $(DSO_LDOPTS)
++MKSHLIB			= $(CC) $(DSO_LDOPTS)
+ 
+ G++INCLUDES		= -I/usr/include/g++
+diff --git a/c-sdk/configure b/c-sdk/configure
+--- ldap/sdks/c-sdk/configure
++++ ldap/sdks/c-sdk/configure
+@@ -4241,8 +4241,10 @@ EOF
+ #define DRAGONFLY 1
+ EOF
+ 
++    LD='$(CC)'
++    MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+     DSO_CFLAGS=-fPIC
+-    DSO_LDOPTS='-shared'
++    DSO_LDOPTS='-shared -Wl,-soname,$(notdir $@)'
+ 	;;
+ 
+ *-freebsd*)
+@@ -4261,6 +4263,7 @@ EOF
+ #define HAVE_BSD_FLOCK 1
+ EOF
+ 
++    LD='$(CC)'
+     CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
+     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
+     if test "$MOZ_OBJFORMAT" = "elf"; then
+@@ -4268,8 +4271,9 @@ EOF
+     else
+         DLL_SUFFIX=so.1.0
+     fi
++    MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+     DSO_CFLAGS=-fPIC
+-    DSO_LDOPTS=-Bshareable
++    DSO_LDOPTS='-shared -Wl,-soname,$(notdir $@)'
+     ;;
+ 
+ *-hpux*)
+@@ -6512,8 +6516,15 @@ echo "configure:6510: checking whether $
+    if test $? -eq 0; then
+ 	if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
+ 	    ac_cv_have_dash_pthread=yes
+-	    CFLAGS="$CFLAGS -pthread"
+-	    CXXFLAGS="$CXXFLAGS -pthread"
++		case "$target_os" in
++	    dragonfly*|freebsd*)
++# Freebsd doesn't use -pthread for compiles, it uses them for linking
++            ;;
++	    *)
++            CFLAGS="$CFLAGS -pthread"
++            CXXFLAGS="$CXXFLAGS -pthread"
++            ;;
++        esac
+ 	fi
+     fi
+     rm -f conftest*
+@@ -6542,7 +6553,22 @@ echo "configure:6526: checking whether $
+             _PTHREAD_LDFLAGS=
+         fi
+ 	    ;;
+-    *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*)
++    *-dragonfly*|*-freebsd*)
++	    cat >> confdefs.h <<\EOF
++#define _REENTRANT 1
++EOF
++
++	    cat >> confdefs.h <<\EOF
++#define _THREAD_SAFE 1
++EOF
++
++	    	    if test "$ac_cv_have_dash_pthread" = "yes"; then
++	        _PTHREAD_LDFLAGS="-pthread"
++	    else
++	        _PTHREAD_LDFLAGS="-lc_r"
++	    fi
++	    ;;
++    *-openbsd*|*-bsdi*|*-netbsd*)
+ 	    cat >> confdefs.h <<\EOF
+ #define _THREAD_SAFE 1
+ EOF
+diff --git a/c-sdk/configure.in b/c-sdk/configure.in
+--- ldap/sdks/c-sdk/configure.in
++++ ldap/sdks/c-sdk/configure.in
+@@ -1225,8 +1225,10 @@ tools are selected during the Xcode/Deve
+     fi
+     AC_DEFINE(XP_UNIX)
+     AC_DEFINE(DRAGONFLY)
++    LD='$(CC)'
++    MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+     DSO_CFLAGS=-fPIC
+-    DSO_LDOPTS='-shared'
++    DSO_LDOPTS='-shared -Wl,-soname,$(notdir $@)'
+ 	;;
+ 
+ *-freebsd*)
+@@ -1236,6 +1238,7 @@ tools are selected during the Xcode/Deve
+     AC_DEFINE(XP_UNIX)
+     AC_DEFINE(FREEBSD)
+     AC_DEFINE(HAVE_BSD_FLOCK)
++    LD='$(CC)'
+     CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
+     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
+     if test "$MOZ_OBJFORMAT" = "elf"; then
+@@ -1243,8 +1246,9 @@ tools are selected during the Xcode/Deve
+     else
+         DLL_SUFFIX=so.1.0
+     fi
++    MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+     DSO_CFLAGS=-fPIC
+-    DSO_LDOPTS=-Bshareable
++    DSO_LDOPTS='-shared -Wl,-soname,$(notdir $@)'
+     ;;
+ 
+ *-hpux*)
+@@ -2329,8 +2333,15 @@ if test -n "$USE_PTHREADS"; then
+    if test $? -eq 0; then
+ 	if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
+ 	    ac_cv_have_dash_pthread=yes
+-	    CFLAGS="$CFLAGS -pthread"
+-	    CXXFLAGS="$CXXFLAGS -pthread"
++		case "$target_os" in
++	    dragonfly*|freebsd*)
++# Freebsd doesn't use -pthread for compiles, it uses them for linking
++            ;;
++	    *)
++            CFLAGS="$CFLAGS -pthread"
++            CXXFLAGS="$CXXFLAGS -pthread"
++            ;;
++        esac
+ 	fi
+     fi
+     rm -f conftest*
+@@ -2361,7 +2372,17 @@ if test -n "$USE_PTHREADS"; then
+             _PTHREAD_LDFLAGS=
+         fi
+ 	    ;;
+-    *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*)
++    *-dragonfly*|*-freebsd*)
++	    AC_DEFINE(_REENTRANT)
++	    AC_DEFINE(_THREAD_SAFE)
++	    dnl -pthread links in -lc_r, so don't specify it explicitly.
++	    if test "$ac_cv_have_dash_pthread" = "yes"; then
++	        _PTHREAD_LDFLAGS="-pthread"
++	    else
++	        _PTHREAD_LDFLAGS="-lc_r"
++	    fi
++	    ;;
++    *-openbsd*|*-bsdi*|*-netbsd*)
+ 	    AC_DEFINE(_THREAD_SAFE)
+ 	    dnl -pthread links in -lc_r, so don't specify it explicitly.
+ 	    if test "$ac_cv_have_dash_pthread" = "yes"; then
diff --git a/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in b/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in
deleted file mode 100644
index 63f7b76052c3..000000000000
--- a/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- ldap/sdks/c-sdk/ldap/libraries/libldap/Makefile.in.orig	2009-11-10 09:56:42.000000000 +0100
-+++ ldap/sdks/c-sdk/ldap/libraries/libldap/Makefile.in	2009-11-10 09:58:15.000000000 +0100
-@@ -254,6 +254,10 @@
- EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lbe
- endif
- 
-+ifeq ($(OS_ARCH), FreeBSD)
-+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread
-+endif
-+
- ifeq ($(OS_ARCH), NetBSD)
- EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
- endif
diff --git a/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in b/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in
deleted file mode 100644
index 5495298ae3d1..000000000000
--- a/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in.orig	2008-09-11 16:38:35.000000000 +0200
-+++ ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in	2009-12-01 10:18:43.000000000 +0100
-@@ -147,6 +147,12 @@
- CUSTOM_LIBS=1
- endif
- 
-+ifneq (,$(filter DragonFly FreeBSD,$(OS_ARCH)))
-+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread
-+EXTRA_LIBS+= $(filter -L% -l%,${NSPRLINK})
-+CUSTOM_LIBS=1
-+endif
-+
- # no extra libs on HP-UX
- ifeq ($(OS_ARCH), HP-UX)
- CUSTOM_LIBS=1
diff --git a/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in b/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in
deleted file mode 100644
index 98aa2319501a..000000000000
--- a/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in.orig	2009-09-10 17:36:39.000000000 +0200
-+++ ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in	2009-09-10 17:37:28.000000000 +0200
-@@ -180,6 +180,10 @@
- CUSTOM_LIBS=1
- endif
- 
-+ifeq ($(OS_ARCH), FreeBSD)
-+CUSTOM_LIBS=1
-+endif
-+
- ifndef CUSTOM_LIBS
- EXTRA_LIBS = -L$(dist_libdir) -l$(LDAP_LIBNAME) -l$(PRLDAP_LIBNAME)
- EXTRA_LIBS += $(NSSLINK) 
diff --git a/www/seamonkey/files/patch-config-baseconfig.mk b/www/seamonkey/files/patch-mozilla-config-baseconfig.mk
index fedf7c5d8a8e..21c5eb9a1a20 100644
--- a/www/seamonkey/files/patch-config-baseconfig.mk
+++ b/www/seamonkey/files/patch-mozilla-config-baseconfig.mk
@@ -1,5 +1,5 @@
---- config/baseconfig.mk~
-+++ config/baseconfig.mk
+--- mozilla/config/baseconfig.mk~
++++ mozilla/config/baseconfig.mk
 @@ -1,7 +1,7 @@
 -includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 -idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
@@ -9,6 +9,6 @@
 +idldir = $(datadir)/idl/%%MOZILLA%%
 +installdir = $(libdir)/%%MOZILLA%%
 +sdkdir = $(libdir)/%%MOZILLA%%
- MOZILLA_SRCDIR = $(topsrcdir)/mozilla
- MOZDEPTH = $(DEPTH)/mozilla
- DIST = $(MOZDEPTH)/dist
+ ifndef TOP_DIST
+ TOP_DIST = dist
+ endif
diff --git a/www/seamonkey/files/patch-system-openh264 b/www/seamonkey/files/patch-system-openh264
index fd8f8332c51a..c75b8bd83125 100644
--- a/www/seamonkey/files/patch-system-openh264
+++ b/www/seamonkey/files/patch-system-openh264
@@ -1,15 +1,15 @@
 # Revert bug 1045209 to allow using absolute path
 
 diff --git content/media/gmp/GMPChild.cpp content/media/gmp/GMPChild.cpp
-index 4165a75..81914d5 100644
+index 1dde3ac..12c88cf 100644
 --- mozilla/content/media/gmp/GMPChild.cpp
 +++ mozilla/content/media/gmp/GMPChild.cpp
-@@ -66,19 +66,11 @@
+@@ -76,21 +76,14 @@ GetFileBase(const std::string& aPluginPa
    }
  #endif
  
 -  nsCOMPtr<nsIFile> parent;
--  rv = aLibFile->GetParent(getter_AddRefs(parent));
+-  rv = aFileBase->GetParent(getter_AddRefs(parent));
 -  if (NS_FAILED(rv)) {
 -    return false;
 -  }
@@ -18,15 +18,18 @@ index 4165a75..81914d5 100644
 -  rv = parent->GetLeafName(parentLeafName);
 -  if (NS_FAILED(rv)) {
 +  nsAutoString leafName;
-+  if (NS_FAILED(aLibFile->GetLeafName(leafName))) {
++  if (NS_FAILED(aFileBase->GetLeafName(leafName))) {
      return false;
    }
--
--  nsAutoString baseName(Substring(parentLeafName, 4, parentLeafName.Length() - 1));
-+  nsAutoString baseName(Substring(leafName, 4, leafName.Length() - 1));
  
- #if defined(XP_MACOSX)
-   nsAutoString binaryName = NS_LITERAL_STRING("lib") + baseName + NS_LITERAL_STRING(".dylib");
+-  aBaseName = Substring(parentLeafName,
++  aBaseName = Substring(leafName,
+                         4,
+-                        parentLeafName.Length() - 1);
++                        leafName.Length() - 1);
+   return true;
+ }
+ 
 diff --git content/media/gmp/GMPParent.cpp content/media/gmp/GMPParent.cpp
 index aa60acf..90878ca 100644
 --- mozilla/content/media/gmp/GMPParent.cpp
diff --git a/www/seamonkey/files/patch-z-bug517422 b/www/seamonkey/files/patch-z-bug517422
index 33c317273bd0..b11c6790c393 100644
--- a/www/seamonkey/files/patch-z-bug517422
+++ b/www/seamonkey/files/patch-z-bug517422
@@ -494,10 +494,10 @@ index d42137a..695e75a8 100644
  if CONFIG['MOZ_NATIVE_LIBEVENT']:
      OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
  
-diff --git xpcom/build/nsXPComInit.cpp xpcom/build/nsXPComInit.cpp
+diff --git xpcom/build/XPCOMInit.cpp xpcom/build/XPCOMInit.cpp
 index 2cf281e..6d7af0e 100644
---- mozilla/xpcom/build/nsXPComInit.cpp
-+++ mozilla/xpcom/build/nsXPComInit.cpp
+--- mozilla/xpcom/build/XPCOMInit.cpp
++++ mozilla/xpcom/build/XPCOMInit.cpp
 @@ -138,7 +138,9 @@ extern nsresult nsStringInputStreamConstructor(nsISupports*, REFNSIID, void**);
  #include "mozilla/VisualEventTracer.h"
  #endif