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

Update to mozilla-thunderbird 3.1.8. Fixes MFSA-2011-01,08,09

Browse Source
This commit is contained in:
landry 2011-03-02 14:44:19 +00:00
parent 693fafbdb8
commit 13f06106cf
10 changed files with 33 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mail/mozilla-thunderbird/Makefile
View File

@ -1,21 +1,20 @@
# $OpenBSD: Makefile,v 1.117 2011/01/28 21:38:12 landry Exp $
# $OpenBSD: Makefile,v 1.118 2011/03/02 14:44:19 landry Exp $
COMMENT-main = Mozilla e-mail, rss and usenet client
COMMENT-lightning = Mozilla Thunderbird calendar extension
# Don't forget to bump mail/thunderbird-i18n after updates.
MOZILLA_VERSION = 3.1.7
MOZILLA_VERSION = 3.1.8
MOZILLA_BRANCH = 1.9.2
MOZILLA_PROJECT = mozilla-thunderbird
MOZILLA_CODENAME = mail
MULTI_PACKAGES = -main -lightning
PKGNAME-main = ${PKGNAME}
REVISION-main = 3
PKGNAME-lightning = lightning-1.0beta2
EPOCH-lightning = 0
REVISION-lightning = 13
REVISION-lightning = 14
# need to be in synch with SO_VERSION in mail/enigmail/thunderbird
SO_VERSION = 17.1
@ -56,7 +55,7 @@ MODULES = www/mozilla devel/gettext lang/python
# Regression tests are too hard to adapt to run here
NO_REGRESS = Yes
MODGNU_CONFIG_GUESS_DIRS += ${WRKSRC}/directory/c-sdk/config/autoconf
MODGNU_CONFIG_GUESS_DIRS += ${WRKSRC}/directory/sdks/c-sdk/config/autoconf
CONFIGURE_STYLE = autoconf no-autoheader
@ -75,7 +74,7 @@ ALL_TARGET = default
MOZILLA_DATADIRS = chrome components defaults dictionaries extensions \
greprefs isp modules plugins res
MOZILLA_AUTOCONF_DIRS = directory/c-sdk mozilla mozilla/js/src
MOZILLA_AUTOCONF_DIRS = directory/sdks/c-sdk mozilla mozilla/js/src
MOZILLA_SUBST_FILES += config/autoconf.mk.in
# guid for gdata-provider comes from em:id in install.rdf

10
mail/mozilla-thunderbird/distinfo
View File

@ -1,5 +1,5 @@
MD5 (thunderbird-3.1.7.source.tar.bz2) = vmRjAVKi1agkp2dSWU51lg==
RMD160 (thunderbird-3.1.7.source.tar.bz2) = xeJQBFZd7PFGeptFITnArt7EKZ4=
SHA1 (thunderbird-3.1.7.source.tar.bz2) = wtbN7f45nBq0HAAEXk/Og1zAs28=
SHA256 (thunderbird-3.1.7.source.tar.bz2) = gA/iY7OInU5gL/SIiQNq1W6UD8eSiUrKEPoH2yi25mI=
SIZE (thunderbird-3.1.7.source.tar.bz2) = 65948060
MD5 (thunderbird-3.1.8.source.tar.bz2) = u0Vk66Q3rc6yIpIknRhuEQ==
RMD160 (thunderbird-3.1.8.source.tar.bz2) = /6egx7nKTx2sJce7+BEatKkJZgE=
SHA1 (thunderbird-3.1.8.source.tar.bz2) = WCMNC/vGn0XXVNjretAS8d6/4gM=
SHA256 (thunderbird-3.1.8.source.tar.bz2) = 7EQ5793FLWcuqq/e5weXTGpZymY0yQhPf8hEpu4PTI4=
SIZE (thunderbird-3.1.8.source.tar.bz2) = 68613204

12
mail/mozilla-thunderbird/patches/patch-directory_c-sdk_configure_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-directory_c-sdk_configure_in,v 1.9 2010/04/03 09:26:45 landry Exp $
--- directory/c-sdk/configure.in.orig Sat Jan 23 12:41:13 2010
+++ directory/c-sdk/configure.in Sat Jan 23 12:41:57 2010
@@ -1798,7 +1798,7 @@ mips-sony-newsos*)
AC_DEFINE(HAVE_SOCKLEN_T)
CFLAGS="$CFLAGS -ansi -Wall"
CXXFLAGS="$CXXFLAGS -ansi -Wall"
- DLL_SUFFIX=so.1.0
+ DLL_SUFFIX=so.${SO_VERSION}
DSO_CFLAGS=-fPIC
USE_NSPR_THREADS=1
DSO_LDOPTS='-shared -fPIC'

