pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2006Q1]: pkgsrc/www Pullup ticket 1378 - requested by ghen
details: https://anonhg.NetBSD.org/pkgsrc/rev/b1cb57d27139
branches: pkgsrc-2006Q1
changeset: 510214:b1cb57d27139
user: salo <salo%pkgsrc.org@localhost>
date: Sat Apr 15 23:32:58 2006 +0000
description:
Pullup ticket 1378 - requested by ghen
security update for firefox
Revisions pulled up:
- pkgsrc/www/firefox/Makefile 1.32
- pkgsrc/www/firefox/Makefile-firefox.common 1.29
- pkgsrc/www/firefox/distinfo 1.46, 1.47
- pkgsrc/www/firefox/patches/patch-ab 1.6
- pkgsrc/www/firefox/patches/patch-ac 1.8
- pkgsrc/www/firefox/patches/patch-bu removed
- pkgsrc/www/firefox/patches/patch-bv removed
- pkgsrc/www/firefox-gtk1/Makefile 1.10
Module Name: pkgsrc
Committed By: taya
Date: Thu Apr 13 14:47:50 UTC 2006
Modified Files:
pkgsrc/www/firefox: distinfo
pkgsrc/www/firefox/patches: patch-ac
Removed Files:
pkgsrc/www/firefox/patches: patch-bu patch-bv
Log Message:
use xpcom code for linux instead of our original.
fix PR/33181.
---
Module Name: pkgsrc
Committed By: ghen
Date: Sat Apr 15 14:20:31 UTC 2006
Modified Files:
pkgsrc/www/firefox: Makefile Makefile-firefox.common distinfo
pkgsrc/www/firefox-gtk1: Makefile
pkgsrc/www/firefox/patches: patch-ab
Log Message:
Update to Firefox 1.5.0.2.
Firefox 1.5.0.2 offers improved stability, and several security fixes:
MFSA 2006-29 Spoofing with translucent windows
MFSA 2006-28 Security check of js_ValueToFunctionObject() can be circumvented
MFSA 2006-25 Privilege escalation through Print Preview
MFSA 2006-24 Privilege escalation using crypto.generateCRMFRequest
MFSA 2006-23 File stealing by changing input type
MFSA 2006-22 CSS Letter-Spacing Heap Overflow Vulnerability
MFSA 2006-20 Crashes with evidence of memory corruption (rv:1.8.0.2)
For a detailed ChangeLog, see:
http://www.squarefree.com/burningedge/releases/1.5.0.2.html
diffstat:
www/firefox-gtk1/Makefile | 3 +-
www/firefox/Makefile | 3 +-
www/firefox/Makefile-firefox.common | 4 +-
www/firefox/distinfo | 14 +-
www/firefox/patches/patch-ab | 19 +-
www/firefox/patches/patch-ac | 9 +-
www/firefox/patches/patch-bu | 180 ------------------------------
www/firefox/patches/patch-bv | 212 ------------------------------------
8 files changed, 24 insertions(+), 420 deletions(-)
diffs (truncated from 551 to 300 lines):
diff -r ebfa087c5177 -r b1cb57d27139 www/firefox-gtk1/Makefile
--- a/www/firefox-gtk1/Makefile Sat Apr 15 21:24:03 2006 +0000
+++ b/www/firefox-gtk1/Makefile Sat Apr 15 23:32:58 2006 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:11:21 joerg Exp $
+# $NetBSD: Makefile,v 1.9.2.1 2006/04/15 23:32:58 salo Exp $
MOZILLA= firefox-gtk1
-PKGREVISION= 1
COMMENT= Lightweight gecko-based web browser built with GTK+-1.x
.include "../../www/firefox/Makefile-firefox.common"
diff -r ebfa087c5177 -r b1cb57d27139 www/firefox/Makefile
--- a/www/firefox/Makefile Sat Apr 15 21:24:03 2006 +0000
+++ b/www/firefox/Makefile Sat Apr 15 23:32:58 2006 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2006/02/06 09:20:46 ghen Exp $
+# $NetBSD: Makefile,v 1.31.2.1 2006/04/15 23:32:58 salo Exp $
MOZILLA= firefox
-PKGREVISION= 1
EXTRACT_SUFX= .tar.bz2
COMMENT= Lightweight gecko-based web browser
diff -r ebfa087c5177 -r b1cb57d27139 www/firefox/Makefile-firefox.common
--- a/www/firefox/Makefile-firefox.common Sat Apr 15 21:24:03 2006 +0000
+++ b/www/firefox/Makefile-firefox.common Sat Apr 15 23:32:58 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile-firefox.common,v 1.28 2006/03/14 01:14:34 jlam Exp $
+# $NetBSD: Makefile-firefox.common,v 1.28.2.1 2006/04/15 23:32:58 salo Exp $
MOZILLA_BIN= firefox-bin
-MOZ_VER= 1.5.0.1
+MOZ_VER= 1.5.0.2
EXTRACT_SUFX= .tar.bz2
DISTNAME= firefox-${MOZ_VER}-source
diff -r ebfa087c5177 -r b1cb57d27139 www/firefox/distinfo
--- a/www/firefox/distinfo Sat Apr 15 21:24:03 2006 +0000
+++ b/www/firefox/distinfo Sat Apr 15 23:32:58 2006 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.45 2006/02/12 11:04:51 ghen Exp $
+$NetBSD: distinfo,v 1.45.2.1 2006/04/15 23:32:58 salo Exp $
-SHA1 (firefox-1.5.0.1/firefox-1.5.0.1-source.tar.bz2) = 719a0c5218ead7a4e426612277e1c92c33800d38
-RMD160 (firefox-1.5.0.1/firefox-1.5.0.1-source.tar.bz2) = 6e332fb1a7e80ab56d3d6e3de3d203c8c58217bf
-Size (firefox-1.5.0.1/firefox-1.5.0.1-source.tar.bz2) = 34705286 bytes
+SHA1 (firefox-1.5.0.2/firefox-1.5.0.2-source.tar.bz2) = 21f5497a4cdd4b142bdcb9c3fbdfea43cae1455f
+RMD160 (firefox-1.5.0.2/firefox-1.5.0.2-source.tar.bz2) = a3128798930d069a175d278b5522cdc8e43dc352
+Size (firefox-1.5.0.2/firefox-1.5.0.2-source.tar.bz2) = 35234245 bytes
SHA1 (patch-aa) = 5095449d4e979085fc5791b9d0251076b9c969c3
-SHA1 (patch-ab) = bcc480ab0f7d1760bf4f26b6464db6b69fa3b4d6
-SHA1 (patch-ac) = d35b8da8ee1a6b42068ece31a1f4659e153b29cd
+SHA1 (patch-ab) = eda86e19dbf45be392b6be4a40dbb25936c91439
+SHA1 (patch-ac) = c0cfa9805d883e0761b5bc63b4015cbf1e951eec
SHA1 (patch-ad) = 20f2184a7e5e98b065e884c67e4c17fc52019a79
SHA1 (patch-ae) = fea251aabc772c3d4ad3044c8295af45cc9cab2d
SHA1 (patch-af) = 01e10664fbf20dffa53ecb94be24a421c39b838b
@@ -28,8 +28,6 @@
SHA1 (patch-bq) = 2b29436d138fea4e1941d537be1a636969db9a77
SHA1 (patch-br) = 943b38fef5e7070de7af8a055f05e576039ad8bb
SHA1 (patch-bs) = 79cb84a5ed67780e124e7c595ee4ae6ffc7617a6
-SHA1 (patch-bu) = 0714f658001c363f4abbfb248ac77c4862e3ccf9
-SHA1 (patch-bv) = ef06a6a774c9d4da7b3fbf6f4e274ab042926e49
SHA1 (patch-bx) = 7d524d6d46593ba54f12a75c57822518feee84d0
SHA1 (patch-by) = a6eeccfee4e7e3620be41b315c357575c8bd0635
SHA1 (patch-bz) = 7f939c1717b2df473217da9cf703a37e459731c7
diff -r ebfa087c5177 -r b1cb57d27139 www/firefox/patches/patch-ab
--- a/www/firefox/patches/patch-ab Sat Apr 15 21:24:03 2006 +0000
+++ b/www/firefox/patches/patch-ab Sat Apr 15 23:32:58 2006 +0000
@@ -1,10 +1,9 @@
-$NetBSD: patch-ab,v 1.5 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-ab,v 1.5.4.1 2006/04/15 23:32:58 salo Exp $
-diff -ruN ../Orig/mozilla/configure.in ./configure.in
---- ../Orig/mozilla/configure.in 2005-10-04 14:53:49.000000000 +0900
-+++ ./configure.in 2005-12-04 19:02:51.000000000 +0900
-@@ -1360,7 +1360,7 @@
- esac
+--- configure.in.orig 2006-04-15 10:47:18.000000000 +0200
++++ configure.in
+@@ -1418,7 +1418,7 @@ case "$target" in
+ LDFLAGS=$_SAVE_LDFLAGS
;;
-*-freebsd*)
@@ -12,7 +11,7 @@
if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then
DLL_SUFFIX=".so.1.0"
DSO_LDOPTS="-shared"
-@@ -1374,6 +1374,9 @@
+@@ -1432,6 +1432,9 @@ case "$target" in
# MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
# MKSHLIB_UNFORCE_ALL=''
# fi
@@ -22,7 +21,7 @@
;;
*-hpux*)
-@@ -1768,6 +1771,13 @@
+@@ -1826,6 +1829,13 @@ case "$target" in
if test "$LIBRUNPATH"; then
DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
fi
@@ -36,7 +35,7 @@
;;
*-nto*)
-@@ -1993,7 +2003,7 @@
+@@ -2051,7 +2061,7 @@ dnl the qsort routine under solaris is f
MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
MKSHLIB_UNFORCE_ALL=''
@@ -45,7 +44,7 @@
AR_LIST="$AR t"
AR_EXTRACT="$AR x"
AR_DELETE="$AR d"
-@@ -5205,7 +5215,7 @@
+@@ -5279,7 +5289,7 @@ dnl ====================================
dnl = Enable code optimization. ON by default.
dnl ========================================================
if test -z "$MOZ_OPTIMIZE_FLAGS"; then
diff -r ebfa087c5177 -r b1cb57d27139 www/firefox/patches/patch-ac
--- a/www/firefox/patches/patch-ac Sat Apr 15 21:24:03 2006 +0000
+++ b/www/firefox/patches/patch-ac Sat Apr 15 23:32:58 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.7 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-ac,v 1.7.4.1 2006/04/15 23:32:58 salo Exp $
-diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/reflect/xptcall/src/md/unix/Makefile.in
+diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/reflect/xptcall/src/md/unix/Makefile.in
--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2005-06-15 17:32:21.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in 2005-12-04 19:03:04.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in 2006-04-09 23:31:15.000000000 +0900
@@ -61,10 +61,13 @@
#
# Lots of Unixish x86 flavors
@@ -13,7 +13,7 @@
CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
endif
+ifeq (amd64,$(OS_TEST))
-+CPPSRCS := xptcinvoke_unixish_amd64.cpp xptcstubs_unixish_amd64.cpp
++CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
+endif
endif
#
@@ -58,3 +58,4 @@
#
# Solaris/SPARC
#
+Only in ./xpcom/reflect/xptcall/src/md/unix: Makefile.in.orig
diff -r ebfa087c5177 -r b1cb57d27139 www/firefox/patches/patch-bu
--- a/www/firefox/patches/patch-bu Sat Apr 15 21:24:03 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,180 +0,0 @@
-$NetBSD: patch-bu,v 1.4 2005/12/10 13:47:22 taya Exp $
-
-diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp
---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp 1970-01-01 09:00:00.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp 2005-12-07 00:07:35.000000000 +0900
-@@ -0,0 +1,174 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+// Platform specific code to invoke XPCOM methods on native objects
-+
-+#include "xptcprivate.h"
-+
-+// 6 integral parameters are passed in registers
-+const PRUint32 GPR_COUNT = 6;
-+
-+// 8 floating point parameters are passed in SSE registers
-+const PRUint32 FPR_COUNT = 8;
-+
-+// Remember that these 'words' are 64-bit long
-+static inline void
-+invoke_count_words(PRUint32 paramCount, nsXPTCVariant * s,
-+ PRUint32 & nr_gpr, PRUint32 & nr_fpr, PRUint32 & nr_stack)
-+{
-+ nr_gpr = 1; // skip one GP register for 'that'
-+ nr_fpr = 0;
-+ nr_stack = 0;
-+
-+ /* Compute number of eightbytes of class MEMORY. */
-+ for (uint32 i = 0; i < paramCount; i++, s++) {
-+ if (!s->IsPtrData()
-+ && (s->type == nsXPTType::T_FLOAT || s->type == nsXPTType::T_DOUBLE)) {
-+ if (nr_fpr < FPR_COUNT)
-+ nr_fpr++;
-+ else
-+ nr_stack++;
-+ }
-+ else {
-+ if (nr_gpr < GPR_COUNT)
-+ nr_gpr++;
-+ else
-+ nr_stack++;
-+ }
-+ }
-+}
-+
-+static void
-+invoke_copy_to_stack(PRUint64 * d, PRUint32 paramCount, nsXPTCVariant * s,
-+ PRUint64 * gpregs, double * fpregs)
-+{
-+ PRUint32 nr_gpr = 1; // skip one GP register for 'that'
-+ PRUint32 nr_fpr = 0;
-+ PRUint64 value;
-+
-+ for (uint32 i = 0; i < paramCount; i++, s++) {
-+ if (s->IsPtrData())
-+ value = (PRUint64) s->ptr;
-+ else {
-+ switch (s->type) {
-+ case nsXPTType::T_FLOAT: break;
-+ case nsXPTType::T_DOUBLE: break;
-+ case nsXPTType::T_I8: value = s->val.i8; break;
-+ case nsXPTType::T_I16: value = s->val.i16; break;
-+ case nsXPTType::T_I32: value = s->val.i32; break;
-+ case nsXPTType::T_I64: value = s->val.i64; break;
-+ case nsXPTType::T_U8: value = s->val.u8; break;
-+ case nsXPTType::T_U16: value = s->val.u16; break;
-+ case nsXPTType::T_U32: value = s->val.u32; break;
-+ case nsXPTType::T_U64: value = s->val.u64; break;
-+ case nsXPTType::T_BOOL: value = s->val.b; break;
-+ case nsXPTType::T_CHAR: value = s->val.c; break;
-+ case nsXPTType::T_WCHAR: value = s->val.wc; break;
-+ default: value = (PRUint64) s->val.p; break;
-+ }
-+ }
-+
-+ if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) {
-+ if (nr_fpr < FPR_COUNT)
-+ fpregs[nr_fpr++] = s->val.d;
-+ else {
-+ *((double *)d) = s->val.d;
-+ d++;
-+ }
-+ }
-+ else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
-+ if (nr_fpr < FPR_COUNT)
-+ // The value in %xmm register is already prepared to
-+ // be retrieved as a float. Therefore, we pass the
-+ // value verbatim, as a double without conversion.
-+ fpregs[nr_fpr++] = s->val.d;
-+ else {
-+ *((float *)d) = s->val.f;
-+ d++;
-+ }
-+ }
-+ else {
-+ if (nr_gpr < GPR_COUNT)
-+ gpregs[nr_gpr++] = value;
-+ else
-+ *d++ = value;
-+ }
-+ }
-+}
-+
-+extern "C"
-+XPTC_PUBLIC_API(nsresult)
-+XPTC_InvokeByIndex(nsISupports * that, PRUint32 methodIndex,
-+ PRUint32 paramCount, nsXPTCVariant * params)
-+{
-+ PRUint32 nr_gpr, nr_fpr, nr_stack;
-+ invoke_count_words(paramCount, params, nr_gpr, nr_fpr, nr_stack);
-+
-+ // Stack, if used, must be 16-bytes aligned
-+ if (nr_stack)
-+ nr_stack = (nr_stack + 1) & ~1;
-+
-+ // Load parameters to stack, if necessary
-+ PRUint64 *stack = (PRUint64 *) __builtin_alloca(nr_stack * 8);
-+ PRUint64 gpregs[GPR_COUNT];
-+ double fpregs[FPR_COUNT];
-+ invoke_copy_to_stack(stack, paramCount, params, gpregs, fpregs);
-+
-+ // Load FPR registers from fpregs[]
-+ register double d0 asm("xmm0");
-+ register double d1 asm("xmm1");
-+ register double d2 asm("xmm2");
-+ register double d3 asm("xmm3");
-+ register double d4 asm("xmm4");
-+ register double d5 asm("xmm5");
-+ register double d6 asm("xmm6");
-+ register double d7 asm("xmm7");
-+
-+ switch (nr_fpr) {
-+#define ARG_FPR(N) \
-+ case N+1: d##N = fpregs[N];
-+ ARG_FPR(7);
-+ ARG_FPR(6);
-+ ARG_FPR(5);
-+ ARG_FPR(4);
-+ ARG_FPR(3);
-+ ARG_FPR(2);
-+ ARG_FPR(1);
-+ ARG_FPR(0);
-+ case 0:;
-+#undef ARG_FPR
-+ }
-+
Home |
Main Index |
Thread Index |
Old Index