- update thunderbird, firefox-esr, linux-thunderbird and linux-firefox to

  17.0.5
- update firefox to 20.0
- update seamonkey and linux-seamonkey to 2.17
- update nspr to 4.9.6
- remove mail/thunderbird-esr, Mozilla stopped providing 2 versions of
  thunderbird
- prune support for old FreeBSD versions; users of 8.2, 7.4 or earlier
  are advised to upgrade - http://www.freebsd.org/security/
- add vuln.xml entry

Security:	94976433-9c74-11e2-a9fc-d43d7e0c7c02
Approved by:	portmgr (miwi)
In collaboration with:	Jan Beich <jbeich@tormail.org>

7 files changed, 73 insertions, 46 deletions

diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index da40cc596a8c..11ea136f1cd0 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	firefox
-DISTVERSION=	17.0.4
+DISTVERSION=	17.0.5
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -56,17 +56,6 @@ OPTIONS_DEFAULT:=${OPTIONS_DEFAULT:S/OSS/ALSA/}
 
 WRKSRC:=	${WRKDIR}/mozilla-esr17
 
-.if ${ARCH} == amd64
-CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL}
-.elif ${ARCH} == powerpc64
-.if ${OSVERSION} < 900033
-BROKEN=		Needs binutils 2.17.50 to build
-.else
-MOZ_EXPORT+=	UNAME_m="powerpc64"
-CFLAGS+=	-mminimal-toc
-.endif
-.endif
-
 .if ${PORT_OPTIONS:MPGO}
 USE_GCC?=	any
 USE_DISPLAY=		yes
diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo
index 43d0e1f70c5c..e50832525115 100644
--- a/www/firefox-esr/distinfo
+++ b/www/firefox-esr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (firefox-17.0.4esr.source.tar.bz2) = a3ffa72ac0554fc76899f3f293fee3e05e073117145c4a80a673207fce4806de
-SIZE (firefox-17.0.4esr.source.tar.bz2) = 90791964
+SHA256 (firefox-17.0.5esr.source.tar.bz2) = ba2cb1c1bf747190dceb71a31a187811c9c6fc1da56c9a9db70cfd5a1780eb14
+SIZE (firefox-17.0.5esr.source.tar.bz2) = 91105421
diff --git a/www/firefox-esr/files/patch-bug753046 b/www/firefox-esr/files/patch-bug753046
index c5ecdbd8af1b..3d99258b8323 100644
--- a/www/firefox-esr/files/patch-bug753046
+++ b/www/firefox-esr/files/patch-bug753046
@@ -460,7 +460,7 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.4 2012/04/01
 
 --- ipc/chromium/src/base/platform_thread_posix.cc.orig	2012-03-13 01:36:53.000000000 +0000
 +++ ipc/chromium/src/base/platform_thread_posix.cc
-@@ -9,16 +9,30 @@
+@@ -9,16 +9,24 @@
  
  #if defined(OS_MACOSX)
  #include <mach/mach.h>
@@ -474,13 +474,7 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.4 2012/04/01
 -#include <pthread_np.h>
 +#elif defined(OS_FREEBSD)
 +#include <sys/param.h>
-+#if __FreeBSD_version > 802500
 +#include <sys/thr.h>
-+#else
-+_Pragma("GCC visibility push(default)")
-+extern "C" int thr_self(long *);
-+_Pragma("GCC visibility pop")
-+#endif
  #endif
 +
 +#if !defined(OS_MACOSX)
