diff options
| author | tron <tron@pkgsrc.org> | 2003-01-19 20:22:19 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2003-01-19 20:22:19 +0000 |
| commit | 54e550eeaa13c0af4c62566fc221beb3334c1ab8 (patch) | |
| tree | 89e440f96f7e7a1407dc60e0565132d1fa065dd2 /www | |
| parent | 95e52be73851cd2ea5e0544abd69cc8ba635db8e (diff) | |
| download | pkgsrc-54e550eeaa13c0af4c62566fc221beb3334c1ab8.tar.gz | |
Avoid connection problems to IPv4 sites on a NetBSD system with IPv6 and
native threads. This fix was suggested by Shin'ichiro Taya as fix for
PR pkg/19928 and successfully tested by me.
Diffstat (limited to 'www')
| -rw-r--r-- | www/mozilla/Makefile | 4 | ||||
| -rw-r--r-- | www/mozilla/distinfo | 5 | ||||
| -rw-r--r-- | www/mozilla/patches/patch-am | 23 |
3 files changed, 23 insertions, 9 deletions
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index da74ce64ba6..e5da2a81767 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.109 2002/12/25 09:21:42 grant Exp $ +# $NetBSD: Makefile,v 1.110 2003/01/19 20:22:19 tron Exp $ MOZILLA= mozilla MOZILLA_BIN= mozilla-bin MOZ_VER= 1.2.1 EXTRACT_SUFX= .tar.bz2 -PKGREVISION= 2 +PKGREVISION= 3 COMMENT= Open-source version of the Netscape browser diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo index 1548f373afa..676411e5b4b 100644 --- a/www/mozilla/distinfo +++ b/www/mozilla/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.32 2002/12/11 12:00:37 he Exp $ +$NetBSD: distinfo,v 1.33 2003/01/19 20:22:21 tron Exp $ SHA1 (mozilla-source-1.2.1.tar.bz2) = 3af707a14eb11e3f615ad7d2225cc7205faa4d36 Size (mozilla-source-1.2.1.tar.bz2) = 30919648 bytes @@ -7,11 +7,10 @@ SHA1 (patch-ab) = d40ba83bad039487492690b26d28715da7dd856e SHA1 (patch-ac) = 91d1534e3aa3bbcd3d5e1e10c3d0577fe6ca8282 SHA1 (patch-ad) = 7287d7cc4396062e1620990d2167a9ec7db1de1b SHA1 (patch-ae) = bb358c813459a65955ce1a47af27f122ab1ba65f -SHA1 (patch-am) = c389e0200df768eaa34c5a704efd5b60fdf2f8de +SHA1 (patch-am) = 5f8d3fcd9a03171328791763d254f5f963d198d3 SHA1 (patch-aw) = 6d3b745337ad1a4c33c6eb557947449bc87f0822 SHA1 (patch-ba) = dec6b0da64fda9c6593eef066acbebbd50a96d23 SHA1 (patch-bb) = 6ad4068f3dad88dbc6c74679268f3a64a91bb2d8 SHA1 (patch-be) = da2d741f7fbfa9538e3baab250a57b948335e2f6 -SHA1 (patch-bj) = 7c625199a11dbafec6ed43e5ca2af1538bd1fc6f SHA1 (patch-bm) = 90293a32a571e58884a815b4ca18616bed4fb3af SHA1 (patch-bn) = fe5152d4f4bb8bd791249237f0dcd14e11ba27d1 diff --git a/www/mozilla/patches/patch-am b/www/mozilla/patches/patch-am index 5ae33a8c4ce..380041aa4e6 100644 --- a/www/mozilla/patches/patch-am +++ b/www/mozilla/patches/patch-am @@ -1,8 +1,7 @@ -$NetBSD: patch-am,v 1.8 2002/12/04 15:20:29 taya Exp $ +$NetBSD: patch-am,v 1.9 2003/01/19 20:22:22 tron Exp $ -diff -ru ../Orig/mozilla/nsprpub/pr/src/pthreads/ptio.c ./nsprpub/pr/src/pthreads/ptio.c ---- ../Orig/mozilla/nsprpub/pr/src/pthreads/ptio.c Tue Sep 24 23:21:06 2002 -+++ ./nsprpub/pr/src/pthreads/ptio.c Wed Nov 13 14:21:27 2002 +--- nsprpub/pr/src/pthreads/ptio.c.orig Sun Jan 19 18:55:37 2003 ++++ nsprpub/pr/src/pthreads/ptio.c Sun Jan 19 18:57:31 2003 @@ -192,7 +192,7 @@ #elif defined(IRIX) || defined(OSF1) || defined(AIX) || defined(HPUX) \ || defined(LINUX) || defined(FREEBSD) || defined(BSDI) || defined(VMS) \ @@ -12,3 +11,19 @@ diff -ru ../Orig/mozilla/nsprpub/pr/src/pthreads/ptio.c ./nsprpub/pr/src/pthread #define _PRSockOptVal_t void * #else #error "Cannot determine architecture" +@@ -3426,6 +3426,15 @@ + if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno); + else + { ++#if defined(__NetBSD__) && defined(_PR_INET6) && defined(IPV6_V6ONLY) ++ if(domain == PR_AF_INET6) { ++ int opt = 0; ++ if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY, &opt, sizeof(opt))){ ++ close(osfd); ++ return NULL; ++ } ++ } ++#endif + fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE); + if (fd == NULL) close(osfd); + } |