Index: branches/2016Q1/security/ca_root_nss/Makefile
===================================================================
--- branches/2016Q1/security/ca_root_nss/Makefile	(revision 409424)
+++ branches/2016Q1/security/ca_root_nss/Makefile	(revision 409425)
@@ -1,71 +1,71 @@
 # $FreeBSD$
 
 PORTNAME=	ca_root_nss
 PORTVERSION=	${VERSION_NSS}
 CATEGORIES=	security
 MASTER_SITES=	MOZILLA/security/nss/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src
 DISTNAME=	nss-${VERSION_NSS}${NSS_SUFFIX}
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Root certificate bundle from the Mozilla Project
 
 LICENSE=	MPL
 
 OPTIONS_DEFINE=		ETCSYMLINK
 OPTIONS_DEFAULT=	ETCSYMLINK
 
 OPTIONS_SUB=		yes
 
 ETCSYMLINK_DESC=	Add symlink to /etc/ssl/cert.pem
 ETCSYMLINK_CONFLICTS_INSTALL=	ca-roots-[0-9]*
 
 USES=		perl5
 USE_PERL5=	build
 NO_ARCH=	yes
 NO_WRKSUBDIR=	yes
 
 CERTDIR?=	share/certs
 PLIST_SUB+=	CERTDIR=${CERTDIR}
 
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # !!!  These versions are intended to track security/nss.        !!!
 # !!!  Please DO NOT submit patches for new version until it has !!!
 # !!!  been committed there first.                               !!!
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-VERSION_NSS=	3.21
+VERSION_NSS=	3.22
 #NSS_SUFFIX=	-with-ckbi-1.98
 CERTDATA_TXT_PATH=	nss-${VERSION_NSS}/nss/lib/ckfw/builtins/certdata.txt
 BUNDLE_PROCESSOR=	MAca-bundle.pl
 
 SUB_FILES=	MAca-bundle.pl pkg-message
 SUB_LIST=	VERSION_NSS=${VERSION_NSS}
 
 .include <bsd.port.options.mk>
 
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	@${TAR} -C ${WRKDIR} -xf ${DISTDIR}/nss-${VERSION_NSS}${NSS_SUFFIX}${EXTRACT_SUFX} \
 	    ${CERTDATA_TXT_PATH}
 	@${CP} ${WRKDIR}/${CERTDATA_TXT_PATH} ${WRKDIR}
 	@${RM} -rf ${WRKDIR}/nss-${VERSION_NSS}
 
 do-build:	apply-slist
 	@${PERL} ${WRKDIR}/${BUNDLE_PROCESSOR} \
 	    < ${WRKDIR}/certdata.txt > \
 	    ${WRKDIR}/ca-root-nss.crt
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${CERTDIR}
 	${INSTALL_DATA} ${WRKDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/${CERTDIR}
 
 post-install:
 .if ${PORT_OPTIONS:METCSYMLINK}
 	${MKDIR} ${STAGEDIR}/etc/ssl
 	${LN} -sf ${PREFIX}/${CERTDIR}/ca-root-nss.crt ${STAGEDIR}/etc/ssl/cert.pem
 .endif
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/ssl
 	${LN} -sf ${PREFIX}/${CERTDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/etc/ssl/cert.pem.sample
 	${MKDIR} ${STAGEDIR}${PREFIX}/openssl
 	${LN} -sf ${PREFIX}/${CERTDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/openssl/cert.pem.sample
 
 .include <bsd.port.mk>
Index: branches/2016Q1/security/ca_root_nss/distinfo
===================================================================
--- branches/2016Q1/security/ca_root_nss/distinfo	(revision 409424)
+++ branches/2016Q1/security/ca_root_nss/distinfo	(revision 409425)
@@ -1,2 +1,2 @@
-SHA256 (nss-3.21.tar.gz) = 3f7a5b027d7cdd5c0e4ff7544da33fdc6f56c2f8c27fff02938fd4a6fbe87239
-SIZE (nss-3.21.tar.gz) = 6978112
+SHA256 (nss-3.22.tar.gz) = 30ebd121c77e725a1383618eff79a6752d6e9f0f21882ad825ddab12e7227611
+SIZE (nss-3.22.tar.gz) = 6992347
Index: branches/2016Q1/security/nss/Makefile
===================================================================
--- branches/2016Q1/security/nss/Makefile	(revision 409424)
+++ branches/2016Q1/security/nss/Makefile	(revision 409425)
@@ -1,102 +1,102 @@
 # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	nss
-PORTVERSION=	3.21
+PORTVERSION=	3.22.1
 #DISTVERSIONSUFFIX=	-with-ckbi-1.98
 CATEGORIES=	security
 MASTER_SITES=	MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Libraries to support development of security-enabled applications
 
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		nspr>=4.10.10:${PORTSDIR}/devel/nspr \
+		nspr>=4.12:${PORTSDIR}/devel/nspr \
 		sqlite3>=3.7.15:${PORTSDIR}/databases/sqlite3
 LIB_DEPENDS=	libnspr4.so:${PORTSDIR}/devel/nspr \
 		libsqlite3.so:${PORTSDIR}/databases/sqlite3
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/nss
 
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/nss
 USES=		cpe gmake perl5
 CPE_VENDOR=	mozilla
 CPE_PRODUCT=	network_security_services
 USE_PERL5=	build
 MAKE_ENV=	LIBRARY_PATH="${LOCALBASE}/lib" \
 		SQLITE_INCLUDE_DIR="${LOCALBASE}/include" \
 		FREEBL_LOWHASH=1 \
 		NSS_DISABLE_GTESTS=1 \
 		NSS_USE_SYSTEM_SQLITE=1
 CFLAGS+=	-I${LOCALBASE}/include/nspr
 
 SUB_FILES=	nss-config nss.pc
 SUB_LIST=	PORTVERSION=${PORTVERSION}
 
 DIST=		${WRKSRC:H}/dist
 
 EXTRACT_AFTER_ARGS=--exclude */lib/zlib --exclude */lib/dbm --exclude */lib/sqlite
 
-INSTALL_BINS=	certcgi certutil checkcert cmsutil crlutil derdump makepqg \
+INSTALL_BINS=	certcgi certutil cmsutil crlutil derdump makepqg \
 		mangle modutil ocspclnt oidcalc p7content p7env p7sign \
 		p7verify pk12util rsaperf shlibsign signtool signver \
 		ssltap strsclnt symkeyutil vfychain vfyserv
 
 OPTIONS_DEFINE=	DEBUG
 
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MDEBUG}
 MAKE_ENV+=	BUILD_OPT=1
 BINS=		${DIST}/${OPSYS}${OSREL}_OPT.OBJ
 .else
 BINS=		${DIST}/${OPSYS}${OSREL}_DBG.OBJ
 .endif
 
 .if ${ARCH} == amd64
 USE_BINUTILS=	# intel-gcm.s
 CFLAGS+=	-B${LOCALBASE}/bin
 .endif
 
 check regression-test test:
 	cd ${WRKSRC}/tests;	\
 		${SETENV} PATH="${BINS}/bin:${PATH}" \
 		    LD_LIBRARY_PATH="${BINS}/lib" \
 		    ${MAKE_ENV}	\
 			./all.sh
 	@if ${GREP} -Fh '>Failed<'	\
 	    ${WRKSRC:H}/tests_results/security/*/results.html; then	\
 		echo "Some tests have failed. Let ${MAINTAINER} know.";	\
 		exit 1;	\
 	else	\
 		echo "All tests succeeded. Good news.";	\
 	fi
 
 post-patch:
 	@${REINPLACE_CMD} '/NSS_DEFAULT_SYSTEM/s,/etc,${PREFIX}&,' \
 		${WRKSRC}/lib/sysinit/nsssysinit.c
 	@cd ${WRKSRC} && \
 		${FIND} . -name "*.c" -o -name "*.h" | \
 		${XARGS} ${REINPLACE_CMD} -e 's|"nspr.h"|<nspr.h>|'
 	${FIND} ${WRKSRC}/tests -name '*.sh' | ${XARGS} ${GREP} -l -F '/bin/bash' | \
 		${XARGS} ${REINPLACE_CMD} -e 's|#! */bin/bash|#!${SH}|'
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/nss/nss ${STAGEDIR}${PREFIX}/lib/nss
 	${FIND} ${DIST}/public/nss -type l \
 	    	-exec ${INSTALL_DATA} {} ${STAGEDIR}${PREFIX}/include/nss/nss \;
 	${INSTALL_LIB} ${BINS}/lib/*.so.1 \
 		${STAGEDIR}${PREFIX}/lib/nss
 	${INSTALL_DATA} ${BINS}/lib/libcrmf.a \
 	    	${STAGEDIR}${PREFIX}/lib/nss
 .for bin in ${INSTALL_BINS}
 	${INSTALL_PROGRAM} ${BINS}/bin/${bin} \
 		${STAGEDIR}${PREFIX}/bin
 .endfor
 	cd ${BINS}/lib && \
 	    	${TAR} -cf - *.so | ${TAR} --unlink -C ${STAGEDIR}${PREFIX}/lib/nss -xf -
 	${INSTALL_SCRIPT} ${WRKDIR}/nss-config ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKDIR}/nss.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
 
 .include <bsd.port.mk>
Index: branches/2016Q1/security/nss/distinfo
===================================================================
--- branches/2016Q1/security/nss/distinfo	(revision 409424)
+++ branches/2016Q1/security/nss/distinfo	(revision 409425)
@@ -1,2 +1,2 @@
-SHA256 (nss-3.21.tar.gz) = 3f7a5b027d7cdd5c0e4ff7544da33fdc6f56c2f8c27fff02938fd4a6fbe87239
-SIZE (nss-3.21.tar.gz) = 6978112
+SHA256 (nss-3.22.1.tar.gz) = 89e1fc7074e5c325962821289f4cd7d8207ae95af2308ba881215ed9ca68fa4f
+SIZE (nss-3.22.1.tar.gz) = 6993562
Index: branches/2016Q1/security/nss/files/patch-sysdb
===================================================================
--- branches/2016Q1/security/nss/files/patch-sysdb	(revision 409424)
+++ branches/2016Q1/security/nss/files/patch-sysdb	(revision 409425)
@@ -1,146 +1,146 @@
 --- lib/softoken/legacydb/cdbhdl.h.orig	2009-08-31 12:33:12.000000000 +0200
 +++ lib/softoken/legacydb/cdbhdl.h	2009-08-31 12:33:36.000000000 +0200
 @@ -43,7 +43,8 @@
  #define _CDBHDL_H_
  
  #include "nspr.h"
 -#include "mcom_db.h"
 +#include <db.h>
 +#include <fcntl.h>
  #include "pcertt.h"
  #include "prtypes.h"
  
 
 --- lib/softoken/legacydb/dbmshim.c.orig	2009-08-31 10:40:23.000000000 +0200
 +++ lib/softoken/legacydb/dbmshim.c	2009-08-31 10:40:35.000000000 +0200
 @@ -39,7 +39,8 @@
   *
   * $Id: dbmshim.c,v 1.2 2007/06/13 00:24:57 rrelyea%redhat.com Exp $
   */
 -#include "mcom_db.h"
 +#include <db.h>
 +#include <fcntl.h>
  #include "secitem.h"
  #include "nssb64.h"
  #include "blapi.h"
 --- lib/softoken/legacydb/keydb.c.orig	2009-08-31 10:40:04.000000000 +0200
 +++ lib/softoken/legacydb/keydb.c	2009-08-31 10:40:08.000000000 +0200
 @@ -43,7 +43,6 @@
  #include "blapi.h"
  #include "secitem.h"
  #include "pcert.h"
 -#include "mcom_db.h"
  #include "secerr.h"
  
  #include "keydbi.h"
 --- lib/softoken/legacydb/keydbi.h.orig	2009-08-31 12:33:17.000000000 +0200
 +++ lib/softoken/legacydb/keydbi.h	2009-08-31 12:34:13.000000000 +0200
 @@ -43,5 +43,5 @@
  
  #include "nspr.h"
  #include "seccomon.h"
 -#include "mcom_db.h"
 +#include <db.h>
  
  /*
   * Handle structure for open key databases
 --- lib/softoken/legacydb/pcertdb.c.orig	2009-08-31 10:40:52.000000000 +0200
 +++ lib/softoken/legacydb/pcertdb.c	2009-08-31 10:41:26.000000000 +0200
 @@ -41,7 +41,8 @@
   */
  #include "lowkeyti.h"
  #include "pcert.h"
 -#include "mcom_db.h"
 +#include <db.h>
 +#include <fcntl.h>
  #include "pcert.h"
  #include "secitem.h"
  #include "secder.h"
 --- lib/softoken/legacydb/pk11db.c.orig	2009-08-31 10:40:57.000000000 +0200
 +++ lib/softoken/legacydb/pk11db.c	2009-08-31 10:41:55.000000000 +0200
 @@ -41,7 +41,8 @@
  
  #include "pk11pars.h"
  #include "lgdb.h"
 -#include "mcom_db.h"
 +#include <db.h>
 +#include <fcntl.h>
  #include "secerr.h"
  
  #define FREE_CLEAR(p) if (p) { PORT_Free(p); p = NULL; }
 --- lib/ckfw/dbm/ckdbm.h.orig	2009-08-31 10:46:00.000000000 +0200
 +++ lib/ckfw/dbm/ckdbm.h	2009-08-31 10:46:22.000000000 +0200
 @@ -59,7 +59,7 @@
  #include "ckt.h"
  #endif /* CKT_H */
  
 -#include "mcom_db.h"
 +#include <db.h>
  
  NSS_EXTERN_DATA NSSCKMDInstance nss_dbm_mdInstance;
  
 --- lib/softoken/legacydb/config.mk.orig	2009-08-31 12:39:49.000000000 +0200
 +++ lib/softoken/legacydb/config.mk	2009-08-31 12:40:03.000000000 +0200
 @@ -40,7 +40,6 @@
  
  EXTRA_LIBS += \
  	$(CRYPTOLIB) \
 -	$(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \
  	$(NULL)
  
  # can't do this in manifest.mn because OS_TARGET isn't defined there.
 --- lib/certdb/xauthkid.c.orig	2009-08-31 12:43:13.000000000 +0200
 +++ lib/certdb/xauthkid.c	2009-08-31 12:44:21.000000000 +0200
 @@ -39,7 +39,7 @@
   *
   */
  
 -#include "prtypes.h"
 +#include <prtypes.h>
  #include "seccomon.h"
  #include "secdert.h"
  #include "secoidt.h"
 --- lib/certdb/xbsconst.c.orig	2009-08-31 12:43:22.000000000 +0200
 +++ lib/certdb/xbsconst.c	2009-08-31 12:44:41.000000000 +0200
 @@ -38,7 +38,7 @@
   * X.509 v3 Basic Constraints Extension 
   */
  
 -#include "prtypes.h"
 +#include <prtypes.h>
- #include <limits.h>     /* for LONG_MAX */
+ #include <limits.h> /* for LONG_MAX */
  #include "seccomon.h"
  #include "secdert.h"
 --- lib/certdb/xconst.c.orig	2009-08-31 12:43:46.000000000 +0200
 +++ lib/certdb/xconst.c	2009-08-31 12:44:50.000000000 +0200
 @@ -38,7 +38,7 @@
   * X.509 Extension Encoding  
   */
  
 -#include "prtypes.h"
 +#include <prtypes.h>
  #include "seccomon.h"
  #include "secdert.h"
  #include "secoidt.h"
 --- lib/manifest.mn~
 +++ lib/manifest.mn
 @@ -20,7 +20,7 @@ DIRS = \
  	$(UTIL_SRCDIR) \
  	$(FREEBL_SRCDIR) \
  	$(SQLITE_SRCDIR) \
 -	$(DBM_SRCDIR) \
 +	$(NULL) \
  	$(SOFTOKEN_SRCDIR) \
  	base dev pki \
  	libpkix \
 --- cmd/platlibs.mk.orig	2009-08-31 12:57:13.000000000 +0200
 +++ cmd/platlibs.mk	2009-08-31 12:57:29.000000000 +0200
 @@ -85,7 +85,7 @@
  ifdef NSS_DISABLE_DBM
  DBMLIB = $(NULL)
  else
 -DBMLIB = $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) 
 +DBMLIB = $(NULL)
  endif
  
  ifdef USE_STATIC_LIBS
Index: branches/2016Q1/security/nss/pkg-plist
===================================================================
--- branches/2016Q1/security/nss/pkg-plist	(revision 409424)
+++ branches/2016Q1/security/nss/pkg-plist	(revision 409425)
@@ -1,140 +1,139 @@
 bin/certcgi
 bin/certutil
-bin/checkcert
 bin/cmsutil
 bin/crlutil
 bin/derdump
 bin/makepqg
 bin/mangle
 bin/modutil
 bin/nss-config
 bin/ocspclnt
 bin/oidcalc
 bin/p7content
 bin/p7env
 bin/p7sign
 bin/p7verify
 bin/pk12util
 bin/rsaperf
 bin/shlibsign
 bin/signtool
 bin/signver
 bin/ssltap
 bin/strsclnt
 bin/symkeyutil
 bin/vfychain
 bin/vfyserv
 include/nss/nss/base64.h
 include/nss/nss/blapit.h
 include/nss/nss/cert.h
 include/nss/nss/certdb.h
 include/nss/nss/certt.h
 include/nss/nss/ciferfam.h
 include/nss/nss/cmmf.h
 include/nss/nss/cmmft.h
 include/nss/nss/cms.h
 include/nss/nss/cmsreclist.h
 include/nss/nss/cmst.h
 include/nss/nss/crmf.h
 include/nss/nss/crmft.h
 include/nss/nss/cryptohi.h
 include/nss/nss/cryptoht.h
 include/nss/nss/ecl-exp.h
 include/nss/nss/hasht.h
 include/nss/nss/jar-ds.h
 include/nss/nss/jar.h
 include/nss/nss/jarfile.h
 include/nss/nss/key.h
 include/nss/nss/keyhi.h
 include/nss/nss/keyt.h
 include/nss/nss/keythi.h
 include/nss/nss/nss.h
 include/nss/nss/nssb64.h
 include/nss/nss/nssb64t.h
 include/nss/nss/nssbase.h
 include/nss/nss/nssbaset.h
 include/nss/nss/nssck.api
 include/nss/nss/nssckbi.h
 include/nss/nss/nssckepv.h
 include/nss/nss/nssckft.h
 include/nss/nss/nssckfw.h
 include/nss/nss/nssckfwc.h
 include/nss/nss/nssckfwt.h
 include/nss/nss/nssckg.h
 include/nss/nss/nssckmdt.h
 include/nss/nss/nssckt.h
 include/nss/nss/nssilckt.h
 include/nss/nss/nssilock.h
 include/nss/nss/nsslocks.h
 include/nss/nss/nsslowhash.h
 include/nss/nss/nssrwlk.h
 include/nss/nss/nssrwlkt.h
 include/nss/nss/nssutil.h
 include/nss/nss/ocsp.h
 include/nss/nss/ocspt.h
 include/nss/nss/p12.h
 include/nss/nss/p12plcy.h
 include/nss/nss/p12t.h
 include/nss/nss/pk11func.h
 include/nss/nss/pk11pqg.h
 include/nss/nss/pk11priv.h
 include/nss/nss/pk11pub.h
 include/nss/nss/pk11sdr.h
 include/nss/nss/pkcs11.h
 include/nss/nss/pkcs1sig.h
 include/nss/nss/pkcs11f.h
 include/nss/nss/pkcs11n.h
 include/nss/nss/pkcs11p.h
 include/nss/nss/pkcs11t.h
 include/nss/nss/pkcs11u.h
 include/nss/nss/pkcs12.h
 include/nss/nss/pkcs12t.h
 include/nss/nss/pkcs7t.h
 include/nss/nss/portreg.h
 include/nss/nss/preenc.h
 include/nss/nss/secasn1.h
 include/nss/nss/secasn1t.h
 include/nss/nss/seccomon.h
 include/nss/nss/secder.h
 include/nss/nss/secdert.h
 include/nss/nss/secdig.h
 include/nss/nss/secdigt.h
 include/nss/nss/secerr.h
 include/nss/nss/sechash.h
 include/nss/nss/secitem.h
 include/nss/nss/secmime.h
 include/nss/nss/secmod.h
 include/nss/nss/secmodt.h
 include/nss/nss/secoid.h
 include/nss/nss/secoidt.h
 include/nss/nss/secpkcs5.h
 include/nss/nss/secpkcs7.h
 include/nss/nss/secport.h
 include/nss/nss/shsign.h
 include/nss/nss/smime.h
 include/nss/nss/ssl.h
 include/nss/nss/sslerr.h
 include/nss/nss/sslproto.h
 include/nss/nss/sslt.h
 include/nss/nss/utilmodt.h
 include/nss/nss/utilpars.h
 include/nss/nss/utilparst.h
 include/nss/nss/utilrename.h
 lib/nss/libcrmf.a
 lib/nss/libfreebl3.so
 lib/nss/libfreebl3.so.1
 lib/nss/libnss3.so
 lib/nss/libnss3.so.1
 lib/nss/libnssckbi.so
 lib/nss/libnssckbi.so.1
 lib/nss/libnssdbm3.so
 lib/nss/libnssdbm3.so.1
 lib/nss/libnssutil3.so
 lib/nss/libnssutil3.so.1
 lib/nss/libsmime3.so
 lib/nss/libsmime3.so.1
 lib/nss/libsoftokn3.so
 lib/nss/libsoftokn3.so.1
 lib/nss/libssl3.so
 lib/nss/libssl3.so.1
 libdata/pkgconfig/nss.pc
Index: branches/2016Q1
===================================================================
--- branches/2016Q1	(revision 409424)
+++ branches/2016Q1	(revision 409425)

Property changes on: branches/2016Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r408519,409345