Yo,

here are updates to mozilla ports, fixing a bunch of MFSA : 2010-34 ->
2010-47, see for reference
http://www.mozilla.org/security/known-vulnerabilities/firefox36.html#firefox3.6.7

As it's a bugfix/security update, there should be no fallout, but who
knows.. so test if you care. Builds fine @amd64/sparc64.

Ffx 3.5.11 will come later, and i'll update the thunderbird 3.1.x diff
to match 3.1.1 release.

Landry
? build.log
? build3
? build4
? build5
? todo
? xul
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/xulrunner/1.9/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- Makefile    19 Jul 2010 13:46:27 -0000      1.18
+++ Makefile    21 Jul 2010 11:01:35 -0000
@@ -2,16 +2,15 @@
 
 ONLY_FOR_ARCHS=                alpha amd64 arm i386 powerpc sparc sparc64
 
-VERSION=               1.9.2.6
-REVISION-main=         1
-REVISION-devel=                3
+VERSION=               1.9.2.7
+FFX_VERSION=           3.6.7
 DIRECTORY=             xulrunner1.9
 # needed for mozilla.port.mk
 MOZILLA_PROJECT=       xulrunner1.9
 DISTNAME=              mozilla-1.9.2
-DISTFILES=             firefox-3.6.6.source.tar.bz2
+DISTFILES=             firefox-${FFX_VERSION}.source.tar.bz2
 
-MASTER_SITES=  
http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.6/source/
+MASTER_SITES=  
http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${FFX_VERSION}/source/
 
 SO_VERSION=            3.0
 # NOTE: Must bump minor version if any shlib's are removed from the
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/xulrunner/1.9/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo    28 Jun 2010 21:25:28 -0000      1.7
+++ distinfo    21 Jul 2010 11:01:35 -0000
@@ -1,5 +1,5 @@
-MD5 (firefox-3.6.6.source.tar.bz2) = yaBxsxu5DQXt+5MRfQp1Nw==
-RMD160 (firefox-3.6.6.source.tar.bz2) = wc9bcq5C6c6YuN7P6InDMueIUMg=
-SHA1 (firefox-3.6.6.source.tar.bz2) = kHu/NXvWUok6WPu2QffnsrTcH1c=
-SHA256 (firefox-3.6.6.source.tar.bz2) = 
WbhycflAaE9Rzda+y8/a+ZpaWICUi6B879B0dMmrBrM=
-SIZE (firefox-3.6.6.source.tar.bz2) = 51076968
+MD5 (firefox-3.6.7.source.tar.bz2) = 4kBUGJh2bkSkB+VDxw1JSQ==
+RMD160 (firefox-3.6.7.source.tar.bz2) = bW7KV6JGQXJdzlcd6lvjdQ0Lt+E=
+SHA1 (firefox-3.6.7.source.tar.bz2) = EsWEpj6m3buSUwlK1QC8awRpA6Y=
+SHA256 (firefox-3.6.7.source.tar.bz2) = 
DnUcchjJfo4tYACzrAiJbI2usu5XiXWhXpCzjKWUm00=
+SIZE (firefox-3.6.7.source.tar.bz2) = 51233147
Index: pkg/PLIST-devel
===================================================================
RCS file: /cvs/ports/devel/xulrunner/1.9/pkg/PLIST-devel,v
retrieving revision 1.7
diff -u -r1.7 PLIST-devel
--- pkg/PLIST-devel     11 Jul 2010 14:55:56 -0000      1.7
+++ pkg/PLIST-devel     21 Jul 2010 11:01:35 -0000
@@ -847,6 +847,7 @@
 ${MOZILLA_PROJECT}/idl/nsIProxyAutoConfig.idl
 ${MOZILLA_PROJECT}/idl/nsIProxyInfo.idl
 ${MOZILLA_PROJECT}/idl/nsIProxyObjectManager.idl
+${MOZILLA_PROJECT}/idl/nsIQueryContentEventResult.idl
 ${MOZILLA_PROJECT}/idl/nsIRDFCompositeDataSource.idl
 ${MOZILLA_PROJECT}/idl/nsIRDFContainer.idl
 ${MOZILLA_PROJECT}/idl/nsIRDFContainerUtils.idl
@@ -2406,6 +2407,7 @@
 ${MOZILLA_PROJECT}/include/nsIProxyAutoConfig.h
 ${MOZILLA_PROJECT}/include/nsIProxyInfo.h
 ${MOZILLA_PROJECT}/include/nsIProxyObjectManager.h
