CVS commit: pkgsrc/devel/nspr

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/nspr
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Thu, 1 Jul 2021 07:23:00 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jul  1 07:23:00 UTC 2021

Modified Files:
        pkgsrc/devel/nspr: Makefile PLIST distinfo
        pkgsrc/devel/nspr/patches: patch-ab patch-ac patch-ba
            patch-nspr_pr_include_md___netbsd.cfg
            patch-nspr_pr_src_pthreads_ptsynch.c
            patch-nspr_pr_src_pthreads_ptthread.c
Removed Files:
        pkgsrc/devel/nspr/patches: patch-ae patch-ag
            patch-nspr_pr_include_md___pth.h
            patch-nsprpub_pr_include_md__dragonfly.cfg
            patch-nsprpub_pr_include_md_prosdep.h
            patch-nsprpub_pr_src_md_unix_uxrng.c
            patch-nsprpub_pr_src_pthreads_ptio.c

Log Message:
nspr: update to 4.32

Remove dragonfly patches.
Report NetBSD patches upstream, add bug report URLs.

Changes:
- implement new socket option PR_SockOpt_DontFrag
- support larger DNS records by increasing the default buffer
  size for DNS queries


To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 pkgsrc/devel/nspr/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/nspr/PLIST
cvs rdiff -u -r1.62 -r1.63 pkgsrc/devel/nspr/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/nspr/patches/patch-ab
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/nspr/patches/patch-ac
cvs rdiff -u -r1.8 -r0 pkgsrc/devel/nspr/patches/patch-ae
cvs rdiff -u -r1.5 -r0 pkgsrc/devel/nspr/patches/patch-ag
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/nspr/patches/patch-ba \
    pkgsrc/devel/nspr/patches/patch-nspr_pr_include_md___netbsd.cfg
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/devel/nspr/patches/patch-nspr_pr_include_md___pth.h
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptsynch.c \
    pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptthread.c
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/devel/nspr/patches/patch-nsprpub_pr_include_md__dragonfly.cfg \
    pkgsrc/devel/nspr/patches/patch-nsprpub_pr_include_md_prosdep.h
cvs rdiff -u -r1.4 -r0 \
    pkgsrc/devel/nspr/patches/patch-nsprpub_pr_src_md_unix_uxrng.c \
    pkgsrc/devel/nspr/patches/patch-nsprpub_pr_src_pthreads_ptio.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.113 pkgsrc/devel/nspr/Makefile:1.114
