diff options
25 files changed, 90 insertions, 615 deletions
diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile index 30792bc..02a79a5 100644 --- a/www/mozilla-devel/Makefile +++ b/www/mozilla-devel/Makefile @@ -6,15 +6,14 @@ # PORTNAME= mozilla -PORTVERSION= 1.0.rc1 -PORTREVISION= 3 +PORTVERSION= 1.0.rc2 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} \ - ${MASTER_SITE_LOCAL:S,$,:local,} + http://people.FreeBSD.org/~marcus/:local MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION:S/.rc/rc/}/src \ sobomax/:local -DISTFILES= ${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} \ +DISTFILES= ${PORTNAME}-source-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \ libart_lgpl-${PORTVERSION}${EXTRACT_SUFX}:local MAINTAINER= gnome@FreeBSD.org diff --git a/www/mozilla-devel/distinfo b/www/mozilla-devel/distinfo index 62a62f1..893c080 100644 --- a/www/mozilla-devel/distinfo +++ b/www/mozilla-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (mozilla-source-1.0.rc1.tar.bz2) = 04d3126991bf273ef8e818feea7afaaa -MD5 (libart_lgpl-1.0.rc1.tar.bz2) = 5ddb071a3b7bdb53913e0083a6d87673 +MD5 (mozilla-source-1.0rc2.tar.bz2) = 974255bcb7bdff8517f26ece0f8b0fbc +MD5 (libart_lgpl-1.0.rc2.tar.bz2) = 5ddb071a3b7bdb53913e0083a6d87673 diff --git a/www/mozilla-devel/files/patch-qt b/www/mozilla-devel/files/patch-qt index 985984b..acec8e2 100644 --- a/www/mozilla-devel/files/patch-qt +++ b/www/mozilla-devel/files/patch-qt @@ -1,16 +1,6 @@ ---- configure.orig Fri May 10 17:05:47 2002 -+++ configure Fri May 10 17:06:17 2002 -@@ -6256,6 +6256,9 @@ - # for stuff like -lXshm - CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}" - ;; -+freebsd*) -+ CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}" -+ ;; - esac - for ac_hdr in sys/byteorder.h compat.h getopt.h - do -@@ -7489,7 +7492,7 @@ +--- configure.orig Wed May 8 22:24:05 2002 ++++ configure Mon May 13 01:18:53 2002 +@@ -7489,7 +7489,7 @@ EOF if test "$ac_cv_have_dash_pthread" = "yes"; then @@ -19,7 +9,7 @@ else _PTHREAD_LDFLAGS="-lc_r" fi -@@ -9927,7 +9930,7 @@ +@@ -9967,7 +9967,7 @@ fi MOC=$HOST_MOC @@ -28,16 +18,14 @@ QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11" # Check whether --with-static-qt or --without-static-qt was given. -@@ -10796,7 +10799,7 @@ +@@ -10836,13 +10836,13 @@ --MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector irc" -+MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector" +-MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector irc universalchardet" ++MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector universalchardet" - case "$target_os" in - msvc*|mksnt*|mingw*|cygwin*) -@@ -10808,7 +10811,7 @@ + if test -n "$SUNCTL"; then MOZ_EXTENSIONS_DEFAULT="$MOZ_EXTENSIONS_DEFAULT ctl" fi diff --git a/www/mozilla-devel/files/patch-security_fix b/www/mozilla-devel/files/patch-security_fix deleted file mode 100644 index 0642799..0000000 --- a/www/mozilla-devel/files/patch-security_fix +++ /dev/null @@ -1,97 +0,0 @@ -Index: uriloader/base/nsDocLoader.cpp -=================================================================== -RCS file: /cvsroot/mozilla/uriloader/base/nsDocLoader.cpp,v -retrieving revision 3.251 -diff -u -r3.251 nsDocLoader.cpp ---- uriloader/base/nsDocLoader.cpp 17 Apr 2002 03:48:37 -0000 3.251 -+++ uriloader/base/nsDocLoader.cpp 30 Apr 2002 19:02:19 -0000 -@@ -1263,6 +1263,7 @@ - rv = aNewChannel->GetURI(getter_AddRefs(newURI)); - if (NS_FAILED(rv)) return rv; - -+#ifdef HTTP_DOESNT_CALL_CHECKLOADURI - // verify that this is a legal redirect - nsCOMPtr<nsIScriptSecurityManager> securityManager = - do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); -@@ -1270,6 +1271,7 @@ - rv = securityManager->CheckLoadURI(oldURI, newURI, - nsIScriptSecurityManager::DISALLOW_FROM_MAIL); - if (NS_FAILED(rv)) return rv; -+#endif - - nsLoadFlags loadFlags = 0; - PRInt32 stateFlags = nsIWebProgressListener::STATE_REDIRECTING | -Index: netwerk/protocol/http/src/Makefile.in -=================================================================== -RCS file: /cvsroot/mozilla/netwerk/protocol/http/src/Makefile.in,v -retrieving revision 1.56 -diff -u -r1.56 Makefile.in ---- netwerk/protocol/http/src/Makefile.in 19 Apr 2002 22:25:18 -0000 1.56 -+++ netwerk/protocol/http/src/Makefile.in 30 Apr 2002 19:02:19 -0000 -@@ -36,6 +36,8 @@ - intl \ - exthandler \ - caps \ -+ xpconnect \ -+ js \ - $(NULL) - - CPPSRCS = \ -Index: netwerk/protocol/http/src/nsHttpChannel.cpp -=================================================================== -RCS file: /cvsroot/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp,v -retrieving revision 1.114 -diff -u -r1.114 nsHttpChannel.cpp ---- netwerk/protocol/http/src/nsHttpChannel.cpp 26 Apr 2002 22:50:50 -0000 1.114 -+++ netwerk/protocol/http/src/nsHttpChannel.cpp 30 Apr 2002 19:02:19 -0000 -@@ -34,6 +34,7 @@ - #include "nsISupportsPrimitives.h" - #include "nsIURL.h" - #include "nsIMIMEService.h" -+#include "nsIScriptSecurityManager.h" - #include "nsCExternalHandlerService.h" - #include "nsMimeTypes.h" - #include "nsNetUtil.h" -@@ -1465,6 +1466,15 @@ - rv = ioService->NewURI(nsDependentCString(location), nsnull, mURI, - getter_AddRefs(newURI)); - if (NS_FAILED(rv)) return rv; -+ -+ // verify that this is a legal redirect -+ nsCOMPtr<nsIScriptSecurityManager> securityManager = -+ do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID); -+ if (securityManager) { -+ rv = securityManager->CheckLoadURI(mURI, newURI, -+ nsIScriptSecurityManager::DISALLOW_FROM_MAIL); -+ if (NS_FAILED(rv)) return rv; -+ } - - // Kill the current cache entry if we are redirecting - // back to ourself. ---- htmlparser/src/CNavDTD.cpp.orig Sat May 4 00:32:17 2002 -+++ htmlparser/src/CNavDTD.cpp Sat May 4 01:14:59 2002 -@@ -473,14 +473,14 @@ - - nsresult result = NS_OK; - -- if (aTokenizer && mSink && aParser) { -+ if (aTokenizer && aParser) { - nsITokenizer* oldTokenizer = mTokenizer; - - mTokenizer = aTokenizer; - mParser = (nsParser*)aParser; - mTokenAllocator = mTokenizer->GetTokenAllocator(); - -- -+ if (mSink) { - if (mBodyContext->GetCount() == 0) { - CStartToken* theToken=nsnull; - if(ePlainText==mDocType) { -@@ -537,6 +537,7 @@ - } - }//while - mTokenizer = oldTokenizer; -+ } - } - - return result; diff --git a/www/mozilla-devel/pkg-plist b/www/mozilla-devel/pkg-plist index 6986ca3..33e44f3 100644 --- a/www/mozilla-devel/pkg-plist +++ b/www/mozilla-devel/pkg-plist @@ -26,6 +26,7 @@ lib/mozilla/chrome/installed-chrome.txt lib/mozilla/chrome/messenger.jar lib/mozilla/chrome/modern.jar lib/mozilla/chrome/overlayinfo/communicator/content/overlays.rdf +lib/mozilla/chrome/overlayinfo/cookie/content/overlays.rdf lib/mozilla/chrome/overlayinfo/editor/content/overlays.rdf lib/mozilla/chrome/overlayinfo/inspector/content/overlays.rdf lib/mozilla/chrome/overlayinfo/messenger/content/overlays.rdf @@ -178,6 +179,7 @@ lib/mozilla/components/libucvmath.so lib/mozilla/components/libucvtw.so lib/mozilla/components/libucvtw2.so lib/mozilla/components/libunicharutil.so +lib/mozilla/components/libuniversalchardet.so lib/mozilla/components/liburiloader.so lib/mozilla/components/libvcard.so lib/mozilla/components/libwallet.so @@ -225,6 +227,7 @@ lib/mozilla/components/nsDictionary.js lib/mozilla/components/nsDownloadProgressListener.js lib/mozilla/components/nsFilePicker.js lib/mozilla/components/nsHelperAppDlg.js +lib/mozilla/components/nsKillAll.js lib/mozilla/components/nsLDAPPrefsService.js lib/mozilla/components/nsProgressDialog.js lib/mozilla/components/nsProxyAutoConfig.js @@ -582,6 +585,8 @@ lib/mozilla/xpt_link @dirrm lib/mozilla/chrome/overlayinfo/inspector @dirrm lib/mozilla/chrome/overlayinfo/editor/content @dirrm lib/mozilla/chrome/overlayinfo/editor +@dirrm lib/mozilla/chrome/overlayinfo/cookie/content +@dirrm lib/mozilla/chrome/overlayinfo/cookie @dirrm lib/mozilla/chrome/overlayinfo/communicator/content @dirrm lib/mozilla/chrome/overlayinfo/communicator @dirrm lib/mozilla/chrome/overlayinfo diff --git a/www/mozilla-vendor/Makefile b/www/mozilla-vendor/Makefile index 30792bc..02a79a5 100644 --- a/www/mozilla-vendor/Makefile +++ b/www/mozilla-vendor/Makefile @@ -6,15 +6,14 @@ # PORTNAME= mozilla -PORTVERSION= 1.0.rc1 -PORTREVISION= 3 +PORTVERSION= 1.0.rc2 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} \ - ${MASTER_SITE_LOCAL:S,$,:local,} + http://people.FreeBSD.org/~marcus/:local MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION:S/.rc/rc/}/src \ sobomax/:local -DISTFILES= ${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} \ +DISTFILES= ${PORTNAME}-source-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \ libart_lgpl-${PORTVERSION}${EXTRACT_SUFX}:local MAINTAINER= gnome@FreeBSD.org diff --git a/www/mozilla-vendor/distinfo b/www/mozilla-vendor/distinfo index 62a62f1..893c080 100644 --- a/www/mozilla-vendor/distinfo +++ b/www/mozilla-vendor/distinfo @@ -1,2 +1,2 @@ -MD5 (mozilla-source-1.0.rc1.tar.bz2) = 04d3126991bf273ef8e818feea7afaaa -MD5 (libart_lgpl-1.0.rc1.tar.bz2) = 5ddb071a3b7bdb53913e0083a6d87673 +MD5 (mozilla-source-1.0rc2.tar.bz2) = 974255bcb7bdff8517f26ece0f8b0fbc +MD5 (libart_lgpl-1.0.rc2.tar.bz2) = 5ddb071a3b7bdb53913e0083a6d87673 diff --git a/www/mozilla-vendor/files/patch-qt b/www/mozilla-vendor/files/patch-qt index 985984b..acec8e2 100644 --- a/www/mozilla-vendor/files/patch-qt +++ b/www/mozilla-vendor/files/patch-qt @@ -1,16 +1,6 @@ ---- configure.orig Fri May 10 17:05:47 2002 -+++ configure Fri May 10 17:06:17 2002 -@@ -6256,6 +6256,9 @@ - # for stuff like -lXshm - CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}" - ;; -+freebsd*) -+ CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}" -+ ;; - esac - for ac_hdr in sys/byteorder.h compat.h getopt.h - do -@@ -7489,7 +7492,7 @@ +--- configure.orig Wed May 8 22:24:05 2002 ++++ configure Mon May 13 01:18:53 2002 +@@ -7489,7 +7489,7 @@ EOF if test "$ac_cv_have_dash_pthread" = "yes"; then @@ -19,7 +9,7 @@ else _PTHREAD_LDFLAGS="-lc_r" fi -@@ -9927,7 +9930,7 @@ +@@ -9967,7 +9967,7 @@ fi MOC=$HOST_MOC @@ -28,16 +18,14 @@ QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11" # Check whether --with-static-qt or --without-static-qt was given. -@@ -10796,7 +10799,7 @@ +@@ -10836,13 +10836,13 @@ --MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector irc" -+MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector" +-MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector irc universalchardet" ++MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector universalchardet" - case "$target_os" in - msvc*|mksnt*|mingw*|cygwin*) -@@ -10808,7 +10811,7 @@ + if test -n "$SUNCTL"; then MOZ_EXTENSIONS_DEFAULT="$MOZ_EXTENSIONS_DEFAULT ctl" fi diff --git a/www/mozilla-vendor/files/patch-security_fix b/www/mozilla-vendor/files/patch-security_fix deleted file mode 100644 index 0642799..0000000 --- a/www/mozilla-vendor/files/patch-security_fix +++ /dev/null @@ -1,97 +0,0 @@ -Index: uriloader/base/nsDocLoader.cpp -=================================================================== -RCS file: /cvsroot/mozilla/uriloader/base/nsDocLoader.cpp,v -retrieving revision 3.251 -diff -u -r3.251 nsDocLoader.cpp ---- uriloader/base/nsDocLoader.cpp 17 Apr 2002 03:48:37 -0000 3.251 -+++ uriloader/base/nsDocLoader.cpp 30 Apr 2002 19:02:19 -0000 -@@ -1263,6 +1263,7 @@ - rv = aNewChannel->GetURI(getter_AddRefs(newURI)); - if (NS_FAILED(rv)) return rv; - -+#ifdef HTTP_DOESNT_CALL_CHECKLOADURI - // verify that this is a legal redirect - nsCOMPtr<nsIScriptSecurityManager> securityManager = - do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); -@@ -1270,6 +1271,7 @@ - rv = securityManager->CheckLoadURI(oldURI, newURI, - nsIScriptSecurityManager::DISALLOW_FROM_MAIL); - if (NS_FAILED(rv)) return rv; -+#endif - - nsLoadFlags loadFlags = 0; - PRInt32 stateFlags = nsIWebProgressListener::STATE_REDIRECTING | -Index: netwerk/protocol/http/src/Makefile.in -=================================================================== -RCS file: /cvsroot/mozilla/netwerk/protocol/http/src/Makefile.in,v -retrieving revision 1.56 -diff -u -r1.56 Makefile.in ---- netwerk/protocol/http/src/Makefile.in 19 Apr 2002 22:25:18 -0000 1.56 -+++ netwerk/protocol/http/src/Makefile.in 30 Apr 2002 19:02:19 -0000 -@@ -36,6 +36,8 @@ - intl \ - exthandler \ - caps \ -+ xpconnect \ -+ js \ - $(NULL) - - CPPSRCS = \ -Index: netwerk/protocol/http/src/nsHttpChannel.cpp -=================================================================== -RCS file: /cvsroot/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp,v -retrieving revision 1.114 -diff -u -r1.114 nsHttpChannel.cpp ---- netwerk/protocol/http/src/nsHttpChannel.cpp 26 Apr 2002 22:50:50 -0000 1.114 -+++ netwerk/protocol/http/src/nsHttpChannel.cpp 30 Apr 2002 19:02:19 -0000 -@@ -34,6 +34,7 @@ - #include "nsISupportsPrimitives.h" - #include "nsIURL.h" - #include "nsIMIMEService.h" -+#include "nsIScriptSecurityManager.h" - #include "nsCExternalHandlerService.h" - #include "nsMimeTypes.h" - #include "nsNetUtil.h" -@@ -1465,6 +1466,15 @@ - rv = ioService->NewURI(nsDependentCString(location), nsnull, mURI, - getter_AddRefs(newURI)); - if (NS_FAILED(rv)) return rv; -+ -+ // verify that this is a legal redirect -+ nsCOMPtr<nsIScriptSecurityManager> securityManager = -+ do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID); -+ if (securityManager) { -+ rv = securityManager->CheckLoadURI(mURI, newURI, -+ nsIScriptSecurityManager::DISALLOW_FROM_MAIL); -+ if (NS_FAILED(rv)) return rv; -+ } - - // Kill the current cache entry if we are redirecting - // back to ourself. ---- htmlparser/src/CNavDTD.cpp.orig Sat May 4 00:32:17 2002 -+++ htmlparser/src/CNavDTD.cpp Sat May 4 01:14:59 2002 -@@ -473,14 +473,14 @@ - - nsresult result = NS_OK; - -- if (aTokenizer && mSink && aParser) { -+ if (aTokenizer && aParser) { - nsITokenizer* oldTokenizer = mTokenizer; - - mTokenizer = aTokenizer; - mParser = (nsParser*)aParser; - mTokenAllocator = mTokenizer->GetTokenAllocator(); - -- -+ if (mSink) { - if (mBodyContext->GetCount() == 0) { - CStartToken* theToken=nsnull; - if(ePlainText==mDocType) { -@@ -537,6 +537,7 @@ - } - }//while - mTokenizer = oldTokenizer; -+ } - } - - return result; diff --git a/www/mozilla-vendor/pkg-plist b/www/mozilla-vendor/pkg-plist index 6986ca3..33e44f3 100644 --- a/www/mozilla-vendor/pkg-plist +++ b/www/mozilla-vendor/pkg-plist @@ -26,6 +26,7 @@ lib/mozilla/chrome/installed-chrome.txt lib/mozilla/chrome/messenger.jar lib/mozilla/chrome/modern.jar lib/mozilla/chrome/overlayinfo/communicator/content/overlays.rdf +lib/mozilla/chrome/overlayinfo/cookie/content/overlays.rdf lib/mozilla/chrome/overlayinfo/editor/content/overlays.rdf lib/mozilla/chrome/overlayinfo/inspector/content/overlays.rdf lib/mozilla/chrome/overlayinfo/messenger/content/overlays.rdf @@ -178,6 +179,7 @@ lib/mozilla/components/libucvmath.so lib/mozilla/components/libucvtw.so lib/mozilla/components/libucvtw2.so lib/mozilla/components/libunicharutil.so +lib/mozilla/components/libuniversalchardet.so lib/mozilla/components/liburiloader.so lib/mozilla/components/libvcard.so lib/mozilla/components/libwallet.so @@ -225,6 +227,7 @@ lib/mozilla/components/nsDictionary.js lib/mozilla/components/nsDownloadProgressListener.js lib/mozilla/components/nsFilePicker.js lib/mozilla/components/nsHelperAppDlg.js +lib/mozilla/components/nsKillAll.js lib/mozilla/components/nsLDAPPrefsService.js lib/mozilla/components/nsProgressDialog.js lib/mozilla/components/nsProxyAutoConfig.js @@ -582,6 +585,8 @@ lib/mozilla/xpt_link @dirrm lib/mozilla/chrome/overlayinfo/inspector @dirrm lib/mozilla/chrome/overlayinfo/editor/content @dirrm lib/mozilla/chrome/overlayinfo/editor +@dirrm lib/mozilla/chrome/overlayinfo/cookie/content +@dirrm lib/mozilla/chrome/overlayinfo/cookie @dirrm lib/mozilla/chrome/overlayinfo/communicator/content @dirrm lib/mozilla/chrome/overlayinfo/communicator @dirrm lib/mozilla/chrome/overlayinfo diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 30792bc..02a79a5 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -6,15 +6,14 @@ # PORTNAME= mozilla -PORTVERSION= 1.0.rc1 -PORTREVISION= 3 +PORTVERSION= 1.0.rc2 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} \ - ${MASTER_SITE_LOCAL:S,$,:local,} + http://people.FreeBSD.org/~marcus/:local MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION:S/.rc/rc/}/src \ sobomax/:local -DISTFILES= ${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} \ +DISTFILES= ${PORTNAME}-source-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \ libart_lgpl-${PORTVERSION}${EXTRACT_SUFX}:local MAINTAINER= gnome@FreeBSD.org diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo index 62a62f1..893c080 100644 --- a/www/mozilla/distinfo +++ b/www/mozilla/distinfo @@ -1,2 +1,2 @@ -MD5 (mozilla-source-1.0.rc1.tar.bz2) = 04d3126991bf273ef8e818feea7afaaa -MD5 (libart_lgpl-1.0.rc1.tar.bz2) = 5ddb071a3b7bdb53913e0083a6d87673 +MD5 (mozilla-source-1.0rc2.tar.bz2) = 974255bcb7bdff8517f26ece0f8b0fbc +MD5 (libart_lgpl-1.0.rc2.tar.bz2) = 5ddb071a3b7bdb53913e0083a6d87673 diff --git a/www/mozilla/files/patch-qt b/www/mozilla/files/patch-qt index 985984b..acec8e2 100644 --- a/www/mozilla/files/patch-qt +++ b/www/mozilla/files/patch-qt @@ -1,16 +1,6 @@ ---- configure.orig Fri May 10 17:05:47 2002 -+++ configure Fri May 10 17:06:17 2002 -@@ -6256,6 +6256,9 @@ - # for stuff like -lXshm - CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}" - ;; -+freebsd*) -+ CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}" -+ ;; - esac - for ac_hdr in sys/byteorder.h compat.h getopt.h - do -@@ -7489,7 +7492,7 @@ +--- configure.orig Wed May 8 22:24:05 2002 ++++ configure Mon May 13 01:18:53 2002 +@@ -7489,7 +7489,7 @@ EOF if test "$ac_cv_have_dash_pthread" = "yes"; then @@ -19,7 +9,7 @@ else _PTHREAD_LDFLAGS="-lc_r" fi -@@ -9927,7 +9930,7 @@ +@@ -9967,7 +9967,7 @@ fi MOC=$HOST_MOC @@ -28,16 +18,14 @@ QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11" # Check whether --with-static-qt or --without-static-qt was given. -@@ -10796,7 +10799,7 @@ +@@ -10836,13 +10836,13 @@ --MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector irc" -+MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector" +-MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector irc universalchardet" ++MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector universalchardet" - case "$target_os" in - msvc*|mksnt*|mingw*|cygwin*) -@@ -10808,7 +10811,7 @@ + if test -n "$SUNCTL"; then MOZ_EXTENSIONS_DEFAULT="$MOZ_EXTENSIONS_DEFAULT ctl" fi diff --git a/www/mozilla/files/patch-security_fix b/www/mozilla/files/patch-security_fix deleted file mode 100644 index 0642799..0000000 --- a/www/mozilla/files/patch-security_fix +++ /dev/null @@ -1,97 +0,0 @@ -Index: uriloader/base/nsDocLoader.cpp -=================================================================== -RCS file: /cvsroot/mozilla/uriloader/base/nsDocLoader.cpp,v -retrieving revision 3.251 -diff -u -r3.251 nsDocLoader.cpp ---- uriloader/base/nsDocLoader.cpp 17 Apr 2002 03:48:37 -0000 3.251 -+++ uriloader/base/nsDocLoader.cpp 30 Apr 2002 19:02:19 -0000 -@@ -1263,6 +1263,7 @@ - rv = aNewChannel->GetURI(getter_AddRefs(newURI)); - if (NS_FAILED(rv)) return rv; - -+#ifdef HTTP_DOESNT_CALL_CHECKLOADURI - // verify that this is a legal redirect - nsCOMPtr<nsIScriptSecurityManager> securityManager = - do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); -@@ -1270,6 +1271,7 @@ - rv = securityManager->CheckLoadURI(oldURI, newURI, - nsIScriptSecurityManager::DISALLOW_FROM_MAIL); - if (NS_FAILED(rv)) return rv; -+#endif - - nsLoadFlags loadFlags = 0; - PRInt32 stateFlags = nsIWebProgressListener::STATE_REDIRECTING | -Index: netwerk/protocol/http/src/Makefile.in -=================================================================== -RCS file: /cvsroot/mozilla/netwerk/protocol/http/src/Makefile.in,v -retrieving revision 1.56 -diff -u -r1.56 Makefile.in ---- netwerk/protocol/http/src/Makefile.in 19 Apr 2002 22:25:18 -0000 1.56 -+++ netwerk/protocol/http/src/Makefile.in 30 Apr 2002 19:02:19 -0000 -@@ -36,6 +36,8 @@ - intl \ - exthandler \ - caps \ -+ xpconnect \ -+ js \ - $(NULL) - - CPPSRCS = \ -Index: netwerk/protocol/http/src/nsHttpChannel.cpp -=================================================================== -RCS file: /cvsroot/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp,v -retrieving revision 1.114 -diff -u -r1.114 nsHttpChannel.cpp ---- netwerk/protocol/http/src/nsHttpChannel.cpp 26 Apr 2002 22:50:50 -0000 1.114 -+++ netwerk/protocol/http/src/nsHttpChannel.cpp 30 Apr 2002 19:02:19 -0000 -@@ -34,6 +34,7 @@ - #include "nsISupportsPrimitives.h" - #include "nsIURL.h" - #include "nsIMIMEService.h" -+#include "nsIScriptSecurityManager.h" - #include "nsCExternalHandlerService.h" - #include "nsMimeTypes.h" - #include "nsNetUtil.h" -@@ -1465,6 +1466,15 @@ - rv = ioService->NewURI(nsDependentCString(location), nsnull, mURI, - getter_AddRefs(newURI)); - if (NS_FAILED(rv)) return rv; -+ -+ // verify that this is a legal redirect -+ nsCOMPtr<nsIScriptSecurityManager> securityManager = -+ do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID); -+ if (securityManager) { -+ rv = securityManager->CheckLoadURI(mURI, newURI, -+ nsIScriptSecurityManager::DISALLOW_FROM_MAIL); -+ if (NS_FAILED(rv)) return rv; -+ } - - // Kill the current cache entry if we are redirecting - // back to ourself. ---- htmlparser/src/CNavDTD.cpp.orig Sat May 4 00:32:17 2002 -+++ htmlparser/src/CNavDTD.cpp Sat May 4 01:14:59 2002 -@@ -473,14 +473,14 @@ - - nsresult result = NS_OK; - -- if (aTokenizer && mSink && aParser) { -+ if (aTokenizer && aParser) { - nsITokenizer* oldTokenizer = mTokenizer; - - mTokenizer = aTokenizer; - mParser = (nsParser*)aParser; - mTokenAllocator = mTokenizer->GetTokenAllocator(); - -- -+ if (mSink) { - if (mBodyContext->GetCount() == 0) { - CStartToken* theToken=nsnull; - if(ePlainText==mDocType) { -@@ -537,6 +537,7 @@ - } - }//while - mTokenizer = oldTokenizer; -+ } - } - - return result; diff --git a/www/mozilla/pkg-plist b/www/mozilla/pkg-plist index 6986ca3..33e44f3 100644 --- a/www/mozilla/pkg-plist +++ b/www/mozilla/pkg-plist @@ -26,6 +26,7 @@ lib/mozilla/chrome/installed-chrome.txt lib/mozilla/chrome/messenger.jar lib/mozilla/chrome/modern.jar lib/mozilla/chrome/overlayinfo/communicator/content/overlays.rdf +lib/mozilla/chrome/overlayinfo/cookie/content/overlays.rdf lib/mozilla/chrome/overlayinfo/editor/content/overlays.rdf lib/mozilla/chrome/overlayinfo/inspector/content/overlays.rdf lib/mozilla/chrome/overlayinfo/messenger/content/overlays.rdf @@ -178,6 +179,7 @@ lib/mozilla/components/libucvmath.so lib/mozilla/components/libucvtw.so lib/mozilla/components/libucvtw2.so lib/mozilla/components/libunicharutil.so +lib/mozilla/components/libuniversalchardet.so lib/mozilla/components/liburiloader.so lib/mozilla/components/libvcard.so lib/mozilla/components/libwallet.so @@ -225,6 +227,7 @@ lib/mozilla/components/nsDictionary.js lib/mozilla/components/nsDownloadProgressListener.js lib/mozilla/components/nsFilePicker.js lib/mozilla/components/nsHelperAppDlg.js +lib/mozilla/components/nsKillAll.js lib/mozilla/components/nsLDAPPrefsService.js lib/mozilla/components/nsProgressDialog.js lib/mozilla/components/nsProxyAutoConfig.js @@ -582,6 +585,8 @@ lib/mozilla/xpt_link @dirrm lib/mozilla/chrome/overlayinfo/inspector @dirrm lib/mozilla/chrome/overlayinfo/editor/content @dirrm lib/mozilla/chrome/overlayinfo/editor +@dirrm lib/mozilla/chrome/overlayinfo/cookie/content +@dirrm lib/mozilla/chrome/overlayinfo/cookie @dirrm lib/mozilla/chrome/overlayinfo/communicator/content @dirrm lib/mozilla/chrome/overlayinfo/communicator @dirrm lib/mozilla/chrome/overlayinfo diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index 30792bc..02a79a5 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -6,15 +6,14 @@ # PORTNAME= mozilla -PORTVERSION= 1.0.rc1 -PORTREVISION= 3 +PORTVERSION= 1.0.rc2 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} \ - ${MASTER_SITE_LOCAL:S,$,:local,} + http://people.FreeBSD.org/~marcus/:local MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION:S/.rc/rc/}/src \ sobomax/:local -DISTFILES= ${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} \ +DISTFILES= ${PORTNAME}-source-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \ libart_lgpl-${PORTVERSION}${EXTRACT_SUFX}:local MAINTAINER= gnome@FreeBSD.org diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo index 62a62f1..893c080 100644 --- a/www/seamonkey/distinfo +++ b/www/seamonkey/distinfo @@ -1,2 +1,2 @@ -MD5 (mozilla-source-1.0.rc1.tar.bz2) = 04d3126991bf273ef8e818feea7afaaa -MD5 (libart_lgpl-1.0.rc1.tar.bz2) = 5ddb071a3b7bdb53913e0083a6d87673 +MD5 (mozilla-source-1.0rc2.tar.bz2) = 974255bcb7bdff8517f26ece0f8b0fbc +MD5 (libart_lgpl-1.0.rc2.tar.bz2) = 5ddb071a3b7bdb53913e0083a6d87673 diff --git a/www/seamonkey/files/patch-qt b/www/seamonkey/files/patch-qt index 985984b..acec8e2 100644 --- a/www/seamonkey/files/patch-qt +++ b/www/seamonkey/files/patch-qt @@ -1,16 +1,6 @@ ---- configure.orig Fri May 10 17:05:47 2002 -+++ configure Fri May 10 17:06:17 2002 -@@ -6256,6 +6256,9 @@ - # for stuff like -lXshm - CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}" - ;; -+freebsd*) -+ CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}" -+ ;; - esac - for ac_hdr in sys/byteorder.h compat.h getopt.h - do -@@ -7489,7 +7492,7 @@ +--- configure.orig Wed May 8 22:24:05 2002 ++++ configure Mon May 13 01:18:53 2002 +@@ -7489,7 +7489,7 @@ EOF if test "$ac_cv_have_dash_pthread" = "yes"; then @@ -19,7 +9,7 @@ else _PTHREAD_LDFLAGS="-lc_r" fi -@@ -9927,7 +9930,7 @@ +@@ -9967,7 +9967,7 @@ fi MOC=$HOST_MOC @@ -28,16 +18,14 @@ QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11" # Check whether --with-static-qt or --without-static-qt was given. -@@ -10796,7 +10799,7 @@ +@@ -10836,13 +10836,13 @@ --MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector irc" -+MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector" +-MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector irc universalchardet" ++MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector universalchardet" - case "$target_os" in - msvc*|mksnt*|mingw*|cygwin*) -@@ -10808,7 +10811,7 @@ + if test -n "$SUNCTL"; then MOZ_EXTENSIONS_DEFAULT="$MOZ_EXTENSIONS_DEFAULT ctl" fi diff --git a/www/seamonkey/files/patch-security_fix b/www/seamonkey/files/patch-security_fix deleted file mode 100644 index 0642799..0000000 --- a/www/seamonkey/files/patch-security_fix +++ /dev/null @@ -1,97 +0,0 @@ -Index: uriloader/base/nsDocLoader.cpp -=================================================================== -RCS file: /cvsroot/mozilla/uriloader/base/nsDocLoader.cpp,v -retrieving revision 3.251 -diff -u -r3.251 nsDocLoader.cpp ---- uriloader/base/nsDocLoader.cpp 17 Apr 2002 03:48:37 -0000 3.251 -+++ uriloader/base/nsDocLoader.cpp 30 Apr 2002 19:02:19 -0000 -@@ -1263,6 +1263,7 @@ - rv = aNewChannel->GetURI(getter_AddRefs(newURI)); - if (NS_FAILED(rv)) return rv; - -+#ifdef HTTP_DOESNT_CALL_CHECKLOADURI - // verify that this is a legal redirect - nsCOMPtr<nsIScriptSecurityManager> securityManager = - do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); -@@ -1270,6 +1271,7 @@ - rv = securityManager->CheckLoadURI(oldURI, newURI, - nsIScriptSecurityManager::DISALLOW_FROM_MAIL); - if (NS_FAILED(rv)) return rv; -+#endif - - nsLoadFlags loadFlags = 0; - PRInt32 stateFlags = nsIWebProgressListener::STATE_REDIRECTING | -Index: netwerk/protocol/http/src/Makefile.in -=================================================================== -RCS file: /cvsroot/mozilla/netwerk/protocol/http/src/Makefile.in,v -retrieving revision 1.56 -diff -u -r1.56 Makefile.in ---- netwerk/protocol/http/src/Makefile.in 19 Apr 2002 22:25:18 -0000 1.56 -+++ netwerk/protocol/http/src/Makefile.in 30 Apr 2002 19:02:19 -0000 -@@ -36,6 +36,8 @@ - intl \ - exthandler \ - caps \ -+ xpconnect \ -+ js \ - $(NULL) - - CPPSRCS = \ -Index: netwerk/protocol/http/src/nsHttpChannel.cpp -=================================================================== -RCS file: /cvsroot/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp,v -retrieving revision 1.114 -diff -u -r1.114 nsHttpChannel.cpp ---- netwerk/protocol/http/src/nsHttpChannel.cpp 26 Apr 2002 22:50:50 -0000 1.114 -+++ netwerk/protocol/http/src/nsHttpChannel.cpp 30 Apr 2002 19:02:19 -0000 -@@ -34,6 +34,7 @@ - #include "nsISupportsPrimitives.h" - #include "nsIURL.h" - #include "nsIMIMEService.h" -+#include "nsIScriptSecurityManager.h" - #include "nsCExternalHandlerService.h" - #include "nsMimeTypes.h" - #include "nsNetUtil.h" -@@ -1465,6 +1466,15 @@ - rv = ioService->NewURI(nsDependentCString(location), nsnull, mURI, - getter_AddRefs(newURI)); - if (NS_FAILED(rv)) return rv; -+ -+ // verify that this is a legal redirect -+ nsCOMPtr<nsIScriptSecurityManager> securityManager = -+ do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID); -+ if (securityManager) { -+ rv = securityManager->CheckLoadURI(mURI, newURI, -+ nsIScriptSecurityManager::DISALLOW_FROM_MAIL); -+ if (NS_FAILED(rv)) return rv; -+ } - - // Kill the current cache entry if we are redirecting - // back to ourself. ---- htmlparser/src/CNavDTD.cpp.orig Sat May 4 00:32:17 2002 -+++ htmlparser/src/CNavDTD.cpp Sat May 4 01:14:59 2002 -@@ -473,14 +473,14 @@ - - nsresult result = NS_OK; - -- if (aTokenizer && mSink && aParser) { -+ if (aTokenizer && aParser) { - nsITokenizer* oldTokenizer = mTokenizer; - - mTokenizer = aTokenizer; - mParser = (nsParser*)aParser; - mTokenAllocator = mTokenizer->GetTokenAllocator(); - -- -+ if (mSink) { - if (mBodyContext->GetCount() == 0) { - CStartToken* theToken=nsnull; - if(ePlainText==mDocType) { -@@ -537,6 +537,7 @@ - } - }//while - mTokenizer = oldTokenizer; -+ } - } - - return result; diff --git a/www/seamonkey/pkg-plist b/www/seamonkey/pkg-plist index 6986ca3..33e44f3 100644 --- a/www/seamonkey/pkg-plist +++ b/www/seamonkey/pkg-plist @@ -26,6 +26,7 @@ lib/mozilla/chrome/installed-chrome.txt lib/mozilla/chrome/messenger.jar lib/mozilla/chrome/modern.jar lib/mozilla/chrome/overlayinfo/communicator/content/overlays.rdf +lib/mozilla/chrome/overlayinfo/cookie/content/overlays.rdf lib/mozilla/chrome/overlayinfo/editor/content/overlays.rdf lib/mozilla/chrome/overlayinfo/inspector/content/overlays.rdf lib/mozilla/chrome/overlayinfo/messenger/content/overlays.rdf @@ -178,6 +179,7 @@ lib/mozilla/components/libucvmath.so lib/mozilla/components/libucvtw.so lib/mozilla/components/libucvtw2.so lib/mozilla/components/libunicharutil.so +lib/mozilla/components/libuniversalchardet.so lib/mozilla/components/liburiloader.so lib/mozilla/components/libvcard.so lib/mozilla/components/libwallet.so @@ -225,6 +227,7 @@ lib/mozilla/components/nsDictionary.js lib/mozilla/components/nsDownloadProgressListener.js lib/mozilla/components/nsFilePicker.js lib/mozilla/components/nsHelperAppDlg.js +lib/mozilla/components/nsKillAll.js lib/mozilla/components/nsLDAPPrefsService.js lib/mozilla/components/nsProgressDialog.js lib/mozilla/components/nsProxyAutoConfig.js @@ -582,6 +585,8 @@ lib/mozilla/xpt_link @dirrm lib/mozilla/chrome/overlayinfo/inspector @dirrm lib/mozilla/chrome/overlayinfo/editor/content @dirrm lib/mozilla/chrome/overlayinfo/editor +@dirrm lib/mozilla/chrome/overlayinfo/cookie/content +@dirrm lib/mozilla/chrome/overlayinfo/cookie @dirrm lib/mozilla/chrome/overlayinfo/communicator/content @dirrm lib/mozilla/chrome/overlayinfo/communicator @dirrm lib/mozilla/chrome/overlayinfo diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile index 30792bc..02a79a5 100644 --- a/www/seamonkey2/Makefile +++ b/www/seamonkey2/Makefile @@ -6,15 +6,14 @@ # PORTNAME= mozilla -PORTVERSION= 1.0.rc1 -PORTREVISION= 3 +PORTVERSION= 1.0.rc2 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} \ - ${MASTER_SITE_LOCAL:S,$,:local,} + http://people.FreeBSD.org/~marcus/:local MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION:S/.rc/rc/}/src \ sobomax/:local -DISTFILES= ${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} \ +DISTFILES= ${PORTNAME}-source-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \ libart_lgpl-${PORTVERSION}${EXTRACT_SUFX}:local MAINTAINER= gnome@FreeBSD.org diff --git a/www/seamonkey2/distinfo b/www/seamonkey2/distinfo index 62a62f1..893c080 100644 --- a/www/seamonkey2/distinfo +++ b/www/seamonkey2/distinfo @@ -1,2 +1,2 @@ -MD5 (mozilla-source-1.0.rc1.tar.bz2) = 04d3126991bf273ef8e818feea7afaaa -MD5 (libart_lgpl-1.0.rc1.tar.bz2) = 5ddb071a3b7bdb53913e0083a6d87673 +MD5 (mozilla-source-1.0rc2.tar.bz2) = 974255bcb7bdff8517f26ece0f8b0fbc +MD5 (libart_lgpl-1.0.rc2.tar.bz2) = 5ddb071a3b7bdb53913e0083a6d87673 diff --git a/www/seamonkey2/files/patch-qt b/www/seamonkey2/files/patch-qt index 985984b..acec8e2 100644 --- a/www/seamonkey2/files/patch-qt +++ b/www/seamonkey2/files/patch-qt @@ -1,16 +1,6 @@ ---- configure.orig Fri May 10 17:05:47 2002 -+++ configure Fri May 10 17:06:17 2002 -@@ -6256,6 +6256,9 @@ - # for stuff like -lXshm - CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}" - ;; -+freebsd*) -+ CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}" -+ ;; - esac - for ac_hdr in sys/byteorder.h compat.h getopt.h - do -@@ -7489,7 +7492,7 @@ +--- configure.orig Wed May 8 22:24:05 2002 ++++ configure Mon May 13 01:18:53 2002 +@@ -7489,7 +7489,7 @@ EOF if test "$ac_cv_have_dash_pthread" = "yes"; then @@ -19,7 +9,7 @@ else _PTHREAD_LDFLAGS="-lc_r" fi -@@ -9927,7 +9930,7 @@ +@@ -9967,7 +9967,7 @@ fi MOC=$HOST_MOC @@ -28,16 +18,14 @@ QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11" # Check whether --with-static-qt or --without-static-qt was given. -@@ -10796,7 +10799,7 @@ +@@ -10836,13 +10836,13 @@ --MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector irc" -+MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector" +-MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector irc universalchardet" ++MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector universalchardet" - case "$target_os" in - msvc*|mksnt*|mingw*|cygwin*) -@@ -10808,7 +10811,7 @@ + if test -n "$SUNCTL"; then MOZ_EXTENSIONS_DEFAULT="$MOZ_EXTENSIONS_DEFAULT ctl" fi diff --git a/www/seamonkey2/files/patch-security_fix b/www/seamonkey2/files/patch-security_fix deleted file mode 100644 index 0642799..0000000 --- a/www/seamonkey2/files/patch-security_fix +++ /dev/null @@ -1,97 +0,0 @@ -Index: uriloader/base/nsDocLoader.cpp -=================================================================== -RCS file: /cvsroot/mozilla/uriloader/base/nsDocLoader.cpp,v -retrieving revision 3.251 -diff -u -r3.251 nsDocLoader.cpp ---- uriloader/base/nsDocLoader.cpp 17 Apr 2002 03:48:37 -0000 3.251 -+++ uriloader/base/nsDocLoader.cpp 30 Apr 2002 19:02:19 -0000 -@@ -1263,6 +1263,7 @@ - rv = aNewChannel->GetURI(getter_AddRefs(newURI)); - if (NS_FAILED(rv)) return rv; - -+#ifdef HTTP_DOESNT_CALL_CHECKLOADURI - // verify that this is a legal redirect - nsCOMPtr<nsIScriptSecurityManager> securityManager = - do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); -@@ -1270,6 +1271,7 @@ - rv = securityManager->CheckLoadURI(oldURI, newURI, - nsIScriptSecurityManager::DISALLOW_FROM_MAIL); - if (NS_FAILED(rv)) return rv; -+#endif - - nsLoadFlags loadFlags = 0; - PRInt32 stateFlags = nsIWebProgressListener::STATE_REDIRECTING | -Index: netwerk/protocol/http/src/Makefile.in -=================================================================== -RCS file: /cvsroot/mozilla/netwerk/protocol/http/src/Makefile.in,v -retrieving revision 1.56 -diff -u -r1.56 Makefile.in ---- netwerk/protocol/http/src/Makefile.in 19 Apr 2002 22:25:18 -0000 1.56 -+++ netwerk/protocol/http/src/Makefile.in 30 Apr 2002 19:02:19 -0000 -@@ -36,6 +36,8 @@ - intl \ - exthandler \ - caps \ -+ xpconnect \ -+ js \ - $(NULL) - - CPPSRCS = \ -Index: netwerk/protocol/http/src/nsHttpChannel.cpp -=================================================================== -RCS file: /cvsroot/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp,v -retrieving revision 1.114 -diff -u -r1.114 nsHttpChannel.cpp ---- netwerk/protocol/http/src/nsHttpChannel.cpp 26 Apr 2002 22:50:50 -0000 1.114 -+++ netwerk/protocol/http/src/nsHttpChannel.cpp 30 Apr 2002 19:02:19 -0000 -@@ -34,6 +34,7 @@ - #include "nsISupportsPrimitives.h" - #include "nsIURL.h" - #include "nsIMIMEService.h" -+#include "nsIScriptSecurityManager.h" - #include "nsCExternalHandlerService.h" - #include "nsMimeTypes.h" - #include "nsNetUtil.h" -@@ -1465,6 +1466,15 @@ - rv = ioService->NewURI(nsDependentCString(location), nsnull, mURI, - getter_AddRefs(newURI)); - if (NS_FAILED(rv)) return rv; -+ -+ // verify that this is a legal redirect -+ nsCOMPtr<nsIScriptSecurityManager> securityManager = -+ do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID); -+ if (securityManager) { -+ rv = securityManager->CheckLoadURI(mURI, newURI, -+ nsIScriptSecurityManager::DISALLOW_FROM_MAIL); -+ if (NS_FAILED(rv)) return rv; -+ } - - // Kill the current cache entry if we are redirecting - // back to ourself. ---- htmlparser/src/CNavDTD.cpp.orig Sat May 4 00:32:17 2002 -+++ htmlparser/src/CNavDTD.cpp Sat May 4 01:14:59 2002 -@@ -473,14 +473,14 @@ - - nsresult result = NS_OK; - -- if (aTokenizer && mSink && aParser) { -+ if (aTokenizer && aParser) { - nsITokenizer* oldTokenizer = mTokenizer; - - mTokenizer = aTokenizer; - mParser = (nsParser*)aParser; - mTokenAllocator = mTokenizer->GetTokenAllocator(); - -- -+ if (mSink) { - if (mBodyContext->GetCount() == 0) { - CStartToken* theToken=nsnull; - if(ePlainText==mDocType) { -@@ -537,6 +537,7 @@ - } - }//while - mTokenizer = oldTokenizer; -+ } - } - - return result; diff --git a/www/seamonkey2/pkg-plist b/www/seamonkey2/pkg-plist index 6986ca3..33e44f3 100644 --- a/www/seamonkey2/pkg-plist +++ b/www/seamonkey2/pkg-plist @@ -26,6 +26,7 @@ lib/mozilla/chrome/installed-chrome.txt lib/mozilla/chrome/messenger.jar lib/mozilla/chrome/modern.jar lib/mozilla/chrome/overlayinfo/communicator/content/overlays.rdf +lib/mozilla/chrome/overlayinfo/cookie/content/overlays.rdf lib/mozilla/chrome/overlayinfo/editor/content/overlays.rdf lib/mozilla/chrome/overlayinfo/inspector/content/overlays.rdf lib/mozilla/chrome/overlayinfo/messenger/content/overlays.rdf @@ -178,6 +179,7 @@ lib/mozilla/components/libucvmath.so lib/mozilla/components/libucvtw.so lib/mozilla/components/libucvtw2.so lib/mozilla/components/libunicharutil.so +lib/mozilla/components/libuniversalchardet.so lib/mozilla/components/liburiloader.so lib/mozilla/components/libvcard.so lib/mozilla/components/libwallet.so @@ -225,6 +227,7 @@ lib/mozilla/components/nsDictionary.js lib/mozilla/components/nsDownloadProgressListener.js lib/mozilla/components/nsFilePicker.js lib/mozilla/components/nsHelperAppDlg.js +lib/mozilla/components/nsKillAll.js lib/mozilla/components/nsLDAPPrefsService.js lib/mozilla/components/nsProgressDialog.js lib/mozilla/components/nsProxyAutoConfig.js @@ -582,6 +585,8 @@ lib/mozilla/xpt_link @dirrm lib/mozilla/chrome/overlayinfo/inspector @dirrm lib/mozilla/chrome/overlayinfo/editor/content @dirrm lib/mozilla/chrome/overlayinfo/editor +@dirrm lib/mozilla/chrome/overlayinfo/cookie/content +@dirrm lib/mozilla/chrome/overlayinfo/cookie @dirrm lib/mozilla/chrome/overlayinfo/communicator/content @dirrm lib/mozilla/chrome/overlayinfo/communicator @dirrm lib/mozilla/chrome/overlayinfo |
