diff options
| author | markd <markd@pkgsrc.org> | 2006-10-23 10:49:34 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2006-10-23 10:49:34 +0000 |
| commit | dc9de7c78f0eff3f86b1703135d7d05ee81db7bf (patch) | |
| tree | 75ac499db7cbb8e0abd44201a9bdc80169c0044b /www/firefox | |
| parent | befcffa4e2dd8373012db02ef3c8357b9d3aeb7b (diff) | |
| download | pkgsrc-dc9de7c78f0eff3f86b1703135d7d05ee81db7bf.tar.gz | |
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.
Diffstat (limited to 'www/firefox')
| -rw-r--r-- | www/firefox/Makefile | 4 | ||||
| -rw-r--r-- | www/firefox/distinfo | 3 | ||||
| -rw-r--r-- | www/firefox/patches/patch-at | 36 |
3 files changed, 40 insertions, 3 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile index a3ec745b697..92949f09f31 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.37 2006/10/19 10:25:17 markd Exp $ +# $NetBSD: Makefile,v 1.38 2006/10/23 10:49:34 markd Exp $ MOZILLA= firefox -PKGREVISION= 1 +PKGREVISION= 2 COMMENT= Lightweight gecko-based web browser diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 440fca2db2e..1f797b86065 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.56 2006/10/19 10:25:17 markd Exp $ +$NetBSD: distinfo,v 1.57 2006/10/23 10:49:34 markd Exp $ SHA1 (firefox-1.5.0.7-source.tar.bz2) = f10d57af87bddc1b929ec5321688ac0efa880960 RMD160 (firefox-1.5.0.7-source.tar.bz2) = 156a73842949d4fcd401dfaa54afc6cac3aa66c2 @@ -19,6 +19,7 @@ SHA1 (patch-an) = 8b855be2d22422fcbf9293717ee45a8115e15bff 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 --git a/www/firefox/patches/patch-at b/www/firefox/patches/patch-at new file mode 100644 index 00000000000..105ad05624f --- /dev/null +++ b/www/firefox/patches/patch-at @@ -0,0 +1,36 @@ +$NetBSD: patch-at,v 1.1 2006/10/23 10:49:35 markd 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 { |