--- pkgsrc/devel/nspr/Makefile:1.113    Thu May 27 06:39:35 2021
+++ pkgsrc/devel/nspr/Makefile  Thu Jul  1 07:23:00 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.113 2021/05/27 06:39:35 wiz Exp $
+# $NetBSD: Makefile,v 1.114 2021/07/01 07:23:00 wiz Exp $
 
 DISTNAME=      nspr-${NSPR_RELEASE:S/.0$//}
-NSPR_RELEASE=  4.31.0
+NSPR_RELEASE=  4.32.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.16 pkgsrc/devel/nspr/PLIST:1.17
--- pkgsrc/devel/nspr/PLIST:1.16        Tue Dec  3 14:28:26 2019
+++ pkgsrc/devel/nspr/PLIST     Thu Jul  1 07:23:00 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2019/12/03 14:28:26 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.17 2021/07/01 07:23:00 wiz Exp $
 bin/compile-et.pl
 bin/nspr-config
 bin/prerr.properties
@@ -6,7 +6,6 @@ include/nspr/md/_aix32.cfg
 include/nspr/md/_aix64.cfg
 include/nspr/md/_bsdi.cfg
 include/nspr/md/_darwin.cfg
-include/nspr/md/_dragonfly.cfg
 include/nspr/md/_freebsd.cfg
 include/nspr/md/_hpux32.cfg
 include/nspr/md/_hpux64.cfg

Index: pkgsrc/devel/nspr/distinfo
diff -u pkgsrc/devel/nspr/distinfo:1.62 pkgsrc/devel/nspr/distinfo:1.63
--- pkgsrc/devel/nspr/distinfo:1.62     Thu May 27 06:39:35 2021
+++ pkgsrc/devel/nspr/distinfo  Thu Jul  1 07:23:00 2021
@@ -1,19 +1,12 @@
-$NetBSD: distinfo,v 1.62 2021/05/27 06:39:35 wiz Exp $
+$NetBSD: distinfo,v 1.63 2021/07/01 07:23:00 wiz Exp $
 
-SHA1 (nspr-4.31.tar.gz) = 3001e873da7535e03a91339e7b55aca6f9f83914
-RMD160 (nspr-4.31.tar.gz) = 0e3f74690de98a45d2efc8f6172488667c1c99e8
-SHA512 (nspr-4.31.tar.gz) = 1f37d04721335288dd8a5cf700ead5a56cee73365e619f3da90f6067830b78a050a525950686bcdd14fcf61faffd1141ec46d4180a0dd10375f7e9fef6eac6ed
-Size (nspr-4.31.tar.gz) = 1078163 bytes
-SHA1 (patch-ab) = a24f80c2bab73c12b02d0aad7649da0ce4ca8d4f
-SHA1 (patch-ac) = a3d2cef788393b84e833d9e33bdf40b10d8efbd0
-SHA1 (patch-ae) = 28474b852325a37fb2a30717e9f7ffb77dad5deb
-SHA1 (patch-ag) = 653d4bc8cc4eced8f628cfb738c5d99cc1a6cf24
-SHA1 (patch-ba) = 141b354b9ec0423a9c671d5eaca05cf16daac312
-SHA1 (patch-nspr_pr_include_md___netbsd.cfg) = d859aed2b165d25bfb1f95903ee7725d1d358097
-SHA1 (patch-nspr_pr_include_md___pth.h) = ef97e3a9c2dbde85a7c36152807217f962d2b4fa
-SHA1 (patch-nspr_pr_src_pthreads_ptsynch.c) = 52e0e2bb1d1ddb282f92ce2df2c69684c0634dbe
-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) = 2fda72f511abb003685c9c48413d92c82b63f992
-SHA1 (patch-nsprpub_pr_src_pthreads_ptio.c) = 027da3827c393bfb91842bc4da45196493c17393
+SHA1 (nspr-4.32.tar.gz) = 28e05ef5cbe6e7cde239d3cdcccabf571ec73f69
+RMD160 (nspr-4.32.tar.gz) = e7b4a6903ac891161149b59142fccf29c11eb58f
+SHA512 (nspr-4.32.tar.gz) = da9b65b374783d20a2e589211b411816d899e296e91175d376e59df1919144c1808c155a234d6ceefdf7b8ae8f47cec98d92a5aa3150a579513251860e50dcb7
+Size (nspr-4.32.tar.gz) = 1079004 bytes
+SHA1 (patch-ab) = 008f5b84994ad20e3b1a0de1e0f7a028932d03d2
+SHA1 (patch-ac) = c751b8397744c969e6141f609cb3914db6e699e3
+SHA1 (patch-ba) = 35f7cc7bbe7fa0f72eb7b506094ad1812b754aa5
+SHA1 (patch-nspr_pr_include_md___netbsd.cfg) = a3aba89d02cd61f748862ebb3b76050873ccdd69
+SHA1 (patch-nspr_pr_src_pthreads_ptsynch.c) = 77fc5653bcfaf39f55f26b301992aaeb2ff2401c
+SHA1 (patch-nspr_pr_src_pthreads_ptthread.c) = 187fdad28d0407c440154a614d38d860b71bfad1

Index: pkgsrc/devel/nspr/patches/patch-ab
diff -u pkgsrc/devel/nspr/patches/patch-ab:1.9 pkgsrc/devel/nspr/patches/patch-ab:1.10
--- pkgsrc/devel/nspr/patches/patch-ab:1.9      Sat May 12 09:01:08 2018
+++ pkgsrc/devel/nspr/patches/patch-ab  Thu Jul  1 07:23:00 2021
@@ -1,4 +1,7 @@
-$NetBSD: patch-ab,v 1.9 2018/05/12 09:01:08 jmcneill Exp $
+$NetBSD: patch-ab,v 1.10 2021/07/01 07:23:00 wiz Exp $
+
+Improve NetBSD support.
+https://bugzilla.mozilla.org/show_bug.cgi?id=1718836
 
 --- nspr/pr/include/md/_netbsd.h.orig  2018-03-05 15:50:28.000000000 +0000
 +++ nspr/pr/include/md/_netbsd.h

Index: pkgsrc/devel/nspr/patches/patch-ac
diff -u pkgsrc/devel/nspr/patches/patch-ac:1.14 pkgsrc/devel/nspr/patches/patch-ac:1.15
--- pkgsrc/devel/nspr/patches/patch-ac:1.14     Wed Oct  4 12:52:43 2017
+++ pkgsrc/devel/nspr/patches/patch-ac  Thu Jul  1 07:23:00 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.14 2017/10/04 12:52:43 jperkin Exp $
+$NetBSD: patch-ac,v 1.15 2021/07/01 07:23:00 wiz Exp $
 
 add runpath to Linux caught during check-shlibs-elf
 
