[pkgsrc/pkgsrc-2009Q3]: pkgsrc Pullup ticket 2953 - requested by tnn

[spz <spz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/442ee024fb7a
branches:  pkgsrc-2009Q3
changeset: 400008:442ee024fb7a
user:      spz <spz%pkgsrc.org@localhost>
date:      Sun Dec 20 19:41:08 2009 +0000

description:
Pullup ticket 2953 - requested by tnn
security update

Revisions pulled up:
- pkgsrc/devel/xulrunner/Makefile               by patch
- pkgsrc/devel/xulrunner/distinfo               by patch
- pkgsrc/devel/xulrunner/mozilla-common.mk      by patch
- pkgsrc/www/firefox/Makefile                   by patch

   -------------------------------------------------------------------------
   firefox-3.5.6 & xulrunner-1.9.1.6 fix the following vulnerabilities:

   MFSA 2009-71 GeckoActiveXObject exception messages can be used to
                enumerate installed COM objects
   MFSA 2009-70 Privilege escalation via chrome window.opener
   MFSA 2009-69 Location bar spoofing vulnerabilities
   MFSA 2009-68 NTLM reflection vulnerability
   MFSA 2009-67 Integer overflow, crash in libtheora video library
   MFSA 2009-66 Memory safety fixes in liboggplay media library
   MFSA 2009-65 Crashes with evidence of memory corruption

diffstat:

 devel/xulrunner/Makefile          |  4 ++--
 devel/xulrunner/distinfo          |  8 ++++----
 devel/xulrunner/mozilla-common.mk |  8 +++++++-
 www/firefox/Makefile              |  6 +++---
 4 files changed, 16 insertions(+), 10 deletions(-)

diffs (77 lines):

diff -r f2835951fa06 -r 442ee024fb7a devel/xulrunner/Makefile
--- a/devel/xulrunner/Makefile  Sun Dec 20 09:43:08 2009 +0000
+++ b/devel/xulrunner/Makefile  Sun Dec 20 19:41:08 2009 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23.2.1 2009/10/28 18:13:23 tron Exp $
+# $NetBSD: Makefile,v 1.23.2.2 2009/12/20 19:41:08 spz Exp $
 #
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/firefox/xulrunner/:S/3.5/1.9.1/:S/.source//}
-FIREFOX_VER=   3.5.4
+FIREFOX_VER=   3.5.6
 CATEGORIES=    devel www
 MASTER_SITES=  ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=  .tar.bz2
diff -r f2835951fa06 -r 442ee024fb7a devel/xulrunner/distinfo
--- a/devel/xulrunner/distinfo  Sun Dec 20 09:43:08 2009 +0000
+++ b/devel/xulrunner/distinfo  Sun Dec 20 19:41:08 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12.2.1 2009/10/28 18:13:23 tron Exp $
+$NetBSD: distinfo,v 1.12.2.2 2009/12/20 19:41:08 spz Exp $
 
-SHA1 (firefox-3.5.4.source.tar.bz2) = ce250208371326d03e72a02d223bc136cd376e5d
-RMD160 (firefox-3.5.4.source.tar.bz2) = e89ff54fef6d036538c9779176f5086a8eaa721e
-Size (firefox-3.5.4.source.tar.bz2) = 46905557 bytes
+SHA1 (firefox-3.5.6.source.tar.bz2) = fc1de4ddb9c20c7ba9e297737f926e9d8e32eed4
+RMD160 (firefox-3.5.6.source.tar.bz2) = 1002ff196eb8e281c06ef451154b64a903104664
+Size (firefox-3.5.6.source.tar.bz2) = 46914620 bytes
 SHA1 (patch-aa) = 1a103647b3ce602e1bf2d22f6486a6649a68878b
 SHA1 (patch-ab) = 5331bae45501013d3ca13d161226e311bc10aafe
 SHA1 (patch-ac) = e50356963fd235ea11fa45baae356fcf21c6669d
diff -r f2835951fa06 -r 442ee024fb7a devel/xulrunner/mozilla-common.mk
--- a/devel/xulrunner/mozilla-common.mk Sun Dec 20 09:43:08 2009 +0000
+++ b/devel/xulrunner/mozilla-common.mk Sun Dec 20 19:41:08 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.1.2.1 2009/10/28 18:13:23 tron Exp $
+# $NetBSD: mozilla-common.mk,v 1.1.2.2 2009/12/20 19:41:08 spz Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 1.9.1.
 
@@ -56,6 +56,12 @@
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${OPSYS} == "NetBSD"
+# The configure test for __thread succeeds, but later we end up with:
+# dist/bin/libxul.so: undefined reference to `__tls_get_addr'
+CONFIGURE_ENV+=        ac_cv_thread_keyword=no
+.endif
+
 .if ${OPSYS} == "Linux"
 .include "../../audio/alsa-lib/buildlink3.mk"
 .endif
diff -r f2835951fa06 -r 442ee024fb7a www/firefox/Makefile
--- a/www/firefox/Makefile      Sun Dec 20 09:43:08 2009 +0000
+++ b/www/firefox/Makefile      Sun Dec 20 19:41:08 2009 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.59.2.1 2009/10/28 18:13:24 tron Exp $
+# $NetBSD: Makefile,v 1.59.2.2 2009/12/20 19:41:08 spz Exp $
 #
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       firefox-${FIREFOX_VER}
-FIREFOX_VER=   3.5.4
+FIREFOX_VER=   3.5.6
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=  .tar.bz2
@@ -56,7 +56,7 @@
          > ${WRKDIR}/firefox
        ${INSTALL_SCRIPT} ${WRKDIR}/firefox ${DESTDIR}${PREFIX}/bin
 
-BUILDLINK_API_DEPENDS.xulrunner+=      xulrunner-1.9.1.4{,nb*}
+BUILDLINK_API_DEPENDS.xulrunner+=      xulrunner-1.9.1.6{,nb*}
 .include "../../devel/xulrunner/buildlink3.mk"
 PLIST_VARS+=   gnome
 .if !empty(PKG_BUILD_OPTIONS.xulrunner:Mgnome)