diff options
| author | markd <markd> | 2006-10-23 10:49:34 +0000 |
|---|---|---|
| committer | markd <markd> | 2006-10-23 10:49:34 +0000 |
| commit | b15343ba8fdfd7a45f8db95487a2efe629616e73 (patch) | |
| tree | 75ac499db7cbb8e0abd44201a9bdc80169c0044b /www/seamonkey | |
| parent | 96446d2e8c9b8b07996f239df4429d919d9e4807 (diff) | |
| download | pkgsrc-b15343ba8fdfd7a45f8db95487a2efe629616e73.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/seamonkey')
| -rw-r--r-- | www/seamonkey/Makefile | 4 | ||||
| -rw-r--r-- | www/seamonkey/distinfo | 3 | ||||
| -rw-r--r-- | www/seamonkey/patches/patch-at | 36 |
3 files changed, 40 insertions, 3 deletions
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index cb468523f78..a588caa1611 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2006/10/19 10:25:36 markd Exp $ +# $NetBSD: Makefile,v 1.12 2006/10/23 10:49:34 markd Exp $ MOZILLA= seamonkey -PKGREVISION= 2 +PKGREVISION= 3 COMMENT= Full featured gecko-based browser diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo index 3095cb957a1..dd6ee9b3492 100644 --- a/www/seamonkey/distinfo +++ b/www/seamonkey/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2006/10/20 10:28:51 rillig Exp $ +$NetBSD: distinfo,v 1.13 2006/10/23 10:49:34 markd Exp $ SHA1 (seamonkey-1.0.5.source.tar.bz2) = 60be0112e369a06958c0295ad2de995ab476cef1 RMD160 (seamonkey-1.0.5.source.tar.bz2) = 9f99f4a542c3a4e1c7e054e73c9ca08cd7252e63 @@ -19,6 +19,7 @@ SHA1 (patch-an) = 99ac2da44322db96f8d65fbfdb380727b9da96fe SHA1 (patch-ao) = 617d232bd335bc988388f2004ca919c829e371da SHA1 (patch-ap) = 856f74f774b4db7df9b4453aea4d849893ee6bf1 SHA1 (patch-aq) = 29183e61d6b1a38853151426c2d4ffe45efd9c43 +SHA1 (patch-at) = 1b541df50b9ed94613524d1d48ff98970d8f21dd SHA1 (patch-aw) = db73e21e67dc4200312285973faaaed308ea436e SHA1 (patch-ax) = b32483c5259cbe95202944683889bf20a7c1650e SHA1 (patch-ba) = add9ecd6cff002525b2bc63aad7eb142e610b190 diff --git a/www/seamonkey/patches/patch-at b/www/seamonkey/patches/patch-at new file mode 100644 index 00000000000..864d6b219dd --- /dev/null +++ b/www/seamonkey/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 { |