Update firefox36 to 3.6.27.

pkgsrc changes:
* use own mozilla-common.mk, some dependency differ from recent Firefox.
* switch to use system cairo.

Fixed in Firefox 3.6.27
* MFSA 2012-11 libpng integer overflow
Fixed in Firefox 3.6.26
* MFSA 2012-08 Crash with malformed embedded XSLT stylesheets
* MFSA 2012-07 Potential Memory Corruption When Decoding Ogg Vorbis files
* MFSA 2012-04 Child nodes from nsDOMAttribute still accessible after removal of nodes
* MFSA 2012-02 Overly permissive IPv6 literal syntax
* MFSA 2012-01 Miscellaneous memory safety hazards (rv:10.0/ rv:1.9.2.26)
Fixed in Firefox 3.6.25
* MFSA 2011-59 .jar not treated as executable in Firefox 3.6 on Mac

5 files changed, 102 insertions, 23 deletions

diff --git a/devel/xulrunner192/Makefile b/devel/xulrunner192/Makefile
index d18cc142e84..b07990f1941 100644
--- a/devel/xulrunner192/Makefile
+++ b/devel/xulrunner192/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2012/02/06 12:39:58 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2012/02/22 11:00:06 obache Exp $
 
 .include "dist.mk"
 PKGNAME=	xulrunner192-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-PKGREVISION=	3
 CATEGORIES=	devel www
 
 MAINTAINER=	tnn@NetBSD.org
@@ -37,7 +36,7 @@ SUBST_FILES.fix-paths2+=	${MOZILLA_DIR}xulrunner/app/nsRegisterGREUnix.cpp
 SUBST_FILES.fix-paths2+=	${MOZILLA_DIR}xulrunner/installer/Makefile.in
 SUBST_SED.fix-paths2=           -e 's,/etc/gre.d,${PREFIX}/lib/xulrunner192/gre.d,g' 
 
-.include "../../devel/xulrunner/mozilla-common.mk"
+.include "../../devel/xulrunner192/mozilla-common.mk"
 CONFIGURE_ARGS+=	--enable-chrome-format=jar
 .include "options.mk"
 
diff --git a/devel/xulrunner192/PLIST b/devel/xulrunner192/PLIST
index e3b248390fb..e0f6346a64b 100644
--- a/devel/xulrunner192/PLIST
+++ b/devel/xulrunner192/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2011/08/20 13:05:49 tnn Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/02/22 11:00:06 obache Exp $
 bin/xulrunner192
 ${PLIST.jit}include/xulrunner192/Allocator.h
 ${PLIST.jit}include/xulrunner192/Assembler.h
@@ -17,17 +17,6 @@ include/xulrunner192/XPCIDispatch.h
 ${PLIST.jit}include/xulrunner192/avmplus.h
 include/xulrunner192/base64.h
 include/xulrunner192/blapit.h
-include/xulrunner192/cairo/cairo-deprecated.h
-include/xulrunner192/cairo/cairo-features.h
-include/xulrunner192/cairo/cairo-ft.h
-include/xulrunner192/cairo/cairo-pdf.h
-include/xulrunner192/cairo/cairo-platform.h
-include/xulrunner192/cairo/cairo-ps.h
-include/xulrunner192/cairo/cairo-rename.h
-include/xulrunner192/cairo/cairo-version.h
-include/xulrunner192/cairo/cairo-xlib-xrender.h
-include/xulrunner192/cairo/cairo-xlib.h
-include/xulrunner192/cairo/cairo.h
 include/xulrunner192/cert.h
 include/xulrunner192/certdb.h
 include/xulrunner192/certt.h
@@ -2061,8 +2050,6 @@ include/xulrunner192/ots-memory-stream.h
 include/xulrunner192/p12.h
 include/xulrunner192/p12plcy.h
 include/xulrunner192/p12t.h
-include/xulrunner192/pixman-version.h
-include/xulrunner192/pixman.h
 include/xulrunner192/pk11func.h
 include/xulrunner192/pk11pqg.h
 include/xulrunner192/pk11priv.h
diff --git a/devel/xulrunner192/dist.mk b/devel/xulrunner192/dist.mk
index bc0f3f39c1b..984eabd44b8 100644
--- a/devel/xulrunner192/dist.mk
+++ b/devel/xulrunner192/dist.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dist.mk,v 1.5 2011/12/19 06:26:55 obache Exp $
+# $NetBSD: dist.mk,v 1.6 2012/02/22 11:00:07 obache Exp $
 #
 # used by devel/xulrunner192/Makefile
 # used by www/firefox36/Makefile
