Update to nss-3.19.1-3.el6_6

3 files changed, 29 insertions, 28 deletions

diff --git a/security/linux-c6-nss/Makefile b/security/linux-c6-nss/Makefile
index 307b70284ca8..ec4397b17865 100644
--- a/security/linux-c6-nss/Makefile
+++ b/security/linux-c6-nss/Makefile
@@ -2,12 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	nss
-PORTVERSION=	3.16.1
+PORTVERSION=	3.19.1
 CATEGORIES=	security linux
+MASTER_SITES=	CENTOS_LINUX_UPDATES
 DISTFILES=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}.${LINUX_RPM_ARCH}.rpm \
-		nss-util-3.16.1-3.el6.${LINUX_RPM_ARCH}.rpm \
-		nss-softokn-3.14.3-17.el6.${LINUX_RPM_ARCH}.rpm \
-		nss-softokn-freebl-3.14.3-17.el6.${LINUX_RPM_ARCH}.rpm
+		nss-util-3.19.1-1.el6_6.${LINUX_RPM_ARCH}.rpm \
+		nss-softokn-3.14.3-22.el6_6.${LINUX_RPM_ARCH}.rpm \
+		nss-softokn-freebl-3.14.3-22.el6_6.${LINUX_RPM_ARCH}.rpm
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Network Security Services (Linux CentOS ${LINUX_DIST_VER})
@@ -15,7 +16,7 @@ COMMENT=	Network Security Services (Linux CentOS ${LINUX_DIST_VER})
 CONFLICTS=	linux-f10-nss-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
-RPMVERSION=	14.el6
+RPMVERSION=	3.el6_6
 USE_LINUX=	c6
 USE_LINUX_APPS=	nspr sqlite3
 
@@ -23,8 +24,8 @@ USE_LINUX_RPM=	yes
 USE_LDCONFIG=	yes
 
 SRC_DISTFILES=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX} \
