1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-27 05:10:36 +00:00

- Update to 3.1.7

- Drop MD5 checksum
- Replace CONFLICTS with CONFLICTS_INSTALL

Security:	http://www.vuxml.org/freebsd/1d8ff4a2-0445-11e0-8e32-000f20797ede.html
This commit is contained in:
Beat Gaetzi 2010-12-10 14:51:59 +00:00
parent 05872634ce
commit 5067484c50
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=265982
6 changed files with 8 additions and 56 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= thunderbird
DISTVERSION= 3.1.6
DISTVERSION= 3.1.7
CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source
@ -19,7 +19,7 @@ BUILD_DEPENDS= nspr>=4.8:${PORTSDIR}/devel/nspr
USE_AUTOTOOLS= autoconf213
USE_GECKO= gecko
CONFLICTS= thunderbird-3.0*
CONFLICTS_INSTALL= thunderbird-3.0*
USE_MOZILLA= -png -nss -dbm -jpeg -xft
MOZ_TOOLKIT= cairo-gtk2

View File

@ -1,3 +1,2 @@
MD5 (thunderbird-3.1.6.source.tar.bz2) = d126a68e6610d8e3675909e0ba606b42
SHA256 (thunderbird-3.1.6.source.tar.bz2) = 9a27e3acfe14a0f17d2197d75192a005930347d89a88917c468096e527019ef8
SIZE (thunderbird-3.1.6.source.tar.bz2) = 65850094
SHA256 (thunderbird-3.1.7.source.tar.bz2) = 800fe263b3889d4e602ff48889036ad56e940fc792894aca10fa07db28b6e662
SIZE (thunderbird-3.1.7.source.tar.bz2) = 65948060

View File

@ -1,23 +0,0 @@
--- mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp.orig
+++ mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
@@ -629,16 +629,17 @@ IndexOfDirectoryOfFile(nsISupportsArray* aSearchPath, nsILocalFile* aFile)
NS_ASSERTION(count, "broken search path! bad count");
for(PRUint32 i = 0; i < count; i++)
{
- nsCOMPtr<nsIFile> current;
+ nsCOMPtr<nsIFile> current, normalized;
aSearchPath->QueryElementAt(i, NS_GET_IID(nsIFile),
getter_AddRefs(current));
NS_ASSERTION(current, "broken search path! bad element");
// nsIFile::Equals basically compares path strings so normalize
// before the comparison.
parent->Normalize();
- current->Normalize();
+ current->Clone(getter_AddRefs(normalized));
+ normalized->Normalize();
PRBool same;
- if (NS_SUCCEEDED(parent->Equals(current, &same)) && same)
+ if (NS_SUCCEEDED(parent->Equals(normalized, &same)) && same)
return (int) i;
}
}

View File

@ -6,7 +6,7 @@
#
PORTNAME= thunderbird
DISTVERSION= 3.1.6
DISTVERSION= 3.1.7
CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source
@ -19,7 +19,7 @@ BUILD_DEPENDS= nspr>=4.8:${PORTSDIR}/devel/nspr
USE_AUTOTOOLS= autoconf213
USE_GECKO= gecko
CONFLICTS= thunderbird-3.0*
CONFLICTS_INSTALL= thunderbird-3.0*
USE_MOZILLA= -png -nss -dbm -jpeg -xft
MOZ_TOOLKIT= cairo-gtk2

View File

@ -1,3 +1,2 @@
MD5 (thunderbird-3.1.6.source.tar.bz2) = d126a68e6610d8e3675909e0ba606b42
SHA256 (thunderbird-3.1.6.source.tar.bz2) = 9a27e3acfe14a0f17d2197d75192a005930347d89a88917c468096e527019ef8
SIZE (thunderbird-3.1.6.source.tar.bz2) = 65850094
SHA256 (thunderbird-3.1.7.source.tar.bz2) = 800fe263b3889d4e602ff48889036ad56e940fc792894aca10fa07db28b6e662
SIZE (thunderbird-3.1.7.source.tar.bz2) = 65948060

View File

@ -1,23 +0,0 @@
--- mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp.orig
+++ mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
@@ -629,16 +629,17 @@ IndexOfDirectoryOfFile(nsISupportsArray* aSearchPath, nsILocalFile* aFile)
NS_ASSERTION(count, "broken search path! bad count");
for(PRUint32 i = 0; i < count; i++)
{
- nsCOMPtr<nsIFile> current;
+ nsCOMPtr<nsIFile> current, normalized;
aSearchPath->QueryElementAt(i, NS_GET_IID(nsIFile),
getter_AddRefs(current));
NS_ASSERTION(current, "broken search path! bad element");
// nsIFile::Equals basically compares path strings so normalize
// before the comparison.
parent->Normalize();
- current->Normalize();
+ current->Clone(getter_AddRefs(normalized));
+ normalized->Normalize();
PRBool same;
- if (NS_SUCCEEDED(parent->Equals(current, &same)) && same)
+ if (NS_SUCCEEDED(parent->Equals(normalized, &same)) && same)
return (int) i;
}
}