@@ -6,7 +6,7 @@
 DISTNAME=	firefox-${FIREFOX_VER}.source
 FIREFOX_VER=	3.6${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=	1.9.2
-MOZ_BRANCH_MINOR=	.24
+MOZ_BRANCH_MINOR=	.27
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=	.tar.bz2
 
diff --git a/devel/xulrunner192/distinfo b/devel/xulrunner192/distinfo
index a3cbe2d52d1..21cdce26df7 100644
--- a/devel/xulrunner192/distinfo
+++ b/devel/xulrunner192/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2011/12/19 06:26:55 obache Exp $
+$NetBSD: distinfo,v 1.7 2012/02/22 11:00:07 obache Exp $
 
-SHA1 (firefox-3.6.24.source.tar.bz2) = 973d298e2fc177beb815fc5371e0383ec638cee0
-RMD160 (firefox-3.6.24.source.tar.bz2) = 61d00f2976353d13c119b922c2ee677b7f3e9dfd
-Size (firefox-3.6.24.source.tar.bz2) = 51684019 bytes
+SHA1 (firefox-3.6.27.source.tar.bz2) = dd472a10e4ef5b017f00074d0325be13e832d610
+RMD160 (firefox-3.6.27.source.tar.bz2) = 96d6be5fad13a8777bed00e728e0888fb0cefdde
+Size (firefox-3.6.27.source.tar.bz2) = 51693122 bytes
 SHA1 (patch-aa) = 88223c8a4047d284d31e91aa28af23d9b0caaf5a
 SHA1 (patch-ab) = a9a9db3f53ecac231007de9ed163bd99f2184462
 SHA1 (patch-ac) = e50356963fd235ea11fa45baae356fcf21c6669d
diff --git a/devel/xulrunner192/mozilla-common.mk b/devel/xulrunner192/mozilla-common.mk
new file mode 100644
index 00000000000..b27cb876397
--- /dev/null
+++ b/devel/xulrunner192/mozilla-common.mk
@@ -0,0 +1,93 @@
+# $NetBSD: mozilla-common.mk,v 1.1 2012/02/22 11:00:07 obache Exp $
+#
+# common Makefile fragment for mozilla packages based on gecko 2.0.
+# 
+# used by devel/xulrunner192/Makefile
+# used by www/firefox36/Makefile
+
+GNU_CONFIGURE=		yes
+USE_TOOLS+=		pkg-config perl gmake autoconf213 unzip zip
+USE_LANGUAGES+=		c99 c++
+UNLIMIT_RESOURCES+=	datasize
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
+CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
+CHECK_INTERPRETER_SKIP+=lib/xulrunner-sdk/sdk/bin/xpt.py
+PRIVILEGED_STAGES+=	clean
+
+CONFIGURE_ARGS+=	--disable-tests --disable-pedantic
+CONFIGURE_ARGS+=	--enable-crypto
+CONFIGURE_ARGS+=	--enable-optimize=-O2 --with-pthreads
+CONFIGURE_ARGS+=	--disable-javaxpcom
+CONFIGURE_ARGS+=	--enable-default-toolkit=cairo-gtk2
+CONFIGURE_ARGS+=	--enable-svg --enable-mathml
+CONFIGURE_ARGS+=	--enable-system-cairo
+CONFIGURE_ARGS+=	--with-system-jpeg
+CONFIGURE_ARGS+=	--with-system-zlib --with-system-bz2
+CONFIGURE_ARGS+=	--with-system-libevent=${BUILDLINK_PREFIX.libevent}
+CONFIGURE_ARGS+=	--enable-system-sqlite
+CONFIGURE_ARGS+=	--disable-crashreporter
+CONFIGURE_ARGS+=	--disable-libnotify
+CONFIGURE_ARGS+=	--disable-necko-wifi
+CONFIGURE_ARGS+=	--enable-chrome-format=flat
+
+SUBST_CLASSES+=			fix-paths
+SUBST_STAGE.fix-paths=		pre-configure
+SUBST_MESSAGE.fix-paths=	Fixing absolute paths.
+SUBST_FILES.fix-paths=		${MOZILLA_DIR}xpcom/build/nsXPCOMPrivate.h
+SUBST_FILES.fix-paths+=		${MOZILLA_DIR}xpcom/io/nsAppFileLocationProvider.cpp
+SUBST_SED.fix-paths+=		-e 's,/usr/lib/mozilla/plugins,${PREFIX}/lib/netscape/plugins,g'
+
+CONFIG_GUESS_OVERRIDE+=		${MOZILLA_DIR}build/autoconf/config.guess
+CONFIG_GUESS_OVERRIDE+=		${MOZILLA_DIR}js/src/build/autoconf/config.guess
+CONFIG_GUESS_OVERRIDE+=		${MOZILLA_DIR}nsprpub/build/autoconf/config.guess
+CONFIG_GUESS_OVERRIDE+=		${MOZILLA_DIR}/js/ctypes/libffi/config.guess
+CONFIG_SUB_OVERRIDE+=		${MOZILLA_DIR}build/autoconf/config.sub
+CONFIG_SUB_OVERRIDE+=		${MOZILLA_DIR}js/src/build/autoconf/config.sub
+CONFIG_SUB_OVERRIDE+=		${MOZILLA_DIR}nsprpub/build/autoconf/config.sub
+CONFIG_SUB_OVERRIDE+=		${MOZILLA_DIR}/js/ctypes/libffi/config.sub
+
+PYTHON_FOR_BUILD_ONLY=		yes
+.include "../../lang/python/application.mk"
+CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
+
+# Makefiles sometimes call "rm -f" without more arguments. Kludge around ...
+.PHONY: create-rm-wrapper
+pre-configure: create-rm-wrapper
+create-rm-wrapper:
+	printf '#!/bin/sh\n[ "$$*" = "-f" ] && exit 0\nexec /bin/rm $$@\n' > \
+	  ${WRAPPER_DIR}/bin/rm
+	chmod +x ${WRAPPER_DIR}/bin/rm
+
+.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} == "SunOS"
+# native libbz2.so hides BZ2_crc32Table
+PREFER.bzip2?=	pkgsrc
+.endif
+
+.if ${OPSYS} == "Linux"
+.include "../../audio/alsa-lib/buildlink3.mk"
+.endif
+.include "../../archivers/bzip2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.sqlite3+=	sqlite3>=3.7.5
+CONFIGURE_ENV+=	ac_cv_sqlite_secure_delete=yes	# c.f. patches/patch-al
+.include "../../databases/sqlite3/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libevent+=	libevent>=1.1
+.include "../../devel/libevent/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.8.8
+.include "../../graphics/cairo/buildlink3.mk"
+.include "../../net/libIDL/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.18.3nb1
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"