[pkgsrc/trunk]: pkgsrc/www/firefox Avoid a crash on alignment critical archit...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/376315135ea0
branches:  trunk
changeset: 649809:376315135ea0
user:      martin <martin%pkgsrc.org@localhost>
date:      Fri Apr 10 05:40:36 2015 +0000

description:
Avoid a crash on alignment critical architectures

diffstat:

 www/firefox/Makefile                                                  |   3 +-
 www/firefox/distinfo                                                  |   3 +-
 www/firefox/patches/patch-security_manager_boot_src_CertBlocklist.cpp |  15 ++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diffs (53 lines):

diff -r 055dd25e61ef -r 376315135ea0 www/firefox/Makefile
--- a/www/firefox/Makefile      Fri Apr 10 03:33:20 2015 +0000
+++ b/www/firefox/Makefile      Fri Apr 10 05:40:36 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.206 2015/04/06 10:50:50 tron Exp $
+# $NetBSD: Makefile,v 1.207 2015/04/10 05:40:36 martin Exp $
 
 FIREFOX_VER=   ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=    37.0.1
@@ -6,6 +6,7 @@
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
diff -r 055dd25e61ef -r 376315135ea0 www/firefox/distinfo
--- a/www/firefox/distinfo      Fri Apr 10 03:33:20 2015 +0000
+++ b/www/firefox/distinfo      Fri Apr 10 05:40:36 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.199 2015/04/06 10:50:50 tron Exp $
+$NetBSD: distinfo,v 1.200 2015/04/10 05:40:36 martin Exp $
 
 SHA1 (firefox-37.0.1.source.tar.bz2) = 8bbffaa3cb81916bb44e11773d3f05fc4f2b9f36
 RMD160 (firefox-37.0.1.source.tar.bz2) = f3605aaab5e4e002ab29523d8dcaed1953a03ab8
@@ -141,6 +141,7 @@
 SHA1 (patch-pb) = 97c9b2e4cefd524dc6ba825f71c3da2a761aa1f4
 SHA1 (patch-pc) = 8b2baa88f0983a2fef4f801cf6b1ae425f6c813a
 SHA1 (patch-rc) = 2733724442a2cb49c5091146fd7e6001af686121
+SHA1 (patch-security_manager_boot_src_CertBlocklist.cpp) = 54f73d6dd200c5292895445fcec94aa604dc3101
 SHA1 (patch-security_manager_ssl_src_nsNSSComponent.cpp) = 28d216fb8dcb5968c1ff657578b4caf814c146ac
 SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__back.jsm) = 6b926ccd793391ad7bd7101635f4b3eefe3db130
 SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__front.jsm) = f5adba2137f2d7fd4d4a6a1e8ef8625866513890
diff -r 055dd25e61ef -r 376315135ea0 www/firefox/patches/patch-security_manager_boot_src_CertBlocklist.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox/patches/patch-security_manager_boot_src_CertBlocklist.cpp     Fri Apr 10 05:40:36 2015 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-security_manager_boot_src_CertBlocklist.cpp,v 1.1 2015/04/10 05:40:36 martin Exp $
+
+See https://bugzilla.mozilla.org/show_bug.cgi?id=1153090
+
+--- security/manager/boot/src/CertBlocklist.cpp.orig   2015-04-03 04:30:09.000000000 +0200
++++ security/manager/boot/src/CertBlocklist.cpp        2015-04-10 07:30:39.000000000 +0200
+@@ -87,7 +87,7 @@ CertBlocklistItem::Hash() const
+   // there's no requirement for a serial to be as large as 32 bits; if it's
+   // smaller, fall back to the first octet (otherwise, the last four)
+   if (serialLength >= 4) {
+-    hash = *(uint32_t *)(mSerialData + serialLength - 4);
++    memcpy(&hash, mSerialData + serialLength - 4, 4);
+   } else {
+     hash = *mSerialData;
+   }