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 /time | |
| 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 'time')
| -rw-r--r-- | time/sunbird/Makefile | 4 | ||||
| -rw-r--r-- | time/sunbird/distinfo | 3 | ||||
| -rw-r--r-- | time/sunbird/patches/patch-at | 36 |
3 files changed, 40 insertions, 3 deletions
diff --git a/time/sunbird/Makefile b/time/sunbird/Makefile index f3769b75790..d53be5c853b 100644 --- a/time/sunbird/Makefile +++ b/time/sunbird/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2006/10/19 10:27:06 markd Exp $ +# $NetBSD: Makefile,v 1.4 2006/10/23 10:49:34 markd Exp $ MOZILLA= sunbird -PKGREVISION= 1 +PKGREVISION= 2 COMMENT= Mozilla stand-alone calendar application diff --git a/time/sunbird/distinfo b/time/sunbird/distinfo index a99753527be..63e1dfd85e7 100644 --- a/time/sunbird/distinfo +++ b/time/sunbird/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2006/10/19 10:27:06 markd Exp $ +$NetBSD: distinfo,v 1.8 2006/10/23 10:49:34 markd Exp $ SHA1 (sunbird-0.3.source.tar.bz2) = 9c498789d428b1f6a5abcb5a690a6d977553dce5 RMD160 (sunbird-0.3.source.tar.bz2) = a5b71c40be6e6739b9ad558dfac8d2b714709e3c @@ -18,6 +18,7 @@ SHA1 (patch-an) = ece4b8f63b40b7284fdde840c45310e791a4b3a9 SHA1 (patch-ao) = c7859e18c9fbd583be11de5b87dcf638121913cb SHA1 (patch-ap) = 7aa03607d77c39612e6d48771e7c514c4b2a6243 SHA1 (patch-aq) = 9e7ba653cb7beaa2d8e74797e89dc5fc1ef15b4b +SHA1 (patch-at) = 1b541df50b9ed94613524d1d48ff98970d8f21dd SHA1 (patch-aw) = 65d44e92ece767ac56b8a9ffe4ab4eadf61c0cb7 SHA1 (patch-ax) = 761c47168cadc8fcfedc98ec89a09aa82473f6a0 SHA1 (patch-ba) = dc4b09d9be363345b4a0b15d49442686de8ac4fd diff --git a/time/sunbird/patches/patch-at b/time/sunbird/patches/patch-at new file mode 100644 index 00000000000..864d6b219dd --- /dev/null +++ b/time/sunbird/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 { |