CVS commit: pkgsrc/devel/nspr

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/nspr
From: "Ryo ONODERA" <ryoon%netbsd.org@localhost>
Date: Tue, 3 Dec 2019 14:28:27 +0000

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Dec  3 14:28:26 UTC 2019

Modified Files:
        pkgsrc/devel/nspr: Makefile PLIST distinfo
        pkgsrc/devel/nspr/patches: patch-ae patch-nspr_pr_include_md___pth.h
            patch-nsprpub_pr_src_md_unix_uxrng.c
            patch-nsprpub_pr_src_pthreads_ptio.c
Removed Files:
        pkgsrc/devel/nspr/patches: patch-nsprpub_pr_src_pthreads_ptsynch.c

Log Message:
Update to 4.23

Changelog:
NSPR 4.23 contains the following changes:
- fixed a build failure that was introduced in 4.22
- correctness fix for Win64 socket polling
- whitespace in C files was cleaned up and no longer uses
  tab characters for indenting


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 pkgsrc/devel/nspr/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/nspr/PLIST
cvs rdiff -u -r1.52 -r1.53 pkgsrc/devel/nspr/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/nspr/patches/patch-ae
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/nspr/patches/patch-nspr_pr_include_md___pth.h
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/devel/nspr/patches/patch-nsprpub_pr_src_md_unix_uxrng.c \
    pkgsrc/devel/nspr/patches/patch-nsprpub_pr_src_pthreads_ptio.c
cvs rdiff -u -r1.4 -r0 \
    pkgsrc/devel/nspr/patches/patch-nsprpub_pr_src_pthreads_ptsynch.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/nspr/Makefile
