summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2006-10-23 10:49:34 +0000
committermarkd <markd@pkgsrc.org>2006-10-23 10:49:34 +0000
commitdc9de7c78f0eff3f86b1703135d7d05ee81db7bf (patch)
tree75ac499db7cbb8e0abd44201a9bdc80169c0044b
parentbefcffa4e2dd8373012db02ef3c8357b9d3aeb7b (diff)
downloadpkgsrc-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
-rw-r--r--mail/thunderbird-gtk1/Makefile4
-rw-r--r--mail/thunderbird/Makefile4
-rw-r--r--mail/thunderbird/distinfo3
-rw-r--r--mail/thunderbird/patches/patch-at36
-rw-r--r--time/sunbird/Makefile4
-rw-r--r--time/sunbird/distinfo3
-rw-r--r--time/sunbird/patches/patch-at36
-rw-r--r--www/firefox-gtk1/Makefile4
-rw-r--r--www/firefox/Makefile4
-rw-r--r--www/firefox/distinfo3
-rw-r--r--www/firefox/patches/patch-at36
-rw-r--r--www/seamonkey-gtk1/Makefile4
-rw-r--r--www/seamonkey/Makefile4
-rw-r--r--www/seamonkey/distinfo3
-rw-r--r--www/seamonkey/patches/patch-at36
15 files changed, 168 insertions, 16 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 {
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 {
diff --git a/www/firefox-gtk1/Makefile b/www/firefox-gtk1/Makefile
index 333300ac4a1..e5816d063b4 100644
--- a/www/firefox-gtk1/Makefile
+++ b/www/firefox-gtk1/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2006/05/04 05:16:13 ghen Exp $
+# $NetBSD: Makefile,v 1.14 2006/10/23 10:49:35 markd Exp $
MOZILLA= firefox-gtk1
+PKGREVISION= 1
+
COMMENT= Lightweight gecko-based web browser built with GTK+-1.x
.include "../../www/firefox/Makefile-firefox.common"
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 {
diff --git a/www/seamonkey-gtk1/Makefile b/www/seamonkey-gtk1/Makefile
index bb583536e91..8f6106b390b 100644
--- a/www/seamonkey-gtk1/Makefile
+++ b/www/seamonkey-gtk1/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2006/09/26 22:21:32 salo Exp $
+# $NetBSD: Makefile,v 1.9 2006/10/23 10:49:34 markd Exp $
MOZILLA= seamonkey-gtk1
+PKGREVISION= 1
+
COMMENT= Full featured gecko-based browser built with GTK1
.include "../../www/seamonkey/Makefile-seamonkey.common"
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 {
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-07 03:14:18 +0000