pkg/32689: [patch] devel/nspr update to 4.6.1

To: pkg-manager%netbsd.org@localhost, gnats-admin%netbsd.org@localhost, pkgsrc-bugs%netbsd.org@localhost
Subject: pkg/32689: [patch] devel/nspr update to 4.6.1
From: mjl%luckie.org.nz@localhost
Date: Wed, 1 Feb 2006 07:35:00 +0000 (UTC)
>Number:         32689
>Category:       pkg
>Synopsis:       [patch] devel/nspr update to 4.6.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Feb 01 07:35:00 +0000 2006
>Originator:     Matthew Luckie
>Release:        NetBSD 2.0.2
>Organization:
        
>Environment:
        
        
System: NetBSD spandex.plunket.luckie.org.nz 2.0.2 NetBSD 2.0.2 (spandex) #4: 
Mon Aug 29 20:11:26 NZST 2005 
root%spandex.plunket.luckie.org.nz@localhost:/usr/src/sys/arch/i386/compile/spandex
 i386
Architecture: i386
Machine: i386
>Description:
        update nspr to 4.6.1
        the patches have been brought up to date with the nspr patches in
        www/mozilla
>How-To-Repeat:
        N/A
>Fix:
Note: patch-ae is no longer required

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/nspr/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile    5 Dec 2005 20:50:05 -0000       1.10
+++ Makefile    1 Feb 2006 07:13:20 -0000
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.10 2005/12/05 20:50:05 rillig Exp $
 
-DISTNAME=              nspr-4.4.1
-PKGREVISION=           2
+DISTNAME=              nspr-4.6.1
 CATEGORIES=            devel
 MASTER_SITES?=         ${MASTER_SIZE_MOZILLA:=nspr/releases/v4.4.1/src}
 
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/devel/nspr/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- PLIST       16 Oct 2005 11:15:10 -0000      1.5
+++ PLIST       1 Feb 2006 07:13:20 -0000
@@ -50,11 +50,12 @@ include/nspr/md/_reliantunix.cfg
 include/nspr/md/_reliantunix.h
 include/nspr/md/_rhapsody.cfg
 include/nspr/md/_rhapsody.h
+include/nspr/md/_riscos.cfg
+include/nspr/md/_riscos.h
 include/nspr/md/_scoos.cfg
 include/nspr/md/_scoos.h
+include/nspr/md/_solaris.cfg
 include/nspr/md/_solaris.h
-include/nspr/md/_solaris32.cfg
-include/nspr/md/_solaris64.cfg
 include/nspr/md/_sony.cfg
 include/nspr/md/_sony.h
 include/nspr/md/_sunos4.cfg
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/nspr/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo    12 Aug 2005 20:07:35 -0000      1.4
+++ distinfo    1 Feb 2006 07:13:20 -0000
@@ -1,11 +1,10 @@
 $NetBSD: distinfo,v 1.4 2005/08/12 20:07:35 reed Exp $
 
-SHA1 (nspr-4.4.1.tar.gz) = f709b7941c8f28508293541a8578ed4b625adeaf
-RMD160 (nspr-4.4.1.tar.gz) = 7e07e66652c38d4567e6927f30ae26889c2c672b
-Size (nspr-4.4.1.tar.gz) = 1324075 bytes
+SHA1 (nspr-4.6.1.tar.gz) = eb02eb63277e02a3f474f2b9746d3c2d5165d2b3
+RMD160 (nspr-4.6.1.tar.gz) = 75e8fe9b32df1698a9290baec122fa5bb970a75d
+Size (nspr-4.6.1.tar.gz) = 1327028 bytes
 SHA1 (patch-aa) = 41cf591b7553175cd5f60a1f30fb5659bab8af8f
-SHA1 (patch-ab) = 80d88458a1209f9b0fd79b1cffad168cdb6e6c71
-SHA1 (patch-ac) = 5fb247fac34b7aca0593ef541d983b5d7e968484
-SHA1 (patch-ad) = 4945ca7de73bf3294e369607a06b59bdab00653c
-SHA1 (patch-ae) = f09efe0defd526eaedf736d9c3df3bdd2a2600b8
+SHA1 (patch-ab) = 0e0c70157ab0bd1442a9396b9ef9e03f41dbcab7
+SHA1 (patch-ac) = d79edfd33237b38c9cac251012476e63d8da1df3
+SHA1 (patch-ad) = c4ea8ec9d00c634b651f67153c97587b9d95aa6e
 SHA1 (patch-af) = b8b09a97b026905418b7bcd6cd6434f6665586c4
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/devel/nspr/patches/patch-ab,v
retrieving revision 1.1
diff -u -p -r1.1 patch-ab
--- patches/patch-ab    25 Jan 2005 14:50:39 -0000      1.1
+++ patches/patch-ab    1 Feb 2006 07:13:20 -0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2005/01/25 14:50:39 jschauma Exp $
+$NetBSD$
 