diff --git a/www/firefox-esr/files/patch-bug810716 b/www/firefox-esr/files/patch-bug810716
new file mode 100644
index 000000000000..8c08e9a66986
--- /dev/null
+++ b/www/firefox-esr/files/patch-bug810716
@@ -0,0 +1,68 @@
+diff --git configure.in configure.in
+index 2084be9..eb6eeb2 100644
+--- configure.in
++++ configure.in
+@@ -3369,14 +3369,19 @@ fi
+ AC_CACHE_CHECK(
+     [for res_ninit()],
+     ac_cv_func_res_ninit,
+-    [AC_TRY_LINK([
++    [AC_TRY_RUN([
+         #ifdef linux
+         #define _BSD_SOURCE 1
+         #endif
++        #include <sys/types.h>
++        #include <netinet/in.h>
++        #include <arpa/nameser.h>
+         #include <resolv.h>
+-        ],
+-        [int foo = res_ninit(&_res);],
++        int main(int argc, char **argv){
++            int foo = res_ninit(&_res);
++        }],
+         [ac_cv_func_res_ninit=yes],
++        [ac_cv_func_res_ninit=no],
+         [ac_cv_func_res_ninit=no])
+     ])
+ 
+diff --git extensions/auth/nsAuthGSSAPI.cpp extensions/auth/nsAuthGSSAPI.cpp
+index e828beb..6444246 100644
+--- extensions/auth/nsAuthGSSAPI.cpp
++++ extensions/auth/nsAuthGSSAPI.cpp
+@@ -39,6 +39,9 @@ typedef KLStatus (*KLCacheHasValidTickets_type)(
+ #endif
+ 
+ #if defined(HAVE_RES_NINIT)
++#include <sys/types.h>
++#include <netinet/in.h>
++#include <arpa/nameser.h>
+ #include <resolv.h>
+ #endif
+ 
+diff --git js/src/configure.in js/src/configure.in
+index e25f569..b9722f9 100644
+--- js/src/configure.in
++++ js/src/configure.in
+@@ -2797,14 +2797,19 @@ fi
+ AC_CACHE_CHECK(
+     [for res_ninit()],
+     ac_cv_func_res_ninit,
+-    [AC_TRY_LINK([
++    [AC_TRY_RUN([
+         #ifdef linux
+         #define _BSD_SOURCE 1
+         #endif
++        #include <sys/types.h>
++        #include <netinet/in.h>
++        #include <arpa/nameser.h>
+         #include <resolv.h>
+-        ],
+-        [int foo = res_ninit(&_res);],
++        int main(int argc, char **argv){
++            int foo = res_ninit(&_res);
++        }],
+         [ac_cv_func_res_ninit=yes],
++        [ac_cv_func_res_ninit=no],
+         [ac_cv_func_res_ninit=no])
+     ])
+ 
diff --git a/www/firefox-esr/files/patch-content-media-nsAudioStream.cpp b/www/firefox-esr/files/patch-content-media-nsAudioStream.cpp
deleted file mode 100644
index bd0f0d4963db..000000000000
--- a/www/firefox-esr/files/patch-content-media-nsAudioStream.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- content/media/nsAudioStream.cpp~
-+++ content/media/nsAudioStream.cpp
-@@ -298,7 +298,11 @@ static int PrefChanged(const char* aPref
-       gVolumeScale = NS_MAX<double>(0, PR_strtod(utf8.get(), nsnull));
-     }
-   } else if (strcmp(aPref, PREF_USE_CUBEB) == 0) {
-+#if defined(__FreeBSD__) && __FreeBSD_version < 800097
-+    bool value = Preferences::GetBool(aPref, false);
-+#else
-     bool value = Preferences::GetBool(aPref, true);
-+#endif
-     mozilla::MutexAutoLock lock(*gAudioPrefsLock);
-     gUseCubeb = value;
-   } else if (strcmp(aPref, PREF_CUBEB_LATENCY) == 0) {
diff --git a/www/firefox-esr/files/patch-js-src-js-confdefs.h.in b/www/firefox-esr/files/patch-js-src-js-confdefs.h.in
deleted file mode 100644
index cb032237b2cc..000000000000
--- a/www/firefox-esr/files/patch-js-src-js-confdefs.h.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- js/src/js-confdefs.h.in~
-+++ js/src/js-confdefs.h.in
-@@ -12,6 +12,7 @@
-  * C++ implementations should define these macros only when __STDC_LIMIT_MACROS
-  * is defined before <stdint.h> is included. */
- #define __STDC_LIMIT_MACROS
-+#define __STDC_CONSTANT_MACROS
- 
- #endif /* _JS_CONFDEFS_H_ */
- 
diff --git a/www/firefox-esr/pkg-message b/www/firefox-esr/pkg-message
index b282c9ce33a1..33841ae90f29 100644
--- a/www/firefox-esr/pkg-message
+++ b/www/firefox-esr/pkg-message
@@ -17,7 +17,7 @@ The SSH server on remote_host must allow pub key authentication.
 Firefox and HTML5
 
 Certain functions used to display HTML5 elements need the sem module
-on 7.x and 8.x releases.
+only on 8.x releases.
 
 If your Firefox crashes with the following message while viewing a
 HTML5 page: