4 files changed, 41 insertions, 35 deletions

diff --git a/security/linux-c6-nss/Makefile b/security/linux-c6-nss/Makefile
index e3ed93d60e1c..080a75e2bb8b 100644
--- a/security/linux-c6-nss/Makefile
+++ b/security/linux-c6-nss/Makefile
@@ -4,11 +4,11 @@
 PORTNAME=	nss
 PORTVERSION=	3.19.1
 CATEGORIES=	security linux
-MASTER_SITES=	CENTOS_LINUX_UPDATES
+MASTER_SITES=	CENTOS_LINUX CENTOS_LINUX_UPDATES
 DISTFILES=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}.${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
+		nss-util-3.19.1-2.el6_7.${LINUX_RPM_ARCH}.rpm \
+		nss-softokn-3.14.3-23.el6_7.${LINUX_RPM_ARCH}.rpm \
+		nss-softokn-freebl-3.14.3-23.el6_7.${LINUX_RPM_ARCH}.rpm
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Network Security Services (Linux CentOS ${LINUX_DIST_VER})
@@ -16,7 +16,7 @@ COMMENT=	Network Security Services (Linux CentOS ${LINUX_DIST_VER})
 CONFLICTS=	linux-f10-nss-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
-RPMVERSION=	3.el6_6
+RPMVERSION=	5.el6_7
 USE_LINUX=	c6
 USE_LINUX_APPS=	nspr sqlite3
 
@@ -24,8 +24,8 @@ USE_LINUX_RPM=	yes
 USE_LDCONFIG=	yes
 
 SRC_DISTFILES=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE \
-		nss-util-3.19.1-1.el6_6.src.rpm:SOURCE \
-		nss-softokn-3.14.3-22.el6_6.src.rpm:SOURCE
+		nss-util-3.19.1-2.el6_7.src.rpm:SOURCE \
+		nss-softokn-3.14.3-23.el6_7.src.rpm:SOURCE
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/security/linux-c6-nss/distinfo.i686 b/security/linux-c6-nss/distinfo.i686
index 8c44e5cf4ed2..af8d0a2b3c1b 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.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
+SHA256 (rpm/i686/centos/6.7/nss-3.19.1-5.el6_7.i686.rpm) = e393b4dd10cbe47688991416f534c60cb02aac06c8e3e498a29ef773e05845ee
+SIZE (rpm/i686/centos/6.7/nss-3.19.1-5.el6_7.i686.rpm) = 880772
+SHA256 (rpm/i686/centos/6.7/nss-util-3.19.1-2.el6_7.i686.rpm) = 2244ada80af9a50e7159f2b15d583c95d52a8fcf64bf24741a9ef43cae60ba7c
+SIZE (rpm/i686/centos/6.7/nss-util-3.19.1-2.el6_7.i686.rpm) = 67524
+SHA256 (rpm/i686/centos/6.7/nss-softokn-3.14.3-23.el6_7.i686.rpm) = 5fcfe60107924f132e329a7c3106262b67498960c167f311770257670f955394
+SIZE (rpm/i686/centos/6.7/nss-softokn-3.14.3-23.el6_7.i686.rpm) = 276044
+SHA256 (rpm/i686/centos/6.7/nss-softokn-freebl-3.14.3-23.el6_7.i686.rpm) = e18491a0502de2be4bec0921f7d781e18e175b6c8ad81ca0c164ea75132b5fc3
+SIZE (rpm/i686/centos/6.7/nss-softokn-freebl-3.14.3-23.el6_7.i686.rpm) = 160752
+SHA256 (rpm/i686/centos/6.7/nss-3.19.1-5.el6_7.src.rpm) = 95999daa348612d669a0fc66981e9cccc8dd64021b5bd558a84d351fb9204fc0
+SIZE (rpm/i686/centos/6.7/nss-3.19.1-5.el6_7.src.rpm) = 5605341
+SHA256 (rpm/i686/centos/6.7/nss-util-3.19.1-2.el6_7.src.rpm) = 29270259046ca34f5c7039c0ca5160e02a2877f1a074bf05d0060b56e5a1461b
+SIZE (rpm/i686/centos/6.7/nss-util-3.19.1-2.el6_7.src.rpm) = 753607
+SHA256 (rpm/i686/centos/6.7/nss-softokn-3.14.3-23.el6_7.src.rpm) = 9a102fb89f11aace8fd00ee6d96a4306e55096600e949b71439c4a8c79554a91
+SIZE (rpm/i686/centos/6.7/nss-softokn-3.14.3-23.el6_7.src.rpm) = 1303804
diff --git a/security/linux-c6-nss/distinfo.x86_64 b/security/linux-c6-nss/distinfo.x86_64
index 36f888017229..b6d4c009ba06 100644
--- a/security/linux-c6-nss/distinfo.x86_64
+++ b/security/linux-c6-nss/distinfo.x86_64
@@ -1,14 +1,14 @@
-SHA256 (rpm/x86_64/centos/6.6/nss-3.19.1-3.el6_6.x86_64.rpm) = 527b9685f9466312d5dc12fd5c95a17eaca308b93cb6e6e2b6e90f67b6199839
-SIZE (rpm/x86_64/centos/6.6/nss-3.19.1-3.el6_6.x86_64.rpm) = 877004
-SHA256 (rpm/x86_64/centos/6.6/nss-util-3.19.1-1.el6_6.x86_64.rpm) = 6d18c09300d59c832734701ff7403398a46ef2faa8897ae52f88d204a2d610a2
-SIZE (rpm/x86_64/centos/6.6/nss-util-3.19.1-1.el6_6.x86_64.rpm) = 67636
-SHA256 (rpm/x86_64/centos/6.6/nss-softokn-3.14.3-22.el6_6.x86_64.rpm) = fb22476443aa77b1ec969dc09416a9cabde6e652e4712a6a33266a9140c2b7d9
-SIZE (rpm/x86_64/centos/6.6/nss-softokn-3.14.3-22.el6_6.x86_64.rpm) = 268076
-SHA256 (rpm/x86_64/centos/6.6/nss-softokn-freebl-3.14.3-22.el6_6.x86_64.rpm) = 1078c1194369da908b57512aa6f76655b26694f00106756e290852deda12742b
-SIZE (rpm/x86_64/centos/6.6/nss-softokn-freebl-3.14.3-22.el6_6.x86_64.rpm) = 170992
-SHA256 (rpm/x86_64/centos/6.6/nss-3.19.1-3.el6_6.src.rpm) = b30fb858dcec5a154713cfd27386aa48def4cf819f2ed39f586c513f8eb1d209
-SIZE (rpm/x86_64/centos/6.6/nss-3.19.1-3.el6_6.src.rpm) = 5605304
-SHA256 (rpm/x86_64/centos/6.6/nss-util-3.19.1-1.el6_6.src.rpm) = 8b4f5d17d8260f788fc58e0d22bc4f6d79481822be4218403e3d8dfc7f92229b
-SIZE (rpm/x86_64/centos/6.6/nss-util-3.19.1-1.el6_6.src.rpm) = 748693
-SHA256 (rpm/x86_64/centos/6.6/nss-softokn-3.14.3-22.el6_6.src.rpm) = db139757d5d628729ad254de68e45d8595c2727159d991388a93296e221b2c81
-SIZE (rpm/x86_64/centos/6.6/nss-softokn-3.14.3-22.el6_6.src.rpm) = 1302552
+SHA256 (rpm/x86_64/centos/6.7/nss-3.19.1-5.el6_7.x86_64.rpm) = 1e26eb517f2c9ef4ea97906fac1a9b919feb69c202b2c8a455605138a8d28981
+SIZE (rpm/x86_64/centos/6.7/nss-3.19.1-5.el6_7.x86_64.rpm) = 877136
+SHA256 (rpm/x86_64/centos/6.7/nss-util-3.19.1-2.el6_7.x86_64.rpm) = 3050110e0f9737ecb291a6a3b5a4889454eb05785c6408ec8ab674e5491c2fd4
+SIZE (rpm/x86_64/centos/6.7/nss-util-3.19.1-2.el6_7.x86_64.rpm) = 68016
+SHA256 (rpm/x86_64/centos/6.7/nss-softokn-3.14.3-23.el6_7.x86_64.rpm) = 4b01afc8e522112ad555a9ff8055f612690f36278a5ffe0a9758384616c975aa
+SIZE (rpm/x86_64/centos/6.7/nss-softokn-3.14.3-23.el6_7.x86_64.rpm) = 268256
+SHA256 (rpm/x86_64/centos/6.7/nss-softokn-freebl-3.14.3-23.el6_7.x86_64.rpm) = 21daeb0da2a7bfdbad5eec9af53bd5544519fb3408a4e5ca639a87f083d647bd
+SIZE (rpm/x86_64/centos/6.7/nss-softokn-freebl-3.14.3-23.el6_7.x86_64.rpm) = 171236
+SHA256 (rpm/x86_64/centos/6.7/nss-3.19.1-5.el6_7.src.rpm) = 95999daa348612d669a0fc66981e9cccc8dd64021b5bd558a84d351fb9204fc0
+SIZE (rpm/x86_64/centos/6.7/nss-3.19.1-5.el6_7.src.rpm) = 5605341
+SHA256 (rpm/x86_64/centos/6.7/nss-util-3.19.1-2.el6_7.src.rpm) = 29270259046ca34f5c7039c0ca5160e02a2877f1a074bf05d0060b56e5a1461b
+SIZE (rpm/x86_64/centos/6.7/nss-util-3.19.1-2.el6_7.src.rpm) = 753607
+SHA256 (rpm/x86_64/centos/6.7/nss-softokn-3.14.3-23.el6_7.src.rpm) = 9a102fb89f11aace8fd00ee6d96a4306e55096600e949b71439c4a8c79554a91
+SIZE (rpm/x86_64/centos/6.7/nss-softokn-3.14.3-23.el6_7.src.rpm) = 1303804
diff --git a/security/linux-c6-nss/pkg-plist.x86_64 b/security/linux-c6-nss/pkg-plist.x86_64
index 4ec309d093a7..64dfd2df7eae 100644
--- a/security/linux-c6-nss/pkg-plist.x86_64
+++ b/security/linux-c6-nss/pkg-plist.x86_64
@@ -1,10 +1,15 @@
 etc/pki/nssdb/cert8.db
 etc/pki/nssdb/key3.db
 etc/pki/nssdb/secmod.db
+etc/prelink.conf.d/nss-softokn-prelink.conf
 lib64/libfreebl3.chk
 lib64/libfreebl3.so
+lib64/libfreeblpriv3.chk
+lib64/libfreeblpriv3.so
 usr/lib64/libfreebl3.chk
 usr/lib64/libfreebl3.so
+usr/lib64/libfreeblpriv3.chk
+usr/lib64/libfreeblpriv3.so
 usr/lib64/libnss3.so
 usr/lib64/nss/libnssckbi.so
 usr/lib64/libnssdbm3.chk
@@ -18,4 +23,5 @@ usr/lib64/libsoftokn3.so
 usr/lib64/nss/unsupported-tools/shlibsign
 usr/lib64/nss/unsupported-tools/bltest
 usr/lib64/nss/unsupported-tools/fipstest
+usr/share/dracut/modules.d/05nss-softokn/install
 @dir usr/lib64/nss/saved