Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 7 Jul 2017 15:09:57 +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: r445258 - in head: emulators/linux_base-c6 security/linux-c6-nss
Message-ID:  <201707071509.v67F9vnB058144@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Fri Jul  7 15:09:57 2017
New Revision: 445258
URL: https://svnweb.freebsd.org/changeset/ports/445258

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

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

Modified: head/emulators/linux_base-c6/Makefile
==============================================================================
--- head/emulators/linux_base-c6/Makefile	Fri Jul  7 15:07:45 2017	(r445257)
+++ head/emulators/linux_base-c6/Makefile	Fri Jul  7 15:09:57 2017	(r445258)
@@ -3,6 +3,7 @@
 
 PORTNAME=	c6
 PORTVERSION=	${LINUX_DIST_VER}
+PORTREVISION=	1
 CATEGORIES=	emulators linux
 PKGNAMEPREFIX=	linux_base-
 BIN_DISTNAMES=	bash-4.1.2-48.el6 \
@@ -47,6 +48,7 @@ LIB_DISTNAMES=	bzip2-libs-1.0.5-7.el6_0 \
 		libstdc++-4.4.7-18.el6 \
 		libuuid-2.17.2-12.28.el6 \
 		ncurses-libs-5.7-4.20090207.el6 \
+		nss-softokn-freebl-3.14.3-23.3.el6_8 \
 		pcre-7.8-7.el6 \
 		popt-1.13-7.el6 \
 		readline-6.0-4.el6 \
@@ -87,6 +89,7 @@ SRC_DISTFILES=	acl-2.2.49-7.el6${SRC_SUFX}:SOURCE \
 		libselinux-2.0.94-7.el6${SRC_SUFX}:SOURCE \
 		libsepol-2.0.41-4.el6${SRC_SUFX}:SOURCE \
 		ncurses-5.7-4.20090207.el6${SRC_SUFX}:SOURCE \
+		nss-softokn-3.14.3-23.3.el6_8${SRC_SUFX}:SOURCE \
 		pcre-7.8-7.el6${SRC_SUFX}:SOURCE \
 		popt-1.13-7.el6${SRC_SUFX}:SOURCE \
 		readline-6.0-4.el6${SRC_SUFX}:SOURCE \

Modified: head/emulators/linux_base-c6/distinfo
==============================================================================
--- head/emulators/linux_base-c6/distinfo	Fri Jul  7 15:07:45 2017	(r445257)
+++ head/emulators/linux_base-c6/distinfo	Fri Jul  7 15:09:57 2017	(r445258)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1495811467
+TIMESTAMP = 1499438461
 SHA256 (centos/basesystem-10.0-4.el6.noarch.rpm) = 18860007697438e375733bb4a36a599daac2e2ae95d98a74c436a10d0974710e
 SIZE (centos/basesystem-10.0-4.el6.noarch.rpm) = 4784
 SHA256 (centos/bash-4.1.2-48.el6.i686.rpm) = 0300a6935602bb86a6e44dc526993069e79b80a32a02cfaeec7def94e3a2973e
