Mon Jul 3 12:18:17 2017 UTC ()
Update to 4.15

Changelog:
NSPR 4.15 contains the following changes:

- added TCP Fast Open functionality
- various correctness fixes


(ryoon)
diff -r1.89 -r1.90 pkgsrc/devel/nspr/Makefile
diff -r1.43 -r1.44 pkgsrc/devel/nspr/distinfo
diff -r1.11 -r1.12 pkgsrc/devel/nspr/patches/patch-ac
cvs diff -r1.89 -r1.90 pkgsrc/devel/nspr/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/nspr/Makefile 2017/03/31 23:38:37 1.89
+++ pkgsrc/devel/nspr/Makefile 2017/07/03 12:18:17 1.90
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.89 2017/03/31 23:38:37 ryoon Exp $ 1# $NetBSD: Makefile,v 1.90 2017/07/03 12:18:17 ryoon Exp $
2 2
3DISTNAME= nspr-${NSPR_RELEASE:S/.0$//} 3DISTNAME= nspr-${NSPR_RELEASE:S/.0$//}
4NSPR_RELEASE= 4.14.0 4NSPR_RELEASE= 4.15.0
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_MOZILLA_ALL:=nspr/releases/v${NSPR_RELEASE:S/.0$//}/src/} 6MASTER_SITES= ${MASTER_SITE_MOZILLA_ALL:=nspr/releases/v${NSPR_RELEASE:S/.0$//}/src/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR 9HOMEPAGE= https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR
10COMMENT= Platform-neutral API for system level and libc like functions 10COMMENT= Platform-neutral API for system level and libc like functions
11LICENSE= mpl-2.0 11LICENSE= mpl-2.0
12 12
13CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh 13CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
14CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh 14CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
15CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/configure 15CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/configure
16CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}configure 16CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}configure
17 17
cvs diff -r1.43 -r1.44 pkgsrc/devel/nspr/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/nspr/distinfo 2017/03/31 23:38:37 1.43
+++ pkgsrc/devel/nspr/distinfo 2017/07/03 12:18:17 1.44
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.43 2017/03/31 23:38:37 ryoon Exp $ 1$NetBSD: distinfo,v 1.44 2017/07/03 12:18:17 ryoon Exp $
2 2
3SHA1 (nspr-4.14.tar.gz) = 4c9ffda940882229104090f8fc8539f6412e1ff7 3SHA1 (nspr-4.15.tar.gz) = 56030e0177849034ba3027a23ae2a7f8ed41f379
4RMD160 (nspr-4.14.tar.gz) = 211bbe6b0724feb18e36fe7b8f80893c09c8b688 4RMD160 (nspr-4.15.tar.gz) = 27b31774022523b9eb88684f7c0b459c2d225ff0
5SHA512 (nspr-4.14.tar.gz) = cb0c82d7bb3dfebdfc167f88bc0dde1c0eb4340eb7c53342a57591b120b42248da9f3ee604bec60c80c4af24fb8e46c5cacf859d66e3253e7f35d2c47cf4e676 5SHA512 (nspr-4.15.tar.gz) = 1d6e9ba3ef71376ddb4f5ef2a6796bf3f95cf37abfac89d1745f02cc01003877d088a87946208d3827a3b3e28420215e543a647aadceff2ae6f9c1c70d4ac563
6Size (nspr-4.14.tar.gz) = 1136626 bytes 6Size (nspr-4.15.tar.gz) = 1140182 bytes
7SHA1 (patch-ab) = d93c055bbb12bd9edf5f21138a93898d6b3b3c73 7SHA1 (patch-ab) = d93c055bbb12bd9edf5f21138a93898d6b3b3c73
8SHA1 (patch-ac) = 543f0e899f7c1d7e8b7c63db76a6492e68b1a585 8SHA1 (patch-ac) = fb55a0da3e7978532823b0b25d17803f50087b95
9SHA1 (patch-ae) = c6cf30927792140d867bb4dc3adf19786f6cdbe0 9SHA1 (patch-ae) = c6cf30927792140d867bb4dc3adf19786f6cdbe0
10SHA1 (patch-ag) = 653d4bc8cc4eced8f628cfb738c5d99cc1a6cf24 10SHA1 (patch-ag) = 653d4bc8cc4eced8f628cfb738c5d99cc1a6cf24
11SHA1 (patch-az) = 8961cde8e657176e9e18098ab8e8e4d59723ceca 11SHA1 (patch-az) = 8961cde8e657176e9e18098ab8e8e4d59723ceca
12SHA1 (patch-ba) = 141b354b9ec0423a9c671d5eaca05cf16daac312 12SHA1 (patch-ba) = 141b354b9ec0423a9c671d5eaca05cf16daac312
13SHA1 (patch-nsprpub_pr_include_md__dragonfly.cfg) = 54d3fbd4c515290395b66f6b9e736a01a8318244 13SHA1 (patch-nsprpub_pr_include_md__dragonfly.cfg) = 54d3fbd4c515290395b66f6b9e736a01a8318244
14SHA1 (patch-nsprpub_pr_include_md__pth.h) = 1745efd2354199897fc0f180b1a0e2557d0db25f 14SHA1 (patch-nsprpub_pr_include_md__pth.h) = 1745efd2354199897fc0f180b1a0e2557d0db25f
15SHA1 (patch-nsprpub_pr_include_md_prosdep.h) = dd90cda6251aeeb10f02ef594c02484237195155 15SHA1 (patch-nsprpub_pr_include_md_prosdep.h) = dd90cda6251aeeb10f02ef594c02484237195155
16SHA1 (patch-nsprpub_pr_src_md_unix_uxrng.c) = 1d0f4ef5560ccdd7bf7097e987a06a34fc49621c 16SHA1 (patch-nsprpub_pr_src_md_unix_uxrng.c) = 1d0f4ef5560ccdd7bf7097e987a06a34fc49621c
17SHA1 (patch-nsprpub_pr_src_pthreads_ptio.c) = f83cc645a7114bf122adf62fd69808ad00bb989a 17SHA1 (patch-nsprpub_pr_src_pthreads_ptio.c) = f83cc645a7114bf122adf62fd69808ad00bb989a
18SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = 78c4b1063d6998b9cc135a99b425f9008753922d 18SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = 78c4b1063d6998b9cc135a99b425f9008753922d
cvs diff -r1.11 -r1.12 pkgsrc/devel/nspr/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/devel/nspr/patches/patch-ac 2016/08/28 07:00:50 1.11
+++ pkgsrc/devel/nspr/patches/patch-ac 2017/07/03 12:18:17 1.12
@@ -1,29 +1,37 @@ @@ -1,29 +1,37 @@
1$NetBSD: patch-ac,v 1.11 2016/08/28 07:00:50 richard Exp $ 1$NetBSD: patch-ac,v 1.12 2017/07/03 12:18:17 ryoon Exp $
2 2
3add runpath to Linux caught during check-shlibs-elf 3add runpath to Linux caught during check-shlibs-elf
4 4
5--- nspr/configure.in.orig 2016-02-12 13:51:25.000000000 +0000 5--- nspr/configure.in.orig 2017-06-05 20:16:00.000000000 +0000
6+++ nspr/configure.in 6+++ nspr/configure.in
7@@ -38,7 +38,7 @@ OBJDIR_NAME=. 7@@ -38,7 +38,7 @@ OBJDIR_NAME=.
8 OBJDIR_SUFFIX=OBJ 8 OBJDIR_SUFFIX=OBJ
9 NSINSTALL='$(MOD_DEPTH)/config/$(OBJDIR_NAME)/nsinstall' 9 NSINSTALL='$(MOD_DEPTH)/config/$(OBJDIR_NAME)/nsinstall'
10 NOSUCHFILE=/no-such-file 10 NOSUCHFILE=/no-such-file
11-LIBNSPR='-L$(dist_libdir) -lnspr$(MOD_MAJOR_VERSION)' 11-LIBNSPR='-L$(dist_libdir) -lnspr$(MOD_MAJOR_VERSION)'
12+LIBNSPR='-Wl,-R${prefix}/lib/${MOZILLA_PKG_NAME} -L$(dist_libdir) -lnspr$(MOD_MAJOR_VERSION)' 12+LIBNSPR='-Wl,-R${prefix}/lib/${MOZILLA_PKG_NAME} -L$(dist_libdir) -lnspr$(MOD_MAJOR_VERSION)'
13 LIBPLC='-L$(dist_libdir) -lplc$(MOD_MAJOR_VERSION)' 13 LIBPLC='-L$(dist_libdir) -lplc$(MOD_MAJOR_VERSION)'
14 CYGWIN_WRAPPER= 14 CYGWIN_WRAPPER=
15 MACOS_SDK_DIR= 15 MACOS_SDK_DIR=
16@@ -1531,6 +1531,33 @@ tools are selected during the Xcode/Deve 16@@ -1389,6 +1389,7 @@ case "$target" in
 17 changequote([,])
 18 if test "$HOST_DARWIN_MAJOR" -ge 15 ; then
 19 AC_DEFINE(HAS_CONNECTX)
 20+ fi
 21 AS='$(CC) -x assembler-with-cpp'
 22 CFLAGS="$CFLAGS -Wall -fno-common"
 23 case "${target_cpu}" in
 24@@ -1571,6 +1572,33 @@ tools are selected during the Xcode/Deve
