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

- update to 2.0.0.3;

Browse Source 
- don't force -Os;
ok naddy@, kurt@
This commit is contained in:
martynas 2007-03-27 16:04:37 +00:00
parent 8c517eb47c
commit 076c6a6f95
12 changed files with 15 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
www/mozilla-firefox/Makefile
View File

@ -1,15 +1,16 @@
# $OpenBSD: Makefile,v 1.70 2007/03/06 17:43:36 espie Exp $
# $OpenBSD: Makefile,v 1.71 2007/03/27 16:04:37 martynas Exp $
SHARED_ONLY= Yes
ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64
COMMENT-main= "redesign of Mozilla's browser component"
COMMENT-devel= "devel files for Gecko"
VER= 2.0.0.2
VER= 2.0.0.3
DISTNAME= mozilla
PKGNAME= mozilla-firefox-${VER}
PKGNAME-main= mozilla-firefox-${VER}p2
PKGNAME-devel= mozilla-firefox-devel-${VER}p1
PKGNAME-main= mozilla-firefox-${VER}
PKGNAME-devel= mozilla-firefox-devel-${VER}
SO_VERSION= 19.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.
@ -80,7 +81,7 @@ CONFIGURE_ARGS= --with-system-jpeg=${LOCALBASE} \
--with-system-nss \
--with-pthreads \
--enable-xft \
--enable-optimize=-Os \
--disable-optimize \
--enable-default-toolkit=gtk2 \
--disable-debug \
--disable-tests \

10
www/mozilla-firefox/distinfo
View File

@ -1,5 +1,5 @@
MD5 (firefox-2.0.0.2-source.tar.bz2) = d7db87b76c1e78a229b662d7dd642265
RMD160 (firefox-2.0.0.2-source.tar.bz2) = 489cd55a5e772f5be2605dc998572a1256d07a8e
SHA1 (firefox-2.0.0.2-source.tar.bz2) = bfe17b8b9eacd4f5329f252f1d136c7c932c70d8
SHA256 (firefox-2.0.0.2-source.tar.bz2) = dca8c47792904f11425f5ddc80f311dfb94f38a88d8ebc3c3783dcb5cfa2a091
SIZE (firefox-2.0.0.2-source.tar.bz2) = 37137694
MD5 (firefox-2.0.0.3-source.tar.bz2) = 24398e3d98673a2a92a01a8f771ca12a
RMD160 (firefox-2.0.0.3-source.tar.bz2) = 23d3d0ae89ac257304647aabe236ef8caec4d05f
SHA1 (firefox-2.0.0.3-source.tar.bz2) = 58cb7251e5fdea7d82cbbc0c2fd92aa0be81f53d
SHA256 (firefox-2.0.0.3-source.tar.bz2) = 02169e4e7a095c426fd5caf56c6cfc2415f4fe54cef7f4e78556f350e2c94007
SIZE (firefox-2.0.0.3-source.tar.bz2) = 37135441

49
www/mozilla-firefox/patches/patch-browser_base_content_browser_js
View File