12
mail/mozilla-thunderbird/patches/patch-directory_sdks_c-sdk_configure_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-directory_sdks_c-sdk_configure_in,v 1.1 2011/03/02 14:44:19 landry Exp $
--- directory/sdks/c-sdk/configure.in.orig Mon Feb 21 12:47:41 2011
+++ directory/sdks/c-sdk/configure.in Wed Mar 2 10:28:32 2011
@@ -1820,7 +1820,7 @@ mips-sony-newsos*)
AC_DEFINE(HAVE_SOCKLEN_T)
CFLAGS="$CFLAGS -ansi -Wall"
CXXFLAGS="$CXXFLAGS -ansi -Wall"
- DLL_SUFFIX=so.1.0
+ DLL_SUFFIX=so.${SO_VERSION}
DSO_CFLAGS=-fPIC
USE_NSPR_THREADS=1
DSO_LDOPTS='-shared -fPIC'

17
mail/mozilla-thunderbird/patches/patch-mozilla_gfx_src_psshared_nsCUPSShim_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-mozilla_gfx_src_psshared_nsCUPSShim_cpp,v 1.2 2011/01/05 08:22:30 dcoppa Exp $
--- mozilla/gfx/src/psshared/nsCUPSShim.cpp.orig Mon Jan 3 14:54:07 2011
+++ mozilla/gfx/src/psshared/nsCUPSShim.cpp Mon Jan 3 14:54:15 2011
$OpenBSD: patch-mozilla_gfx_src_psshared_nsCUPSShim_cpp,v 1.3 2011/03/02 14:44:19 landry Exp $
--- mozilla/gfx/src/psshared/nsCUPSShim.cpp.orig Mon Feb 21 12:46:54 2011
+++ mozilla/gfx/src/psshared/nsCUPSShim.cpp Wed Mar 2 10:28:39 2011
@@ -59,7 +59,7 @@ static const int gSymNameCt = sizeof(gSymName) / sizeo
PRBool
nsCUPSShim::Init()
@ -10,14 +10,3 @@ $OpenBSD: patch-mozilla_gfx_src_psshared_nsCUPSShim_cpp,v 1.2 2011/01/05 08:22:3
if (!mCupsLib)
return PR_FALSE;
@@ -87,10 +87,4 @@ nsCUPSShim::Init()
}
}
return PR_TRUE;
-}
-
-nsCUPSShim::~nsCUPSShim()
-{
- if (mCupsLib)
- PR_UnloadLibrary(mCupsLib);
}

