From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8B2E41389FE for ; Fri, 31 Oct 2014 19:08:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F02BE0867; Fri, 31 Oct 2014 19:08:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ED05CE0867 for ; Fri, 31 Oct 2014 19:08:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8575C340548 for ; Fri, 31 Oct 2014 19:08:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 310749267 for ; Fri, 31 Oct 2014 19:08:55 +0000 (UTC) From: "Ian Stakenvicius" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Stakenvicius" Message-ID: <1414522774.a5ee1cbf16727382aabe194a46fc59bd4a5c1c0e.axs@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/firefox/, www-client/firefox/files/ X-VCS-Repository: proj/mozilla X-VCS-Files: www-client/firefox/Manifest www-client/firefox/files/firefox-31.0-webm-disallow-negative-samples.patch www-client/firefox/firefox-34.0_beta2.ebuild www-client/firefox/firefox-34.0_beta4.ebuild X-VCS-Directories: www-client/firefox/files/ www-client/firefox/ X-VCS-Committer: axs X-VCS-Committer-Name: Ian Stakenvicius X-VCS-Revision: a5ee1cbf16727382aabe194a46fc59bd4a5c1c0e X-VCS-Branch: master Date: Fri, 31 Oct 2014 19:08:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3cb8561f-e27b-4a0c-8b1b-e0e0e5be15a2 X-Archives-Hash: 4612336e568ab5cd4c7e0e2daecf7129 commit: a5ee1cbf16727382aabe194a46fc59bd4a5c1c0e Author: Ian Stakenvicius gentoo org> AuthorDate: Tue Oct 28 18:53:57 2014 +0000 Commit: Ian Stakenvicius gentoo org> CommitDate: Tue Oct 28 18:59:34 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=a5ee1cbf bump 34.0 beta, add patch to fix webm segfault --- www-client/firefox/Manifest | 2 +- ...refox-31.0-webm-disallow-negative-samples.patch | 29 ++++++++++++++++++++++ ...34.0_beta2.ebuild => firefox-34.0_beta4.ebuild} | 2 ++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest index a55d4f9..04ae2ce 100644 --- a/www-client/firefox/Manifest +++ b/www-client/firefox/Manifest @@ -83,4 +83,4 @@ DIST firefox-33.0-zh-TW.xpi 422430 SHA256 88e13c51ab2cde95ca274c458c73af74fe2b4a DIST firefox-33.0-zu.xpi 443460 SHA256 6deb6b853ec1923ab325332d2eb5e96e6a0cea443d447203dff0cff5352c15bf SHA512 39cf08663bf7ea3668bbddba84aa4c27fa365e6a43132c02ce78c6a63327bbc212ea179fcdd562c1962b4d167b17186c5d56dafe3267dcc4f32ee22c671b1e1f WHIRLPOOL 56a5729de1f5daf0d5c177e40e8e58def910558c6837c40b3fb22cdb11dec347894fd23c1bd2aa4fe3f42937dadba87bf932bcff7c053300abb408b0f852fcd8 DIST firefox-33.0.source.tar.bz2 155177527 SHA256 1018c2fae8c54c8a45f5a3ce348a2617a3f8039a789b09b7cfa5a27be069b229 SHA512 856585bedb0c0cc2a5c8591a5a3d373dca66fd8c15dd2c04b09e17e9a2da2bf978e4bff872a814b42e1963c3a6def05ccc0b68d9a8f4e7c9152dca878cf17e51 WHIRLPOOL be267b29bc9d21b6f0d35d1e42410afe9a0d6bed9174f5de5bfd80898fd1a73fc4e762a7e606c94c99562c6ac2b99eb33022509a85f5a762685cf26496a2744b DIST firefox-34.0-patches-0.1.tar.xz 4412 SHA256 29cd2fee297ca23b9552c134051d663ad5d7b2f7acdec8e441889cc82553d373 SHA512 dd2099cb8f5c8a411439afc4aa16cfabc8bab56ff090c4e84cbe54143b177ae141c48398b6a71c7506bada50223e01a8b1eec12b5e274353803b50de6c253b8c WHIRLPOOL 71ae7630bb5b0eff082d7a7cc89b3524b886bfe3af5556c27a47643839b166d36945a2f7e0afbd9b36ea8b4c0629daa660aeed23ad548f9a9d079a4252c1c363 -DIST firefox-34.0b2.source.tar.bz2 164311277 SHA256 7087f7b36c2f7aaabcbb11f94a0a7d5e4ea0b17a6ac54f6fe7ba947566d03097 SHA512 2d263ea92c54ad87f390acd6c2bdf3ce5713f22b902efba28e8b5f0a7a97eec2bd4748b49842700d0e13ea4179b95c2c498d5071f4d6f066455af7ed003978f2 WHIRLPOOL 4393eda13fb1f8fa0cfed91424db7682779c5db492fcb1e641885bafd4c2e6f8eb17f38d23fe1900e2ea655cad0f51dc663eb788abd29f37f01f50084db04883 +DIST firefox-34.0b4.source.tar.bz2 164290577 SHA256 b37a84e6fcf262ce3d4e9244150033d7fd5893ac954b5347c129ac65840e56a1 SHA512 16225804242952ab68526c543b36daf4fc66026ee9264f0e8c113151f54cae9ce90f18e85ad6f66244006a5156eb4d67d4bd793bb7b06a00132b746ce1c853ac WHIRLPOOL 22e7b97c567d2803e2e377f2f09535682515f3d4f764bafa1dfce72960bc125290ea63cff1781152f1181efa61e9b6eac6c852d18d2da46c0e39f70f20ddae0b diff --git a/www-client/firefox/files/firefox-31.0-webm-disallow-negative-samples.patch b/www-client/firefox/files/firefox-31.0-webm-disallow-negative-samples.patch new file mode 100644 index 0000000..bccc25e --- /dev/null +++ b/www-client/firefox/files/firefox-31.0-webm-disallow-negative-samples.patch @@ -0,0 +1,29 @@ +--- a/content/media/webm/WebMReader.cpp 2014-10-20 21:59:39.000000000 -0400 ++++ b/content/media/webm/WebMReader.cpp 2014-10-28 09:06:51.959665416 -0400 +@@ -668,7 +668,15 @@ + return true; + } + int32_t keepFrames = frames - skipFrames; ++ if (keepFrames < 0) { ++ NS_WARNING("Int overflow in keepFrames"); ++ return false; ++ } + int samples = keepFrames * channels; ++ if (samples < 0) { ++ NS_WARNING("Int overflow in samples"); ++ return false; ++ } + nsAutoArrayPtr trimBuffer(new AudioDataValue[samples]); + for (int i = 0; i < samples; i++) + trimBuffer[i] = buffer[skipFrames*channels + i]; +@@ -691,6 +699,10 @@ + int32_t keepFrames = frames - discardFrames.value(); + if (keepFrames > 0) { + int samples = keepFrames * channels; ++ if (samples < 0) { ++ NS_WARNING("Int overflow in samples"); ++ return false; ++ } + nsAutoArrayPtr trimBuffer(new AudioDataValue[samples]); + for (int i = 0; i < samples; i++) + trimBuffer[i] = buffer[i]; diff --git a/www-client/firefox/firefox-34.0_beta2.ebuild b/www-client/firefox/firefox-34.0_beta4.ebuild similarity index 99% rename from www-client/firefox/firefox-34.0_beta2.ebuild rename to www-client/firefox/firefox-34.0_beta4.ebuild index 3f28ef9..26857ae 100644 --- a/www-client/firefox/firefox-34.0_beta2.ebuild +++ b/www-client/firefox/firefox-34.0_beta4.ebuild @@ -147,6 +147,8 @@ src_prepare() { EPATCH_FORCE="yes" \ epatch "${WORKDIR}/firefox" + epatch "${FILESDIR}"/${PN}-31.0-webm-disallow-negative-samples.patch # bug 527010 + # Allow user to apply any additional patches without modifing ebuild epatch_user