Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 7 Jul 2017 16:17:48 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r445266 - in head: emulators/linux_base-c7 security/linux-c7-nss
Message-ID:  <201707071617.v67GHmkY087755@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Fri Jul  7 16:17:48 2017
New Revision: 445266
URL: https://svnweb.freebsd.org/changeset/ports/445266

Log:
  - Update security/linux-c7-nss to 3.28.4-1.2.el7_3. [1]
  - Move nss-softokn-freebl to linux_base-c7 because it is needed by
    libcrypt.so (part of glibc).
  
  PR:		220147 [1]
  Submitted by:	Piotr Kubaj <pkubaj@anongoth.pl> [1]

Modified:
  head/emulators/linux_base-c7/Makefile
  head/emulators/linux_base-c7/distinfo
  head/emulators/linux_base-c7/pkg-plist.amd64
  head/emulators/linux_base-c7/pkg-plist.i386
  head/security/linux-c7-nss/Makefile
  head/security/linux-c7-nss/distinfo
  head/security/linux-c7-nss/pkg-plist.amd64
  head/security/linux-c7-nss/pkg-plist.i386

Modified: head/emulators/linux_base-c7/Makefile
==============================================================================
--- head/emulators/linux_base-c7/Makefile	Fri Jul  7 16:09:49 2017	(r445265)
+++ head/emulators/linux_base-c7/Makefile	Fri Jul  7 16:17:48 2017	(r445266)
@@ -2,7 +2,7 @@
 
 PORTNAME=	c7
 PORTVERSION=	${LINUX_DIST_VER}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	emulators linux
 PKGNAMEPREFIX=	linux_base-
 BIN_DISTNAMES=	centos-release-7-3.1611.el7.centos \
@@ -48,6 +48,7 @@ LIB_DISTNAMES=	bzip2-libs-1.0.6-13.el7 \
 		libstdc++-4.8.5-11.el7 \
 		libuuid-2.23.2-33.el7_3.2 \
 		ncurses-libs-5.9-13.20130511.el7 \
+		nss-softokn-freebl-3.16.2.3-14.4.el7 \
 		pcre-8.32-15.el7_2.1 \
 		popt-1.13-16.el7 \
 		readline-6.2-9.el7 \
@@ -89,6 +90,7 @@ SRC_DISTFILES=	acl-2.2.51-12.el7${SRC_SUFX}:SOURCE \
 		libselinux-2.5-6.el7${SRC_SUFX}:SOURCE \
 		libsepol-2.5-6.el7${SRC_SUFX}:SOURCE \
 		ncurses-5.9-13.20130511.el7${SRC_SUFX}:SOURCE \
+		nss-softokn-3.16.2.3-14.4.el7${SRC_SUFX}:SOURCE \
 		pcre-8.32-15.el7_2.1${SRC_SUFX}:SOURCE \
 		popt-1.13-16.el7${SRC_SUFX}:SOURCE \
 		readline-6.2-9.el7${SRC_SUFX}:SOURCE \

Modified: head/emulators/linux_base-c7/distinfo
==============================================================================
--- head/emulators/linux_base-c7/distinfo	Fri Jul  7 16:09:49 2017	(r445265)
+++ head/emulators/linux_base-c7/distinfo	Fri Jul  7 16:17:48 2017	(r445266)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1499186289
+TIMESTAMP = 1499443377
 SHA256 (centos/basesystem-10.0-7.el7.centos.noarch.rpm) = 0280ee16df09be0cebf62695706598caed8ff5cba47de1fed625068a90a9ef68
 SIZE (centos/basesystem-10.0-7.el7.centos.noarch.rpm) = 5124
 SHA256 (centos/bash-4.2.46-21.el7_3.i686.rpm) = f74595a21194625b71cf216fd080f27ef30c30d876422e5d67c922ad44b998cf