11
mail/mozilla-thunderbird/patches/patch-mozilla_gfx_src_psshared_nsCUPSShim_h
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-mozilla_gfx_src_psshared_nsCUPSShim_h,v 1.1 2011/01/05 08:22:30 dcoppa Exp $
--- mozilla/gfx/src/psshared/nsCUPSShim.h.orig Tue Dec 7 17:35:40 2010
+++ mozilla/gfx/src/psshared/nsCUPSShim.h Mon Jan 3 14:54:15 2011
@@ -86,7 +86,6 @@ struct PRLibrary;
class NS_PSSHARED nsCUPSShim {
public:
nsCUPSShim() : mCupsLib(nsnull) { }
- ~nsCUPSShim();
/**
* Initialize this object. Attempt to load the CUPS shared

45
mail/mozilla-thunderbird/patches/patch-mozilla_gfx_src_psshared_nsPSPrinters_cpp
View File

@ -1,45 +0,0 @@
$OpenBSD: patch-mozilla_gfx_src_psshared_nsPSPrinters_cpp,v 1.1 2011/01/05 08:22:30 dcoppa Exp $
--- mozilla/gfx/src/psshared/nsPSPrinters.cpp.orig Tue Dec 7 17:35:40 2010
+++ mozilla/gfx/src/psshared/nsPSPrinters.cpp Mon Jan 3 14:54:15 2011
@@ -56,6 +56,8 @@
/* dummy printer name for the gfx/src/ps driver */
#define NS_POSTSCRIPT_DRIVER_NAME "PostScript/"
+nsCUPSShim gCupsShim;
+
/* Initialize the printer manager object */
nsresult
nsPSPrinterList::Init()
@@ -70,8 +72,8 @@ nsPSPrinterList::Init()
// Should we try cups?
PRBool useCups = PR_TRUE;
rv = mPref->GetBoolPref("postscript.cups.enabled", &useCups);
- if (useCups)
- mCups.Init();
+ if (useCups && !gCupsShim.IsInitialized())
+ gCupsShim.Init();
return NS_OK;
}
@@ -99,10 +101,10 @@ nsPSPrinterList::GetPrinterList(nsTArray<nsCString>& a
// Query CUPS for a printer list. The default printer goes to the
// head of the output list; others are appended.
- if (mCups.IsInitialized()) {
+ if (gCupsShim.IsInitialized()) {
cups_dest_t *dests;
- int num_dests = (mCups.mCupsGetDests)(&dests);
+ int num_dests = (gCupsShim.mCupsGetDests)(&dests);
if (num_dests) {
for (int i = 0; i < num_dests; i++) {
nsCAutoString fullName(NS_CUPS_PRINTER);
@@ -117,7 +119,7 @@ nsPSPrinterList::GetPrinterList(nsTArray<nsCString>& a
aList.AppendElement(fullName);
}
}
- (mCups.mCupsFreeDests)(num_dests, dests);
+ (gCupsShim.mCupsFreeDests)(num_dests, dests);
}
// Build the "classic" list of printers -- those accessed by running

19
mail/mozilla-thunderbird/patches/patch-mozilla_gfx_src_psshared_nsPSPrinters_h
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-mozilla_gfx_src_psshared_nsPSPrinters_h,v 1.1 2011/01/05 08:22:30 dcoppa Exp $
--- mozilla/gfx/src/psshared/nsPSPrinters.h.orig Tue Dec 7 17:35:40 2010
+++ mozilla/gfx/src/psshared/nsPSPrinters.h Mon Jan 3 14:54:15 2011
@@ -42,7 +42,6 @@
#include "nsString.h"
#include "nsTArray.h"
#include "prtypes.h"
-#include "nsCUPSShim.h"
#include "psSharedCore.h"
class nsIPrefService;
@@ -96,7 +95,6 @@ class NS_PSSHARED nsPSPrinterList {
private:
nsCOMPtr<nsIPrefService> mPrefSvc;
nsCOMPtr<nsIPrefBranch> mPref;
- nsCUPSShim mCups;
};
#endif /* nsPSPrinters_h___ */

8
mail/mozilla-thunderbird/patches/patch-mozilla_storage_src_mozStorageConnection_cpp
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-mozilla_storage_src_mozStorageConnection_cpp,v 1.1 2011/01/14 22:53:42 landry Exp $
$OpenBSD: patch-mozilla_storage_src_mozStorageConnection_cpp,v 1.2 2011/03/02 14:44:19 landry Exp $
force the use of secure_delete instead of using internal sqlite copy
--- mozilla/storage/src/mozStorageConnection.cpp.orig Tue Jan 11 22:46:42 2011
+++ mozilla/storage/src/mozStorageConnection.cpp Tue Jan 11 22:47:26 2011
@@ -383,6 +383,13 @@ Connection::initialize(nsIFile *aDatabaseFile)
--- mozilla/storage/src/mozStorageConnection.cpp.orig Mon Feb 21 12:47:11 2011
+++ mozilla/storage/src/mozStorageConnection.cpp Wed Mar 2 10:29:08 2011
@@ -384,6 +384,13 @@ Connection::initialize(nsIFile *aDatabaseFile)
return convertResultCode(srv);
}

8
mail/mozilla-thunderbird/patches/patch-mozilla_toolkit_library_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_toolkit_library_Makefile_in,v 1.3 2010/12/01 15:00:12 dcoppa Exp $
--- mozilla/toolkit/library/Makefile.in.orig Wed Oct 27 09:05:36 2010
+++ mozilla/toolkit/library/Makefile.in Mon Nov 29 14:32:59 2010
@@ -288,6 +288,12 @@ ifdef MOZ_ENABLE_QT
$OpenBSD: patch-mozilla_toolkit_library_Makefile_in,v 1.4 2011/03/02 14:44:19 landry Exp $
--- mozilla/toolkit/library/Makefile.in.orig Mon Feb 21 12:47:17 2011
+++ mozilla/toolkit/library/Makefile.in Wed Mar 2 10:29:08 2011
@@ -286,6 +286,12 @@ ifdef MOZ_ENABLE_QT
EXTRA_DSO_LDOPTS += $(MOZ_QT_LDFLAGS)
endif