diff -u pkgsrc/devel/nspr/Makefile:1.100 pkgsrc/devel/nspr/Makefile:1.101
--- pkgsrc/devel/nspr/Makefile:1.100    Sun Nov  3 10:39:21 2019
+++ pkgsrc/devel/nspr/Makefile  Tue Dec  3 14:28:26 2019
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.100 2019/11/03 10:39:21 rillig Exp $
+# $NetBSD: Makefile,v 1.101 2019/12/03 14:28:26 ryoon Exp $
 
 DISTNAME=      nspr-${NSPR_RELEASE:S/.0$//}
-NSPR_RELEASE=  4.21.0
-PKGREVISION=   1
+NSPR_RELEASE=  4.23.0
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_MOZILLA_ALL:=nspr/releases/v${NSPR_RELEASE:S/.0$//}/src/}
 

Index: pkgsrc/devel/nspr/PLIST
diff -u pkgsrc/devel/nspr/PLIST:1.15 pkgsrc/devel/nspr/PLIST:1.16
--- pkgsrc/devel/nspr/PLIST:1.15        Sat Dec 15 01:31:33 2012
+++ pkgsrc/devel/nspr/PLIST     Tue Dec  3 14:28:26 2019
@@ -1,30 +1,24 @@
-@comment $NetBSD: PLIST,v 1.15 2012/12/15 01:31:33 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.16 2019/12/03 14:28:26 ryoon Exp $
 bin/compile-et.pl
 bin/nspr-config
 bin/prerr.properties
 include/nspr/md/_aix32.cfg
 include/nspr/md/_aix64.cfg
-include/nspr/md/_beos.cfg
 include/nspr/md/_bsdi.cfg
 include/nspr/md/_darwin.cfg
-include/nspr/md/_dgux.cfg
 include/nspr/md/_dragonfly.cfg
 include/nspr/md/_freebsd.cfg
 include/nspr/md/_hpux32.cfg
 include/nspr/md/_hpux64.cfg
-include/nspr/md/_irix32.cfg
-include/nspr/md/_irix64.cfg
 include/nspr/md/_linux.cfg
 include/nspr/md/_netbsd.cfg
 include/nspr/md/_nto.cfg
 include/nspr/md/_openbsd.cfg
 include/nspr/md/_os2.cfg
-include/nspr/md/_osf1.cfg
 include/nspr/md/_qnx.cfg
 include/nspr/md/_riscos.cfg
 include/nspr/md/_scoos.cfg
 include/nspr/md/_solaris.cfg
-include/nspr/md/_symbian.cfg
 include/nspr/md/_unixware.cfg
 include/nspr/md/_unixware7.cfg
 include/nspr/md/_win95.cfg

Index: pkgsrc/devel/nspr/distinfo
diff -u pkgsrc/devel/nspr/distinfo:1.52 pkgsrc/devel/nspr/distinfo:1.53
--- pkgsrc/devel/nspr/distinfo:1.52     Mon Mar 11 14:16:00 2019
+++ pkgsrc/devel/nspr/distinfo  Tue Dec  3 14:28:26 2019
@@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.52 2019/03/11 14:16:00 ryoon Exp $
+$NetBSD: distinfo,v 1.53 2019/12/03 14:28:26 ryoon Exp $
 
-SHA1 (nspr-4.21.tar.gz) = 0ae8c710a52775e209b96aa6220362837b79b6c3
-RMD160 (nspr-4.21.tar.gz) = d854dea260b8f5a11327017eecab767727a62817
-SHA512 (nspr-4.21.tar.gz) = 4f152c6ca32d9dd4cf3d92b4b54f249ac1fa39047811f7c0c7a67bdc73173cf7de0dce36dc278ad781189ea2fdc71fa70e044597676a8b1f5e6d664907e5ab7c
-Size (nspr-4.21.tar.gz) = 1140741 bytes
+SHA1 (nspr-4.23.tar.gz) = f3fb61231901cdbb9e1b74e3930ff081ed764358
+RMD160 (nspr-4.23.tar.gz) = 0e18bc1e11fa1ac8be1cef4e222e2b068546926d
+SHA512 (nspr-4.23.tar.gz) = 19f964f11a6ae8acf83a6daa0c9ee141c6f2793fd79113f3d283e9590bc2c90bfa4e46814f902f376f15c0668fa9c283cc44f975d88461d8854b87b67c0a21c1
+Size (nspr-4.23.tar.gz) = 1078660 bytes
 SHA1 (patch-ab) = a24f80c2bab73c12b02d0aad7649da0ce4ca8d4f
 SHA1 (patch-ac) = a3d2cef788393b84e833d9e33bdf40b10d8efbd0
-SHA1 (patch-ae) = c6cf30927792140d867bb4dc3adf19786f6cdbe0
+SHA1 (patch-ae) = 28474b852325a37fb2a30717e9f7ffb77dad5deb
 SHA1 (patch-ag) = 653d4bc8cc4eced8f628cfb738c5d99cc1a6cf24
 SHA1 (patch-ba) = 141b354b9ec0423a9c671d5eaca05cf16daac312
 SHA1 (patch-nspr_pr_include_md___netbsd.cfg) = c7a652afc962e83cca49f451f6692bbc43644403
-SHA1 (patch-nspr_pr_include_md___pth.h) = f2c122b0af7635bea14e8cb60fad106e79b62f24
+SHA1 (patch-nspr_pr_include_md___pth.h) = ef97e3a9c2dbde85a7c36152807217f962d2b4fa
 SHA1 (patch-nspr_pr_src_pthreads_ptthread.c) = 1aaa1048399cc7a82a67b98ea2368033cb597ac6
 SHA1 (patch-nsprpub_pr_include_md__dragonfly.cfg) = 54d3fbd4c515290395b66f6b9e736a01a8318244
 SHA1 (patch-nsprpub_pr_include_md_prosdep.h) = dd90cda6251aeeb10f02ef594c02484237195155
-SHA1 (patch-nsprpub_pr_src_md_unix_uxrng.c) = 1d0f4ef5560ccdd7bf7097e987a06a34fc49621c
-SHA1 (patch-nsprpub_pr_src_pthreads_ptio.c) = f83cc645a7114bf122adf62fd69808ad00bb989a
+SHA1 (patch-nsprpub_pr_src_md_unix_uxrng.c) = 2fda72f511abb003685c9c48413d92c82b63f992
+SHA1 (patch-nsprpub_pr_src_pthreads_ptio.c) = 027da3827c393bfb91842bc4da45196493c17393
 SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = 9ce6cf8a182d797e5ff229b14b38be9dfb9682d0

Index: pkgsrc/devel/nspr/patches/patch-ae
diff -u pkgsrc/devel/nspr/patches/patch-ae:1.7 pkgsrc/devel/nspr/patches/patch-ae:1.8
--- pkgsrc/devel/nspr/patches/patch-ae:1.7      Sat Jul 20 08:57:20 2013
+++ pkgsrc/devel/nspr/patches/patch-ae  Tue Dec  3 14:28:26 2019
@@ -1,17 +1,17 @@
-$NetBSD: patch-ae,v 1.7 2013/07/20 08:57:20 ryoon Exp $
+$NetBSD: patch-ae,v 1.8 2019/12/03 14:28:26 ryoon Exp $
 
---- nsprpub/pr/src/misc/prnetdb.c.orig 2012-03-06 13:14:20.000000000 +0000
+--- nspr/pr/src/misc/prnetdb.c.orig    2019-10-15 14:21:38.000000000 +0000
 +++ nspr/pr/src/misc/prnetdb.c
-@@ -73,7 +73,7 @@ PRLock *_pr_dnsLock = NULL;
-         || defined(AIX4_3_PLUS) || (defined(AIX) && defined(_THREAD_SAFE)) \
-       || (defined(HPUX10_10) && defined(_REENTRANT)) \
+@@ -68,7 +68,7 @@ PRLock *_pr_dnsLock = NULL;
+ #if defined(AIX4_3_PLUS) || (defined(AIX) && defined(_THREAD_SAFE)) \
+     || (defined(HPUX10_10) && defined(_REENTRANT)) \
          || (defined(HPUX10_20) && defined(_REENTRANT)) \
 -        || defined(OPENBSD)
 +        || defined(OPENBSD) || defined(NETBSD)
  #define _PR_HAVE_GETPROTO_R
  #define _PR_HAVE_GETPROTO_R_INT
  #endif
-@@ -83,6 +83,11 @@ PRLock *_pr_dnsLock = NULL;
+@@ -78,6 +78,11 @@ PRLock *_pr_dnsLock = NULL;
  #define _PR_HAVE_5_ARG_GETPROTO_R
  #endif
  
@@ -21,9 +21,9 @@ $NetBSD: patch-ae,v 1.7 2013/07/20 08:57
 +#endif
 +
  /* BeOS has glibc but not the glibc-style getprotobyxxx_r functions. */
- #if (defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(XP_BEOS))
+ #if (defined(__GLIBC__) && __GLIBC__ >= 2)
  #define _PR_HAVE_GETPROTO_R
-@@ -300,7 +305,7 @@ _pr_QueryNetIfs(void)
+@@ -304,7 +309,7 @@ _pr_QueryNetIfs(void)
  }
  
  #elif (defined(DARWIN) && defined(HAVE_GETIFADDRS)) || defined(FREEBSD) \
@@ -32,7 +32,7 @@ $NetBSD: patch-ae,v 1.7 2013/07/20 08:57
  
  /*
   * Use the BSD getifaddrs function.
-@@ -2044,6 +2049,11 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
+@@ -2163,6 +2168,11 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
           */
          hints.ai_socktype = SOCK_STREAM;
  
@@ -44,15 +44,3 @@ $NetBSD: patch-ae,v 1.7 2013/07/20 08:57
          rv = GETADDRINFO(hostname, NULL, &hints, &res);
  #ifdef AI_ADDRCONFIG
          if (rv == EAI_BADFLAGS && (hints.ai_flags & AI_ADDRCONFIG)) {
-@@ -2051,6 +2061,11 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
-             rv = GETADDRINFO(hostname, NULL, &hints, &res);
-         }
- #endif
-+
-+#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 299000900
-+        UNLOCK_DNS();
-+#endif
-+
-         if (rv == 0)
-             return (PRAddrInfo *) res;
- 

Index: pkgsrc/devel/nspr/patches/patch-nspr_pr_include_md___pth.h
diff -u pkgsrc/devel/nspr/patches/patch-nspr_pr_include_md___pth.h:1.1 pkgsrc/devel/nspr/patches/patch-nspr_pr_include_md___pth.h:1.2
--- pkgsrc/devel/nspr/patches/patch-nspr_pr_include_md___pth.h:1.1      Wed Jan 24 16:21:42 2018
+++ pkgsrc/devel/nspr/patches/patch-nspr_pr_include_md___pth.h  Tue Dec  3 14:28:26 2019
@@ -1,39 +1,40 @@
-$NetBSD: patch-nspr_pr_include_md___pth.h,v 1.1 2018/01/24 16:21:42 ryoon Exp $
+$NetBSD: patch-nspr_pr_include_md___pth.h,v 1.2 2019/12/03 14:28:26 ryoon Exp $
 
---- nspr/pr/include/md/_pth.h.orig     2018-01-18 12:37:14.000000000 +0000
+--- nspr/pr/include/md/_pth.h.orig     2019-10-15 14:21:38.000000000 +0000
 +++ nspr/pr/include/md/_pth.h
 @@ -86,7 +86,7 @@
   */
- #if defined(IRIX) || defined(OSF1) || defined(AIX) || defined(SOLARIS) \
-       || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
--      || defined(HPUX) || defined(FREEBSD) \
-+      || defined(HPUX) || defined(FREEBSD) || defined(__DragonFly__) \
-       || defined(NETBSD) || defined(OPENBSD) || defined(BSDI) \
-       || defined(NTO) || defined(DARWIN) \
-       || defined(UNIXWARE) || defined(RISCOS) || defined(SYMBIAN)
+ #if defined(AIX) || defined(SOLARIS) \
+     || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
+-    || defined(HPUX) || defined(FREEBSD) \
++    || defined(HPUX) || defined(FREEBSD) || defined(__DragonFly__) \
+     || defined(NETBSD) || defined(OPENBSD) || defined(BSDI) \
+     || defined(NTO) || defined(DARWIN) \
+     || defined(UNIXWARE) || defined(RISCOS)
 @@ -115,7 +115,7 @@
  #if (defined(AIX) && !defined(AIX4_3_PLUS)) \
-       || defined(LINUX) || defined(__GNU__)|| defined(__GLIBC__) \
-       || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
--      || defined(BSDI) || defined(UNIXWARE) \
-+      || defined(BSDI) || defined(UNIXWARE) || defined(__DragonFly__)\
-       || defined(DARWIN) || defined(SYMBIAN)
+     || defined(LINUX) || defined(__GNU__)|| defined(__GLIBC__) \
+     || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
+-    || defined(BSDI) || defined(UNIXWARE) \
++    || defined(BSDI) || defined(UNIXWARE) || defined(__DragonFly__) \
+     || defined(DARWIN)
  #define PT_NO_SIGTIMEDWAIT
  #endif
-@@ -140,7 +140,7 @@
+@@ -133,7 +133,7 @@
  #define PT_PRIO_MIN            sched_get_priority_min(SCHED_OTHER)
  #define PT_PRIO_MAX            sched_get_priority_max(SCHED_OTHER)
  #elif defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
--      || defined(FREEBSD) || defined(SYMBIAN)
-+      || defined(FREEBSD) || defined(SYMBIAN) || defined(__DragonFly__)
+-    || defined(FREEBSD)
++    || defined(FREEBSD) || defined(__DragonFly__) 
  #define PT_PRIO_MIN            sched_get_priority_min(SCHED_OTHER)
  #define PT_PRIO_MAX            sched_get_priority_max(SCHED_OTHER)
  #elif defined(NTO)
-@@ -197,6 +197,7 @@ extern int (*_PT_aix_yield_fcn)();
- #elif defined(HPUX) || defined(SOLARIS) \
-       || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-       || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
-+      || defined(__DragonFly__) \
-       || defined(BSDI) || defined(NTO) || defined(DARWIN) \
-       || defined(UNIXWARE) || defined(RISCOS) || defined(SYMBIAN)
- #define _PT_PTHREAD_YIELD()                   sched_yield()
+@@ -177,7 +177,7 @@ extern int (*_PT_aix_yield_fcn)();
+     || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
+     || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
+     || defined(BSDI) || defined(NTO) || defined(DARWIN) \
+-    || defined(UNIXWARE) || defined(RISCOS)
++    || defined(UNIXWARE) || defined(RISCOS) || defined(__DragonFly__)
+ #define _PT_PTHREAD_YIELD()             sched_yield()
+ #else
+ #error "Need to define _PT_PTHREAD_YIELD for this platform"

Index: pkgsrc/devel/nspr/patches/patch-nsprpub_pr_src_md_unix_uxrng.c
diff -u pkgsrc/devel/nspr/patches/patch-nsprpub_pr_src_md_unix_uxrng.c:1.3 pkgsrc/devel/nspr/patches/patch-nsprpub_pr_src_md_unix_uxrng.c:1.4
--- pkgsrc/devel/nspr/patches/patch-nsprpub_pr_src_md_unix_uxrng.c:1.3  Sat Jul 20 08:57:20 2013
+++ pkgsrc/devel/nspr/patches/patch-nsprpub_pr_src_md_unix_uxrng.c      Tue Dec  3 14:28:26 2019
@@ -1,13 +1,13 @@
-$NetBSD: patch-nsprpub_pr_src_md_unix_uxrng.c,v 1.3 2013/07/20 08:57:20 ryoon Exp $
+$NetBSD: patch-nsprpub_pr_src_md_unix_uxrng.c,v 1.4 2019/12/03 14:28:26 ryoon Exp $
 
---- nsprpub/pr/src/md/unix/uxrng.c.orig        2012-05-18 21:55:29.000000000 +0000
+--- nspr/pr/src/md/unix/uxrng.c.orig   2019-10-15 14:21:38.000000000 +0000
 +++ nspr/pr/src/md/unix/uxrng.c
-@@ -94,7 +94,7 @@ GetHighResClock(void *buf, size_t maxbyt
+@@ -64,7 +64,7 @@ GetHighResClock(void *buf, size_t maxbyt
  
  #elif (defined(LINUX) || defined(FREEBSD) || defined(__FreeBSD_kernel__) \
      || defined(NETBSD) || defined(__NetBSD_kernel__) || defined(OPENBSD) \
--    || defined(SYMBIAN) || defined(__GNU__))
-+    || defined(SYMBIAN) || defined(__GNU__)) || defined(__DragonFly__)
+-    || defined(__GNU__))
++    || defined(__GNU__)) || defined(__DragonFly__)
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <fcntl.h>
Index: pkgsrc/devel/nspr/patches/patch-nsprpub_pr_src_pthreads_ptio.c
diff -u pkgsrc/devel/nspr/patches/patch-nsprpub_pr_src_pthreads_ptio.c:1.3 pkgsrc/devel/nspr/patches/patch-nsprpub_pr_src_pthreads_ptio.c:1.4
--- pkgsrc/devel/nspr/patches/patch-nsprpub_pr_src_pthreads_ptio.c:1.3  Sat Jul 20 08:57:20 2013
+++ pkgsrc/devel/nspr/patches/patch-nsprpub_pr_src_pthreads_ptio.c      Tue Dec  3 14:28:26 2019
@@ -1,23 +1,23 @@
-$NetBSD: patch-nsprpub_pr_src_pthreads_ptio.c,v 1.3 2013/07/20 08:57:20 ryoon Exp $
+$NetBSD: patch-nsprpub_pr_src_pthreads_ptio.c,v 1.4 2019/12/03 14:28:26 ryoon Exp $
 
