cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to firefox36 3.6.20, fixes MFSA 2011-30.

Browse Source 
Remove patches merged upstream (#643137 & #629057)
This commit is contained in:
landry 2011-08-23 20:33:21 +00:00
parent 86abdde075
commit 00a1c1da77
4 changed files with 7 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/firefox36/Makefile
View File

@ -1,16 +1,14 @@
# $OpenBSD: Makefile,v 1.10 2011/08/23 08:38:13 landry Exp $
# $OpenBSD: Makefile,v 1.11 2011/08/23 20:33:21 landry Exp $
COMMENT = Mozilla web browser
# Don't forget to update devel/xulrunner/1.9 if patches changes.
MOZILLA_VERSION = 3.6.18
MOZILLA_VERSION = 3.6.20
MOZILLA_BRANCH = 1.9.2
MOZILLA_PROJECT = firefox36
MOZILLA_CODENAME = browser
REVISION = 0
SO_VERSION = 22.2
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.

10
www/firefox36/distinfo
View File

@ -1,5 +1,5 @@
MD5 (mozilla/firefox-3.6.18.source.tar.bz2) = Lxtvgsbz+lklSzJGjingCA==
RMD160 (mozilla/firefox-3.6.18.source.tar.bz2) = PE3dtFTh5eP6GbW1CjqvT8WnhQY=
SHA1 (mozilla/firefox-3.6.18.source.tar.bz2) = Y1xW6QVvfDWbu3YvN/vN5B4vds0=
SHA256 (mozilla/firefox-3.6.18.source.tar.bz2) = Z4AYXg6o4RLjN8Nrt7OQDse3LdREXgvSmDt0i4QEngQ=
SIZE (mozilla/firefox-3.6.18.source.tar.bz2) = 51553263
MD5 (mozilla/firefox-3.6.20.source.tar.bz2) = Wn797zHzMc/2jb0o52df8Q==
RMD160 (mozilla/firefox-3.6.20.source.tar.bz2) = sjFNUAIIFatDLOkZMSZohEEL7ew=
SHA1 (mozilla/firefox-3.6.20.source.tar.bz2) = 0l2JKzIU+S8Hmeza9upkFKiVDrI=
SHA256 (mozilla/firefox-3.6.20.source.tar.bz2) = Do4xEMjNH0rZE8PHQklSsa7r9rN16Pa1zP4+C22Kuxg=
SIZE (mozilla/firefox-3.6.20.source.tar.bz2) = 51564376

17
www/firefox36/patches/patch-gfx_ots_include_opentype-sanitiser_h
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-gfx_ots_include_opentype-sanitiser_h,v 1.1 2011/03/26 10:58:36 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=643137
--- gfx/ots/include/opentype-sanitiser.h.orig Fri Mar 18 00:02:27 2011
+++ gfx/ots/include/opentype-sanitiser.h Fri Mar 18 00:02:35 2011
@@ -64,8 +64,10 @@ class OTSStream {
}
while (length >= 4) {
- chksum_ += ntohl(*reinterpret_cast<const uint32_t*>(
- reinterpret_cast<const uint8_t*>(data) + offset));
+ uint32_t tmp;
+ std::memcpy(&tmp, reinterpret_cast<const uint8_t *>(data) + offset,
+ sizeof(uint32_t));
+ chksum_ += ntohl(tmp);
length -= 4;
offset += 4;
}

28
www/firefox36/patches/patch-gfx_qcms_iccread_c
View File

@ -1,28 +0,0 @@
$OpenBSD: patch-gfx_qcms_iccread_c,v 1.1 2011/03/26 10:58:36 landry Exp $
Fix crash on sparc64
https://bugzilla.mozilla.org/show_bug.cgi?id=629057
http://hg.mozilla.org/mozilla-central/rev/e8207773d54d
--- gfx/qcms/iccread.c.orig Fri Dec 3 16:48:03 2010
+++ gfx/qcms/iccread.c Thu Jan 27 23:43:43 2011
@@ -87,7 +87,9 @@ static uint32_t read_u32(struct mem_source *mem, size_
invalid_source(mem, "Invalid offset");
return 0;
} else {
- return be32_to_cpu(*(__be32*)(mem->buf + offset));
+ __be32 k;
+ memcpy(&k, mem->buf + offset, sizeof(__be32));
+ return be32_to_cpu(k);
}
}
@@ -97,7 +99,9 @@ static uint16_t read_u16(struct mem_source *mem, size_
invalid_source(mem, "Invalid offset");
return 0;
} else {
- return be16_to_cpu(*(__be16*)(mem->buf + offset));
+ __be16 k;
+ memcpy(&k, mem->buf + offset, sizeof(__be16));
+ return be16_to_cpu(k);
}
}