@@ -157,6 +157,10 @@ SHA256 (centos/ncurses-libs-5.7-4.20090207.el6.i686.rp
 SIZE (centos/ncurses-libs-5.7-4.20090207.el6.i686.rpm) = 255352
 SHA256 (centos/ncurses-libs-5.7-4.20090207.el6.x86_64.rpm) = 88b5174e139c595569787ebe4750fefdfc5e047657f13df0c87b8316ff6cf956
 SIZE (centos/ncurses-libs-5.7-4.20090207.el6.x86_64.rpm) = 250916
+SHA256 (centos/nss-softokn-freebl-3.14.3-23.3.el6_8.i686.rpm) = c691e669816890bc0de9c05e83ce632836f9098acad04781c95abb9dc3de34dc
+SIZE (centos/nss-softokn-freebl-3.14.3-23.3.el6_8.i686.rpm) = 161168
+SHA256 (centos/nss-softokn-freebl-3.14.3-23.3.el6_8.x86_64.rpm) = bccc1e55c5cf90d7ee5ef2d25253fc8dd2c3854121a65711f5f5618b097ffb70
+SIZE (centos/nss-softokn-freebl-3.14.3-23.3.el6_8.x86_64.rpm) = 171680
 SHA256 (centos/pcre-7.8-7.el6.i686.rpm) = 62aff1a2975adc4a02293297d12b0202b5710155c00753bd4657d6896c3e7b8e
 SIZE (centos/pcre-7.8-7.el6.i686.rpm) = 201096
 SHA256 (centos/pcre-7.8-7.el6.x86_64.rpm) = 6e099492eb691f0e869c02a7352530ec6a8d0056c1aadcde3613cc1f8e24e52c
@@ -261,6 +265,8 @@ SHA256 (centos/libsepol-2.0.41-4.el6.src.rpm) = ac1799
 SIZE (centos/libsepol-2.0.41-4.el6.src.rpm) = 248004
 SHA256 (centos/ncurses-5.7-4.20090207.el6.src.rpm) = f60edf25d3cc6e9cf6f9a590a869d351ceb6cae161abf3102939c678be421f55
 SIZE (centos/ncurses-5.7-4.20090207.el6.src.rpm) = 2647744
+SHA256 (centos/nss-softokn-3.14.3-23.3.el6_8.src.rpm) = 01fe8fafbbfcf904b24e8ea78cc064b2e89fb4c2c14eb8176fb13d15b542b91e
+SIZE (centos/nss-softokn-3.14.3-23.3.el6_8.src.rpm) = 1305116
 SHA256 (centos/pcre-7.8-7.el6.src.rpm) = 7006ca55f22ae910c395d5fdbf94cc0c0ff567e8703cac519d5d1abebbbcd94f
 SIZE (centos/pcre-7.8-7.el6.src.rpm) = 876304
 SHA256 (centos/popt-1.13-7.el6.src.rpm) = 3b1b1c6e47e84d387b58899dbbc3bf24e45ae09fb79cf975c011aae245091406

Modified: head/emulators/linux_base-c6/pkg-plist.amd64
==============================================================================
--- head/emulators/linux_base-c6/pkg-plist.amd64	Fri Jul  7 15:07:45 2017	(r445257)
+++ head/emulators/linux_base-c6/pkg-plist.amd64	Fri Jul  7 15:09:57 2017	(r445258)
@@ -50,6 +50,7 @@ etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
 etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Debug-6
 etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Security-6
 etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Testing-6
+etc/prelink.conf.d/nss-softokn-prelink.conf
 etc/profile
 etc/profile.d/colorls.csh
 etc/profile.d/colorls.sh
@@ -630,6 +631,10 @@ usr/lib/libform.so.5
 usr/lib/libform.so.5.7
 usr/lib/libformw.so.5
 usr/lib/libformw.so.5.7
+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.3.22
 usr/lib/libgamin-1.so.0
@@ -1055,6 +1060,10 @@ usr/lib64/libform.so.5
 usr/lib64/libform.so.5.7
 usr/lib64/libformw.so.5
 usr/lib64/libformw.so.5.7
+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.3.22
 usr/lib64/libgamin-1.so.0
@@ -1467,6 +1476,7 @@ usr/sbin/zic
 %%PORTDOCS%%usr/share/doc/zlib-1.2.3/ChangeLog
 %%PORTDOCS%%usr/share/doc/zlib-1.2.3/FAQ
 %%PORTDOCS%%usr/share/doc/zlib-1.2.3/README
+usr/share/dracut/modules.d/05nss-softokn/install
 usr/share/emacs/site-lisp/idna.el
 usr/share/emacs/site-lisp/punycode.el
 usr/share/i18n/charmaps/ANSI_X3.110-1983.gz

Modified: head/emulators/linux_base-c6/pkg-plist.i386
==============================================================================
--- head/emulators/linux_base-c6/pkg-plist.i386	Fri Jul  7 15:07:45 2017	(r445257)
+++ head/emulators/linux_base-c6/pkg-plist.i386	Fri Jul  7 15:09:57 2017	(r445258)
@@ -47,6 +47,7 @@ etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
 etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Debug-6
 etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Security-6
 etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Testing-6
+etc/prelink.conf.d/nss-softokn-prelink.conf
 etc/profile
 etc/profile.d/colorls.csh
 etc/profile.d/colorls.sh
@@ -625,6 +626,10 @@ usr/lib/libform.so.5
 usr/lib/libform.so.5.7
 usr/lib/libformw.so.5
 usr/lib/libformw.so.5.7
+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.3.22
 usr/lib/libgamin-1.so.0
@@ -1044,6 +1049,7 @@ usr/sbin/zic
 %%PORTDOCS%%usr/share/doc/zlib-1.2.3/ChangeLog
 %%PORTDOCS%%usr/share/doc/zlib-1.2.3/FAQ
 %%PORTDOCS%%usr/share/doc/zlib-1.2.3/README
+usr/share/dracut/modules.d/05nss-softokn/install
 usr/share/emacs/site-lisp/idna.el
 usr/share/emacs/site-lisp/punycode.el
 usr/share/i18n/charmaps/ANSI_X3.110-1983.gz

Modified: head/security/linux-c6-nss/Makefile
==============================================================================
--- head/security/linux-c6-nss/Makefile	Fri Jul  7 15:07:45 2017	(r445257)
+++ head/security/linux-c6-nss/Makefile	Fri Jul  7 15:09:57 2017	(r445258)
@@ -3,11 +3,11 @@
 
 PORTNAME=	nss
 PORTVERSION=	3.28.4
+PORTREVISION=	1
 CATEGORIES=	security linux
 LIB_DISTNAMES=	${DISTNAME} \
 		${PORTNAME}-util-${PORTVERSION}-1.el6_9 \
-		${PORTNAME}-softokn-3.14.3-23.3.el6_8 \
-		${PORTNAME}-softokn-freebl-3.14.3-23.3.el6_8
+		${PORTNAME}-softokn-3.14.3-23.3.el6_8
 SRC_DISTFILES=	${DISTNAME}${SRC_SUFX}:SOURCE \
 		${PORTNAME}-util-${PORTVERSION}-1.el6_9${SRC_SUFX}:SOURCE \
 		${PORTNAME}-softokn-3.14.3-23.3.el6_8${SRC_SUFX}:SOURCE
@@ -18,7 +18,7 @@ COMMENT=	Network Security Services (Linux CentOS ${LIN
 LICENSE=	MPL
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-RPMVERSION=	1.el6_9
+RPMVERSION=	3.el6_9
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	nspr sqlite3

Modified: head/security/linux-c6-nss/distinfo
==============================================================================
--- head/security/linux-c6-nss/distinfo	Fri Jul  7 15:07:45 2017	(r445257)
+++ head/security/linux-c6-nss/distinfo	Fri Jul  7 15:09:57 2017	(r445258)
@@ -1,22 +1,18 @@
-TIMESTAMP = 1492782699
-SHA256 (centos/nss-3.28.4-1.el6_9.i686.rpm) = 5821f235b991ffcd273006c24ca9d3e1daf4b6e3228ce7dcb97c24de5b21de41
-SIZE (centos/nss-3.28.4-1.el6_9.i686.rpm) = 904408
-SHA256 (centos/nss-3.28.4-1.el6_9.x86_64.rpm) = a82f4e54a89d9b8923fe457130bf4e7aefc0b9d506716eb1ead0db9fa2b8714a
-SIZE (centos/nss-3.28.4-1.el6_9.x86_64.rpm) = 901368
+TIMESTAMP = 1499439708
+SHA256 (centos/nss-3.28.4-3.el6_9.i686.rpm) = d77edfa78ee44700556252fe80f032fc033a55fb7bb2f2c5ba5aea73a1125c1d
+SIZE (centos/nss-3.28.4-3.el6_9.i686.rpm) = 903148
+SHA256 (centos/nss-3.28.4-3.el6_9.x86_64.rpm) = e31ab61a961da1167d5d3fec3b4d2735602e942dd2491ce6f09536030b971a1f
+SIZE (centos/nss-3.28.4-3.el6_9.x86_64.rpm) = 900308
 SHA256 (centos/nss-softokn-3.14.3-23.3.el6_8.i686.rpm) = 05ddcfdc1ac5e369ce1fc6c11b5d11e96ee14a87e30d16b150950bf769029022
 SIZE (centos/nss-softokn-3.14.3-23.3.el6_8.i686.rpm) = 276536
 SHA256 (centos/nss-softokn-3.14.3-23.3.el6_8.x86_64.rpm) = 7e4298904daec41067f01c8943055560cd153d1f39c668c6d2fa978a3d66dd81
 SIZE (centos/nss-softokn-3.14.3-23.3.el6_8.x86_64.rpm) = 268680
-SHA256 (centos/nss-softokn-freebl-3.14.3-23.3.el6_8.i686.rpm) = c691e669816890bc0de9c05e83ce632836f9098acad04781c95abb9dc3de34dc
-SIZE (centos/nss-softokn-freebl-3.14.3-23.3.el6_8.i686.rpm) = 161168
-SHA256 (centos/nss-softokn-freebl-3.14.3-23.3.el6_8.x86_64.rpm) = bccc1e55c5cf90d7ee5ef2d25253fc8dd2c3854121a65711f5f5618b097ffb70
-SIZE (centos/nss-softokn-freebl-3.14.3-23.3.el6_8.x86_64.rpm) = 171680
 SHA256 (centos/nss-util-3.28.4-1.el6_9.i686.rpm) = 09d5ded637588ded6406eafe69a19b13d981a8bf945ada12894da1a0d21d376f
 SIZE (centos/nss-util-3.28.4-1.el6_9.i686.rpm) = 69468
 SHA256 (centos/nss-util-3.28.4-1.el6_9.x86_64.rpm) = 62d946e014cfbfb7cc657a58295a8f27b11043f2136edf91126b3ff467400c85
 SIZE (centos/nss-util-3.28.4-1.el6_9.x86_64.rpm) = 70016
-SHA256 (centos/nss-3.28.4-1.el6_9.src.rpm) = f3d57fbec19b0a79e88bedf659868d173f34a651a42313ddc600b0ce420aef47
-SIZE (centos/nss-3.28.4-1.el6_9.src.rpm) = 7589897
+SHA256 (centos/nss-3.28.4-3.el6_9.src.rpm) = 362a030086f701a7c8037aec4da72d9995fcf6476acfac5ca9ace4ad12ea0309
+SIZE (centos/nss-3.28.4-3.el6_9.src.rpm) = 7608532
 SHA256 (centos/nss-util-3.28.4-1.el6_9.src.rpm) = 0667ca1376b6eca9ae5b4b0c5745d5ae9801227458afe5c43fab9422908f8763
 SIZE (centos/nss-util-3.28.4-1.el6_9.src.rpm) = 1126368
 SHA256 (centos/nss-softokn-3.14.3-23.3.el6_8.src.rpm) = 01fe8fafbbfcf904b24e8ea78cc064b2e89fb4c2c14eb8176fb13d15b542b91e

Modified: head/security/linux-c6-nss/pkg-plist.amd64
==============================================================================
--- head/security/linux-c6-nss/pkg-plist.amd64	Fri Jul  7 15:07:45 2017	(r445257)
+++ head/security/linux-c6-nss/pkg-plist.amd64	Fri Jul  7 15:09:57 2017	(r445258)
@@ -2,11 +2,6 @@ etc/pki/nss-legacy/nss-rhel6.config
 etc/pki/nssdb/cert8.db
 etc/pki/nssdb/key3.db
 etc/pki/nssdb/secmod.db
-etc/prelink.conf.d/nss-softokn-prelink.conf
-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
@@ -20,10 +15,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
@@ -37,6 +28,5 @@ usr/lib64/nss/libnssckbi.so
 usr/lib64/nss/unsupported-tools/bltest
 usr/lib64/nss/unsupported-tools/fipstest
 usr/lib64/nss/unsupported-tools/shlibsign
-usr/share/dracut/modules.d/05nss-softokn/install
 @dir usr/lib/nss/saved
 @dir usr/lib64/nss/saved

Modified: head/security/linux-c6-nss/pkg-plist.i386
==============================================================================
--- head/security/linux-c6-nss/pkg-plist.i386	Fri Jul  7 15:07:45 2017	(r445257)
+++ head/security/linux-c6-nss/pkg-plist.i386	Fri Jul  7 15:09:57 2017	(r445258)
@@ -2,11 +2,6 @@ etc/pki/nss-legacy/nss-rhel6.config
 etc/pki/nssdb/cert8.db
 etc/pki/nssdb/key3.db
 etc/pki/nssdb/secmod.db
-etc/prelink.conf.d/nss-softokn-prelink.conf
-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
@@ -20,5 +15,4 @@ usr/lib/nss/libnssckbi.so
 usr/lib/nss/unsupported-tools/bltest
 usr/lib/nss/unsupported-tools/fipstest
 usr/lib/nss/unsupported-tools/shlibsign
-usr/share/dracut/modules.d/05nss-softokn/install
 @dir usr/lib/nss/saved



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