17 DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' 25 DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
18 MDCPUCFG_H=_freebsd.cfg 26 MDCPUCFG_H=_freebsd.cfg
19 PR_MD_CSRCS=freebsd.c 27 PR_MD_CSRCS=freebsd.c
20+ if test "$LIBRUNPATH"; then 28+ if test "$LIBRUNPATH"; then
21+ DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH" 29+ DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH"
22+ fi 30+ fi
23+ ;; 31+ ;;
24+ 32+
25+*-dragonfly*) 33+*-dragonfly*)
26+ if test -z "$USE_NSPR_THREADS"; then 34+ if test -z "$USE_NSPR_THREADS"; then
27+ USE_PTHREADS=1 35+ USE_PTHREADS=1
28+ fi 36+ fi
29+ AC_DEFINE(XP_UNIX) 37+ AC_DEFINE(XP_UNIX)
@@ -37,59 +45,59 @@ add runpath to Linux caught during check @@ -37,59 +45,59 @@ add runpath to Linux caught during check
37+ DLL_SUFFIX=so.1.0 45+ DLL_SUFFIX=so.1.0
38+ fi 46+ fi
39+ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' 47+ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
40+ DSO_CFLAGS=-fPIC 48+ DSO_CFLAGS=-fPIC
41+ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' 49+ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
42+ MDCPUCFG_H=_dragonfly.cfg 50+ MDCPUCFG_H=_dragonfly.cfg
43+ PR_MD_CSRCS=freebsd.c 51+ PR_MD_CSRCS=freebsd.c
44+ if test "$LIBRUNPATH"; then 52+ if test "$LIBRUNPATH"; then
45+ DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH" 53+ DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH"
46+ fi 54+ fi
47 ;; 55 ;;
48  56
49 *-hpux*) 57 *-hpux*)
50@@ -1805,6 +1832,9 @@ tools are selected during the Xcode/Deve 58@@ -1846,6 +1874,9 @@ tools are selected during the Xcode/Deve
51 MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' 59 MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
52 DSO_CFLAGS=-fPIC 60 DSO_CFLAGS=-fPIC
53 DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' 61 DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
54+ if test "$LIBRUNPATH"; then 62+ if test "$LIBRUNPATH"; then
55+ DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH" 63+ DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH"
56+ fi 64+ fi
57 _OPTIMIZE_FLAGS=-O2 65 _OPTIMIZE_FLAGS=-O2
58 _DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that 66 _DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that
59 # combo is not yet good at debugging inlined 67 # combo is not yet good at debugging inlined
60@@ -2128,7 +2158,7 @@ tools are selected during the Xcode/Deve 68@@ -2169,7 +2200,7 @@ tools are selected during the Xcode/Deve
61 AC_DEFINE(HAVE_SOCKLEN_T) 69 AC_DEFINE(HAVE_SOCKLEN_T)
62 CFLAGS="$CFLAGS -ansi -Wall" 70 CFLAGS="$CFLAGS -ansi -Wall"
63 CXXFLAGS="$CXXFLAGS -ansi -Wall" 71 CXXFLAGS="$CXXFLAGS -ansi -Wall"
64- DLL_SUFFIX=so.1.0 72- DLL_SUFFIX=so.1.0
65+ DLL_SUFFIX=so 73+ DLL_SUFFIX=so
66 DSO_CFLAGS=-fPIC 74 DSO_CFLAGS=-fPIC
67 MDCPUCFG_H=_openbsd.cfg 75 MDCPUCFG_H=_openbsd.cfg
68 PR_MD_CSRCS=openbsd.c 76 PR_MD_CSRCS=openbsd.c
69@@ -2715,7 +2745,7 @@ if test -n "$USE_PTHREADS"; then 77@@ -2756,7 +2787,7 @@ if test -n "$USE_PTHREADS"; then
70 if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then 78 if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
71 ac_cv_have_dash_pthread=yes 79 ac_cv_have_dash_pthread=yes
72 case "$target_os" in 80 case "$target_os" in
73- freebsd*) 81- freebsd*)
74+ freebsd* | dragonfly*) 82+ freebsd* | dragonfly*)
75 # Freebsd doesn't use -pthread for compiles, it uses them for linking 83 # Freebsd doesn't use -pthread for compiles, it uses them for linking
76 ;; 84 ;;
77 *) 85 *)
78@@ -2753,7 +2783,7 @@ if test -n "$USE_PTHREADS"; then 86@@ -2794,7 +2825,7 @@ if test -n "$USE_PTHREADS"; then
79 _PTHREAD_LDFLAGS= 87 _PTHREAD_LDFLAGS=
80 fi 88 fi
81 ;; 89 ;;
82- *-freebsd*) 90- *-freebsd*)
83+ *-freebsd* | *-dragonfly*) 91+ *-freebsd* | *-dragonfly*)
84 AC_DEFINE(_REENTRANT) 92 AC_DEFINE(_REENTRANT)
85 AC_DEFINE(_THREAD_SAFE) 93 AC_DEFINE(_THREAD_SAFE)
86 dnl -pthread links in -lc_r, so don't specify it explicitly. 94 dnl -pthread links in -lc_r, so don't specify it explicitly.
87@@ -2834,7 +2864,7 @@ case "$target" in 95@@ -2875,7 +2906,7 @@ case "$target" in
88 AC_DEFINE(_PR_NEED_PTHREAD_INIT) 96 AC_DEFINE(_PR_NEED_PTHREAD_INIT)
89 fi 97 fi
90 ;; 98 ;;
91-*-freebsd*) 99-*-freebsd*)
92+*-freebsd* | *-dragonfly*) 100+*-freebsd* | *-dragonfly*)
93 if test -n "$USE_NSPR_THREADS"; then 101 if test -n "$USE_NSPR_THREADS"; then
94 AC_DEFINE(_PR_LOCAL_THREADS_ONLY) 102 AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
95 fi 103 fi