---- nspr/configure.in.orig     2017-07-27 12:31:27.000000000 +0000
+--- nspr/configure.in.orig     2021-06-30 21:43:23.000000000 +0000
 +++ nspr/configure.in
 @@ -38,7 +38,7 @@ OBJDIR_NAME=.
  OBJDIR_SUFFIX=OBJ
@@ -13,41 +13,17 @@ add runpath to Linux caught during check
  LIBPLC='-L$(dist_libdir) -lplc$(MOD_MAJOR_VERSION)'
  CYGWIN_WRAPPER=
  MACOS_SDK_DIR=
-@@ -1573,6 +1573,33 @@ tools are selected during the Xcode/Deve
+@@ -1486,6 +1486,9 @@ tools are selected during the Xcode/Deve
      DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
      MDCPUCFG_H=_freebsd.cfg
      PR_MD_CSRCS=freebsd.c
 +    if test "$LIBRUNPATH"; then
 +        DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH"
 +    fi
-+    ;;
-+
-+*-dragonfly*)
-+    if test -z "$USE_NSPR_THREADS"; then
-+        USE_PTHREADS=1
-+    fi
-+    AC_DEFINE(XP_UNIX)
-+    AC_DEFINE(HAVE_BSD_FLOCK)
-+    AC_DEFINE(HAVE_SOCKLEN_T)
-+    CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+    MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    if test "$MOZ_OBJFORMAT" = "elf"; then
-+        DLL_SUFFIX=so
-+    else
-+        DLL_SUFFIX=so.1.0
-+    fi
-+    MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-+    DSO_CFLAGS=-fPIC
-+    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
-+    MDCPUCFG_H=_dragonfly.cfg
-+    PR_MD_CSRCS=freebsd.c
-+    if test "$LIBRUNPATH"; then
-+        DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH"
-+    fi
      ;;
  
  *-hpux*)
-@@ -1848,6 +1875,9 @@ tools are selected during the Xcode/Deve
+@@ -1662,6 +1665,9 @@ tools are selected during the Xcode/Deve
      MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
      DSO_CFLAGS=-fPIC
      DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
@@ -57,7 +33,7 @@ add runpath to Linux caught during check
      _OPTIMIZE_FLAGS=-O2
      _DEBUG_FLAGS="-g -fno-inline"  # most people on linux use gcc/gdb, and that
                                     # combo is not yet good at debugging inlined
-@@ -2173,7 +2203,7 @@ tools are selected during the Xcode/Deve
+@@ -1991,7 +1997,7 @@ tools are selected during the Xcode/Deve
      AC_DEFINE(HAVE_POINTER_LOCALTIME_R)
      CFLAGS="$CFLAGS -ansi -Wall"
      CXXFLAGS="$CXXFLAGS -ansi -Wall"
@@ -66,7 +42,7 @@ add runpath to Linux caught during check
      DSO_CFLAGS=-fPIC
      MDCPUCFG_H=_openbsd.cfg
      PR_MD_CSRCS=openbsd.c
-@@ -2293,7 +2323,7 @@ tools are selected during the Xcode/Deve
+@@ -2070,7 +2076,7 @@ tools are selected during the Xcode/Deve
          if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then
              GCC_USE_GNU_LD=1
          fi
@@ -75,30 +51,3 @@ add runpath to Linux caught during check
          if test -n "$USE_B_DIRECT"; then
              DSO_LDOPTS="$DSO_LDOPTS,-Bdirect"
          fi
-@@ -2760,7 +2790,7 @@ if test -n "$USE_PTHREADS"; then
-       if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
-           ac_cv_have_dash_pthread=yes
-               case "$target_os" in
--          freebsd*)
-+          freebsd* | dragonfly*)
- # Freebsd doesn't use -pthread for compiles, it uses them for linking
-             ;;
-           *)
-@@ -2798,7 +2828,7 @@ if test -n "$USE_PTHREADS"; then
-             _PTHREAD_LDFLAGS=
-         fi
-           ;;
--    *-freebsd*)
-+    *-freebsd* | *-dragonfly*)
-           AC_DEFINE(_REENTRANT)
-           AC_DEFINE(_THREAD_SAFE)
-           dnl -pthread links in -lc_r, so don't specify it explicitly.
-@@ -2879,7 +2909,7 @@ case "$target" in
-         AC_DEFINE(_PR_NEED_PTHREAD_INIT)
-     fi
-     ;;
--*-freebsd*)
-+*-freebsd* | *-dragonfly*)
-     if test -n "$USE_NSPR_THREADS"; then
-         AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
-     fi

