pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2006Q3]: pkgsrc/www Pullup ticket 1905 - requested by ghen
details: https://anonhg.NetBSD.org/pkgsrc/rev/5a4825ecc38c
branches: pkgsrc-2006Q3
changeset: 519179:5a4825ecc38c
user: salo <salo%pkgsrc.org@localhost>
date: Thu Nov 09 07:28:46 2006 +0000
description:
Pullup ticket 1905 - requested by ghen
security update for firefox
Revisions pulled up:
- pkgsrc/www/firefox/Makefile 1.37, 1.38, 1.39
- pkgsrc/www/firefox/Makefile-firefox.common 1.38
- pkgsrc/www/firefox/distinfo 1.56, 1.57, 1.58
- pkgsrc/www/firefox/patches/patch-ai 1.5
- pkgsrc/www/firefox/patches/patch-at 1.1
- pkgsrc/www/firefox-gtk1/Makefile 1.14, 1.15
- pkgsrc/www/firefox-bin/Makefile 1.23
- pkgsrc/www/firefox-bin/distinfo 1.21
Module Name: pkgsrc
Committed By: markd
Date: Thu Oct 19 10:25:17 UTC 2006
Modified Files:
pkgsrc/www/firefox: Makefile distinfo
pkgsrc/www/firefox/patches: patch-ai
Log Message:
Fix crash after printing caused by trying to destroy the same charset
structure multiple times. Bump PKGREVISION.
---
Module Name: pkgsrc
Committed By: markd
Date: Mon Oct 23 10:49:35 UTC 2006
Modified Files:
pkgsrc/www/firefox: Makefile distinfo
pkgsrc/www/firefox-gtk1: Makefile
Added Files:
pkgsrc/www/firefox/patches: patch-at
Log Message:
thunderbird's ldap doesn't work talking to an ipv4 ldap server if
talking to ipv4 addresses using ipv6 addresses isn't allowed, which is
the default on NetBSD. Patch to use a v4 socket when talking to an ipv4
ldap server. Fixes my PR 33511.
seamonkey/firefox/sunbird have the same code so make the same patch.
OKed ghen. Bump PKGREVISION.
---
Module Name: pkgsrc
Committed By: ghen
Date: Wed Nov 8 09:50:15 UTC 2006
Modified Files:
pkgsrc/www/firefox: Makefile Makefile-firefox.common distinfo
pkgsrc/www/firefox-bin: Makefile distinfo
pkgsrc/www/firefox-gtk1: Makefile
Log Message:
Update firefox, firefox-bin and firefox-gtk1 to 1.5.0.8. Fixed in this
version:
MFSA 2006-67 Running Script can be recompiled
MFSA 2006-66 RSA signature forgery (variant)
MFSA 2006-65 Crashes with evidence of memory corruption (rv:1.8.0.8)
For more info, see
http://www.mozilla.com/en-US/firefox/releases/1.5.0.8.html
diffstat:
www/firefox-bin/Makefile | 4 ++--
www/firefox-bin/distinfo | 8 ++++----
www/firefox-gtk1/Makefile | 3 ++-
www/firefox/Makefile | 3 ++-
www/firefox/Makefile-firefox.common | 4 ++--
www/firefox/distinfo | 11 ++++++-----
www/firefox/patches/patch-ai | 24 ++++++++++++++++--------
www/firefox/patches/patch-at | 36 ++++++++++++++++++++++++++++++++++++
8 files changed, 70 insertions(+), 23 deletions(-)
diffs (189 lines):
diff -r 2f13e863cfb7 -r 5a4825ecc38c www/firefox-bin/Makefile
--- a/www/firefox-bin/Makefile Thu Nov 09 04:59:05 2006 +0000
+++ b/www/firefox-bin/Makefile Thu Nov 09 07:28:46 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2006/09/24 16:36:29 salo Exp $
+# $NetBSD: Makefile,v 1.22.2.1 2006/11/09 07:28:47 salo Exp $
MOZILLA= firefox
-MOZ_VER= 1.5.0.7
+MOZ_VER= 1.5.0.8
MOZ_DISTVER= ${MOZ_VER}
HOMEPAGE= http://www.mozilla.com/firefox/
diff -r 2f13e863cfb7 -r 5a4825ecc38c www/firefox-bin/distinfo
--- a/www/firefox-bin/distinfo Thu Nov 09 04:59:05 2006 +0000
+++ b/www/firefox-bin/distinfo Thu Nov 09 07:28:46 2006 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.20 2006/09/15 09:24:30 ghen Exp $
+$NetBSD: distinfo,v 1.20.2.1 2006/11/09 07:28:47 salo Exp $
-SHA1 (firefox/releases/1.5.0.7/linux-i686/en-US/firefox-1.5.0.7.tar.gz) = 61bdb6a73f6ab02abfde0070e946ea443171fda4
-RMD160 (firefox/releases/1.5.0.7/linux-i686/en-US/firefox-1.5.0.7.tar.gz) = db54624c61650e9102b4b893a3635631764bd275
-Size (firefox/releases/1.5.0.7/linux-i686/en-US/firefox-1.5.0.7.tar.gz) = 8472682 bytes
+SHA1 (firefox/releases/1.5.0.8/linux-i686/en-US/firefox-1.5.0.8.tar.gz) = e619932889af2ce23ea70be3209fa5edfbf37e85
+RMD160 (firefox/releases/1.5.0.8/linux-i686/en-US/firefox-1.5.0.8.tar.gz) = 071f7911fcf59ca535ab87fd3a58e9aa642670ee
+Size (firefox/releases/1.5.0.8/linux-i686/en-US/firefox-1.5.0.8.tar.gz) = 8480597 bytes
diff -r 2f13e863cfb7 -r 5a4825ecc38c www/firefox-gtk1/Makefile
--- a/www/firefox-gtk1/Makefile Thu Nov 09 04:59:05 2006 +0000
+++ b/www/firefox-gtk1/Makefile Thu Nov 09 07:28:46 2006 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2006/05/04 05:16:13 ghen Exp $
+# $NetBSD: Makefile,v 1.13.4.1 2006/11/09 07:28:47 salo Exp $
MOZILLA= firefox-gtk1
+
COMMENT= Lightweight gecko-based web browser built with GTK+-1.x
.include "../../www/firefox/Makefile-firefox.common"
diff -r 2f13e863cfb7 -r 5a4825ecc38c www/firefox/Makefile
--- a/www/firefox/Makefile Thu Nov 09 04:59:05 2006 +0000
+++ b/www/firefox/Makefile Thu Nov 09 07:28:46 2006 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2006/09/15 12:26:56 ghen Exp $
+# $NetBSD: Makefile,v 1.36.2.1 2006/11/09 07:28:46 salo Exp $
MOZILLA= firefox
+
COMMENT= Lightweight gecko-based web browser
MOZILLA_USE_GTK2= # yes
diff -r 2f13e863cfb7 -r 5a4825ecc38c www/firefox/Makefile-firefox.common
--- a/www/firefox/Makefile-firefox.common Thu Nov 09 04:59:05 2006 +0000
+++ b/www/firefox/Makefile-firefox.common Thu Nov 09 07:28:46 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile-firefox.common,v 1.37 2006/09/15 13:53:08 ghen Exp $
+# $NetBSD: Makefile-firefox.common,v 1.37.2.1 2006/11/09 07:28:46 salo Exp $
MOZILLA_BIN= firefox-bin
-MOZ_VER= 1.5.0.7
+MOZ_VER= 1.5.0.8
EXTRACT_SUFX= .tar.bz2
DISTNAME= firefox-${MOZ_VER}-source
diff -r 2f13e863cfb7 -r 5a4825ecc38c www/firefox/distinfo
--- a/www/firefox/distinfo Thu Nov 09 04:59:05 2006 +0000
+++ b/www/firefox/distinfo Thu Nov 09 07:28:46 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.54 2006/09/15 13:53:08 ghen Exp $
+$NetBSD: distinfo,v 1.54.2.1 2006/11/09 07:28:46 salo Exp $
-SHA1 (firefox-1.5.0.7-source.tar.bz2) = f10d57af87bddc1b929ec5321688ac0efa880960
-RMD160 (firefox-1.5.0.7-source.tar.bz2) = 156a73842949d4fcd401dfaa54afc6cac3aa66c2
-Size (firefox-1.5.0.7-source.tar.bz2) = 35541113 bytes
+SHA1 (firefox-1.5.0.8-source.tar.bz2) = 4f93cf8f2c179ab800974416bc8a3e0250482522
+RMD160 (firefox-1.5.0.8-source.tar.bz2) = b28cb7b104c1fbaad9b2a43ded31149fab0cf476
+Size (firefox-1.5.0.8-source.tar.bz2) = 35588049 bytes
SHA1 (patch-aa) = 5095449d4e979085fc5791b9d0251076b9c969c3
SHA1 (patch-ab) = eda86e19dbf45be392b6be4a40dbb25936c91439
SHA1 (patch-ac) = c0cfa9805d883e0761b5bc63b4015cbf1e951eec
@@ -11,7 +11,7 @@
SHA1 (patch-af) = 01e10664fbf20dffa53ecb94be24a421c39b838b
SHA1 (patch-ag) = 1266333a482483f786d5f00e92e641e282266442
SHA1 (patch-ah) = c737519c8ab8a66993d4892a6efac73e2da979f5
-SHA1 (patch-ai) = 58d7d87295cfbcaeba3e6a27457e15533d4b8e78
+SHA1 (patch-ai) = 189aa46f116e424c23368e1c7fbc6c56dd389954
SHA1 (patch-aj) = 84a5e3630c7dd9532bbb20e7444ff9582631ea24
SHA1 (patch-ak) = aa54e2c4d2f1c0d40bbbfcd6e3e55b44c3c549ff
SHA1 (patch-al) = e5fc425630a5363807bf1cc2c648d5eb31d0e40e
@@ -19,6 +19,7 @@
SHA1 (patch-ao) = f7221f4135c8bb5adc154f523cef7ff0ef42e602
SHA1 (patch-ap) = 0a99d04b6746cf85e73a3a9a1e6fed118495c6a5
SHA1 (patch-aq) = 59c1c9922413fd50e1b0573158ad56439a79debf
+SHA1 (patch-at) = 1b541df50b9ed94613524d1d48ff98970d8f21dd
SHA1 (patch-aw) = 9d4388a7bd89b7ca884b9e7eb4855e3afb8e8c3a
SHA1 (patch-ax) = 90bb18ed68a7e266e153b537bf85e082296ade47
SHA1 (patch-ba) = 5e64f23ec426f9baef29f397084dba7158279071
diff -r 2f13e863cfb7 -r 5a4825ecc38c www/firefox/patches/patch-ai
--- a/www/firefox/patches/patch-ai Thu Nov 09 04:59:05 2006 +0000
+++ b/www/firefox/patches/patch-ai Thu Nov 09 07:28:46 2006 +0000
@@ -1,9 +1,17 @@
-$NetBSD: patch-ai,v 1.4 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-ai,v 1.4.8.1 2006/11/09 07:28:46 salo Exp $
-diff -ruN ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetricsPS.cpp
---- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp 2005-04-28 17:04:00.000000000 +0900
-+++ ./gfx/src/ps/nsFontMetricsPS.cpp 2005-12-04 19:06:07.000000000 +0900
-@@ -1859,10 +1859,10 @@
+--- gfx/src/ps/nsFontMetricsPS.cpp.orig 2006-05-07 14:01:25.000000000 +1200
++++ gfx/src/ps/nsFontMetricsPS.cpp
+@@ -993,7 +993,7 @@ nsFontPSXft::FindFont(PRUnichar aChar, c
+
+ fontps *fps = new fontps;
+ fps->entry = xftEntry;
+- fps->charset = fc_charset;
++ fps->charset = FcCharSetCopy (fc_charset);
+ fps->fontps = nsnull;
+ fpi.fontps->AppendElement(fps);
+ }
+@@ -1868,10 +1868,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa
mPixelSize = NSToIntRound(app2dev * mFont->size);
@@ -18,7 +26,7 @@
nsresult rv;
mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
-@@ -1896,7 +1896,7 @@
+@@ -1905,7 +1905,7 @@ nsFontPSFreeType::GetWidth(const PRUnich
if (!face)
return 0;
@@ -27,7 +35,7 @@
nsresult rv = mFt2->GetImageCache(&iCache);
if (NS_FAILED(rv)) {
NS_ERROR("Failed to get Image Cache");
-@@ -1934,8 +1934,8 @@
+@@ -1943,8 +1943,8 @@ nsFontPSFreeType::getFTFace()
FTC_Manager cManager;
mFt2->GetFTCacheManager(&cManager);
@@ -38,7 +46,7 @@
NS_ASSERTION(rv==0, "failed to get face/size");
if (rv)
return nsnull;
-@@ -2379,16 +2379,16 @@
+@@ -2388,16 +2388,16 @@ void nsFT2Type1Generator::GeneratePSFont
mEntry->GetFamilyName(fontName);
mEntry->GetStyleName(styleName);
diff -r 2f13e863cfb7 -r 5a4825ecc38c www/firefox/patches/patch-at
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox/patches/patch-at Thu Nov 09 07:28:46 2006 +0000
@@ -0,0 +1,36 @@
+$NetBSD: patch-at,v 1.1.2.2 2006/11/09 07:28:46 salo Exp $
+
+--- directory/c-sdk/ldap/libraries/libprldap/ldappr-io.c.orig 2006-05-25 11:38:04.000000000 +1200
++++ directory/c-sdk/ldap/libraries/libprldap/ldappr-io.c
+@@ -292,12 +292,12 @@ prldap_try_one_address( struct lextiof_s
+ * Set up address and open a TCP socket:
+ */
+ if ( PR_SUCCESS != PR_SetNetAddr( PR_IpAddrNull, /* don't touch IP addr. */
+- PRLDAP_DEFAULT_ADDRESS_FAMILY, (PRUint16)port, addrp )) {
++ PR_NetAddrFamily( addrp ), (PRUint16)port, addrp )) {
+ return( -1 );
+ }
+
+ if (( prsockp->prsock_prfd = PR_OpenTCPSocket(
+- PRLDAP_DEFAULT_ADDRESS_FAMILY )) == NULL ) {
++ PR_NetAddrFamily( addrp ))) == NULL ) {
+ return( -1 );
+ }
+
+@@ -390,14 +390,14 @@ prldap_connect( const char *hostlist, in
+
+ if ( PR_SUCCESS == PR_StringToNetAddr( host, &addr )) {
+
+- if ( PRLDAP_DEFAULT_ADDRESS_FAMILY == PR_AF_INET6 &&
++ /*if ( PRLDAP_DEFAULT_ADDRESS_FAMILY == PR_AF_INET6 &&
+ PR_AF_INET == PR_NetAddrFamily( &addr )) {
+ PRUint32 ipv4ip = addr.inet.ip;
+ memset( &addr, 0, sizeof(addr));
+ PR_ConvertIPv4AddrToIPv6( ipv4ip, &addr.ipv6.ip );
+ addr.ipv6.family = PR_AF_INET6;
+
+- }
++ }*/
+ rc = prldap_try_one_address( prsockp, &addr, port,
+ timeout, options );
+ } else {
Home |
Main Index |
Thread Index |
Old Index