diff options
| author | markd <markd> | 2006-10-23 10:49:34 +0000 |
|---|---|---|
| committer | markd <markd> | 2006-10-23 10:49:34 +0000 |
| commit | 71aeb79a251b0c098748c04d89bb65acb629a014 (patch) | |
| tree | 75ac499db7cbb8e0abd44201a9bdc80169c0044b /mail | |
| parent | a99a835f1a3b5028334a89d112fe71da87229f06 (diff) | |
| download | pkgsrc-71aeb79a251b0c098748c04d89bb65acb629a014.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 'mail')
| -rw-r--r-- | mail/thunderbird-gtk1/Makefile | 4 | ||||
| -rw-r--r-- | mail/thunderbird/Makefile | 4 | ||||
| -rw-r--r-- | mail/thunderbird/distinfo | 3 | ||||
| -rw-r--r-- | mail/thunderbird/patches/patch-at | 36 |
4 files changed, 42 insertions, 5 deletions
diff --git a/mail/thunderbird-gtk1/Makefile b/mail/thunderbird-gtk1/Makefile index e76d696eb81..2a95dc649b9 100644 --- a/mail/thunderbird-gtk1/Makefile +++ b/mail/thunderbird-gtk1/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2006/10/23 09:43:06 markd Exp $ +# $NetBSD: Makefile,v 1.11 2006/10/23 10:49:34 markd Exp $ MOZILLA= thunderbird-gtk1 -PKGREVISION= 1 +PKGREVISION= 2 COMMENT= Mozilla mail client using the older GTK1 toolkit diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 1fce7e296f7..4f39f41ed60 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.20 2006/10/23 09:43:06 markd Exp $ +# $NetBSD: Makefile,v 1.21 2006/10/23 10:49:34 markd Exp $ MOZILLA= thunderbird -PKGREVISION= 2 +PKGREVISION= 3 COMMENT= Mozilla mail client diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index ed1a99ef2fd..55732066840 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.29 2006/10/20 12:45:13 tron Exp $ +$NetBSD: distinfo,v 1.30 2006/10/23 10:49:34 markd Exp $ SHA1 (thunderbird-1.5.0.7-source.tar.bz2) = 9e5acff9bd098979dd798c0111805dc8d67479ad RMD160 (thunderbird-1.5.0.7-source.tar.bz2) = b8948723e4a96e22409e6a2cb3cd1b6512bef189 @@ -21,6 +21,7 @@ SHA1 (patch-ap) = b2f630863e7b1bc3c0e7139d2b4aca3b80da04de SHA1 (patch-aq) = e8389d53e0d490b3cc1078f646749abfe54225ff SHA1 (patch-ar) = ce81dd6b747ba882434cb23343c5e89aac70ea81 SHA1 (patch-as) = 56effdf9aa488fa2b3c8abcb4b7273841a4b59c1 +SHA1 (patch-at) = 1b541df50b9ed94613524d1d48ff98970d8f21dd SHA1 (patch-aw) = 0df1163297eb1ea48ae8b98d146f715462c0a2e7 SHA1 (patch-ax) = 00d60664a6be38db0d5b2464064230c62b153ca6 SHA1 (patch-ba) = 5e64f23ec426f9baef29f397084dba7158279071 diff --git a/mail/thunderbird/patches/patch-at b/mail/thunderbird/patches/patch-at new file mode 100644 index 00000000000..864d6b219dd --- /dev/null +++ b/mail/thunderbird/patches/patch-at @@ -0,0 +1,36 @@ +$NetBSD: patch-at,v 1.1 2006/10/23 10:49:34 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 { |