- 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>

6 files changed, 100 insertions, 46 deletions

diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index b0c77276d14b..9a6bbc431811 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird
-DISTVERSION=	17.0.4
+DISTVERSION=	17.0.5
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}esr/source
@@ -24,7 +24,7 @@ EM_VERSION=	1.5.1
 USE_AUTOTOOLS=	autoconf213:env
 USE_PYTHON_BUILD=-2.7
 USE_GECKO=	gecko
-CONFLICTS=	thunderbird-2[0-9].* thunderbird-1[1-689].* thunderbird-10.*
+CONFLICTS=	thunderbird-24.* thunderbird-1[1-6].* thunderbird-10.*
 USE_MOZILLA=	# empty
 
 MAKE_JOBS_SAFE=	yes
@@ -62,17 +62,6 @@ MOZSRC:=	${WRKSRC}/mozilla
 
 XPI_LIBDIR=	${PREFIX}/lib/xpi
 
-.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:MENIGMAIL}
 MASTER_SITES+=	http://www.enigmail.net/download/source/:enigmail
 DISTFILES+=	${EM_DISTFILE}:enigmail
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index 01bd2a50190d..6d683516fd17 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,4 +1,4 @@
-SHA256 (thunderbird-17.0.4esr.source.tar.bz2) = e453a0509e28af0001de917801aad274c9a532de80f124a68b2df32b9d152137
-SIZE (thunderbird-17.0.4esr.source.tar.bz2) = 113367797
+SHA256 (thunderbird-17.0.5esr.source.tar.bz2) = d8a6ff5c35fb030514d24eb7b6e224cb0dc69dce85051a2d03952d5308bc67f6
+SIZE (thunderbird-17.0.5esr.source.tar.bz2) = 113259410
 SHA256 (enigmail-1.5.1.tar.gz) = 234ca3c8f7c74afb64ebdaa4762e358f35a72c1f8de007b992497fc2db803af0
 SIZE (enigmail-1.5.1.tar.gz) = 1213954
diff --git a/mail/thunderbird/files/patch-bug753046 b/mail/thunderbird/files/patch-bug753046
index 8dbb09a9b55e..0a11537b30d7 100644
--- a/mail/thunderbird/files/patch-bug753046
+++ b/mail/thunderbird/files/patch-bug753046
@@ -460,7 +460,7 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.4 2012/04/01
 
 --- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig	2012-03-13 01:36:53.000000000 +0000
 +++ mozilla/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/mail/thunderbird/files/patch-bug810716 b/mail/thunderbird/files/patch-bug810716
new file mode 100644
index 000000000000..93e59a2d7929
--- /dev/null
+++ b/mail/thunderbird/files/patch-bug810716
@@ -0,0 +1,95 @@
+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 configure.in configure.in
+index 2084be9..eb6eeb2 100644
+--- mozilla/configure.in
++++ mozilla/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
+--- mozilla/extensions/auth/nsAuthGSSAPI.cpp
++++ mozilla/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
+--- mozilla/js/src/configure.in
++++ mozilla/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/mail/thunderbird/files/patch-mozilla-content-media-nsAudioStream.cpp b/mail/thunderbird/files/patch-mozilla-content-media-nsAudioStream.cpp
deleted file mode 100644
index f31ba356b0ab..000000000000
--- a/mail/thunderbird/files/patch-mozilla-content-media-nsAudioStream.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- mozilla/content/media/nsAudioStream.cpp~
-+++ mozilla/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/mail/thunderbird/files/patch-mozilla-js-src-js-confdefs.h.in b/mail/thunderbird/files/patch-mozilla-js-src-js-confdefs.h.in
deleted file mode 100644
index 6d7fa6c39ca6..000000000000
--- a/mail/thunderbird/files/patch-mozilla-js-src-js-confdefs.h.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla/js/src/js-confdefs.h.in~
-+++ mozilla/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_ */
-