+${MOZILLA_PROJECT}/include/nsIQueryContentEventResult.h
 ${MOZILLA_PROJECT}/include/nsIRDFCompositeDataSource.h
 ${MOZILLA_PROJECT}/include/nsIRDFContainer.h
 ${MOZILLA_PROJECT}/include/nsIRDFContainerUtils.h
? Makefile30
? old
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/mozilla-firefox/Makefile,v
retrieving revision 1.143
diff -u -r1.143 Makefile
--- Makefile    19 Jul 2010 13:46:27 -0000      1.143
+++ Makefile    21 Jul 2010 09:02:32 -0000
@@ -3,12 +3,11 @@
 COMMENT =      Mozilla web browser
 
 # Don't forget to bump www/firefox-i18n after updates.
-MOZILLA_VERSION =      3.6.6
+MOZILLA_VERSION =      3.6.7
 MOZILLA_BRANCH =       1.9.2
 MOZILLA_PROJECT =      mozilla-firefox
 MOZILLA_CODENAME =     browser
 
-REVISION =     1
 SO_VERSION =   22.0
 # NOTE: Must bump minor version if any shlib's are removed from the
 # components dir to avoid pkg_add -r issues.
@@ -48,6 +47,10 @@
 
 MOZILLA_AUTOCONF_DIRS +=       js/src
 MOZILLA_SUBST_FILES +=         config/autoconf.mk.in
