aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authortijl <tijl@FreeBSD.org>2017-01-19 23:44:53 +0800
committertijl <tijl@FreeBSD.org>2017-01-19 23:44:53 +0800
commit55dd07bce317a6a87cb600c4eb5a7d67c3d9721b (patch)
treee291f6d22d8d71faa3022898990b266286fc9af2 /security
parent9685dfba21a336d3762fe96fb09b3114d6d82065 (diff)
downloadfreebsd-ports-gnome-55dd07bce317a6a87cb600c4eb5a7d67c3d9721b.tar.gz
freebsd-ports-gnome-55dd07bce317a6a87cb600c4eb5a7d67c3d9721b.tar.zst
freebsd-ports-gnome-55dd07bce317a6a87cb600c4eb5a7d67c3d9721b.zip
Update Linux CentOS 7 ports to 7.3.1611. While 7.2 had semi-official i386
packages there are no such packages for 7.3 yet so i386 support has been marked IGNORE for now. Change DIST_SUBDIR to just "centos" so distfiles that remain the same between major versions don't have to be redownloaded. Remove fmake hacks from linux.mk. Submitted by: Piotr Kubaj <pkubaj@anongoth.pl>
Diffstat (limited to 'security')
-rw-r--r--security/linux-c7-cyrus-sasl2/Makefile5
-rw-r--r--security/linux-c7-cyrus-sasl2/distinfo.i3865
-rw-r--r--security/linux-c7-cyrus-sasl2/distinfo.x86_6414
-rw-r--r--security/linux-c7-cyrus-sasl2/pkg-plist.i38630
-rw-r--r--security/linux-c7-gnutls/Makefile6
-rw-r--r--security/linux-c7-gnutls/distinfo.i3865
-rw-r--r--security/linux-c7-gnutls/distinfo.x86_6414
-rw-r--r--security/linux-c7-gnutls/pkg-plist.i38625
-rw-r--r--security/linux-c7-gnutls/pkg-plist.x86_648
-rw-r--r--security/linux-c7-libgcrypt/Makefile6
-rw-r--r--security/linux-c7-libgcrypt/distinfo.i3863
-rw-r--r--security/linux-c7-libgcrypt/distinfo.x86_6412
-rw-r--r--security/linux-c7-libgcrypt/pkg-plist.i3863
-rw-r--r--security/linux-c7-libgpg-error/Makefile3
-rw-r--r--security/linux-c7-libgpg-error/distinfo.i3865
-rw-r--r--security/linux-c7-libgpg-error/distinfo.x86_6414
-rw-r--r--security/linux-c7-libgpg-error/pkg-plist.i38623
-rw-r--r--security/linux-c7-libssh2/Makefile3
-rw-r--r--security/linux-c7-libssh2/distinfo.i3865
-rw-r--r--security/linux-c7-libssh2/distinfo.x86_6414
-rw-r--r--security/linux-c7-libssh2/pkg-plist.i3862
-rw-r--r--security/linux-c7-libtasn1/Makefile5
-rw-r--r--security/linux-c7-libtasn1/distinfo.i3865
-rw-r--r--security/linux-c7-libtasn1/distinfo.x86_6414
-rw-r--r--security/linux-c7-libtasn1/pkg-plist.i3862
-rw-r--r--security/linux-c7-nss/Makefile11
-rw-r--r--security/linux-c7-nss/distinfo.i3869
-rw-r--r--security/linux-c7-nss/distinfo.x86_6440
-rw-r--r--security/linux-c7-nss/pkg-plist.i38633
-rw-r--r--security/linux-c7-openssl-compat/Makefile3
-rw-r--r--security/linux-c7-openssl-compat/distinfo.i3865
-rw-r--r--security/linux-c7-openssl-compat/distinfo.x86_6414
-rw-r--r--security/linux-c7-openssl-compat/pkg-plist.i38625
-rw-r--r--security/linux-c7-openssl/Makefile5
-rw-r--r--security/linux-c7-openssl/distinfo.i3867
-rw-r--r--security/linux-c7-openssl/distinfo.x86_6418
-rw-r--r--security/linux-c7-openssl/pkg-plist.i386101
37 files changed, 110 insertions, 392 deletions
diff --git a/security/linux-c7-cyrus-sasl2/Makefile b/security/linux-c7-cyrus-sasl2/Makefile
index f136f858b01f..a0803a32c602 100644
--- a/security/linux-c7-cyrus-sasl2/Makefile
+++ b/security/linux-c7-cyrus-sasl2/Makefile
@@ -3,6 +3,7 @@
PORTNAME= cyrus-sasl2
PORTVERSION= 2.1.26
+PORTREVISION= 1
CATEGORIES= security linux
DISTNAME= cyrus-sasl-lib-${PORTVERSION}-${RPMVERSION}
SRC_DISTFILES= cyrus-sasl-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
@@ -10,9 +11,9 @@ SRC_DISTFILES= cyrus-sasl-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
MAINTAINER= emulation@FreeBSD.org
COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer) (Linux CentOS ${LINUX_DIST_VER})
-CONFLICT= linux-f10-${PORTNAME}-[0-9]* linux-c6-${PORTNAME}-[0-9]*
+CONFLICT= linux-c6-${PORTNAME}-[0-9]*
-RPMVERSION= 19.2.el7
+RPMVERSION= 20.el7_2
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
diff --git a/security/linux-c7-cyrus-sasl2/distinfo.i386 b/security/linux-c7-cyrus-sasl2/distinfo.i386
deleted file mode 100644
index 32b5401b6065..000000000000
--- a/security/linux-c7-cyrus-sasl2/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1473355662
-SHA256 (rpm/centos/7.2.1511/i386/cyrus-sasl-lib-2.1.26-19.2.el7.i686.rpm) = 55e30cace94a37f8f87b6c61ad5cefa79d3b1c259c49172088f9513fa78181d4
-SIZE (rpm/centos/7.2.1511/i386/cyrus-sasl-lib-2.1.26-19.2.el7.i686.rpm) = 157268
-SHA256 (rpm/centos/7.2.1511/i386/cyrus-sasl-2.1.26-19.2.el7.src.rpm) = 9f0fa06fdc9196df06312b773561aa29dbba76b9575e90fd8c44c1c83c147e0a
-SIZE (rpm/centos/7.2.1511/i386/cyrus-sasl-2.1.26-19.2.el7.src.rpm) = 1771611
diff --git a/security/linux-c7-cyrus-sasl2/distinfo.x86_64 b/security/linux-c7-cyrus-sasl2/distinfo.x86_64
index d237408e7fcb..816db3441ad8 100644
--- a/security/linux-c7-cyrus-sasl2/distinfo.x86_64
+++ b/security/linux-c7-cyrus-sasl2/distinfo.x86_64
@@ -1,7 +1,7 @@
-TIMESTAMP = 1473674608
-SHA256 (rpm/centos/7.2.1511/x86_64/cyrus-sasl-lib-2.1.26-19.2.el7.i686.rpm) = 55e30cace94a37f8f87b6c61ad5cefa79d3b1c259c49172088f9513fa78181d4
-SIZE (rpm/centos/7.2.1511/x86_64/cyrus-sasl-lib-2.1.26-19.2.el7.i686.rpm) = 157268
-SHA256 (rpm/centos/7.2.1511/x86_64/cyrus-sasl-lib-2.1.26-19.2.el7.x86_64.rpm) = 036f0a898fe188763a79e1633253bf7bb0b99632fe05d638e8954f37cf7b438b
-SIZE (rpm/centos/7.2.1511/x86_64/cyrus-sasl-lib-2.1.26-19.2.el7.x86_64.rpm) = 158260
-SHA256 (rpm/centos/7.2.1511/x86_64/cyrus-sasl-2.1.26-19.2.el7.src.rpm) = 9f0fa06fdc9196df06312b773561aa29dbba76b9575e90fd8c44c1c83c147e0a
-SIZE (rpm/centos/7.2.1511/x86_64/cyrus-sasl-2.1.26-19.2.el7.src.rpm) = 1771611
+TIMESTAMP = 1482091501
+SHA256 (centos/cyrus-sasl-lib-2.1.26-20.el7_2.i686.rpm) = e328871faf9ec6f073a0667acc03815b2267e4e07aa6ec3c701718168cbb780f
+SIZE (centos/cyrus-sasl-lib-2.1.26-20.el7_2.i686.rpm) = 157376
+SHA256 (centos/cyrus-sasl-lib-2.1.26-20.el7_2.x86_64.rpm) = 61f7eedd1a8eb447bb790c085f71b586d2583934a30ec9c4bed66b56b0fbf632
+SIZE (centos/cyrus-sasl-lib-2.1.26-20.el7_2.x86_64.rpm) = 158372
+SHA256 (centos/cyrus-sasl-2.1.26-20.el7_2.src.rpm) = f8dc7cff9cbd04d416fac1f63eaf51d96b6f99439975dfdb3ecaec1dd2a71452
+SIZE (centos/cyrus-sasl-2.1.26-20.el7_2.src.rpm) = 1775427
diff --git a/security/linux-c7-cyrus-sasl2/pkg-plist.i386 b/security/linux-c7-cyrus-sasl2/pkg-plist.i386
deleted file mode 100644
index 9d7941816c38..000000000000
--- a/security/linux-c7-cyrus-sasl2/pkg-plist.i386
+++ /dev/null
@@ -1,30 +0,0 @@
-usr/lib/libsasl2.so.3
-usr/lib/libsasl2.so.3.0.0
-usr/lib/sasl2/libanonymous.so
-usr/lib/sasl2/libanonymous.so.3
-usr/lib/sasl2/libanonymous.so.3.0.0
-usr/lib/sasl2/libsasldb.so
-usr/lib/sasl2/libsasldb.so.3
-usr/lib/sasl2/libsasldb.so.3.0.0
-usr/sbin/sasldblistusers2
-usr/sbin/saslpasswd2
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/advanced.html
-%%PORTDOCS%%%%DOCSDIR%%/appconvert.html
-%%PORTDOCS%%%%DOCSDIR%%/components.html
-%%PORTDOCS%%%%DOCSDIR%%/gssapi.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/install.html
-%%PORTDOCS%%%%DOCSDIR%%/macosx.html
-%%PORTDOCS%%%%DOCSDIR%%/mechanisms.html
-%%PORTDOCS%%%%DOCSDIR%%/options.html
-%%PORTDOCS%%%%DOCSDIR%%/plugprog.html
-%%PORTDOCS%%%%DOCSDIR%%/programming.html
-%%PORTDOCS%%%%DOCSDIR%%/readme.html
-%%PORTDOCS%%%%DOCSDIR%%/sysadmin.html
-%%PORTDOCS%%%%DOCSDIR%%/upgrading.html
-%%PORTDOCS%%%%DOCSDIR%%/windows.html
-@dir etc/sasl2
diff --git a/security/linux-c7-gnutls/Makefile b/security/linux-c7-gnutls/Makefile
index b3d8c906f35e..68be17340531 100644
--- a/security/linux-c7-gnutls/Makefile
+++ b/security/linux-c7-gnutls/Makefile
@@ -2,15 +2,15 @@
# $FreeBSD$
PORTNAME= gnutls
-PORTVERSION= 3.3.8
+PORTVERSION= 3.3.24
CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= GNU Transport Layer Security library
-CONFLICTS= linux-f10-${PORTNAME}-[0-9]* linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-RPMVERSION= 14.el7_2
+RPMVERSION= 1.el7
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= libtasn1 libgcrypt libgpg-error
diff --git a/security/linux-c7-gnutls/distinfo.i386 b/security/linux-c7-gnutls/distinfo.i386
deleted file mode 100644
index 8e7a1bc9eaf0..000000000000
--- a/security/linux-c7-gnutls/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1473355565
-SHA256 (rpm/centos/7.2.1511/i386/gnutls-3.3.8-14.el7_2.i686.rpm) = b2a82e473add3e5dbda27c34d836ab84b7c6b922a6038638b25ad62fe1952273
-SIZE (rpm/centos/7.2.1511/i386/gnutls-3.3.8-14.el7_2.i686.rpm) = 647504
-SHA256 (rpm/centos/7.2.1511/i386/gnutls-3.3.8-14.el7_2.src.rpm) = 6bb78e62521dbbba7e8ff0f8e42b1b94f1fc80ed0fede9fc0f285ca460af424d
-SIZE (rpm/centos/7.2.1511/i386/gnutls-3.3.8-14.el7_2.src.rpm) = 6205031
diff --git a/security/linux-c7-gnutls/distinfo.x86_64 b/security/linux-c7-gnutls/distinfo.x86_64
index 2813c5f7f88e..c445ab8f1a87 100644
--- a/security/linux-c7-gnutls/distinfo.x86_64
+++ b/security/linux-c7-gnutls/distinfo.x86_64
@@ -1,7 +1,7 @@
-TIMESTAMP = 1473674592
-SHA256 (rpm/centos/7.2.1511/x86_64/gnutls-3.3.8-14.el7_2.i686.rpm) = b2a82e473add3e5dbda27c34d836ab84b7c6b922a6038638b25ad62fe1952273
-SIZE (rpm/centos/7.2.1511/x86_64/gnutls-3.3.8-14.el7_2.i686.rpm) = 647504
-SHA256 (rpm/centos/7.2.1511/x86_64/gnutls-3.3.8-14.el7_2.x86_64.rpm) = 9a6b1d3d392510c197bfb56ac57cb1451944f30a009bd7c4dabd86702089299a
-SIZE (rpm/centos/7.2.1511/x86_64/gnutls-3.3.8-14.el7_2.x86_64.rpm) = 678176
-SHA256 (rpm/centos/7.2.1511/x86_64/gnutls-3.3.8-14.el7_2.src.rpm) = 6bb78e62521dbbba7e8ff0f8e42b1b94f1fc80ed0fede9fc0f285ca460af424d
-SIZE (rpm/centos/7.2.1511/x86_64/gnutls-3.3.8-14.el7_2.src.rpm) = 6205031
+TIMESTAMP = 1482092240
+SHA256 (centos/gnutls-3.3.24-1.el7.i686.rpm) = ac6a918032dff2407ff5c8f0a659a6449de667d2c1b5e1c5b7ae086659df3e47
+SIZE (centos/gnutls-3.3.24-1.el7.i686.rpm) = 656664
+SHA256 (centos/gnutls-3.3.24-1.el7.x86_64.rpm) = a790c99f574807326bc72fc2addc063bf5ff5cd79d8e40806e55dd4779c649b3
+SIZE (centos/gnutls-3.3.24-1.el7.x86_64.rpm) = 688468
+SHA256 (centos/gnutls-3.3.24-1.el7.src.rpm) = b3b35cddc7338fac4226c180bf9f3a228c824c53092060582a66203cf2469de1
+SIZE (centos/gnutls-3.3.24-1.el7.src.rpm) = 6282294
diff --git a/security/linux-c7-gnutls/pkg-plist.i386 b/security/linux-c7-gnutls/pkg-plist.i386
deleted file mode 100644
index 0bf4426a5447..000000000000
--- a/security/linux-c7-gnutls/pkg-plist.i386
+++ /dev/null
@@ -1,25 +0,0 @@
-usr/lib/.libgnutls.so.28.41.0.hmac
-usr/lib/.libgnutls.so.28.hmac
-usr/lib/libgnutls.so.28
-usr/lib/libgnutls.so.28.41.0
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/COPYING.LESSER
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
-usr/share/locale/cs/LC_MESSAGES/gnutls.mo
-usr/share/locale/de/LC_MESSAGES/gnutls.mo
-usr/share/locale/en@boldquot/LC_MESSAGES/gnutls.mo
-usr/share/locale/en@quot/LC_MESSAGES/gnutls.mo
-usr/share/locale/eo/LC_MESSAGES/gnutls.mo
-usr/share/locale/fi/LC_MESSAGES/gnutls.mo
-usr/share/locale/fr/LC_MESSAGES/gnutls.mo
-usr/share/locale/it/LC_MESSAGES/gnutls.mo
-usr/share/locale/ms/LC_MESSAGES/gnutls.mo
-usr/share/locale/nl/LC_MESSAGES/gnutls.mo
-usr/share/locale/pl/LC_MESSAGES/gnutls.mo
-usr/share/locale/sv/LC_MESSAGES/gnutls.mo
-usr/share/locale/uk/LC_MESSAGES/gnutls.mo
-usr/share/locale/vi/LC_MESSAGES/gnutls.mo
-usr/share/locale/zh_CN/LC_MESSAGES/gnutls.mo
diff --git a/security/linux-c7-gnutls/pkg-plist.x86_64 b/security/linux-c7-gnutls/pkg-plist.x86_64
index 3857b7a77aed..2c1ec0296b15 100644
--- a/security/linux-c7-gnutls/pkg-plist.x86_64
+++ b/security/linux-c7-gnutls/pkg-plist.x86_64
@@ -1,11 +1,11 @@
-usr/lib/.libgnutls.so.28.41.0.hmac
+usr/lib/.libgnutls.so.28.41.16.hmac
usr/lib/.libgnutls.so.28.hmac
usr/lib/libgnutls.so.28
-usr/lib/libgnutls.so.28.41.0
-usr/lib64/.libgnutls.so.28.41.0.hmac
+usr/lib/libgnutls.so.28.41.16
+usr/lib64/.libgnutls.so.28.41.16.hmac
usr/lib64/.libgnutls.so.28.hmac
usr/lib64/libgnutls.so.28
-usr/lib64/libgnutls.so.28.41.0
+usr/lib64/libgnutls.so.28.41.16
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/COPYING.LESSER
diff --git a/security/linux-c7-libgcrypt/Makefile b/security/linux-c7-libgcrypt/Makefile
index 5ec3d26cfcab..f779a5506753 100644
--- a/security/linux-c7-libgcrypt/Makefile
+++ b/security/linux-c7-libgcrypt/Makefile
@@ -3,15 +3,13 @@
PORTNAME= libgcrypt
PORTVERSION= 1.5.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security linux
-MASTER_SITES= CENTOS_LINUX/centos/${LINUX_DIST_VER}/cr/x86_64/Packages
-SRC_DISTFILES= # not available
MAINTAINER= emulation@FreeBSD.org
COMMENT= Crypto library based on code used in GnuPG (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-f10-${PORTNAME}-[0-9]* linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
LICENSE= LGPL21+
diff --git a/security/linux-c7-libgcrypt/distinfo.i386 b/security/linux-c7-libgcrypt/distinfo.i386
deleted file mode 100644
index a9de57336523..000000000000
--- a/security/linux-c7-libgcrypt/distinfo.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1480525241
-SHA256 (rpm/centos/7.2.1511/i386/libgcrypt-1.5.3-13.el7_3.1.i686.rpm) = aa89bae855cf4d3d26dce9e353b076ff2c1c5c78fed2df0702f5a6c6c07c8cee
-SIZE (rpm/centos/7.2.1511/i386/libgcrypt-1.5.3-13.el7_3.1.i686.rpm) = 271648
diff --git a/security/linux-c7-libgcrypt/distinfo.x86_64 b/security/linux-c7-libgcrypt/distinfo.x86_64
index 0053624fa5f6..803e7e72306e 100644
--- a/security/linux-c7-libgcrypt/distinfo.x86_64
+++ b/security/linux-c7-libgcrypt/distinfo.x86_64
@@ -1,5 +1,7 @@
-TIMESTAMP = 1480525767
-SHA256 (rpm/centos/7.2.1511/x86_64/libgcrypt-1.5.3-13.el7_3.1.i686.rpm) = aa89bae855cf4d3d26dce9e353b076ff2c1c5c78fed2df0702f5a6c6c07c8cee
-SIZE (rpm/centos/7.2.1511/x86_64/libgcrypt-1.5.3-13.el7_3.1.i686.rpm) = 271648
-SHA256 (rpm/centos/7.2.1511/x86_64/libgcrypt-1.5.3-13.el7_3.1.x86_64.rpm) = 15dd1dd50ecc5b4e3a4a4e03febb066c410f99d56ceb7aa9fa3256ec894e85b1
-SIZE (rpm/centos/7.2.1511/x86_64/libgcrypt-1.5.3-13.el7_3.1.x86_64.rpm) = 269052
+TIMESTAMP = 1482083864
+SHA256 (centos/libgcrypt-1.5.3-13.el7_3.1.i686.rpm) = aa89bae855cf4d3d26dce9e353b076ff2c1c5c78fed2df0702f5a6c6c07c8cee
+SIZE (centos/libgcrypt-1.5.3-13.el7_3.1.i686.rpm) = 271648
+SHA256 (centos/libgcrypt-1.5.3-13.el7_3.1.x86_64.rpm) = 15dd1dd50ecc5b4e3a4a4e03febb066c410f99d56ceb7aa9fa3256ec894e85b1
+SIZE (centos/libgcrypt-1.5.3-13.el7_3.1.x86_64.rpm) = 269052
+SHA256 (centos/libgcrypt-1.5.3-13.el7_3.1.src.rpm) = e5e19b5a3035ff2d90aca9644a317bcfdc55ae0c135741a1d441851e97e399bf
+SIZE (centos/libgcrypt-1.5.3-13.el7_3.1.src.rpm) = 1397001
diff --git a/security/linux-c7-libgcrypt/pkg-plist.i386 b/security/linux-c7-libgcrypt/pkg-plist.i386
deleted file mode 100644
index cecb00c31000..000000000000
--- a/security/linux-c7-libgcrypt/pkg-plist.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/.libgcrypt.so.11.hmac
-usr/lib/libgcrypt.so.11
-usr/lib/libgcrypt.so.11.8.2
diff --git a/security/linux-c7-libgpg-error/Makefile b/security/linux-c7-libgpg-error/Makefile
index a71d1d4ae4f7..d09aa94af44f 100644
--- a/security/linux-c7-libgpg-error/Makefile
+++ b/security/linux-c7-libgpg-error/Makefile
@@ -3,12 +3,13 @@
PORTNAME= libgpg-error
PORTVERSION= 1.12
+PORTREVISION= 1
CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Common error values for all GnuPG components
-CONFLICTS= linux-f10-${PORTNAME}-[0-9]* linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
LICENSE= LGPL21+
diff --git a/security/linux-c7-libgpg-error/distinfo.i386 b/security/linux-c7-libgpg-error/distinfo.i386
deleted file mode 100644
index a2eb00ec7d4c..000000000000
--- a/security/linux-c7-libgpg-error/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1473355653
-SHA256 (rpm/centos/7.2.1511/i386/libgpg-error-1.12-3.el7.i686.rpm) = 491381cb722ada5fbef1f1d942bd3f874570ea4e109fd7ee728693d13b5220f3
-SIZE (rpm/centos/7.2.1511/i386/libgpg-error-1.12-3.el7.i686.rpm) = 89068
-SHA256 (rpm/centos/7.2.1511/i386/libgpg-error-1.12-3.el7.src.rpm) = 3e068d41653bfba16eb25a545d4fd84a16342e832b8d8c6566bbc1884191cc1a
-SIZE (rpm/centos/7.2.1511/i386/libgpg-error-1.12-3.el7.src.rpm) = 500370
diff --git a/security/linux-c7-libgpg-error/distinfo.x86_64 b/security/linux-c7-libgpg-error/distinfo.x86_64
index 1397582e2271..c257064b2758 100644
--- a/security/linux-c7-libgpg-error/distinfo.x86_64
+++ b/security/linux-c7-libgpg-error/distinfo.x86_64
@@ -1,7 +1,7 @@
-TIMESTAMP = 1473674606
-SHA256 (rpm/centos/7.2.1511/x86_64/libgpg-error-1.12-3.el7.i686.rpm) = 491381cb722ada5fbef1f1d942bd3f874570ea4e109fd7ee728693d13b5220f3
-SIZE (rpm/centos/7.2.1511/x86_64/libgpg-error-1.12-3.el7.i686.rpm) = 89068
-SHA256 (rpm/centos/7.2.1511/x86_64/libgpg-error-1.12-3.el7.x86_64.rpm) = 3cdbe510adeb1a2597eb2c81fff2ddef2319c8da70bd4a36efeedb491be5bd33
-SIZE (rpm/centos/7.2.1511/x86_64/libgpg-error-1.12-3.el7.x86_64.rpm) = 89332
-SHA256 (rpm/centos/7.2.1511/x86_64/libgpg-error-1.12-3.el7.src.rpm) = 3e068d41653bfba16eb25a545d4fd84a16342e832b8d8c6566bbc1884191cc1a
-SIZE (rpm/centos/7.2.1511/x86_64/libgpg-error-1.12-3.el7.src.rpm) = 500370
+TIMESTAMP = 1482091626
+SHA256 (centos/libgpg-error-1.12-3.el7.i686.rpm) = 491381cb722ada5fbef1f1d942bd3f874570ea4e109fd7ee728693d13b5220f3
+SIZE (centos/libgpg-error-1.12-3.el7.i686.rpm) = 89068
+SHA256 (centos/libgpg-error-1.12-3.el7.x86_64.rpm) = 3cdbe510adeb1a2597eb2c81fff2ddef2319c8da70bd4a36efeedb491be5bd33
+SIZE (centos/libgpg-error-1.12-3.el7.x86_64.rpm) = 89332
+SHA256 (centos/libgpg-error-1.12-3.el7.src.rpm) = 3e068d41653bfba16eb25a545d4fd84a16342e832b8d8c6566bbc1884191cc1a
+SIZE (centos/libgpg-error-1.12-3.el7.src.rpm) = 500370
diff --git a/security/linux-c7-libgpg-error/pkg-plist.i386 b/security/linux-c7-libgpg-error/pkg-plist.i386
deleted file mode 100644
index 32c4d6ccd1e1..000000000000
--- a/security/linux-c7-libgpg-error/pkg-plist.i386
+++ /dev/null
@@ -1,23 +0,0 @@
-lib/libgpg-error.so.0
-lib/libgpg-error.so.0.10.0
-usr/bin/gpg-error
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-usr/share/locale/cs/LC_MESSAGES/libgpg-error.mo
-usr/share/locale/da/LC_MESSAGES/libgpg-error.mo
-usr/share/locale/de/LC_MESSAGES/libgpg-error.mo
-usr/share/locale/eo/LC_MESSAGES/libgpg-error.mo
-usr/share/locale/fr/LC_MESSAGES/libgpg-error.mo
-usr/share/locale/it/LC_MESSAGES/libgpg-error.mo
-usr/share/locale/ja/LC_MESSAGES/libgpg-error.mo
-usr/share/locale/nl/LC_MESSAGES/libgpg-error.mo
-usr/share/locale/pl/LC_MESSAGES/libgpg-error.mo
-usr/share/locale/ro/LC_MESSAGES/libgpg-error.mo
-usr/share/locale/sv/LC_MESSAGES/libgpg-error.mo
-usr/share/locale/uk/LC_MESSAGES/libgpg-error.mo
-usr/share/locale/vi/LC_MESSAGES/libgpg-error.mo
-usr/share/locale/zh_CN/LC_MESSAGES/libgpg-error.mo
diff --git a/security/linux-c7-libssh2/Makefile b/security/linux-c7-libssh2/Makefile
index d97126d62877..d17c8c571b6b 100644
--- a/security/linux-c7-libssh2/Makefile
+++ b/security/linux-c7-libssh2/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libssh2
PORTVERSION= 1.4.3
+PORTREVISION= 1
CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
@@ -10,7 +11,7 @@ COMMENT= Library implementing the SSH2 protocol (Linux CentOS ${LINUX_DIST_VER})
CONFLICTS= linux-f10-${PORTNAME}-[0-9]* linux-c6-${PORTNAME}-[0-9]*
-RPMVERSION= 10.el7
+RPMVERSION= 10.el7_2.1
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= openssl
diff --git a/security/linux-c7-libssh2/distinfo.i386 b/security/linux-c7-libssh2/distinfo.i386
deleted file mode 100644
index 77e3252cb759..000000000000
--- a/security/linux-c7-libssh2/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1473354094
-SHA256 (rpm/centos/7.2.1511/i386/libssh2-1.4.3-10.el7.i686.rpm) = c834cc8f2f2117b44dd0c06bbff2a80cabb2096da0149f90fecb5a30bbdf6761
-SIZE (rpm/centos/7.2.1511/i386/libssh2-1.4.3-10.el7.i686.rpm) = 136188
-SHA256 (rpm/centos/7.2.1511/i386/libssh2-1.4.3-10.el7.src.rpm) = 92e5e8bd92c85c4015b95d0621b9605bc652ad1418f450a0715ef983884d454b
-SIZE (rpm/centos/7.2.1511/i386/libssh2-1.4.3-10.el7.src.rpm) = 719727
diff --git a/security/linux-c7-libssh2/distinfo.x86_64 b/security/linux-c7-libssh2/distinfo.x86_64
index e13d1c45d49f..0ba22e2d0edd 100644
--- a/security/linux-c7-libssh2/distinfo.x86_64
+++ b/security/linux-c7-libssh2/distinfo.x86_64
@@ -1,7 +1,7 @@
-TIMESTAMP = 1473674585
-SHA256 (rpm/centos/7.2.1511/x86_64/libssh2-1.4.3-10.el7.i686.rpm) = c834cc8f2f2117b44dd0c06bbff2a80cabb2096da0149f90fecb5a30bbdf6761
-SIZE (rpm/centos/7.2.1511/x86_64/libssh2-1.4.3-10.el7.i686.rpm) = 136188
-SHA256 (rpm/centos/7.2.1511/x86_64/libssh2-1.4.3-10.el7.x86_64.rpm) = 07c164dbf3a9b97b76c8a4fb8641dc4c8bf96146504af982b0b59279ff3db3b9
-SIZE (rpm/centos/7.2.1511/x86_64/libssh2-1.4.3-10.el7.x86_64.rpm) = 136636
-SHA256 (rpm/centos/7.2.1511/x86_64/libssh2-1.4.3-10.el7.src.rpm) = 92e5e8bd92c85c4015b95d0621b9605bc652ad1418f450a0715ef983884d454b
-SIZE (rpm/centos/7.2.1511/x86_64/libssh2-1.4.3-10.el7.src.rpm) = 719727
+TIMESTAMP = 1482092360
+SHA256 (centos/libssh2-1.4.3-10.el7_2.1.i686.rpm) = 3a25e00b04b27ba59fa17adb97791702dcccb56e130eb5f51651d6fe4fe42f89
+SIZE (centos/libssh2-1.4.3-10.el7_2.1.i686.rpm) = 136352
+SHA256 (centos/libssh2-1.4.3-10.el7_2.1.x86_64.rpm) = 1e1f93e449e678597bfdd99bed306c9bb8d5b513ffcaea13d32f5b7434900300
+SIZE (centos/libssh2-1.4.3-10.el7_2.1.x86_64.rpm) = 136848
+SHA256 (centos/libssh2-1.4.3-10.el7_2.1.src.rpm) = 2181b44f7d4636eb0920582a519d1adabae94f34cb49c531a5a2b31e2ad4cf57
+SIZE (centos/libssh2-1.4.3-10.el7_2.1.src.rpm) = 720459
diff --git a/security/linux-c7-libssh2/pkg-plist.i386 b/security/linux-c7-libssh2/pkg-plist.i386
deleted file mode 100644
index 108739ce7acf..000000000000
--- a/security/linux-c7-libssh2/pkg-plist.i386
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libssh2.so.1
-usr/lib/libssh2.so.1.0.1
diff --git a/security/linux-c7-libtasn1/Makefile b/security/linux-c7-libtasn1/Makefile
index 968dea706dc6..7067bb41bff2 100644
--- a/security/linux-c7-libtasn1/Makefile
+++ b/security/linux-c7-libtasn1/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libtasn1
PORTVERSION= 3.8
+PORTREVISION= 1
CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
@@ -10,9 +11,9 @@ COMMENT= ASN.1 structure parser library
LICENSE= LGPL21+
-CONFLICT= linux-f10-${PORTNAME}-[0-9]* linux-c6-${PORTNAME}-[0-9]*
+CONFLICT= linux-c6-${PORTNAME}-[0-9]*
-RPMVERSION= 2.el7
+RPMVERSION= 3.el7
USES= cpe linux:c7
CPE_VENDOR= gnu
USE_LDCONFIG= yes
diff --git a/security/linux-c7-libtasn1/distinfo.i386 b/security/linux-c7-libtasn1/distinfo.i386
deleted file mode 100644
index 3758bb798675..000000000000
--- a/security/linux-c7-libtasn1/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1473355649
-SHA256 (rpm/centos/7.2.1511/i386/libtasn1-3.8-2.el7.i686.rpm) = 3b809e6dac614a2d5c40e4cec8d41ce14ae1b358fd0660b5706faab2b42fd1d2
-SIZE (rpm/centos/7.2.1511/i386/libtasn1-3.8-2.el7.i686.rpm) = 326948
-SHA256 (rpm/centos/7.2.1511/i386/libtasn1-3.8-2.el7.src.rpm) = 31f6ba7a03e640bad4b782af1e468a1f9f8bc01bc9a5f3bed63e57600ff4c670
-SIZE (rpm/centos/7.2.1511/i386/libtasn1-3.8-2.el7.src.rpm) = 1878124
diff --git a/security/linux-c7-libtasn1/distinfo.x86_64 b/security/linux-c7-libtasn1/distinfo.x86_64
index 6cffe505265f..2d8dee680f07 100644
--- a/security/linux-c7-libtasn1/distinfo.x86_64
+++ b/security/linux-c7-libtasn1/distinfo.x86_64
@@ -1,7 +1,7 @@
-TIMESTAMP = 1473674604
-SHA256 (rpm/centos/7.2.1511/x86_64/libtasn1-3.8-2.el7.i686.rpm) = 3b809e6dac614a2d5c40e4cec8d41ce14ae1b358fd0660b5706faab2b42fd1d2
-SIZE (rpm/centos/7.2.1511/x86_64/libtasn1-3.8-2.el7.i686.rpm) = 326948
-SHA256 (rpm/centos/7.2.1511/x86_64/libtasn1-3.8-2.el7.x86_64.rpm) = 6787ae67028a79dc5e9debd09d56730ebf02f30fdbcb0530ed681e5fb985aa19
-SIZE (rpm/centos/7.2.1511/x86_64/libtasn1-3.8-2.el7.x86_64.rpm) = 327164
-SHA256 (rpm/centos/7.2.1511/x86_64/libtasn1-3.8-2.el7.src.rpm) = 31f6ba7a03e640bad4b782af1e468a1f9f8bc01bc9a5f3bed63e57600ff4c670
-SIZE (rpm/centos/7.2.1511/x86_64/libtasn1-3.8-2.el7.src.rpm) = 1878124
+TIMESTAMP = 1482091760
+SHA256 (centos/libtasn1-3.8-3.el7.i686.rpm) = 4655a3e6186f90c59fd31c4080c2980d5b8fcd15e8f89c88058b5cb70b743490
+SIZE (centos/libtasn1-3.8-3.el7.i686.rpm) = 327540
+SHA256 (centos/libtasn1-3.8-3.el7.x86_64.rpm) = 8013a465a9f83d7779d13bc1abe139996971a4aafcca8e7fb5e444cd5ed82a33
+SIZE (centos/libtasn1-3.8-3.el7.x86_64.rpm) = 327420
+SHA256 (centos/libtasn1-3.8-3.el7.src.rpm) = 9daf4c25efe50c05c7de55b2907f77e16571134cc5afd61ba14bdaba61c26222
+SIZE (centos/libtasn1-3.8-3.el7.src.rpm) = 1883831
diff --git a/security/linux-c7-libtasn1/pkg-plist.i386 b/security/linux-c7-libtasn1/pkg-plist.i386
deleted file mode 100644
index 65a6a2c16f56..000000000000
--- a/security/linux-c7-libtasn1/pkg-plist.i386
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libtasn1.so.6
-usr/lib/libtasn1.so.6.2.3
diff --git a/security/linux-c7-nss/Makefile b/security/linux-c7-nss/Makefile
index 1b44b207cdab..3fa2aaf84404 100644
--- a/security/linux-c7-nss/Makefile
+++ b/security/linux-c7-nss/Makefile
@@ -3,21 +3,20 @@
PORTNAME= nss
PORTVERSION= 3.21.3
+PORTREVISION= 1
CATEGORIES= security linux
-MASTER_SITES= CENTOS_LINUX/centos/${LINUX_DIST_VER}/cr/x86_64/Packages
-SRC_DISTFILES= # not available
LIB_DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${PORTNAME}-util-${PORTVERSION}-1.1.el7_3${EXTRACT_SUFX} \
${PORTNAME}-softokn-3.16.2.3-14.4.el7${EXTRACT_SUFX} \
${PORTNAME}-softokn-freebl-3.16.2.3-14.4.el7${EXTRACT_SUFX}
-#SRC_DISTFILES= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE \
-# ${PORTNAME}-util-${PORTVERSION}-2.2.el7_2${SRC_SUFX}:SOURCE \
-# ${PORTNAME}-softokn-3.16.2.3-14.2.el7_2${SRC_SUFX}:SOURCE
+SRC_DISTFILES= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE \
+ ${PORTNAME}-util-${PORTVERSION}-1.1.el7_3${SRC_SUFX}:SOURCE \
+ ${PORTNAME}-softokn-3.16.2.3-14.4.el7${SRC_SUFX}:SOURCE
MAINTAINER= emulation@FreeBSD.org
COMMENT= Network Security Services (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-f10-${PORTNAME}-[0-9]* linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
RPMVERSION= 2.el7_3
USES= linux:c7
diff --git a/security/linux-c7-nss/distinfo.i386 b/security/linux-c7-nss/distinfo.i386
deleted file mode 100644
index 2bc06c40384d..000000000000
--- a/security/linux-c7-nss/distinfo.i386
+++ /dev/null
@@ -1,9 +0,0 @@
-TIMESTAMP = 1480526912
-SHA256 (rpm/centos/7.2.1511/i386/nss-3.21.3-2.el7_3.i686.rpm) = 5b4f73cb56c5da024ff3d236401b73fbf09bb294d0f2a32ca596bfbbc702441b
-SIZE (rpm/centos/7.2.1511/i386/nss-3.21.3-2.el7_3.i686.rpm) = 869688
-SHA256 (rpm/centos/7.2.1511/i386/nss-util-3.21.3-1.1.el7_3.i686.rpm) = 2d3652925a4e87ac83483ccaa8e67ca5bd1faa1c17a86202943c71a56d615eef
-SIZE (rpm/centos/7.2.1511/i386/nss-util-3.21.3-1.1.el7_3.i686.rpm) = 72344
-SHA256 (rpm/centos/7.2.1511/i386/nss-softokn-3.16.2.3-14.4.el7.i686.rpm) = 025d3affd527ed34f4eb842b91d089f0cd7b1c6e91eca99233250b12769bc159
-SIZE (rpm/centos/7.2.1511/i386/nss-softokn-3.16.2.3-14.4.el7.i686.rpm) = 313312
-SHA256 (rpm/centos/7.2.1511/i386/nss-softokn-freebl-3.16.2.3-14.4.el7.i686.rpm) = 1dc2b14a034dbe0fdcd7b3ce48ad498fd891cbb0d2440c35771185c01954bd2c
-SIZE (rpm/centos/7.2.1511/i386/nss-softokn-freebl-3.16.2.3-14.4.el7.i686.rpm) = 192344
diff --git a/security/linux-c7-nss/distinfo.x86_64 b/security/linux-c7-nss/distinfo.x86_64
index 292aedc7d55b..73305c54c24d 100644
--- a/security/linux-c7-nss/distinfo.x86_64
+++ b/security/linux-c7-nss/distinfo.x86_64
@@ -1,17 +1,23 @@
-TIMESTAMP = 1480526936
-SHA256 (rpm/centos/7.2.1511/x86_64/nss-3.21.3-2.el7_3.i686.rpm) = 5b4f73cb56c5da024ff3d236401b73fbf09bb294d0f2a32ca596bfbbc702441b
-SIZE (rpm/centos/7.2.1511/x86_64/nss-3.21.3-2.el7_3.i686.rpm) = 869688
-SHA256 (rpm/centos/7.2.1511/x86_64/nss-util-3.21.3-1.1.el7_3.i686.rpm) = 2d3652925a4e87ac83483ccaa8e67ca5bd1faa1c17a86202943c71a56d615eef
-SIZE (rpm/centos/7.2.1511/x86_64/nss-util-3.21.3-1.1.el7_3.i686.rpm) = 72344
-SHA256 (rpm/centos/7.2.1511/x86_64/nss-softokn-3.16.2.3-14.4.el7.i686.rpm) = 025d3affd527ed34f4eb842b91d089f0cd7b1c6e91eca99233250b12769bc159
-SIZE (rpm/centos/7.2.1511/x86_64/nss-softokn-3.16.2.3-14.4.el7.i686.rpm) = 313312
-SHA256 (rpm/centos/7.2.1511/x86_64/nss-softokn-freebl-3.16.2.3-14.4.el7.i686.rpm) = 1dc2b14a034dbe0fdcd7b3ce48ad498fd891cbb0d2440c35771185c01954bd2c
-SIZE (rpm/centos/7.2.1511/x86_64/nss-softokn-freebl-3.16.2.3-14.4.el7.i686.rpm) = 192344
-SHA256 (rpm/centos/7.2.1511/x86_64/nss-3.21.3-2.el7_3.x86_64.rpm) = 1290da10ef699fbb8dd3f644a886476173b7a72104e5d69d6f00b7c9b9fc40b0
-SIZE (rpm/centos/7.2.1511/x86_64/nss-3.21.3-2.el7_3.x86_64.rpm) = 872176
-SHA256 (rpm/centos/7.2.1511/x86_64/nss-util-3.21.3-1.1.el7_3.x86_64.rpm) = 931887b0d899a185e9ae296bc9500680b422174c8757c407b71693cbe9c273d3
-SIZE (rpm/centos/7.2.1511/x86_64/nss-util-3.21.3-1.1.el7_3.x86_64.rpm) = 73812
-SHA256 (rpm/centos/7.2.1511/x86_64/nss-softokn-3.16.2.3-14.4.el7.x86_64.rpm) = 872dfee1cfb387678c8f5d9d34ab3754a942926503eb67dd6809b96cea9868f6
-SIZE (rpm/centos/7.2.1511/x86_64/nss-softokn-3.16.2.3-14.4.el7.x86_64.rpm) = 313204
-SHA256 (rpm/centos/7.2.1511/x86_64/nss-softokn-freebl-3.16.2.3-14.4.el7.x86_64.rpm) = 32bf92422265c3684d9fef702c882fdb3600765ccd624d0cc29917e8286bb714
-SIZE (rpm/centos/7.2.1511/x86_64/nss-softokn-freebl-3.16.2.3-14.4.el7.x86_64.rpm) = 209092
+TIMESTAMP = 1482083963
+SHA256 (centos/nss-3.21.3-2.el7_3.i686.rpm) = 5b4f73cb56c5da024ff3d236401b73fbf09bb294d0f2a32ca596bfbbc702441b
+SIZE (centos/nss-3.21.3-2.el7_3.i686.rpm) = 869688
+SHA256 (centos/nss-util-3.21.3-1.1.el7_3.i686.rpm) = 2d3652925a4e87ac83483ccaa8e67ca5bd1faa1c17a86202943c71a56d615eef
+SIZE (centos/nss-util-3.21.3-1.1.el7_3.i686.rpm) = 72344
+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-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-3.21.3-2.el7_3.x86_64.rpm) = 1290da10ef699fbb8dd3f644a886476173b7a72104e5d69d6f00b7c9b9fc40b0
+SIZE (centos/nss-3.21.3-2.el7_3.x86_64.rpm) = 872176
+SHA256 (centos/nss-util-3.21.3-1.1.el7_3.x86_64.rpm) = 931887b0d899a185e9ae296bc9500680b422174c8757c407b71693cbe9c273d3
+SIZE (centos/nss-util-3.21.3-1.1.el7_3.x86_64.rpm) = 73812
+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.x86_64.rpm) = 32bf92422265c3684d9fef702c882fdb3600765ccd624d0cc29917e8286bb714
+SIZE (centos/nss-softokn-freebl-3.16.2.3-14.4.el7.x86_64.rpm) = 209092
+SHA256 (centos/nss-3.21.3-2.el7_3.src.rpm) = 88272fecfffcdb81ce6388ea39fbfeda1510974e4712fe13d38d1dc1edc8da43
+SIZE (centos/nss-3.21.3-2.el7_3.src.rpm) = 7139471
+SHA256 (centos/nss-util-3.21.3-1.1.el7_3.src.rpm) = 50e2aa1e80e2505837ef2158d02888978b15acf91bd6930e2e595d19d188a635
+SIZE (centos/nss-util-3.21.3-1.1.el7_3.src.rpm) = 1005445
+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
diff --git a/security/linux-c7-nss/pkg-plist.i386 b/security/linux-c7-nss/pkg-plist.i386
deleted file mode 100644
index 0f71b555cccb..000000000000
--- a/security/linux-c7-nss/pkg-plist.i386
+++ /dev/null
@@ -1,33 +0,0 @@
-etc/pki/nssdb/cert8.db
-etc/pki/nssdb/cert9.db
-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
-usr/lib/libnsspem.so
-usr/lib/libnssutil3.so
-usr/lib/libsmime3.so
-usr/lib/libsoftokn3.chk
-usr/lib/libsoftokn3.so
-usr/lib/libssl3.so
-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/man/man5/cert8.db.5.gz
-usr/share/man/man5/cert9.db.5.gz
-usr/share/man/man5/key3.db.5.gz
-usr/share/man/man5/key4.db.5.gz
-usr/share/man/man5/pkcs11.txt.5.gz
-usr/share/man/man5/secmod.db.5.gz
-@dir usr/lib/nss/saved
diff --git a/security/linux-c7-openssl-compat/Makefile b/security/linux-c7-openssl-compat/Makefile
index db04e59a0ed2..2a4cb73568bd 100644
--- a/security/linux-c7-openssl-compat/Makefile
+++ b/security/linux-c7-openssl-compat/Makefile
@@ -4,6 +4,7 @@
PORTNAME= openssl
PKGNAMESUFFIX= -compat
PORTVERSION= 0.9.8e
+PORTREVISION= 1
CATEGORIES= security linux
DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
@@ -13,7 +14,7 @@ COMMENT= OpenSSL toolkit (Linux CentOS ${LINUX_DIST_VER})
LICENSE= OpenSSL
LICENSE_FILE= ${WRKSRC}/usr/share/doc/${LINUX_NAME}-${PORTVERSION}/LICENSE
-CONFLICTS= linux-f10-${PORTNAME}-[0-9]* linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
+CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
LINUX_NAME= openssl098e
RPMVERSION= 29.el7.centos.3
diff --git a/security/linux-c7-openssl-compat/distinfo.i386 b/security/linux-c7-openssl-compat/distinfo.i386
deleted file mode 100644
index 8bebe20c1e86..000000000000
--- a/security/linux-c7-openssl-compat/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1473354212
-SHA256 (rpm/centos/7.2.1511/i386/openssl098e-0.9.8e-29.el7.centos.3.i686.rpm) = bda50ad8086ae3f1265eab271d0523c86cde3e9d1ef1fccbd4cce1abf13636e8
-SIZE (rpm/centos/7.2.1511/i386/openssl098e-0.9.8e-29.el7.centos.3.i686.rpm) = 821984
-SHA256 (rpm/centos/7.2.1511/i386/openssl098e-0.9.8e-29.el7.centos.3.src.rpm) = c26eecaec1161dca9a32db13cd26c70f811bdb3050b30e02b4ea483d31c67d44
-SIZE (rpm/centos/7.2.1511/i386/openssl098e-0.9.8e-29.el7.centos.3.src.rpm) = 3145537
diff --git a/security/linux-c7-openssl-compat/distinfo.x86_64 b/security/linux-c7-openssl-compat/distinfo.x86_64
index 4a79fdb2861b..20cae2a62de6 100644
--- a/security/linux-c7-openssl-compat/distinfo.x86_64
+++ b/security/linux-c7-openssl-compat/distinfo.x86_64
@@ -1,7 +1,7 @@
-TIMESTAMP = 1473674612
-SHA256 (rpm/centos/7.2.1511/x86_64/openssl098e-0.9.8e-29.el7.centos.3.i686.rpm) = bda50ad8086ae3f1265eab271d0523c86cde3e9d1ef1fccbd4cce1abf13636e8
-SIZE (rpm/centos/7.2.1511/x86_64/openssl098e-0.9.8e-29.el7.centos.3.i686.rpm) = 821984
-SHA256 (rpm/centos/7.2.1511/x86_64/openssl098e-0.9.8e-29.el7.centos.3.x86_64.rpm) = 65f73db4d80916a1315f5d6b79cc6dcfbed20ccf84a3a7ab05600b287ab25fcf
-SIZE (rpm/centos/7.2.1511/x86_64/openssl098e-0.9.8e-29.el7.centos.3.x86_64.rpm) = 812020
-SHA256 (rpm/centos/7.2.1511/x86_64/openssl098e-0.9.8e-29.el7.centos.3.src.rpm) = c26eecaec1161dca9a32db13cd26c70f811bdb3050b30e02b4ea483d31c67d44
-SIZE (rpm/centos/7.2.1511/x86_64/openssl098e-0.9.8e-29.el7.centos.3.src.rpm) = 3145537
+TIMESTAMP = 1482094393
+SHA256 (centos/openssl098e-0.9.8e-29.el7.centos.3.i686.rpm) = bda50ad8086ae3f1265eab271d0523c86cde3e9d1ef1fccbd4cce1abf13636e8
+SIZE (centos/openssl098e-0.9.8e-29.el7.centos.3.i686.rpm) = 821984
+SHA256 (centos/openssl098e-0.9.8e-29.el7.centos.3.x86_64.rpm) = 65f73db4d80916a1315f5d6b79cc6dcfbed20ccf84a3a7ab05600b287ab25fcf
+SIZE (centos/openssl098e-0.9.8e-29.el7.centos.3.x86_64.rpm) = 812020
+SHA256 (centos/openssl098e-0.9.8e-29.el7.centos.3.src.rpm) = c26eecaec1161dca9a32db13cd26c70f811bdb3050b30e02b4ea483d31c67d44
+SIZE (centos/openssl098e-0.9.8e-29.el7.centos.3.src.rpm) = 3145537
diff --git a/security/linux-c7-openssl-compat/pkg-plist.i386 b/security/linux-c7-openssl-compat/pkg-plist.i386
deleted file mode 100644
index 82b60988de7f..000000000000
--- a/security/linux-c7-openssl-compat/pkg-plist.i386
+++ /dev/null
@@ -1,25 +0,0 @@
-usr/lib/.libcrypto.so.%%PORTVERSION%%.hmac
-usr/lib/.libcrypto.so.6.hmac
-usr/lib/.libssl.so.%%PORTVERSION%%.hmac
-usr/lib/.libssl.so.6.hmac
-usr/lib/libcrypto.so.%%PORTVERSION%%
-usr/lib/libcrypto.so.6
-usr/lib/libssl.so.%%PORTVERSION%%
-usr/lib/libssl.so.6
-usr/lib/libssl.so.7
-usr/lib/openssl098e/engines/lib4758cca.so
-usr/lib/openssl098e/engines/libaep.so
-usr/lib/openssl098e/engines/libatalla.so
-usr/lib/openssl098e/engines/libchil.so
-usr/lib/openssl098e/engines/libcswift.so
-usr/lib/openssl098e/engines/libgmp.so
-usr/lib/openssl098e/engines/libnuron.so
-usr/lib/openssl098e/engines/libsureware.so
-usr/lib/openssl098e/engines/libubsec.so
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.FIPS
diff --git a/security/linux-c7-openssl/Makefile b/security/linux-c7-openssl/Makefile
index f4a8d9afdc12..ac1e03de9ff0 100644
--- a/security/linux-c7-openssl/Makefile
+++ b/security/linux-c7-openssl/Makefile
@@ -3,6 +3,7 @@
PORTNAME= openssl
PORTVERSION= 1.0.1e
+PORTREVISION= 1
CATEGORIES= security linux
BIN_DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
LIB_DISTFILES= ${PORTNAME}-libs-${PORTVERSION}-${RPMVERSION}${EXTRACT_SUFX}
@@ -14,9 +15,9 @@ COMMENT= OpenSSL toolkit (Linux CentOS ${LINUX_DIST_VER})
LICENSE= OpenSSL
LICENSE_FILE= ${WRKSRC}/usr/share/doc/${PORTNAME}-${PORTVERSION}/LICENSE
-CONFLICTS= linux-f10-${PORTNAME}-[0-9]* linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-RPMVERSION= 51.el7_2.7
+RPMVERSION= 60.el7
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
diff --git a/security/linux-c7-openssl/distinfo.i386 b/security/linux-c7-openssl/distinfo.i386
deleted file mode 100644
index 93a0015ca978..000000000000
--- a/security/linux-c7-openssl/distinfo.i386
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1475154570
-SHA256 (rpm/centos/7.2.1511/i386/openssl-libs-1.0.1e-51.el7_2.7.i686.rpm) = acae0134d0426a80dca9548b918dd1e680966b18bfcadf39a77e74588584b79b
-SIZE (rpm/centos/7.2.1511/i386/openssl-libs-1.0.1e-51.el7_2.7.i686.rpm) = 962504
-SHA256 (rpm/centos/7.2.1511/i386/openssl-1.0.1e-51.el7_2.7.i686.rpm) = 592cfbf57d68a62ee27ff37e1b27da2e97ecb7a83a1f3b8d547ab4a1c4f206b4
-SIZE (rpm/centos/7.2.1511/i386/openssl-1.0.1e-51.el7_2.7.i686.rpm) = 721716
-SHA256 (rpm/centos/7.2.1511/i386/openssl-1.0.1e-51.el7_2.7.src.rpm) = d360d24d02c44f4e6f11d25ba7c0f7f8085c7dd2f1e13e5ec6b9b76014b879bd
-SIZE (rpm/centos/7.2.1511/i386/openssl-1.0.1e-51.el7_2.7.src.rpm) = 3323775
diff --git a/security/linux-c7-openssl/distinfo.x86_64 b/security/linux-c7-openssl/distinfo.x86_64
index 4070ba782286..e5f92b58ce61 100644
--- a/security/linux-c7-openssl/distinfo.x86_64
+++ b/security/linux-c7-openssl/distinfo.x86_64
@@ -1,9 +1,9 @@
-TIMESTAMP = 1475154589
-SHA256 (rpm/centos/7.2.1511/x86_64/openssl-libs-1.0.1e-51.el7_2.7.i686.rpm) = acae0134d0426a80dca9548b918dd1e680966b18bfcadf39a77e74588584b79b
-SIZE (rpm/centos/7.2.1511/x86_64/openssl-libs-1.0.1e-51.el7_2.7.i686.rpm) = 962504
-SHA256 (rpm/centos/7.2.1511/x86_64/openssl-libs-1.0.1e-51.el7_2.7.x86_64.rpm) = 9f8480889c72db6e05d6b87def4799659d4abeb93fa0c9436e69b9fafcce3736
-SIZE (rpm/centos/7.2.1511/x86_64/openssl-libs-1.0.1e-51.el7_2.7.x86_64.rpm) = 975936
-SHA256 (rpm/centos/7.2.1511/x86_64/openssl-1.0.1e-51.el7_2.7.x86_64.rpm) = a383f9d15fbc2c740a773ffafdddb325b6db18a8c59732b347d694f5f89e2dda
-SIZE (rpm/centos/7.2.1511/x86_64/openssl-1.0.1e-51.el7_2.7.x86_64.rpm) = 729500
-SHA256 (rpm/centos/7.2.1511/x86_64/openssl-1.0.1e-51.el7_2.7.src.rpm) = d360d24d02c44f4e6f11d25ba7c0f7f8085c7dd2f1e13e5ec6b9b76014b879bd
-SIZE (rpm/centos/7.2.1511/x86_64/openssl-1.0.1e-51.el7_2.7.src.rpm) = 3323775
+TIMESTAMP = 1482090117
+SHA256 (centos/openssl-libs-1.0.1e-60.el7.i686.rpm) = 03fd0f6e89ca8e1688d680b5260d59deabd033ebb8e94aef8b4e8ce94ac24b1c
+SIZE (centos/openssl-libs-1.0.1e-60.el7.i686.rpm) = 967560
+SHA256 (centos/openssl-libs-1.0.1e-60.el7.x86_64.rpm) = 8a36abefd04bbbe8272650afb80c516b592e4e065faac131144e047204ace7dd
+SIZE (centos/openssl-libs-1.0.1e-60.el7.x86_64.rpm) = 981076
+SHA256 (centos/openssl-1.0.1e-60.el7.x86_64.rpm) = 80b1c46d4cfc26d01d9be23922b843f3ffd855ece9ffd4ac38e4ae2be215b26a
+SIZE (centos/openssl-1.0.1e-60.el7.x86_64.rpm) = 730384
+SHA256 (centos/openssl-1.0.1e-60.el7.src.rpm) = 87c74bb9213f6a1a6e2e14a47a1e65ccdd931565c225707d6aaa6590de67bb07
+SIZE (centos/openssl-1.0.1e-60.el7.src.rpm) = 3330803
diff --git a/security/linux-c7-openssl/pkg-plist.i386 b/security/linux-c7-openssl/pkg-plist.i386
deleted file mode 100644
index 301f11786c44..000000000000
--- a/security/linux-c7-openssl/pkg-plist.i386
+++ /dev/null
@@ -1,101 +0,0 @@
-etc/pki/tls/certs/Makefile
-etc/pki/tls/certs/make-dummy-cert
-etc/pki/tls/certs/renew-dummy-cert
-etc/pki/tls/misc/CA
-etc/pki/tls/misc/c_hash
-etc/pki/tls/misc/c_info
-etc/pki/tls/misc/c_issuer
-etc/pki/tls/misc/c_name
-etc/pki/tls/openssl.cnf
-usr/bin/openssl
-usr/lib/.libcrypto.so.%%PORTVERSION%%.hmac
-usr/lib/.libcrypto.so.10.hmac
-usr/lib/.libssl.so.%%PORTVERSION%%.hmac
-usr/lib/.libssl.so.10.hmac
-usr/lib/libcrypto.so.%%PORTVERSION%%
-usr/lib/libcrypto.so.10
-usr/lib/libssl.so.%%PORTVERSION%%
-usr/lib/libssl.so.10
-usr/lib/openssl/engines/lib4758cca.so
-usr/lib/openssl/engines/libaep.so
-usr/lib/openssl/engines/libatalla.so
-usr/lib/openssl/engines/libcapi.so
-usr/lib/openssl/engines/libchil.so
-usr/lib/openssl/engines/libcswift.so
-usr/lib/openssl/engines/libgmp.so
-usr/lib/openssl/engines/libnuron.so
-usr/lib/openssl/engines/libpadlock.so
-usr/lib/openssl/engines/libsureware.so
-usr/lib/openssl/engines/libubsec.so
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.FIPS
-%%PORTDOCS%%%%DOCSDIR%%/c-indentation.el
-%%PORTDOCS%%%%DOCSDIR%%/openssl.txt
-%%PORTDOCS%%%%DOCSDIR%%/openssl_button.gif
-%%PORTDOCS%%%%DOCSDIR%%/openssl_button.html
-%%PORTDOCS%%%%DOCSDIR%%/ssleay.txt
-%%PORTDOCS%%usr/share/doc/openssl-libs-%%PORTVERSION%%/LICENSE
-usr/share/man/man1/asn1parse.1ssl.gz
-usr/share/man/man1/ca.1ssl.gz
-usr/share/man/man1/ciphers.1ssl.gz
-usr/share/man/man1/cms.1ssl.gz
-usr/share/man/man1/crl.1ssl.gz
-usr/share/man/man1/crl2pkcs7.1ssl.gz
-usr/share/man/man1/dgst.1ssl.gz
-usr/share/man/man1/dhparam.1ssl.gz
-usr/share/man/man1/dsa.1ssl.gz
-usr/share/man/man1/dsaparam.1ssl.gz
-usr/share/man/man1/ec.1ssl.gz
-usr/share/man/man1/ecparam.1ssl.gz
-usr/share/man/man1/enc.1ssl.gz
-usr/share/man/man1/errstr.1ssl.gz
-usr/share/man/man1/gendsa.1ssl.gz
-usr/share/man/man1/genpkey.1ssl.gz
-usr/share/man/man1/genrsa.1ssl.gz
-usr/share/man/man1/md2.1ssl.gz
-usr/share/man/man1/md4.1ssl.gz
-usr/share/man/man1/md5.1ssl.gz
-usr/share/man/man1/mdc2.1ssl.gz
-usr/share/man/man1/nseq.1ssl.gz
-usr/share/man/man1/ocsp.1ssl.gz
-usr/share/man/man1/openssl.1ssl.gz
-usr/share/man/man1/pkcs12.1ssl.gz
-usr/share/man/man1/pkcs7.1ssl.gz
-usr/share/man/man1/pkcs8.1ssl.gz
-usr/share/man/man1/pkey.1ssl.gz
-usr/share/man/man1/pkeyparam.1ssl.gz
-usr/share/man/man1/pkeyutl.1ssl.gz
-usr/share/man/man1/req.1ssl.gz
-usr/share/man/man1/ripemd160.1ssl.gz
-usr/share/man/man1/rsa.1ssl.gz
-usr/share/man/man1/rsautl.1ssl.gz
-usr/share/man/man1/s_client.1ssl.gz
-usr/share/man/man1/s_server.1ssl.gz
-usr/share/man/man1/s_time.1ssl.gz
-usr/share/man/man1/sess_id.1ssl.gz
-usr/share/man/man1/sha.1ssl.gz
-usr/share/man/man1/sha1.1ssl.gz
-usr/share/man/man1/smime.1ssl.gz
-usr/share/man/man1/speed.1ssl.gz
-usr/share/man/man1/spkac.1ssl.gz
-usr/share/man/man1/sslpasswd.1ssl.gz
-usr/share/man/man1/sslrand.1ssl.gz
-usr/share/man/man1/ts.1ssl.gz
-usr/share/man/man1/tsget.1ssl.gz
-usr/share/man/man1/verify.1ssl.gz
-usr/share/man/man1/version.1ssl.gz
-usr/share/man/man1/x509.1ssl.gz
-usr/share/man/man5/config.5ssl.gz
-usr/share/man/man5/openssl.cnf.5ssl.gz
-usr/share/man/man5/x509v3_config.5ssl.gz
-usr/share/man/man7/des_modes.7ssl.gz
-@dir etc/pki/CA/certs
-@dir etc/pki/CA/crl
-@dir etc/pki/CA/newcerts
-@dir etc/pki/CA/private
-@dir etc/pki/tls/private