@ -1,49 +0,0 @@
$OpenBSD: patch-browser_base_content_browser_js,v 1.1 2007/03/01 22:46:06 robert Exp $
--- browser/base/content/browser.js.orig Fri Jan 26 01:05:54 2007
+++ browser/base/content/browser.js Tue Feb 27 20:32:02 2007
@@ -1745,6 +1745,26 @@ function addBookmarkAs(aBrowser, aBookma
if ((!browsers || browsers.length == 1) && aBookmarkAllTabs)
return;
+ if (aBookmarkAllTabs) {
+ for (var i = 0; i < browsers.length; ++i) {
+ try {
+ var url = browsers[i].webNavigation.currentURI.spec;
+ urlSecurityCheck(url, url,
+ nsCI.nsIScriptSecurityManager.DISALLOW_SCRIPT_OR_DATA);
+ } catch (ex) {
+ return; // doesn't pass security check
+ }
+ }
+ } else {
+ try {
+ var url = aBrowser.webNavigation.currentURI.spec;
+ urlSecurityCheck(url, url,
+ nsCI.nsIScriptSecurityManager.DISALLOW_SCRIPT_OR_DATA);
+ } catch (ex) {
+ return; // doesn't pass security check
+ }
+ }
+
if (browsers && browsers.length > 1)
addBookmarkForTabBrowser(aBrowser, aBookmarkAllTabs);
else
@@ -2279,7 +2299,7 @@ function handleURLBarRevert()
// don't revert to last valid url unless page is NOT loading
// and user is NOT key-scrolling through autocomplete list
if ((!throbberElement || !throbberElement.hasAttribute("busy")) && !isScrolling) {
- if (url != "about:blank") {
+ if (url != "about:blank" || content.opener) {
gURLBar.value = url;
gURLBar.select();
SetPageProxyState("valid");
@@ -3851,7 +3871,8 @@ nsBrowserStatusHandler.prototype =
var location = aLocation.spec;
- if (location == "about:blank" || location == "") { //second condition is for new tabs, otherwise
+ if ((location == "about:blank" && !content.opener)
+ || location == "") { //second condition is for new tabs, otherwise
location = ""; //reload function is enabled until tab is refreshed
this.reloadCommand.setAttribute("disabled", "true");
this.reloadSkipCacheCommand.setAttribute("disabled", "true");

11
www/mozilla-firefox/patches/patch-js_src_js_c
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-js_src_js_c,v 1.1 2007/03/01 22:46:06 robert Exp $
--- js/src/js.c.orig Thu Dec 21 04:24:08 2006
+++ js/src/js.c Wed Feb 28 17:55:24 2007
@@ -1116,7 +1116,6 @@ Disassemble(JSContext *cx, JSObject *obj
SHOW_FLAG(THISP_STRING);
SHOW_FLAG(THISP_NUMBER);
SHOW_FLAG(THISP_BOOLEAN);
- SHOW_FLAG(BLOCKLOCALFUN);
SHOW_FLAG(INTERPRETED);
#undef SHOW_FLAG

25
www/mozilla-firefox/patches/patch-js_src_jsemit_c
View File

@ -1,25 +0,0 @@
$OpenBSD: patch-js_src_jsemit_c,v 1.1 2007/03/01 22:46:06 robert Exp $
--- js/src/jsemit.c.orig Wed Jan 17 01:07:07 2007
+++ js/src/jsemit.c Wed Feb 28 17:56:46 2007
@@ -1324,7 +1324,9 @@ EmitNonLocalJumpFixup(JSContext *cx, JSC
JS_ASSERT(*returnop == JSOP_RETURN);
for (stmt = cg->treeContext.topStmt; stmt != toStmt;
stmt = stmt->down) {
- if (stmt->type == STMT_FINALLY) {
+ if (stmt->type == STMT_FINALLY ||
+ ((cg->treeContext.flags & TCF_FUN_HEAVYWEIGHT) &&
+ STMT_MAYBE_SCOPE(stmt))) {
if (js_Emit1(cx, cg, JSOP_SETRVAL) < 0)
return JS_FALSE;
*returnop = JSOP_RETRVAL;
@@ -4000,7 +4002,9 @@ js_EmitTree(JSContext *cx, JSCodeGenerat
if (stmt && stmt->type == STMT_BLOCK &&
stmt->down && stmt->down->type == STMT_BLOCK &&
(stmt->down->flags & SIF_SCOPE)) {
- cg->treeContext.flags |= TCF_HAS_BLOCKLOCALFUN;
+ obj = ATOM_TO_OBJECT(stmt->down->atom);
+ JS_ASSERT(LOCKED_OBJ_GET_CLASS(obj) == &js_BlockClass);
+ OBJ_SET_PARENT(cx, fun->object, obj);
}
if (atomIndex >= JS_BIT(16)) {

12
www/mozilla-firefox/patches/patch-js_src_jsemit_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-js_src_jsemit_h,v 1.1 2007/03/01 22:46:06 robert Exp $
--- js/src/jsemit.h.orig Tue Nov 21 23:07:45 2006
+++ js/src/jsemit.h Wed Feb 28 17:55:24 2007
@@ -183,8 +183,6 @@ struct JSTreeContext { /* t
#define TCF_FUN_FLAGS 0x1E0 /* flags to propagate from FunctionBody */
#define TCF_HAS_DEFXMLNS 0x200 /* default xml namespace = ...; parsed */
#define TCF_HAS_FUNCTION_STMT 0x400 /* block contains a function statement */
-#define TCF_HAS_BLOCKLOCALFUN 0x800 /* inner function declared in let-bearing
- outer function body */
#define TREE_CONTEXT_INIT(tc) \
((tc)->flags = (tc)->numGlobalVars = 0, \

12
www/mozilla-firefox/patches/patch-js_src_jsfun_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-js_src_jsfun_h,v 1.1 2007/03/01 22:46:06 robert Exp $
--- js/src/jsfun.h.orig Tue Nov 21 23:07:45 2006
+++ js/src/jsfun.h Wed Feb 28 17:55:24 2007
@@ -68,8 +68,6 @@ struct JSFunction {
};
#define JSFUN_INTERPRETED 0x8000 /* use u.i if set, u.n if unset */
-#define JSFUN_BLOCKLOCALFUN 0x4000 /* has body block containing both let vars
- and local function declarations */
#define FUN_INTERPRETED(fun) ((fun)->flags & JSFUN_INTERPRETED)
#define FUN_NATIVE(fun) (FUN_INTERPRETED(fun) ? NULL : (fun)->u.n.native)

82
www/mozilla-firefox/patches/patch-js_src_jsinterp_c
View File

@ -1,82 +0,0 @@
$OpenBSD: patch-js_src_jsinterp_c,v 1.1 2007/03/01 22:46:06 robert Exp $
--- js/src/jsinterp.c.orig Sat Jan 20 04:46:50 2007
+++ js/src/jsinterp.c Wed Feb 28 18:20:01 2007
@@ -4889,33 +4889,28 @@ interrupt:
* here captures the let variables.
*/
JS_ASSERT(!fp->blockChain);
- if (fp->fun && (fp->fun->flags & JSFUN_BLOCKLOCALFUN)) {
- jsatomid aid;
-
- obj2 = NULL;
- for (aid = 0; aid < script->atomMap.length; aid++) {
- if (ATOM_IS_OBJECT(script->atomMap.vector[aid])) {
- obj2 = ATOM_TO_OBJECT(script->atomMap.vector[aid]);
- if (OBJ_GET_CLASS(cx, obj2) == &js_BlockClass)
- break;
- }
- }
- fp->blockChain = obj2;
+ if (!(fp->flags & JSFRAME_POP_BLOCKS)) {
+ parent = OBJ_GET_PARENT(cx, obj);
+ if (OBJ_GET_CLASS(cx, parent) == &js_BlockClass)
+ fp->blockChain = parent;
+ parent = js_GetScopeChain(cx, fp);
+ } else {
+ parent = fp->scopeChain;
+ JS_ASSERT(OBJ_GET_CLASS(cx, parent) == &js_BlockClass);
+ JS_ASSERT(OBJ_GET_PROTO(cx, parent) == OBJ_GET_PARENT(cx, obj));
+ JS_ASSERT(OBJ_GET_CLASS(cx, OBJ_GET_PARENT(cx, parent))
+ == &js_CallClass);
}
/* If re-parenting, store a clone of the function object. */
- obj2 = fp->scopeChain;
- parent = js_GetScopeChain(cx, fp);
if (OBJ_GET_PARENT(cx, obj) != parent) {
SAVE_SP_AND_PC(fp);
obj = js_CloneFunctionObject(cx, obj, parent);
- if (!obj)
+ if (!obj) {
ok = JS_FALSE;
+ goto out;
+ }
}
- fp->blockChain = NULL;
- fp->scopeChain = obj2;
- if (!ok)
- goto out;
fp->vars[slot] = OBJECT_TO_JSVAL(obj);
END_LITOPX_CASE(JSOP_DEFLOCALFUN)
@@ -5814,6 +5809,7 @@ interrupt:
END_LITOPX_CASE(JSOP_SETMETHOD)
BEGIN_CASE(JSOP_GETFUNNS)
+ SAVE_SP_AND_PC(fp);
ok = js_GetFunctionNamespace(cx, &rval);
if (!ok)
goto out;
@@ -5842,12 +5838,17 @@ interrupt:
*/
if (fp->flags & JSFRAME_POP_BLOCKS) {
JS_ASSERT(!fp->blockChain);
- obj = js_CloneBlockObject(cx, obj, fp->scopeChain, fp);
- if (!obj) {
- ok = JS_FALSE;
- goto out;
+ parent = fp->scopeChain;
+ if (OBJ_GET_PROTO(cx, parent) == obj) {
+ JS_ASSERT(OBJ_GET_CLASS(cx, parent) == &js_BlockClass);
+ } else {
+ obj = js_CloneBlockObject(cx, obj, parent, fp);
+ if (!obj) {
+ ok = JS_FALSE;
+ goto out;
+ }
+ fp->scopeChain = obj;
}
- fp->scopeChain = obj;
} else {
JS_ASSERT(!fp->blockChain ||
OBJ_GET_PARENT(cx, obj) == fp->blockChain);

12
www/mozilla-firefox/patches/patch-js_src_jsscript_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-js_src_jsscript_c,v 1.1 2007/03/01 22:46:06 robert Exp $
--- js/src/jsscript.c.orig Mon Jan 29 10:33:15 2007
+++ js/src/jsscript.c Wed Feb 28 17:55:24 2007
@@ -1354,8 +1354,6 @@ js_NewScriptFromCG(JSContext *cx, JSCode
fun->u.i.script = script;
if (cg->treeContext.flags & TCF_FUN_HEAVYWEIGHT)
fun->flags |= JSFUN_HEAVYWEIGHT;
- if (cg->treeContext.flags & TCF_HAS_BLOCKLOCALFUN)
- fun->flags |= JSFUN_BLOCKLOCALFUN;
}
/* Tell the debugger about this compiled script. */

10
www/mozilla-firefox/patches/patch-security_coreconf_OpenBSD_mk
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.7 2007/03/01 22:46:06 robert Exp $
$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.8 2007/03/27 16:04:37 martynas Exp $
--- security/coreconf/OpenBSD.mk.orig Sun Apr 25 18:02:17 2004
+++ security/coreconf/OpenBSD.mk Fri Feb 23 21:56:45 2007
+++ security/coreconf/OpenBSD.mk Thu Mar 22 20:29:45 2007
@@ -42,7 +42,7 @@ CC = gcc
CCC = g++
RANLIB = ranlib
@ -19,7 +19,7 @@ $OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.7 2007/03/01 22:46:06 robert Ex
OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DOPENBSD
@@ -64,8 +64,8 @@ OS_LIBS =
@@ -64,7 +64,7 @@ OS_LIBS =
ARCH = openbsd
DSO_CFLAGS = -fPIC -DPIC
@ -27,6 +27,4 @@ $OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.7 2007/03/01 22:46:06 robert Ex
+DSO_LDOPTS = -shared -fPIC -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
DSO_LDFLAGS =
-MKSHLIB = $(CC) $(DSO_LDOPTS)
+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS)
MKSHLIB = $(CC) $(DSO_LDOPTS)

18
www/mozilla-firefox/patches/patch-security_manager_boot_src_nsSecureBrowserUIImpl_cpp
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-security_manager_boot_src_nsSecureBrowserUIImpl_cpp,v 1.1 2007/03/01 22:46:06 robert Exp $
--- security/manager/boot/src/nsSecureBrowserUIImpl.cpp.orig Tue Jun 13 22:13:18 2006
+++ security/manager/boot/src/nsSecureBrowserUIImpl.cpp Tue Feb 27 15:05:04 2007
@@ -861,6 +861,14 @@ nsSecureBrowserUIImpl::OnStateChange(nsI
}
}
+ if (loadFlags & nsIChannel::LOAD_RETARGETED_DOCUMENT_URI)
+ {
+ // The original consumer (this) is no longer the target of the load.
+ // Ignore any events with this flag, do not allow them to update
+ // our secure UI state.
+ return NS_OK;
+ }
+
if (aProgressStateFlags & STATE_START
&&
aProgressStateFlags & STATE_IS_REQUEST

19
www/mozilla-firefox/patches/patch-toolkit_content_widgets_tabbrowser_xml
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-toolkit_content_widgets_tabbrowser_xml,v 1.1 2007/03/01 22:46:06 robert Exp $
--- toolkit/content/widgets/tabbrowser.xml.orig Sun Sep 24 00:27:25 2006
+++ toolkit/content/widgets/tabbrowser.xml Tue Feb 27 15:05:14 2007
@@ -599,12 +599,13 @@
// If location bar is hidden and the URL type supports a host,
// add the scheme and host to the title to prevent spoofing.
// XXX https://bugzilla.mozilla.org/show_bug.cgi?id=22183#c239
- // (only for schemes that support a host)
try {
if (docElement.getAttribute("chromehidden").indexOf("location") != -1) {
var uri = this.mURIFixup.createExposableURI(
this.mCurrentBrowser.currentURI);
- if (uri.host)
+ if (uri.scheme == "about")
+ newTitle = uri.spec + sep + newTitle;
+ else
newTitle = uri.prePath + sep + newTitle;
}
} catch (e) {}