-		nss-util-3.16.1-3.el6.src.rpm \
-		nss-softokn-3.14.3-17.el6.src.rpm
+		nss-util-3.19.1-1.el6_6.src.rpm \
+		nss-softokn-3.14.3-22.el6_6.src.rpm
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/security/linux-c6-nss/distinfo.i686 b/security/linux-c6-nss/distinfo.i686
index 4074d9d2c055..8c44e5cf4ed2 100644
--- a/security/linux-c6-nss/distinfo.i686
+++ b/security/linux-c6-nss/distinfo.i686
@@ -1,14 +1,14 @@
-SHA256 (rpm/i686/centos/6.6/nss-3.16.1-14.el6.i686.rpm) = 0fdb70060fcc83514bbf01c968a1574706650cd76b937803bada67fb7f615023
-SIZE (rpm/i686/centos/6.6/nss-3.16.1-14.el6.i686.rpm) = 858848
-SHA256 (rpm/i686/centos/6.6/nss-util-3.16.1-3.el6.i686.rpm) = f54a000a717d015577bc721392f5fac7792ee24a3e502e114f235cda62986022
-SIZE (rpm/i686/centos/6.6/nss-util-3.16.1-3.el6.i686.rpm) = 66704
-SHA256 (rpm/i686/centos/6.6/nss-softokn-3.14.3-17.el6.i686.rpm) = 586ff1bb135c327fd8b5c259ad6cd059d58c5cb62e002c716298062e9494cc4a
-SIZE (rpm/i686/centos/6.6/nss-softokn-3.14.3-17.el6.i686.rpm) = 275292
-SHA256 (rpm/i686/centos/6.6/nss-softokn-freebl-3.14.3-17.el6.i686.rpm) = 56b54c4d9f13bac765896300c07f43a281a5651c03902962cef6ee13636736c4
-SIZE (rpm/i686/centos/6.6/nss-softokn-freebl-3.14.3-17.el6.i686.rpm) = 156932
-SHA256 (rpm/i686/centos/6.6/nss-3.16.1-14.el6.src.rpm) = 5236665e5fa3cae7c5ebc18949f7706512b95ea6ca0740d7f321aa1bfad4705d
-SIZE (rpm/i686/centos/6.6/nss-3.16.1-14.el6.src.rpm) = 5144624
-SHA256 (rpm/i686/centos/6.6/nss-util-3.16.1-3.el6.src.rpm) = fb9403d2eb1f4a6b5d53f222a206bc8aab1fd05fe81dbee341efc02c07aeff46
-SIZE (rpm/i686/centos/6.6/nss-util-3.16.1-3.el6.src.rpm) = 347593
-SHA256 (rpm/i686/centos/6.6/nss-softokn-3.14.3-17.el6.src.rpm) = 877d91d6c2159758827624bc96689f9b3563fe08caddb601a704a277f8fb861f
-SIZE (rpm/i686/centos/6.6/nss-softokn-3.14.3-17.el6.src.rpm) = 1296314
+SHA256 (rpm/i686/centos/6.6/nss-3.19.1-3.el6_6.i686.rpm) = a74da22a4f4859a8a476af17f4f871901bb90da15afcf16665a66f0b6c71afdb
+SIZE (rpm/i686/centos/6.6/nss-3.19.1-3.el6_6.i686.rpm) = 880696
+SHA256 (rpm/i686/centos/6.6/nss-util-3.19.1-1.el6_6.i686.rpm) = 07b2323f67221bfa440bcbf79d099b401f0b05539d5c7c6054682eea1a054043
+SIZE (rpm/i686/centos/6.6/nss-util-3.19.1-1.el6_6.i686.rpm) = 67300
+SHA256 (rpm/i686/centos/6.6/nss-softokn-3.14.3-22.el6_6.i686.rpm) = 77c7dfa9cdac123d789f1d1a65b8ecb22bd02cf70cf0d74cca4aedcb873be103
+SIZE (rpm/i686/centos/6.6/nss-softokn-3.14.3-22.el6_6.i686.rpm) = 275864
+SHA256 (rpm/i686/centos/6.6/nss-softokn-freebl-3.14.3-22.el6_6.i686.rpm) = c7de3e40ada40624174bd4aea2b3903b3f1dd71ab6ad16ed3a05e9d5574b2bc0
+SIZE (rpm/i686/centos/6.6/nss-softokn-freebl-3.14.3-22.el6_6.i686.rpm) = 160508
+SHA256 (rpm/i686/centos/6.6/nss-3.19.1-3.el6_6.src.rpm) = b30fb858dcec5a154713cfd27386aa48def4cf819f2ed39f586c513f8eb1d209
+SIZE (rpm/i686/centos/6.6/nss-3.19.1-3.el6_6.src.rpm) = 5605304
+SHA256 (rpm/i686/centos/6.6/nss-util-3.19.1-1.el6_6.src.rpm) = 8b4f5d17d8260f788fc58e0d22bc4f6d79481822be4218403e3d8dfc7f92229b
+SIZE (rpm/i686/centos/6.6/nss-util-3.19.1-1.el6_6.src.rpm) = 748693
+SHA256 (rpm/i686/centos/6.6/nss-softokn-3.14.3-22.el6_6.src.rpm) = db139757d5d628729ad254de68e45d8595c2727159d991388a93296e221b2c81
+SIZE (rpm/i686/centos/6.6/nss-softokn-3.14.3-22.el6_6.src.rpm) = 1302552
diff --git a/security/linux-c6-nss/pkg-plist b/security/linux-c6-nss/pkg-plist
index 571ab8385fa7..bc7c26057283 100644
--- a/security/linux-c6-nss/pkg-plist
+++ b/security/linux-c6-nss/pkg-plist
@@ -1,11 +1,15 @@
-@comment file listing
 etc/pki/nssdb/cert8.db
 etc/pki/nssdb/key3.db
 etc/pki/nssdb/secmod.db
+etc/prelink.conf.d/nss-softokn-prelink.conf
 lib/libfreebl3.chk
 lib/libfreebl3.so
+lib/libfreeblpriv3.chk
+lib/libfreeblpriv3.so
 usr/lib/libfreebl3.chk
 usr/lib/libfreebl3.so
+usr/lib/libfreeblpriv3.chk
+usr/lib/libfreeblpriv3.so
 usr/lib/libnss3.so
 usr/lib/nss/libnssckbi.so
 usr/lib/libnssdbm3.chk
@@ -19,9 +23,5 @@ usr/lib/libsoftokn3.so
 usr/lib/nss/unsupported-tools/shlibsign
 usr/lib/nss/unsupported-tools/bltest
 usr/lib/nss/unsupported-tools/fipstest
-@comment non-empty directory listing in revers order
-@dirrm etc/pki/nssdb
-@dirrmtry etc/pki
-@dirrm usr/lib/nss/unsupported-tools
-@dirrm usr/lib/nss/saved
-@dirrm usr/lib/nss
+usr/share/dracut/modules.d/05nss-softokn/install
+@dir usr/lib/nss/saved