+
+# remove file that confuses make update-patches
+pre-patch:
+       rm ${WRKSRC}/toolkit/mozapps/extensions/test/unit/*.orig
 
 post-install:
        ${INSTALL_DATA} ${FILESDIR}/browserconfig.properties ${MOB}/LICENSE 
${MOB}/blocklist.xml ${MOZ}
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/mozilla-firefox/distinfo,v
retrieving revision 1.55
diff -u -r1.55 distinfo
--- distinfo    28 Jun 2010 21:24:22 -0000      1.55
+++ distinfo    21 Jul 2010 09:02:32 -0000
@@ -1,5 +1,5 @@
-MD5 (firefox-3.6.6.source.tar.bz2) = yaBxsxu5DQXt+5MRfQp1Nw==
-RMD160 (firefox-3.6.6.source.tar.bz2) = wc9bcq5C6c6YuN7P6InDMueIUMg=
-SHA1 (firefox-3.6.6.source.tar.bz2) = kHu/NXvWUok6WPu2QffnsrTcH1c=
-SHA256 (firefox-3.6.6.source.tar.bz2) = 
WbhycflAaE9Rzda+y8/a+ZpaWICUi6B879B0dMmrBrM=
-SIZE (firefox-3.6.6.source.tar.bz2) = 51076968
+MD5 (firefox-3.6.7.source.tar.bz2) = 4kBUGJh2bkSkB+VDxw1JSQ==
+RMD160 (firefox-3.6.7.source.tar.bz2) = bW7KV6JGQXJdzlcd6lvjdQ0Lt+E=
+SHA1 (firefox-3.6.7.source.tar.bz2) = EsWEpj6m3buSUwlK1QC8awRpA6Y=
+SHA256 (firefox-3.6.7.source.tar.bz2) = 
DnUcchjJfo4tYACzrAiJbI2usu5XiXWhXpCzjKWUm00=
+SIZE (firefox-3.6.7.source.tar.bz2) = 51233147
Index: patches/patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp
===================================================================
RCS file: 
/cvs/ports/www/mozilla-firefox/patches/patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp,v
retrieving revision 1.3
diff -u -r1.3 patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp
--- patches/patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp    28 Apr 
2010 06:56:38 -0000      1.3
+++ patches/patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp    21 Jul 
2010 09:02:32 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp,v 1.3 
2010/04/28 06:56:38 landry Exp $
---- extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig    Fri Oct  5 
22:13:18 2007
-+++ extensions/spellcheck/hunspell/src/mozHunspell.cpp Thu Sep 25 01:30:45 2008
+--- extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig    Tue Jul 13 
21:10:13 2010
++++ extensions/spellcheck/hunspell/src/mozHunspell.cpp Wed Jul 21 09:54:44 2010
 @@ -63,6 +63,7 @@
  #include "nsISimpleEnumerator.h"
  #include "nsIDirectoryEnumerator.h"
@@ -9,7 +9,7 @@
  #include "nsDirectoryServiceUtils.h"
  #include "nsDirectoryServiceDefs.h"
  #include "mozISpellI18NManager.h"
-@@ -331,6 +332,16 @@ mozHunspell::LoadDictionaryList()
+@@ -342,6 +343,16 @@ mozHunspell::LoadDictionaryList()
        appDir->AppendNative(NS_LITERAL_CSTRING("dictionaries"));
        LoadDictionariesFromDir(appDir);
      }
Index: patches/patch-media_libsydneyaudio_src_Makefile_in
===================================================================
RCS file: 
/cvs/ports/www/mozilla-firefox/patches/patch-media_libsydneyaudio_src_Makefile_in,v
retrieving revision 1.1
diff -u -r1.1 patch-media_libsydneyaudio_src_Makefile_in
--- patches/patch-media_libsydneyaudio_src_Makefile_in  26 Apr 2010 19:55:58 
-0000      1.1
+++ patches/patch-media_libsydneyaudio_src_Makefile_in  21 Jul 2010 09:02:32 
-0000
@@ -1,8 +1,8 @@
 $OpenBSD: patch-media_libsydneyaudio_src_Makefile_in,v 1.1 2010/04/26 19:55:58 
landry Exp $
---- media/libsydneyaudio/src/Makefile.in.orig  Mon Aug 24 18:52:50 2009
-+++ media/libsydneyaudio/src/Makefile.in       Thu Sep 10 23:35:11 2009
-@@ -77,6 +77,12 @@ CSRCS               = \
-               $(NULL)
+--- media/libsydneyaudio/src/Makefile.in.orig  Tue Jul 13 21:10:28 2010
++++ media/libsydneyaudio/src/Makefile.in       Wed Jul 21 09:54:46 2010
+@@ -83,6 +83,12 @@ CSRCS         = \
+               $(NULL)
  endif
  
 +ifeq ($(OS_ARCH),OpenBSD)
Index: patches/patch-toolkit_components_downloads_src_nsDownloadManager_cpp
===================================================================
RCS file: 
/cvs/ports/www/mozilla-firefox/patches/patch-toolkit_components_downloads_src_nsDownloadManager_cpp,v
retrieving revision 1.2
diff -u -r1.2 patch-toolkit_components_downloads_src_nsDownloadManager_cpp
--- patches/patch-toolkit_components_downloads_src_nsDownloadManager_cpp        
26 Apr 2010 19:55:58 -0000      1.2
+++ patches/patch-toolkit_components_downloads_src_nsDownloadManager_cpp        
21 Jul 2010 09:02:32 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-toolkit_components_downloads_src_nsDownloadManager_cpp,v 1.2 
2010/04/26 19:55:58 landry Exp $
---- toolkit/components/downloads/src/nsDownloadManager.cpp.orig        Wed Jan 
 6 05:35:32 2010
-+++ toolkit/components/downloads/src/nsDownloadManager.cpp     Sun Jan 10 
17:52:45 2010
-@@ -1156,7 +1156,7 @@ nsDownloadManager::GetDefaultDownloadsDirectory(nsILoc
+--- toolkit/components/downloads/src/nsDownloadManager.cpp.orig        Tue Jul 
13 21:10:35 2010
++++ toolkit/components/downloads/src/nsDownloadManager.cpp     Wed Jul 21 
09:54:47 2010
+@@ -1160,7 +1160,7 @@ nsDownloadManager::GetDefaultDownloadsDirectory(nsILoc
      rv = downloadDir->Exists(&exists);
      NS_ENSURE_SUCCESS(rv, rv);
      if (!exists) {
@@ -10,7 +10,7 @@
        NS_ENSURE_SUCCESS(rv, rv);
      }
    }
-@@ -1252,7 +1252,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsILocalF
+@@ -1256,7 +1256,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsILocalF
            (void)customDirectory->Exists(&exists);
  
            if (!exists) {
Index: patches/patch-toolkit_crashreporter_client_crashreporter_linux_cpp
===================================================================
RCS file: 
/cvs/ports/www/mozilla-firefox/patches/patch-toolkit_crashreporter_client_crashreporter_linux_cpp,v
retrieving revision 1.2
diff -u -r1.2 patch-toolkit_crashreporter_client_crashreporter_linux_cpp
--- patches/patch-toolkit_crashreporter_client_crashreporter_linux_cpp  28 Jun 
2010 21:24:22 -0000      1.2
+++ patches/patch-toolkit_crashreporter_client_crashreporter_linux_cpp  21 Jul 
2010 09:02:32 -0000
@@ -1,18 +1,9 @@
 $OpenBSD: patch-toolkit_crashreporter_client_crashreporter_linux_cpp,v 1.2 
2010/06/28 21:24:22 landry Exp $
---- toolkit/crashreporter/client/crashreporter_linux.cpp.orig  Fri Jun 11 
22:41:31 2010
-+++ toolkit/crashreporter/client/crashreporter_linux.cpp       Thu Jun 24 
10:08:33 2010
-@@ -215,7 +215,7 @@ static void LoadProxyinfo()
-   if (getenv ("http_proxy"))
-     return; // libcurl can use the value from the environment
+--- toolkit/crashreporter/client/crashreporter_linux.cpp.orig  Tue Jul 13 
21:10:35 2010
++++ toolkit/crashreporter/client/crashreporter_linux.cpp       Wed Jul 21 
09:54:47 2010
+@@ -362,11 +362,11 @@ typedef const GnomeModuleInfo * (*_libgnomeui_module_i
  
--  static void* gconfLib = dlopen("libgconf-2.so.4", RTLD_LAZY);
-+  static void* gconfLib = dlopen("libgconf-2.so", RTLD_LAZY);
-   if (!gconfLib)
-     return;
- 
-@@ -599,11 +599,11 @@ typedef const GnomeModuleInfo * (*_libgnomeui_module_i
- 
- static void TryInitGnome()
+ void TryInitGnome()
  {
 -  gnomeLib = dlopen("libgnome-2.so.0", RTLD_LAZY);
 +  gnomeLib = dlopen("libgnome-2.so", RTLD_LAZY);
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/Makefile,v
retrieving revision 1.96
diff -u -r1.96 Makefile
--- Makefile    9 Jul 2010 16:55:59 -0000       1.96
+++ Makefile    21 Jul 2010 09:02:16 -0000
@@ -4,12 +4,10 @@
 
 # Don't forget to bump mail/thunderbird-i18n after updates.
 
-MOZILLA_VERSION =      3.0.5
+MOZILLA_VERSION =      3.0.6
 MOZILLA_BRANCH =               1.9.1
 MOZILLA_PROJECT =      mozilla-thunderbird
 MOZILLA_CODENAME =     mail
-
-PKGNAME =      ${MOZILLA_PROJECT}-${MOZILLA_VERSION}p0
 
 # need to be in synch with SO_VERSION in www/seamonkey
 # for productivity/sunbird,-lighting and mail/enigmail to work ine
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/distinfo,v
retrieving revision 1.33
diff -u -r1.33 distinfo
--- distinfo    23 Jun 2010 17:10:48 -0000      1.33
+++ distinfo    21 Jul 2010 09:02:16 -0000
@@ -1,5 +1,5 @@
-MD5 (thunderbird-3.0.5.source.tar.bz2) = VkkRKJtdiVul6vSz++1R6A==
-RMD160 (thunderbird-3.0.5.source.tar.bz2) = pev79URP5pTL2bx6cTFGDkBMXUA=
-SHA1 (thunderbird-3.0.5.source.tar.bz2) = xRtsapNXV4vrdEDk089FlKYf1qc=
-SHA256 (thunderbird-3.0.5.source.tar.bz2) = 
FUnQLziifEXzsVPr9TbwW8+qyx637aFw5yHX72HG7qI=
-SIZE (thunderbird-3.0.5.source.tar.bz2) = 60574905
+MD5 (thunderbird-3.0.6.source.tar.bz2) = 4PGi8MHbES+RLme72K72KQ==
+RMD160 (thunderbird-3.0.6.source.tar.bz2) = qHlqv8hPYKo9DxdFSz496/shv1o=
+SHA1 (thunderbird-3.0.6.source.tar.bz2) = rRi6YxRAYNkeOqyTpHcGQ3JZboA=
+SHA256 (thunderbird-3.0.6.source.tar.bz2) = 
RQ4utSzzqvaKW2Cx8QkZ1g6249puIlEdDcPjCyi73uY=
+SIZE (thunderbird-3.0.6.source.tar.bz2) = 60485828

Reply via email to