---- ../pr/include/md/_netbsd.h.orig    2003-09-12 02:24:53.000000000 +0900
-+++ ../pr/include/md/_netbsd.h 2004-06-10 23:07:02.000000000 +0900
-@@ -44,16 +44,26 @@
+--- ../pr/include/md/_netbsd.h.orig    Wed Feb  1 19:41:54 2006
++++ ../pr/include/md/_netbsd.h Wed Feb  1 19:44:48 2006
+@@ -44,6 +44,8 @@
  #define _PR_SI_ARCHITECTURE "x86"
  #elif defined(__alpha__)
  #define _PR_SI_ARCHITECTURE "alpha"
@@ -11,62 +11,3 @@ $NetBSD: patch-ab,v 1.1 2005/01/25 14:50
  #elif defined(__m68k__)
  #define _PR_SI_ARCHITECTURE "m68k"
  #elif defined(__powerpc__)
- #define _PR_SI_ARCHITECTURE "powerpc"
-+#elif defined(__sparc_v9__)
-+#define _PR_SI_ARCHITECTURE "sparc64"
- #elif defined(__sparc__)
- #define _PR_SI_ARCHITECTURE "sparc"
- #elif defined(__mips__)
- #define _PR_SI_ARCHITECTURE "mips"
- #elif defined(__arm32__)
- #define _PR_SI_ARCHITECTURE "arm32"
-+#elif defined(__ARMEL__)
-+#define _PR_SI_ARCHITECTURE "armel"
-+#elif defined(__ARMEL__)
-+#define _PR_SI_ARCHITECTURE "armeb"
-+#elif defined(__arm__)
-+#define _PR_SI_ARCHITECTURE "arm"
- #endif
- 
- #if defined(__ELF__)
-@@ -86,6 +96,12 @@
- #define _PR_INET6_PROBE
- #endif
- 
-+#if __NetBSD_Version__ >= 106370000
-+/* NetBSD 1.6ZK */
-+#define _PR_HAVE_GETPROTO_R
-+#define _PR_HAVE_GETPROTO_R_INT
-+#endif
-+
- #define USE_SETJMP
- 
- #ifndef _PR_PTHREADS
-@@ -108,7 +124,17 @@
- }
- #define       _MD_GET_SP(_thread)     CONTEXT(_thread)[2]
- #endif
--#ifdef __sparc__
-+#ifdef __sparc_v9__
-+#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)                  \
-+{                                                                      \
-+    sigsetjmp(CONTEXT(_thread), 1);                                    \
-+    CONTEXT(_thread)[1] = (unsigned char*) ((_sp) - 176 - 0x7ff);      \
-+    CONTEXT(_thread)[2] = (long) _main;                                \
-+    CONTEXT(_thread)[3] = (long) _main + 4;                            \
-+    *status = PR_TRUE;                                                 \
-+}
-+#define        _MD_GET_SP(_thread)     (CONTEXT(_thread)[2]+0x7ff)
-+#elif defined(__sparc__)
- #define _MD_INIT_CONTEXT(_thread, _sp, _main, status)                 \
- {                                                                     \
-     sigsetjmp(CONTEXT(_thread), 1);                                   \
-@@ -150,7 +176,7 @@
- }
- #define       _MD_GET_SP(_thread)     CONTEXT(_thread)[32]
- #endif
--#ifdef __arm32__
-+#ifdef __arm__
- #define _MD_INIT_CONTEXT(_thread, _sp, _main, status)                 \
- {                                                                     \
-     sigsetjmp(CONTEXT(_thread), 1);                                   \
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/devel/nspr/patches/patch-ac,v
retrieving revision 1.2
diff -u -p -r1.2 patch-ac
--- patches/patch-ac    12 Aug 2005 20:07:35 -0000      1.2
+++ patches/patch-ac    1 Feb 2006 07:13:20 -0000
@@ -1,8 +1,17 @@
-$NetBSD: patch-ac,v 1.2 2005/08/12 20:07:35 reed Exp $
+$NetBSD$
 
---- ../configure.in.orig       2003-11-24 16:09:04.000000000 -0800
-+++ ../configure.in    2005-08-12 12:35:10.000000000 -0700
-@@ -913,7 +913,7 @@
+--- ../configure.in.orig       Fri Sep  2 14:44:37 2005
++++ ../configure.in    Wed Feb  1 19:58:57 2006
+@@ -57,7 +57,7 @@
+ USE_IPV6=
+ USE_MDUPDATE=
+ _MACOSX_DEPLOYMENT_TARGET=
+-_OPTIMIZE_FLAGS=-O
++_OPTIMIZE_FLAGS=
+ _DEBUG_FLAGS=-g
+ MOZ_DEBUG=1
+ MOZ_OPTIMIZE=
+@@ -1025,7 +1025,7 @@
      PR_MD_CSRCS=dgux.c
      ;;
  
@@ -11,7 +20,7 @@ $NetBSD: patch-ac,v 1.2 2005/08/12 20:07
      if test -z "$USE_NSPR_THREADS"; then
          USE_PTHREADS=1
      fi
-@@ -932,6 +932,9 @@
+@@ -1045,6 +1045,9 @@
      DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
      MDCPUCFG_H=_freebsd.cfg
      PR_MD_CSRCS=freebsd.c
@@ -21,7 +30,7 @@ $NetBSD: patch-ac,v 1.2 2005/08/12 20:07
      ;;
  
  *-hpux*)
