From 48340d7f714e4b279dba52f5d642a471eadf958d Mon Sep 17 00:00:00 2001 From: tron Date: Sat, 24 Aug 2013 19:45:15 +0000 Subject: Pullup ticket #4218 - requested by ryoon devel/xulrunner17: security update Revisions pulled up: - devel/xulrunner17/Makefile 1.12-1.15 - devel/xulrunner17/PLIST 1.5 - devel/xulrunner17/buildlink3.mk 1.10 - devel/xulrunner17/dist.mk 1.7-1.8 - devel/xulrunner17/distinfo 1.10-1.12 - devel/xulrunner17/patches/patch-dist_stl__wrappers_ios 1.1 - devel/xulrunner17/patches/patch-dist_stl__wrappers_ostream 1.1 - devel/xulrunner17/patches/patch-ipc_chromium_src_base_file__util.cc 1.1 - devel/xulrunner17/patches/patch-ipc_chromium_src_base_file__util__posix.cc 1.2 - devel/xulrunner17/patches/patch-ipc_chromium_src_base_pickle.cc 1.1 --- Module Name: pkgsrc Committed By: ryoon Date: Tue Jul 9 10:53:14 UTC 2013 Modified Files: pkgsrc/devel/xulrunner17: Makefile dist.mk distinfo Log Message: Update to 17.0.7 Changelog: FIXED Security fixes can be found here Fixed in Firefox ESR 17.0.7 MFSA 2013-59 XrayWrappers can be bypassed to run user defined methods in a privileged context MFSA 2013-56 PreserveWrapper has inconsistent behavior MFSA 2013-55 SVG filters can lead to information disclosure MFSA 2013-54 Data in the body of XHR HEAD requests leads to CSRF attacks MFSA 2013-53 Execution of unmapped memory through onreadystatechange event MFSA 2013-51 Privileged content access and execution via XBL MFSA 2013-50 Memory corruption found using Address Sanitizer MFSA 2013-49 Miscellaneous memory safety hazards (rv:22.0 / rv:17.0.7) --- Module Name: pkgsrc Committed By: joerg Date: Tue Jul 16 22:27:45 UTC 2013 Modified Files: pkgsrc/devel/xulrunner17: distinfo pkgsrc/devel/xulrunner17/patches: patch-ipc_chromium_src_base_file__util__posix.cc Added Files: pkgsrc/devel/xulrunner17/patches: patch-dist_stl__wrappers_ios patch-dist_stl__wrappers_ostream patch-ipc_chromium_src_base_file__util.cc patch-ipc_chromium_src_base_pickle.cc Log Message: Add visibility wrapper around ios and ostream. Don't use false as null pointer. --- Module Name: pkgsrc Committed By: ryoon Date: Fri Aug 2 12:17:57 UTC 2013 Modified Files: pkgsrc/devel/xulrunner17: Makefile PLIST buildlink3.mk Log Message: Remove pkg-config *.pc files from standard place. * Avoid potential conflicts between xulrunners. * Fix buildlink3.mk to handle pc files properly. --- Module Name: pkgsrc Committed By: ryoon Date: Fri Aug 2 12:18:41 UTC 2013 Modified Files: pkgsrc/devel/xulrunner17: Makefile Log Message: Bump PKGREVISION for previous. --- Module Name: pkgsrc Committed By: ryoon Date: Thu Aug 8 13:01:38 UTC 2013 Modified Files: pkgsrc/devel/xulrunner17: Makefile dist.mk distinfo Log Message: Update to 17.0.8 Changelog: Fixed in Firefox ESR 17.0.8 MFSA 2013-75 Local Java applets may read contents of local file system MFSA 2013-73 Same-origin bypass with web workers and XMLHttpRequest MFSA 2013-72 Wrong principal used for validating URI for some Javascript components MFSA 2013-71 Further Privilege escalation through Mozilla Updater MFSA 2013-69 CRMF requests allow for code execution and XSS attacks MFSA 2013-68 Document URI misrepresentation and masquerading MFSA 2013-66 Buffer overflow in Mozilla Maintenance Service and Mozilla Updater MFSA 2013-63 Miscellaneous memory safety hazards (rv:23.0 / rv:17.0.8) --- devel/xulrunner17/Makefile | 5 +---- devel/xulrunner17/PLIST | 6 +----- devel/xulrunner17/buildlink3.mk | 4 +++- devel/xulrunner17/dist.mk | 4 ++-- devel/xulrunner17/distinfo | 14 +++++++++----- devel/xulrunner17/patches/patch-dist_stl__wrappers_ios | 8 ++++++++ .../xulrunner17/patches/patch-dist_stl__wrappers_ostream | 8 ++++++++ .../patches/patch-ipc_chromium_src_base_file__util.cc | 13 +++++++++++++ .../patch-ipc_chromium_src_base_file__util__posix.cc | 15 ++++++++++++--- .../patches/patch-ipc_chromium_src_base_pickle.cc | 13 +++++++++++++ 10 files changed, 70 insertions(+), 20 deletions(-) create mode 100644 devel/xulrunner17/patches/patch-dist_stl__wrappers_ios create mode 100644 devel/xulrunner17/patches/patch-dist_stl__wrappers_ostream create mode 100644 devel/xulrunner17/patches/patch-ipc_chromium_src_base_file__util.cc create mode 100644 devel/xulrunner17/patches/patch-ipc_chromium_src_base_pickle.cc diff --git a/devel/xulrunner17/Makefile b/devel/xulrunner17/Makefile index ec119e926b6..63488507199 100644 --- a/devel/xulrunner17/Makefile +++ b/devel/xulrunner17/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2013/06/06 12:53:45 wiz Exp $ +# $NetBSD: Makefile,v 1.11.2.1 2013/08/24 19:45:15 tron Exp $ .include "dist.mk" PKGNAME= xulrunner17-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/esr//} -PKGREVISION= 5 CATEGORIES= devel www MAINTAINER= pkgsrc-users@NetBSD.org @@ -78,7 +77,5 @@ post-install: ${DESTDIR}${PREFIX}/lib/xulrunner17-sdk/sdk/lib ln -s ${PREFIX}/lib/xulrunner17/lib \ ${DESTDIR}${PREFIX}/lib/xulrunner17-sdk/lib - ${INSTALL_DATA} ${WRKSRC}/xulrunner/installer/*pc \ - ${DESTDIR}${PREFIX}/lib/pkgconfig .include "../../mk/bsd.pkg.mk" diff --git a/devel/xulrunner17/PLIST b/devel/xulrunner17/PLIST index 0e66bcfd477..f2f1bd7fce7 100644 --- a/devel/xulrunner17/PLIST +++ b/devel/xulrunner17/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2013/05/25 11:08:21 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.4.2.1 2013/08/24 19:45:15 tron Exp $ bin/xulrunner17 include/xulrunner17/.mkdir.done include/xulrunner17/AccEvent.h @@ -2538,10 +2538,6 @@ include/xulrunner17/ycbcr_to_rgb565.h include/xulrunner17/yuv_convert.h include/xulrunner17/yuv_row.h include/xulrunner17/zipstruct.h -lib/pkgconfig/libxul-embedding.pc -lib/pkgconfig/libxul.pc -lib/pkgconfig/mozilla-js.pc -lib/pkgconfig/mozilla-plugin.pc lib/xulrunner17/pkgconfig/libxul-embedding.pc lib/xulrunner17/pkgconfig/libxul.pc lib/xulrunner17/pkgconfig/mozilla-js.pc diff --git a/devel/xulrunner17/buildlink3.mk b/devel/xulrunner17/buildlink3.mk index a04ae7c59d1..36d31a5e5d5 100644 --- a/devel/xulrunner17/buildlink3.mk +++ b/devel/xulrunner17/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2013/06/06 12:53:45 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.9.2.1 2013/08/24 19:45:15 tron Exp $ BUILDLINK_TREE+= xulrunner17 @@ -15,6 +15,8 @@ BUILDLINK_FILES.xulrunner17+= lib/xulrunner17/include/*.h BUILDLINK_LIBDIRS.xulrunner17+= lib/xulrunner17/lib BUILDLINK_FILES.xulrunner17+= lib/xulrunner17/lib/*.so +BUILDLINK_FILES.xulrunner17+= lib/xulrunner17/pkgconfig/*pc +BUILDLINK_FNAME_TRANSFORM.xulrunner17+= -e "s|lib/xulrunner17/pkgconfig|lib/pkgconfig|" pkgbase := xulrunner17 .include "../../mk/pkg-build-options.mk" diff --git a/devel/xulrunner17/dist.mk b/devel/xulrunner17/dist.mk index 56c40f227b6..bdf753da301 100644 --- a/devel/xulrunner17/dist.mk +++ b/devel/xulrunner17/dist.mk @@ -1,11 +1,11 @@ -# $NetBSD: dist.mk,v 1.6 2013/05/19 12:49:42 ryoon Exp $ +# $NetBSD: dist.mk,v 1.6.2.1 2013/08/24 19:45:15 tron Exp $ # # used by devel/xulrunner17/Makefile # used by www/firefox17/Makefile DISTNAME= firefox-${FIREFOX_VER}.source FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} -MOZ_BRANCH= 17.0.6 +MOZ_BRANCH= 17.0.8 MOZ_BRANCH_MINOR= esr MASTER_SITES= ${MASTER_SITE_MOZILLA_ESR:=firefox/releases/${FIREFOX_VER}/source/} \ ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/} diff --git a/devel/xulrunner17/distinfo b/devel/xulrunner17/distinfo index a704602e12e..3a095b3f376 100644 --- a/devel/xulrunner17/distinfo +++ b/devel/xulrunner17/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.9 2013/05/19 12:49:42 ryoon Exp $ +$NetBSD: distinfo,v 1.9.2.1 2013/08/24 19:45:15 tron Exp $ -SHA1 (firefox-17.0.6esr.source.tar.bz2) = ccc24db49e97e9cac943af14ae50be2305fe4c0c -RMD160 (firefox-17.0.6esr.source.tar.bz2) = 072911be994dfbd2cb9997091640953bf4ac3403 -Size (firefox-17.0.6esr.source.tar.bz2) = 91112621 bytes +SHA1 (firefox-17.0.8esr.source.tar.bz2) = 2ef8bfcf51f8160590f4450e8bc4a2af32cc2f5e +RMD160 (firefox-17.0.8esr.source.tar.bz2) = 4db87cbd72899adc3df8822c3550dec644bbd36b +Size (firefox-17.0.8esr.source.tar.bz2) = 90765879 bytes SHA1 (patch-aa) = 31801b051004b2bf74ea9cc060d01def3becc1e3 SHA1 (patch-ab) = b0d7975a291c63e07773e13b023f71e88c883128 SHA1 (patch-ac) = 18640ddf00b7da9276fd67d95bd6f1b191a99d4f @@ -36,6 +36,8 @@ SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598 SHA1 (patch-config_system-headers) = 02c71493cdbed0b966fe674c736916aa666ea4f0 SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491 SHA1 (patch-content_media_nsAudioStream.cpp) = 75c9fc45d464ee332271142c3e29b826b6254d49 +SHA1 (patch-dist_stl__wrappers_ios) = a6a6a0b8489c4cbdc56f139125f6c9d9bbc89b08 +SHA1 (patch-dist_stl__wrappers_ostream) = fee1523904368f6dcaa040cebbc8e1d0fca494ca SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 66d023227b46582d30961cfac15506b9f29c23de SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = cba2ea71973b3717b29052e131eb278cec972ebd SHA1 (patch-gfx_skia_src_sfnt_SkOTTable__head.h) = a50b21dc02ee5ae2b053ba574b592679350396ad @@ -48,8 +50,10 @@ SHA1 (patch-ipc_chromium_src_base_base__paths.h) = 0b8e231055cde854f31b9aa443926 SHA1 (patch-ipc_chromium_src_base_debug__util__posix.cc) = c00b594a40c4222261a0ad4f7ddbc804028aec16 SHA1 (patch-ipc_chromium_src_base_dir__reader__bsd.h) = 767160e3099d7bd4eb58dc24ed207417acdf098a SHA1 (patch-ipc_chromium_src_base_dir__reader__posix.h) = d6dd15f644de3fa755f8c9be9190eb4092295091 -SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 96a5a0d4b61ec69b80db3c9ff212d7a7a3d506f6 +SHA1 (patch-ipc_chromium_src_base_file__util.cc) = 44c4d69baf4164196a68294b834156f2d55294ec +SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 7ee3464515998902a5ff024a41f9258d4bda21ba SHA1 (patch-ipc_chromium_src_base_message__loop.cc) = c53a8962a197a3160087ad31e1a55f647a8d8fc8 +SHA1 (patch-ipc_chromium_src_base_pickle.cc) = be869413066e7daf0e12a513b2c0babf1274c33e SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = 1f6eb9d0da16b415df6c2ced4e507d1cbf7dfdae SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = e4560021d85abf96182b8e0c0a5a52e1213fdb31 SHA1 (patch-ipc_chromium_src_base_process__util.h) = f0e705d9e7951d12225ad132f462527651d3b1be diff --git a/devel/xulrunner17/patches/patch-dist_stl__wrappers_ios b/devel/xulrunner17/patches/patch-dist_stl__wrappers_ios new file mode 100644 index 00000000000..584e70bfc14 --- /dev/null +++ b/devel/xulrunner17/patches/patch-dist_stl__wrappers_ios @@ -0,0 +1,8 @@ +$NetBSD: patch-dist_stl__wrappers_ios,v 1.1.2.2 2013/08/24 19:45:15 tron Exp $ + +--- dist/stl_wrappers/ios.orig 2013-07-14 12:39:46.000000000 +0000 ++++ dist/stl_wrappers/ios +@@ -0,0 +1,3 @@ ++#pragma GCC visibility push(default) ++#include_next ++#pragma GCC visibility pop diff --git a/devel/xulrunner17/patches/patch-dist_stl__wrappers_ostream b/devel/xulrunner17/patches/patch-dist_stl__wrappers_ostream new file mode 100644 index 00000000000..c377b151eec --- /dev/null +++ b/devel/xulrunner17/patches/patch-dist_stl__wrappers_ostream @@ -0,0 +1,8 @@ +$NetBSD: patch-dist_stl__wrappers_ostream,v 1.1.2.2 2013/08/24 19:45:15 tron Exp $ + +--- dist/stl_wrappers/ostream.orig 2013-07-14 12:39:46.000000000 +0000 ++++ dist/stl_wrappers/ostream +@@ -0,0 +1,3 @@ ++#pragma GCC visibility push(default) ++#include_next ++#pragma GCC visibility pop diff --git a/devel/xulrunner17/patches/patch-ipc_chromium_src_base_file__util.cc b/devel/xulrunner17/patches/patch-ipc_chromium_src_base_file__util.cc new file mode 100644 index 00000000000..7a342a0bbde --- /dev/null +++ b/devel/xulrunner17/patches/patch-ipc_chromium_src_base_file__util.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-ipc_chromium_src_base_file__util.cc,v 1.1.2.2 2013/08/24 19:45:15 tron Exp $ + +--- ipc/chromium/src/base/file_util.cc.orig 2013-06-18 18:47:18.000000000 +0000 ++++ ipc/chromium/src/base/file_util.cc +@@ -194,7 +194,7 @@ bool ReadFileToString(const FilePath& pa + FILE* CreateAndOpenTemporaryFile(FilePath* path) { + FilePath directory; + if (!GetTempDir(&directory)) +- return false; ++ return NULL; + + return CreateAndOpenTemporaryFileInDir(directory, path); + } diff --git a/devel/xulrunner17/patches/patch-ipc_chromium_src_base_file__util__posix.cc b/devel/xulrunner17/patches/patch-ipc_chromium_src_base_file__util__posix.cc index e31671ec947..2ea931fbf0a 100644 --- a/devel/xulrunner17/patches/patch-ipc_chromium_src_base_file__util__posix.cc +++ b/devel/xulrunner17/patches/patch-ipc_chromium_src_base_file__util__posix.cc @@ -1,8 +1,8 @@ -$NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.1 2013/01/10 16:17:10 ryoon Exp $ +$NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.1.4.1 2013/08/24 19:45:15 tron Exp $ ---- ipc/chromium/src/base/file_util_posix.cc.orig 2012-08-24 22:55:37.000000000 +0000 +--- ipc/chromium/src/base/file_util_posix.cc.orig 2013-06-18 18:47:18.000000000 +0000 +++ ipc/chromium/src/base/file_util_posix.cc -@@ -31,7 +31,7 @@ +@@ -33,7 +33,7 @@ #include "base/time.h" // FreeBSD/OpenBSD lacks stat64, but its stat handles files >2GB just fine @@ -11,3 +11,12 @@ $NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.1 2013/01/10 16:17 #define stat64 stat #endif +@@ -392,7 +392,7 @@ bool CreateTemporaryFileName(FilePath* p + FILE* CreateAndOpenTemporaryShmemFile(FilePath* path) { + FilePath directory; + if (!GetShmemTempDir(&directory)) +- return false; ++ return NULL; + + return CreateAndOpenTemporaryFileInDir(directory, path); + } diff --git a/devel/xulrunner17/patches/patch-ipc_chromium_src_base_pickle.cc b/devel/xulrunner17/patches/patch-ipc_chromium_src_base_pickle.cc new file mode 100644 index 00000000000..a52bd0a09f3 --- /dev/null +++ b/devel/xulrunner17/patches/patch-ipc_chromium_src_base_pickle.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-ipc_chromium_src_base_pickle.cc,v 1.1.2.2 2013/08/24 19:45:15 tron Exp $ + +--- ipc/chromium/src/base/pickle.cc.orig 2013-06-18 18:47:18.000000000 +0000 ++++ ipc/chromium/src/base/pickle.cc +@@ -492,7 +492,7 @@ char* Pickle::BeginWriteData(int length) + "There can only be one variable buffer in a Pickle"; + + if (!WriteInt(length)) +- return false; ++ return NULL; + + char *data_ptr = BeginWrite(length, sizeof(uint32)); + if (!data_ptr) -- cgit v1.2.3