Index: pkgsrc/devel/nspr/patches/patch-ba
diff -u pkgsrc/devel/nspr/patches/patch-ba:1.2 pkgsrc/devel/nspr/patches/patch-ba:1.3
--- pkgsrc/devel/nspr/patches/patch-ba:1.2      Sat Jul 20 08:57:20 2013
+++ pkgsrc/devel/nspr/patches/patch-ba  Thu Jul  1 07:23:00 2021
@@ -1,6 +1,7 @@
-$NetBSD: patch-ba,v 1.2 2013/07/20 08:57:20 ryoon Exp $
+$NetBSD: patch-ba,v 1.3 2021/07/01 07:23:00 wiz Exp $
 
 pthread_t may be 64-bit, avoid casting it.
+https://bugzilla.mozilla.org/show_bug.cgi?id=1718835
 
 --- nsprpub/pr/include/private/pprthred.h.orig 2009-11-02 22:43:08.000000000 +0100
 +++ nspr/pr/include/private/pprthred.h
Index: pkgsrc/devel/nspr/patches/patch-nspr_pr_include_md___netbsd.cfg
diff -u pkgsrc/devel/nspr/patches/patch-nspr_pr_include_md___netbsd.cfg:1.2 pkgsrc/devel/nspr/patches/patch-nspr_pr_include_md___netbsd.cfg:1.3
--- pkgsrc/devel/nspr/patches/patch-nspr_pr_include_md___netbsd.cfg:1.2 Fri Apr 23 16:03:15 2021
+++ pkgsrc/devel/nspr/patches/patch-nspr_pr_include_md___netbsd.cfg     Thu Jul  1 07:23:00 2021
@@ -1,6 +1,7 @@
-$NetBSD: patch-nspr_pr_include_md___netbsd.cfg,v 1.2 2021/04/23 16:03:15 rin Exp $
+$NetBSD: patch-nspr_pr_include_md___netbsd.cfg,v 1.3 2021/07/01 07:23:00 wiz Exp $
 
 Support NetBSD/aarch64{,eb}.
+https://bugzilla.mozilla.org/show_bug.cgi?id=1718836
 
 --- nspr/pr/include/md/_netbsd.cfg.orig        2021-03-16 23:53:01.000000000 +0900
 +++ nspr/pr/include/md/_netbsd.cfg     2021-04-24 00:52:11.369243612 +0900

Index: pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptsynch.c
diff -u pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptsynch.c:1.1 pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptsynch.c:1.2
--- pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptsynch.c:1.1  Wed Feb  5 03:26:52 2020
+++ pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptsynch.c      Thu Jul  1 07:23:00 2021
@@ -1,9 +1,11 @@
-$NetBSD: patch-nspr_pr_src_pthreads_ptsynch.c,v 1.1 2020/02/05 03:26:52 ryoon Exp $
+$NetBSD: patch-nspr_pr_src_pthreads_ptsynch.c,v 1.2 2021/07/01 07:23:00 wiz Exp $
 
 * Do not use pthread_equal() for non-valid thread pointers.
   From kamin@ on source-changes-d%NetBSD.org@localhost.
   https://mail-index.netbsd.org/source-changes-d/2020/02/03/msg012143.html
 
+https://bugzilla.mozilla.org/show_bug.cgi?id=1718838
+
 --- nspr/pr/src/pthreads/ptsynch.c.orig        2020-01-31 20:37:50.000000000 +0000
 +++ nspr/pr/src/pthreads/ptsynch.c
 @@ -25,6 +25,13 @@ static pthread_condattr_t _pt_cvar_attr;
Index: pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptthread.c
diff -u pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptthread.c:1.1 pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptthread.c:1.2
--- pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptthread.c:1.1 Wed Jan 24 16:21:42 2018
+++ pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptthread.c     Thu Jul  1 07:23:00 2021
@@ -1,4 +1,7 @@
-$NetBSD: patch-nspr_pr_src_pthreads_ptthread.c,v 1.1 2018/01/24 16:21:42 ryoon Exp $
+$NetBSD: patch-nspr_pr_src_pthreads_ptthread.c,v 1.2 2021/07/01 07:23:00 wiz Exp $
+
+pthread_t may be 64-bit, avoid casting it.
+https://bugzilla.mozilla.org/show_bug.cgi?id=1718835
 
 --- nspr/pr/src/pthreads/ptthread.c.orig       2018-01-18 12:37:14.000000000 +0000
 +++ nspr/pr/src/pthreads/ptthread.c

Prev by Date: CVS commit: pkgsrc/net/gh
Next by Date: CVS commit: pkgsrc/devel/nspr
Previous by Thread: CVS commit: pkgsrc/net/gh
Next by Thread: CVS commit: pkgsrc/devel/nspr
Indexes:

Home | Main Index | Thread Index | Old Index