@@ -161,6 +161,10 @@ SHA256 (centos/ncurses-libs-5.9-13.20130511.el7.i686.r
 SIZE (centos/ncurses-libs-5.9-13.20130511.el7.i686.rpm) = 323984
 SHA256 (centos/ncurses-libs-5.9-13.20130511.el7.x86_64.rpm) = f73d71453a4d4d43a700feb926cb40782a60afcdbc17608a12b7741a342e76fa
 SIZE (centos/ncurses-libs-5.9-13.20130511.el7.x86_64.rpm) = 323080
+SHA256 (centos/nss-softokn-freebl-3.16.2.3-14.4.el7.i686.rpm) = 1dc2b14a034dbe0fdcd7b3ce48ad498fd891cbb0d2440c35771185c01954bd2c
+SIZE (centos/nss-softokn-freebl-3.16.2.3-14.4.el7.i686.rpm) = 192344
+SHA256 (centos/nss-softokn-freebl-3.16.2.3-14.4.el7.x86_64.rpm) = 32bf92422265c3684d9fef702c882fdb3600765ccd624d0cc29917e8286bb714
+SIZE (centos/nss-softokn-freebl-3.16.2.3-14.4.el7.x86_64.rpm) = 209092
 SHA256 (centos/pcre-8.32-15.el7_2.1.i686.rpm) = dd0f85e9300002b14f1e6fcd859044db85d125565cdee54e96cc13d01784cdad
 SIZE (centos/pcre-8.32-15.el7_2.1.i686.rpm) = 426820
 SHA256 (centos/pcre-8.32-15.el7_2.1.x86_64.rpm) = f116bf68d580df38e4735a6b440d05aebfeb404d79af53dda4c9766e40517ec0
@@ -269,6 +273,8 @@ SHA256 (centos/libsepol-2.5-6.el7.src.rpm) = 91a4d30c0
 SIZE (centos/libsepol-2.5-6.el7.src.rpm) = 514850
 SHA256 (centos/ncurses-5.9-13.20130511.el7.src.rpm) = 563ee995fab10d5257ff12c90b50880c48934ef211e8a74fc6f6db3d7a12d4af
 SIZE (centos/ncurses-5.9-13.20130511.el7.src.rpm) = 3940100
+SHA256 (centos/nss-softokn-3.16.2.3-14.4.el7.src.rpm) = f99e80bc6ba4abde11f91a20cca8111afedc1c8eea2920240a302e8caa4f2035
+SIZE (centos/nss-softokn-3.16.2.3-14.4.el7.src.rpm) = 1748819
 SHA256 (centos/pcre-8.32-15.el7_2.1.src.rpm) = 207c7d8178eae1a2f4a7696e7b65a6f8845709cea197eb3750096f5ad5be311a
 SIZE (centos/pcre-8.32-15.el7_2.1.src.rpm) = 1410793
 SHA256 (centos/popt-1.13-16.el7.src.rpm) = a76a84ef85b502a4501e7e255aafb0d4be34442f94bbb742d248ef40366fb924

Modified: head/emulators/linux_base-c7/pkg-plist.amd64
==============================================================================
--- head/emulators/linux_base-c7/pkg-plist.amd64	Fri Jul  7 16:09:49 2017	(r445265)
+++ head/emulators/linux_base-c7/pkg-plist.amd64	Fri Jul  7 16:17:48 2017	(r445266)
@@ -44,6 +44,7 @@ etc/pam.d/su-l
 etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Debug-7
 etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Testing-7
+etc/prelink.conf.d/nss-softokn-prelink.conf
 etc/profile
 etc/profile.d/colorgrep.csh
 etc/profile.d/colorgrep.sh
@@ -353,6 +354,8 @@ usr/bin/yes
 usr/lib/audit/sotruss-lib.so
 usr/lib/db4.7.25/libdb.so
 usr/lib/db4.7.25/libdb_cxx.so
+usr/lib/dracut/dracut.conf.d/50-nss-softokn.conf
+usr/lib/dracut/modules.d/05nss-softokn/module-setup.sh
 usr/lib/fipscheck/libgmp.so.10.2.0.hmac
 usr/lib/fipscheck/libgmp.so.10.hmac
 usr/lib/gconv/ANSI_X3.110.so
@@ -665,6 +668,10 @@ usr/lib/libform.so.5
 usr/lib/libform.so.5.9
 usr/lib/libformw.so.5
 usr/lib/libformw.so.5.9
+usr/lib/libfreebl3.chk
+usr/lib/libfreebl3.so
+usr/lib/libfreeblpriv3.chk
+usr/lib/libfreeblpriv3.so
 usr/lib/libfreetype.so.6
 usr/lib/libfreetype.so.6.10.0
 usr/lib/libgamin-1.so.0
@@ -1113,6 +1120,10 @@ usr/lib64/libform.so.5
 usr/lib64/libform.so.5.9
 usr/lib64/libformw.so.5
 usr/lib64/libformw.so.5.9
+usr/lib64/libfreebl3.chk
+usr/lib64/libfreebl3.so
+usr/lib64/libfreeblpriv3.chk
+usr/lib64/libfreeblpriv3.so
 usr/lib64/libfreetype.so.6
 usr/lib64/libfreetype.so.6.10.0
 usr/lib64/libgamin-1.so.0

Modified: head/emulators/linux_base-c7/pkg-plist.i386
==============================================================================
--- head/emulators/linux_base-c7/pkg-plist.i386	Fri Jul  7 16:09:49 2017	(r445265)
+++ head/emulators/linux_base-c7/pkg-plist.i386	Fri Jul  7 16:17:48 2017	(r445266)
@@ -43,6 +43,7 @@ etc/pam.d/su-l
 etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Debug-7
 etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Testing-7
+etc/prelink.conf.d/nss-softokn-prelink.conf
 etc/profile
 etc/profile.d/colorgrep.csh
 etc/profile.d/colorgrep.sh
@@ -350,6 +351,8 @@ usr/bin/yes
 usr/lib/audit/sotruss-lib.so
 usr/lib/db4.7.25/libdb.so
 usr/lib/db4.7.25/libdb_cxx.so
+usr/lib/dracut/dracut.conf.d/50-nss-softokn.conf
+usr/lib/dracut/modules.d/05nss-softokn/module-setup.sh
 usr/lib/fipscheck/libgmp.so.10.2.0.hmac
 usr/lib/fipscheck/libgmp.so.10.hmac
 usr/lib/gconv/ANSI_X3.110.so
@@ -662,6 +665,10 @@ usr/lib/libform.so.5
 usr/lib/libform.so.5.9
 usr/lib/libformw.so.5
 usr/lib/libformw.so.5.9
+usr/lib/libfreebl3.chk
+usr/lib/libfreebl3.so
+usr/lib/libfreeblpriv3.chk
+usr/lib/libfreeblpriv3.so
 usr/lib/libfreetype.so.6
 usr/lib/libfreetype.so.6.10.0
 usr/lib/libgamin-1.so.0

Modified: head/security/linux-c7-nss/Makefile
==============================================================================
--- head/security/linux-c7-nss/Makefile	Fri Jul  7 16:09:49 2017	(r445265)
+++ head/security/linux-c7-nss/Makefile	Fri Jul  7 16:17:48 2017	(r445266)
@@ -3,11 +3,11 @@
 
 PORTNAME=	nss
 PORTVERSION=	3.28.4
+PORTREVISION=	1
 CATEGORIES=	security linux
 LIB_DISTNAMES=	${DISTNAME} \
 		${PORTNAME}-util-${PORTVERSION}-1.0.el7_3 \
-		${PORTNAME}-softokn-3.16.2.3-14.4.el7 \
-		${PORTNAME}-softokn-freebl-3.16.2.3-14.4.el7
+		${PORTNAME}-softokn-3.16.2.3-14.4.el7
 SRC_DISTFILES=	${DISTNAME}${SRC_SUFX}:SOURCE \
 		${PORTNAME}-util-${PORTVERSION}-1.0.el7_3${SRC_SUFX}:SOURCE \
 		${PORTNAME}-softokn-3.16.2.3-14.4.el7${SRC_SUFX}:SOURCE
@@ -18,7 +18,7 @@ COMMENT=	Network Security Services (Linux CentOS ${LIN
 CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	1.0.el7_3
+RPMVERSION=	1.2.el7_3
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	nspr sqlite3

Modified: head/security/linux-c7-nss/distinfo
==============================================================================
--- head/security/linux-c7-nss/distinfo	Fri Jul  7 16:09:49 2017	(r445265)
+++ head/security/linux-c7-nss/distinfo	Fri Jul  7 16:17:48 2017	(r445266)
@@ -1,22 +1,18 @@
-TIMESTAMP = 1492785132
-SHA256 (centos/nss-3.28.4-1.0.el7_3.i686.rpm) = 7c0e9cbeacb07e7d2868f2f364527ff71816cdfef0dc18474e05db16e57e25e7
-SIZE (centos/nss-3.28.4-1.0.el7_3.i686.rpm) = 892792
-SHA256 (centos/nss-3.28.4-1.0.el7_3.x86_64.rpm) = 86968563fe276b36b88f07fa11f06c3366a9a96b20c4b2691338748f649f3d4d
-SIZE (centos/nss-3.28.4-1.0.el7_3.x86_64.rpm) = 894376
+TIMESTAMP = 1499443014
+SHA256 (centos/nss-3.28.4-1.2.el7_3.i686.rpm) = 0536cf40d3defdbc22f25218ae674c91f2425eb69bafd1858d1cd9ab526c3682
+SIZE (centos/nss-3.28.4-1.2.el7_3.i686.rpm) = 891440
+SHA256 (centos/nss-3.28.4-1.2.el7_3.x86_64.rpm) = fb37820045416e7bc172eb98f3af5dea0088cebf6c4eafd0bf4cd45601f3f7f2
+SIZE (centos/nss-3.28.4-1.2.el7_3.x86_64.rpm) = 892880
 SHA256 (centos/nss-softokn-3.16.2.3-14.4.el7.i686.rpm) = 025d3affd527ed34f4eb842b91d089f0cd7b1c6e91eca99233250b12769bc159
 SIZE (centos/nss-softokn-3.16.2.3-14.4.el7.i686.rpm) = 313312
 SHA256 (centos/nss-softokn-3.16.2.3-14.4.el7.x86_64.rpm) = 872dfee1cfb387678c8f5d9d34ab3754a942926503eb67dd6809b96cea9868f6
 SIZE (centos/nss-softokn-3.16.2.3-14.4.el7.x86_64.rpm) = 313204
-SHA256 (centos/nss-softokn-freebl-3.16.2.3-14.4.el7.i686.rpm) = 1dc2b14a034dbe0fdcd7b3ce48ad498fd891cbb0d2440c35771185c01954bd2c
-SIZE (centos/nss-softokn-freebl-3.16.2.3-14.4.el7.i686.rpm) = 192344
-SHA256 (centos/nss-softokn-freebl-3.16.2.3-14.4.el7.x86_64.rpm) = 32bf92422265c3684d9fef702c882fdb3600765ccd624d0cc29917e8286bb714
-SIZE (centos/nss-softokn-freebl-3.16.2.3-14.4.el7.x86_64.rpm) = 209092
 SHA256 (centos/nss-util-3.28.4-1.0.el7_3.i686.rpm) = 847b8da43f05a5f24b81b01efbc991e70c5d2c9c659f6bd9feb420bbfe59ba5e
 SIZE (centos/nss-util-3.28.4-1.0.el7_3.i686.rpm) = 73664
 SHA256 (centos/nss-util-3.28.4-1.0.el7_3.x86_64.rpm) = f23201ad7af7e0d5105bbde62ea32c2a10b62cfd1cdce92fe904306bdfb4ae43
 SIZE (centos/nss-util-3.28.4-1.0.el7_3.x86_64.rpm) = 75120
-SHA256 (centos/nss-3.28.4-1.0.el7_3.src.rpm) = 8031fd77de059ce3786fb98712737a9e9e83a8e4e29e8071050ce90ae4a1cb53
-SIZE (centos/nss-3.28.4-1.0.el7_3.src.rpm) = 7595007
+SHA256 (centos/nss-3.28.4-1.2.el7_3.src.rpm) = 67e7973b087488e1f2e51f3cb28fac7d143a1dd07f9b3ddcf79375d5913ea123
+SIZE (centos/nss-3.28.4-1.2.el7_3.src.rpm) = 7613440
 SHA256 (centos/nss-util-3.28.4-1.0.el7_3.src.rpm) = df5fc54dc4fa11167312e53541dc2334c45398132b61f879f1dc2a27cd55f436
 SIZE (centos/nss-util-3.28.4-1.0.el7_3.src.rpm) = 1126022
 SHA256 (centos/nss-softokn-3.16.2.3-14.4.el7.src.rpm) = f99e80bc6ba4abde11f91a20cca8111afedc1c8eea2920240a302e8caa4f2035

Modified: head/security/linux-c7-nss/pkg-plist.amd64
==============================================================================
--- head/security/linux-c7-nss/pkg-plist.amd64	Fri Jul  7 16:09:49 2017	(r445265)
+++ head/security/linux-c7-nss/pkg-plist.amd64	Fri Jul  7 16:17:48 2017	(r445266)
@@ -4,13 +4,6 @@ etc/pki/nssdb/key3.db
 etc/pki/nssdb/key4.db
 etc/pki/nssdb/pkcs11.txt
 etc/pki/nssdb/secmod.db
-etc/prelink.conf.d/nss-softokn-prelink.conf
-usr/lib/dracut/dracut.conf.d/50-nss-softokn.conf
-usr/lib/dracut/modules.d/05nss-softokn/module-setup.sh
-usr/lib/libfreebl3.chk
-usr/lib/libfreebl3.so
-usr/lib/libfreeblpriv3.chk
-usr/lib/libfreeblpriv3.so
 usr/lib/libnss3.so
 usr/lib/libnssdbm3.chk
 usr/lib/libnssdbm3.so
@@ -24,10 +17,6 @@ usr/lib/nss/libnssckbi.so
 usr/lib/nss/unsupported-tools/bltest
 usr/lib/nss/unsupported-tools/fipstest
 usr/lib/nss/unsupported-tools/shlibsign
-usr/lib64/libfreebl3.chk
-usr/lib64/libfreebl3.so
-usr/lib64/libfreeblpriv3.chk
-usr/lib64/libfreeblpriv3.so
 usr/lib64/libnss3.so
 usr/lib64/libnssdbm3.chk
 usr/lib64/libnssdbm3.so

Modified: head/security/linux-c7-nss/pkg-plist.i386
==============================================================================
--- head/security/linux-c7-nss/pkg-plist.i386	Fri Jul  7 16:09:49 2017	(r445265)
+++ head/security/linux-c7-nss/pkg-plist.i386	Fri Jul  7 16:17:48 2017	(r445266)
@@ -4,13 +4,6 @@ etc/pki/nssdb/key3.db
 etc/pki/nssdb/key4.db
 etc/pki/nssdb/pkcs11.txt
 etc/pki/nssdb/secmod.db
-etc/prelink.conf.d/nss-softokn-prelink.conf
-usr/lib/dracut/dracut.conf.d/50-nss-softokn.conf
-usr/lib/dracut/modules.d/05nss-softokn/module-setup.sh
-usr/lib/libfreebl3.chk
-usr/lib/libfreebl3.so
-usr/lib/libfreeblpriv3.chk
-usr/lib/libfreeblpriv3.so
 usr/lib/libnss3.so
 usr/lib/libnssdbm3.chk
 usr/lib/libnssdbm3.so



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707071617.v67GHmkY087755>