---- nsprpub/pr/src/pthreads/ptio.c.orig        2012-03-06 13:14:21.000000000 +0000
+--- nspr/pr/src/pthreads/ptio.c.orig   2019-10-15 14:21:38.000000000 +0000
 +++ nspr/pr/src/pthreads/ptio.c
-@@ -180,7 +180,8 @@ static PRBool _pr_ipv6_v6only_on_by_defa
+@@ -183,7 +183,7 @@ static PRBool _pr_ipv6_v6only_on_by_defa
      || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
      || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
      || defined(BSDI) || defined(NTO) || defined(DARWIN) \
--    || defined(UNIXWARE) || defined(RISCOS) || defined(SYMBIAN)
-+    || defined(UNIXWARE) || defined(RISCOS) || defined(SYMBIAN) \
-+    || defined(__DragonFly__)
+-    || defined(UNIXWARE) || defined(RISCOS)
++    || defined(UNIXWARE) || defined(RISCOS) || defined(__DragonFly__)
  #define _PRSelectFdSetArg_t fd_set *
  #else
  #error "Cannot determine architecture"
-@@ -3254,7 +3255,7 @@ static PRIOMethods _pr_socketpollfd_meth
+@@ -3477,7 +3477,8 @@ static PRIOMethods _pr_socketpollfd_meth
+     || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
      || defined(AIX) || defined(FREEBSD) || defined(NETBSD) \
      || defined(OPENBSD) || defined(BSDI) || defined(NTO) \
-     || defined(DARWIN) || defined(UNIXWARE) || defined(RISCOS) \
--    || defined(SYMBIAN)
-+    || defined(SYMBIAN) || defined(__DragonFly__)
+-    || defined(DARWIN) || defined(UNIXWARE) || defined(RISCOS)
++    || defined(DARWIN) || defined(UNIXWARE) || defined(RISCOS) \
++    || defined(__DragonFly__)
  #define _PR_FCNTL_FLAGS O_NONBLOCK
  #else
  #error "Can't determine architecture"

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index