-@@ -1408,6 +1411,7 @@
+@@ -1544,6 +1547,7 @@
      AC_DEFINE(XP_UNIX)
      AC_DEFINE(NETBSD)
      AC_DEFINE(HAVE_BSD_FLOCK)
@@ -29,7 +38,7 @@ $NetBSD: patch-ac,v 1.2 2005/08/12 20:07
      USE_NSPR_THREADS=1
      MDCPUCFG_H=_netbsd.cfg
      PR_MD_CSRCS=netbsd.c
-@@ -2165,7 +2169,7 @@
+@@ -2345,7 +2349,7 @@
              _PTHREAD_LDFLAGS=
          fi
            ;;
@@ -38,7 +47,7 @@ $NetBSD: patch-ac,v 1.2 2005/08/12 20:07
            AC_DEFINE(_REENTRANT)
            AC_DEFINE(_THREAD_SAFE)
            dnl -pthread links in -lc_r, so don't specify it explicitly.
-@@ -2236,7 +2240,7 @@
+@@ -2426,7 +2430,7 @@
          AC_DEFINE(_PR_NEED_PTHREAD_INIT)
      fi
      ;;
Index: patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/devel/nspr/patches/patch-ad,v
retrieving revision 1.1
diff -u -p -r1.1 patch-ad
--- patches/patch-ad    25 Jan 2005 14:50:39 -0000      1.1
+++ patches/patch-ad    1 Feb 2006 07:13:20 -0000
@@ -1,19 +1,22 @@
-$NetBSD: patch-ad,v 1.1 2005/01/25 14:50:39 jschauma Exp $
+$NetBSD$
 
---- ../pr/src/io/prprf.c.orig  Tue Dec 21 11:15:40 2004
-+++ ../pr/src/io/prprf.c       Tue Dec 21 11:29:27 2004
-@@ -51,7 +51,13 @@
- ** Note: on some platforms va_list is defined as an array,
- ** and requires array notation.
- */
--#if (defined(LINUX) && defined(__powerpc__)) || \
-+#if (defined(LINUX) && defined(__x86_64__))
-+#define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar))
-+#elif (defined (__NetBSD__) && \
-+       (defined(__amd64__) || \
-+       (defined(__powerpc__) && __NetBSD_Version__ >= 105000000)))
-+#define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar))
-+#elif (defined(LINUX) && defined(__powerpc__)) || \
-     (defined(LINUX) && defined(__s390__)) || \
-     (defined(LINUX) && defined(__s390x__)) || \
-     defined(WIN16) || defined(QNX) || \
+--- ../pr/src/misc/prnetdb.c.orig      2006-02-01 20:04:26.000000000 +1300
++++ ../pr/src/misc/prnetdb.c   2006-02-01 20:05:53.000000000 +1300
+@@ -2110,7 +2110,17 @@
+          */
+         hints.ai_socktype = SOCK_STREAM;
+ 
++/* NetBSD >= 2.99.9 has a thread-safe resolver */
++#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 299000900
++      LOCK_DNS();
++#endif
++
+         rv = GETADDRINFO(hostname, NULL, &hints, &res);
++
++#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 299000900
++      UNLOCK_DNS();
++#endif
++
+         if (rv == 0)
+             return (PRAddrInfo *) res;
+ 
--- patches/patch-ae    2005-01-26 03:50:39.000000000 +1300
+++ /dev/null   2006-02-01 20:12:17.000000000 +1300
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/01/25 14:50:39 jschauma Exp $
-
---- ../pr/src/pthreads/ptio.c.orig     Tue Dec 21 11:43:31 2004
-+++ ../pr/src/pthreads/ptio.c  Tue Dec 21 11:43:46 2004
-@@ -202,7 +202,7 @@
- #elif defined(IRIX) || defined(OSF1) || defined(AIX) || defined(HPUX) \
-     || defined(LINUX) || defined(FREEBSD) || defined(BSDI) || defined(VMS) \
-     || defined(NTO) || defined(OPENBSD) || defined(DARWIN) \
--    || defined(UNIXWARE)
-+    || defined(UNIXWARE) || defined(NETBSD)
- #define _PRSockOptVal_t void *
- #else
- #error "Cannot determine architecture"

>Unformatted:
Prev by Date: PR/32688 CVS commit: pkgsrc/graphics/libungif
Next by Date: Re: pkg/32675 (sysutils/dvd+rw-tools dumps core)
Previous by Thread: PR/32688 CVS commit: pkgsrc/graphics/libungif
Next by Thread: pkg/32691: security/p5-Crypt-DES Sun Solaris redeclaration: des_crypt
Indexes:
Home | Main Index | Thread Index | Old Index