Firefox 1.5.0.1 is a stability-and-security update to Firefox 1.5.
It also includes a number of low-risk fixes for other types of bugs.
This commit is contained in:
wilfried
parent
ab083a36eb
commit
4c685774b5
@ -1,13 +1,13 @@
|
||||
# $OpenBSD: Makefile,v 1.47 2006/01/16 07:01:39 steven Exp $
|
||||
# $OpenBSD: Makefile,v 1.48 2006/02/06 08:21:53 wilfried Exp $
|
||||
|
||||
ONLY_FOR_ARCHS= alpha amd64 i386 powerpc sparc sparc64
|
||||
|
||||
COMMENT= "redesign of Mozilla's browser component"
|
||||
|
||||
VER= 1.5
|
||||
VER= 1.5.0.1
|
||||
DISTNAME= mozilla
|
||||
PKGNAME= mozilla-firefox-${VER}p3
|
||||
SO_VERSION= 9.0
|
||||
PKGNAME= mozilla-firefox-${VER}
|
||||
SO_VERSION= 10.0
|
||||
# NOTE: Must bump minor version if any shlib's are removed from the
|
||||
# components dir to avoid pkg_add -r issues.
|
||||
.for _lib in accessibility appcomps auth autoconfig browsercomps \
|
||||
@ -120,9 +120,9 @@ do-install:
|
||||
@cd ${MOB} && ${TAR} -chf - ${dir} | \
|
||||
${TAR} -xf - -C ${MOZ}
|
||||
.endfor
|
||||
@cd ${MOB} && ${TAR} -chf - *.so.?.? | \
|
||||
@cd ${MOB} && ${TAR} -chf - *.so.??.? | \
|
||||
${TAR} -xf - -C ${MOZ}
|
||||
@chmod 444 ${MOZ}/*.so.?.? ${MOZ}/components/*.so.?.? ${MOZ}/components/*.js
|
||||
@chmod 444 ${MOZ}/*.so.??.? ${MOZ}/components/*.so.??.? ${MOZ}/components/*.js
|
||||
${INSTALL_DATA} ${WRKSRC}/LICENSE ${MOZ}
|
||||
|
||||
${INSTALL_DATA} ${WRKSRC}/browser/app/mozicon16.xpm ${WRKSRC}/browser/app/mozicon50.xpm ${MOZ}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
MD5 (firefox-1.5-source.tar.bz2) = fa915ddcadecda30ed3e13694f26a779
|
||||
RMD160 (firefox-1.5-source.tar.bz2) = 5e7475846e9c92e36167a384e1e8a3d699b0b62f
|
||||
SHA1 (firefox-1.5-source.tar.bz2) = 7437c6a351787ec8762e598ae1852e22bcca3220
|
||||
SIZE (firefox-1.5-source.tar.bz2) = 34491496
|
||||
MD5 (firefox-1.5.0.1-source.tar.bz2) = c76f02956645bc823241379e27f76bb5
|
||||
RMD160 (firefox-1.5.0.1-source.tar.bz2) = 6e332fb1a7e80ab56d3d6e3de3d203c8c58217bf
|
||||
SHA1 (firefox-1.5.0.1-source.tar.bz2) = 719a0c5218ead7a4e426612277e1c92c33800d38
|
||||
SIZE (firefox-1.5.0.1-source.tar.bz2) = 34705286
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-gfx_src_psshared_nsCUPSShim_cpp,v 1.1 2006/02/06 08:21:53 wilfried Exp $
|
||||
--- gfx/src/psshared/nsCUPSShim.cpp.orig Sun May 8 17:01:20 2005
|
||||
+++ gfx/src/psshared/nsCUPSShim.cpp Thu Jan 12 13:18:31 2006
|
||||
@@ -59,7 +59,7 @@ static const int gSymNameCt = sizeof(gSy
|
||||
PRBool
|
||||
nsCUPSShim::Init()
|
||||
{
|
||||
- mCupsLib = PR_LoadLibrary("libcups.so.2");
|
||||
+ mCupsLib = PR_LoadLibrary("libcups.so");
|
||||
if (!mCupsLib)
|
||||
return PR_FALSE;
|
||||
|
||||
@ -1,56 +0,0 @@
|
||||
$OpenBSD: patch-toolkit_components_history_src_nsGlobalHistory_cpp,v 1.1 2005/12/21 15:33:01 kurt Exp $
|
||||
--- toolkit/components/history/src/nsGlobalHistory.cpp.orig Sun Oct 23 14:55:54 2005
|
||||
+++ toolkit/components/history/src/nsGlobalHistory.cpp Tue Dec 20 21:45:57 2005
|
||||
@@ -113,6 +113,11 @@ nsIPrefBranch* nsGlobalHistory::gPrefBra
|
||||
|
||||
#define FIND_BY_AGEINDAYS_PREFIX "find:datasource=history&match=AgeInDays&method="
|
||||
|
||||
+// see bug #319004 -- clamp title and URL to generously-large but not too large
|
||||
+// length
|
||||
+#define HISTORY_URI_LENGTH_MAX 65536
|
||||
+#define HISTORY_TITLE_LENGTH_MAX 4096
|
||||
+
|
||||
// sync history every 10 seconds
|
||||
#define HISTORY_SYNC_TIMEOUT (10 * PR_MSEC_PER_SEC)
|
||||
//#define HISTORY_SYNC_TIMEOUT 3000 // every 3 seconds - testing only!
|
||||
@@ -618,6 +623,9 @@ nsGlobalHistory::AddPageToDatabase(nsIUR
|
||||
rv = aURI->GetSpec(URISpec);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
+ if (URISpec.Length() > HISTORY_URI_LENGTH_MAX)
|
||||
+ return NS_OK;
|
||||
+
|
||||
#ifdef DEBUG_bsmedberg
|
||||
printf("AddURI: %s%s%s",
|
||||
URISpec.get(),
|
||||
@@ -1110,7 +1118,7 @@ nsGlobalHistory::SetPageTitle(nsIURI *aU
|
||||
nsresult rv;
|
||||
NS_ENSURE_ARG_POINTER(aURI);
|
||||
|
||||
- const nsAFlatString& titleString = PromiseFlatString(aTitle);
|
||||
+ nsAutoString titleString(StringHead(aTitle, HISTORY_TITLE_LENGTH_MAX));
|
||||
|
||||
// skip about: URIs to avoid reading in the db (about:blank, especially)
|
||||
PRBool isAbout;
|
||||
@@ -1411,6 +1419,9 @@ nsGlobalHistory::HidePage(nsIURI *aURI)
|
||||
rv = aURI->GetSpec(URISpec);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
+ if (URISpec.Length() > HISTORY_URI_LENGTH_MAX)
|
||||
+ return NS_OK;
|
||||
+
|
||||
#ifdef DEBUG_bsmedberg
|
||||
printf("nsGlobalHistory::HidePage: %s\n", URISpec.get());
|
||||
#endif
|
||||
@@ -1447,7 +1458,10 @@ nsGlobalHistory::MarkPageAsTyped(nsIURI
|
||||
nsCAutoString spec;
|
||||
nsresult rv = aURI->GetSpec(spec);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
-
|
||||
+
|
||||
+ if (spec.Length() > HISTORY_URI_LENGTH_MAX)
|
||||
+ return NS_OK;
|
||||
+
|
||||
nsCOMPtr<nsIMdbRow> row;
|
||||
rv = FindRow(kToken_URLColumn, spec.get(), getter_AddRefs(row));
|
||||
if (NS_FAILED(rv)) {
|
||||
@ -1,54 +0,0 @@
|
||||
$OpenBSD: patch-xpfe_components_history_src_nsGlobalHistory_cpp,v 1.1 2005/12/21 15:33:01 kurt Exp $
|
||||
--- xpfe/components/history/src/nsGlobalHistory.cpp.orig Wed Oct 26 15:58:33 2005
|
||||
+++ xpfe/components/history/src/nsGlobalHistory.cpp Tue Dec 20 21:43:18 2005
|
||||
@@ -111,6 +111,11 @@ nsIPrefBranch* nsGlobalHistory::gPrefBra
|
||||
|
||||
#define FIND_BY_AGEINDAYS_PREFIX "find:datasource=history&match=AgeInDays&method="
|
||||
|
||||
+// see bug #319004 -- clamp title and URL to generously-large but not too large
|
||||
+// length
|
||||
+#define HISTORY_URI_LENGTH_MAX 65536
|
||||
+#define HISTORY_TITLE_LENGTH_MAX 4096
|
||||
+
|
||||
// sync history every 10 seconds
|
||||
#define HISTORY_SYNC_TIMEOUT (10 * PR_MSEC_PER_SEC)
|
||||
//#define HISTORY_SYNC_TIMEOUT 3000 // every 3 seconds - testing only!
|
||||
@@ -589,6 +594,9 @@ nsGlobalHistory::AddURI(nsIURI *aURI, PR
|
||||
rv = aURI->GetSpec(URISpec);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
+ if (URISpec.Length() > HISTORY_URI_LENGTH_MAX)
|
||||
+ return NS_OK;
|
||||
+
|
||||
nsCAutoString referrerSpec;
|
||||
if (aReferrer) {
|
||||
rv = aReferrer->GetSpec(referrerSpec);
|
||||
@@ -1033,7 +1041,7 @@ nsGlobalHistory::SetPageTitle(nsIURI *aU
|
||||
nsresult rv;
|
||||
NS_ENSURE_ARG_POINTER(aURI);
|
||||
|
||||
- const nsAFlatString& titleString = PromiseFlatString(aTitle);
|
||||
+ nsAutoString titleString(StringHead(aTitle, HISTORY_TITLE_LENGTH_MAX));
|
||||
|
||||
// skip about: URIs to avoid reading in the db (about:blank, especially)
|
||||
PRBool isAbout;
|
||||
@@ -1333,6 +1341,9 @@ nsGlobalHistory::HidePage(nsIURI *aURI)
|
||||
rv = aURI->GetSpec(URISpec);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
+ if (URISpec.Length() > HISTORY_URI_LENGTH_MAX)
|
||||
+ return NS_OK;
|
||||
+
|
||||
nsCOMPtr<nsIMdbRow> row;
|
||||
|
||||
rv = FindRow(kToken_URLColumn, URISpec.get(), getter_AddRefs(row));
|
||||
@@ -1365,6 +1376,9 @@ nsGlobalHistory::MarkPageAsTyped(nsIURI
|
||||
nsCAutoString spec;
|
||||
nsresult rv = aURI->GetSpec(spec);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
+
|
||||
+ if (spec.Length() > HISTORY_URI_LENGTH_MAX)
|
||||
+ return NS_OK;
|
||||
|
||||
nsCOMPtr<nsIMdbRow> row;
|
||||
rv = FindRow(kToken_URLColumn, spec.get(), getter_AddRefs(row));
|
||||
Loading…
Reference in New Issue
Block a user