aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
Diffstat (limited to 'security')
-rw-r--r--security/Makefile2
-rw-r--r--security/linux-c6-cyrus-sasl2/Makefile14
-rw-r--r--security/linux-c6-cyrus-sasl2/distinfo7
-rw-r--r--security/linux-c6-cyrus-sasl2/distinfo.i3865
-rw-r--r--security/linux-c6-cyrus-sasl2/distinfo.x86_647
-rw-r--r--security/linux-c6-cyrus-sasl2/pkg-plist.amd64 (renamed from security/linux-c6-cyrus-sasl2/pkg-plist.x86_64)0
-rw-r--r--security/linux-c6-gnutls/Makefile14
-rw-r--r--security/linux-c6-gnutls/distinfo7
-rw-r--r--security/linux-c6-gnutls/distinfo.i3865
-rw-r--r--security/linux-c6-gnutls/distinfo.x86_647
-rw-r--r--security/linux-c6-gnutls/pkg-plist.amd6426
-rw-r--r--security/linux-c6-gnutls/pkg-plist.i38634
-rw-r--r--security/linux-c6-gnutls/pkg-plist.x86_6426
-rw-r--r--security/linux-c6-libgcrypt/Makefile9
-rw-r--r--security/linux-c6-libgcrypt/distinfo7
-rw-r--r--security/linux-c6-libgcrypt/distinfo.i3865
-rw-r--r--security/linux-c6-libgcrypt/distinfo.x86_647
-rw-r--r--security/linux-c6-libgcrypt/pkg-plist.amd6411
-rw-r--r--security/linux-c6-libgcrypt/pkg-plist.i38610
-rw-r--r--security/linux-c6-libgcrypt/pkg-plist.x86_647
-rw-r--r--security/linux-c6-libgpg-error/Makefile8
-rw-r--r--security/linux-c6-libgpg-error/distinfo7
-rw-r--r--security/linux-c6-libgpg-error/distinfo.i3865
-rw-r--r--security/linux-c6-libgpg-error/distinfo.x86_647
-rw-r--r--security/linux-c6-libgpg-error/pkg-plist.amd6417
-rw-r--r--security/linux-c6-libgpg-error/pkg-plist.i38628
-rw-r--r--security/linux-c6-libgpg-error/pkg-plist.x86_6417
-rw-r--r--security/linux-c6-libssh2/Makefile9
-rw-r--r--security/linux-c6-libssh2/distinfo7
-rw-r--r--security/linux-c6-libssh2/distinfo.i3865
-rw-r--r--security/linux-c6-libssh2/distinfo.x86_647
-rw-r--r--security/linux-c6-libssh2/pkg-plist.amd649
-rw-r--r--security/linux-c6-libssh2/pkg-plist.i3865
-rw-r--r--security/linux-c6-libssh2/pkg-plist.x86_644
-rw-r--r--security/linux-c6-libtasn1/Makefile11
-rw-r--r--security/linux-c6-libtasn1/distinfo7
-rw-r--r--security/linux-c6-libtasn1/distinfo.i3865
-rw-r--r--security/linux-c6-libtasn1/distinfo.x86_647
-rw-r--r--security/linux-c6-libtasn1/pkg-plist.amd6413
-rw-r--r--security/linux-c6-libtasn1/pkg-plist.i3869
-rw-r--r--security/linux-c6-libtasn1/pkg-plist.x86_644
-rw-r--r--security/linux-c6-nss/Makefile22
-rw-r--r--security/linux-c6-nss/distinfo23
-rw-r--r--security/linux-c6-nss/distinfo.i38615
-rw-r--r--security/linux-c6-nss/distinfo.x86_6423
-rw-r--r--security/linux-c6-nss/pkg-plist.amd64 (renamed from security/linux-c6-nss/pkg-plist.x86_64)8
-rw-r--r--security/linux-c6-nss/pkg-plist.i3864
-rw-r--r--security/linux-c6-openssl-compat/Makefile30
-rw-r--r--security/linux-c6-openssl-compat/distinfo.i3865
-rw-r--r--security/linux-c6-openssl-compat/distinfo.x86_647
-rw-r--r--security/linux-c6-openssl-compat/pkg-plist.i38626
-rw-r--r--security/linux-c6-openssl-compat/pkg-plist.x86_6442
-rw-r--r--security/linux-c6-openssl/Makefile10
-rw-r--r--security/linux-c6-openssl/distinfo7
-rw-r--r--security/linux-c6-openssl/distinfo.i3865
-rw-r--r--security/linux-c6-openssl/distinfo.x86_647
-rw-r--r--security/linux-c6-openssl/pkg-plist.amd64 (renamed from security/linux-c6-openssl/pkg-plist.x86_64)16
-rw-r--r--security/linux-c6-openssl/pkg-plist.i38630
-rw-r--r--security/linux-c7-cyrus-sasl2/Makefile16
-rw-r--r--security/linux-c7-cyrus-sasl2/distinfo (renamed from security/linux-c7-cyrus-sasl2/distinfo.x86_64)0
-rw-r--r--security/linux-c7-cyrus-sasl2/pkg-plist.amd64 (renamed from security/linux-c7-cyrus-sasl2/pkg-plist.x86_64)0
-rw-r--r--security/linux-c7-gnutls/Makefile6
-rw-r--r--security/linux-c7-gnutls/distinfo (renamed from security/linux-c7-gnutls/distinfo.x86_64)0
-rw-r--r--security/linux-c7-gnutls/pkg-plist.amd6429
-rw-r--r--security/linux-c7-gnutls/pkg-plist.x86_6429
-rw-r--r--security/linux-c7-libgcrypt/Makefile7
-rw-r--r--security/linux-c7-libgcrypt/distinfo (renamed from security/linux-c7-libgcrypt/distinfo.x86_64)0
-rw-r--r--security/linux-c7-libgcrypt/pkg-plist.amd64 (renamed from security/linux-c7-libgcrypt/pkg-plist.x86_64)5
-rw-r--r--security/linux-c7-libgpg-error/Makefile7
-rw-r--r--security/linux-c7-libgpg-error/distinfo (renamed from security/linux-c7-libgpg-error/distinfo.x86_64)0
-rw-r--r--security/linux-c7-libgpg-error/pkg-plist.amd6425
-rw-r--r--security/linux-c7-libgpg-error/pkg-plist.x86_6425
-rw-r--r--security/linux-c7-libssh2/Makefile8
-rw-r--r--security/linux-c7-libssh2/distinfo (renamed from security/linux-c7-libssh2/distinfo.x86_64)0
-rw-r--r--security/linux-c7-libssh2/pkg-plist.amd649
-rw-r--r--security/linux-c7-libssh2/pkg-plist.x86_644
-rw-r--r--security/linux-c7-libtasn1/Makefile6
-rw-r--r--security/linux-c7-libtasn1/distinfo (renamed from security/linux-c7-libtasn1/distinfo.x86_64)0
-rw-r--r--security/linux-c7-libtasn1/pkg-plist.amd6412
-rw-r--r--security/linux-c7-libtasn1/pkg-plist.x86_644
-rw-r--r--security/linux-c7-nss/Makefile13
-rw-r--r--security/linux-c7-nss/distinfo (renamed from security/linux-c7-nss/distinfo.x86_64)18
-rw-r--r--security/linux-c7-nss/pkg-plist.amd64 (renamed from security/linux-c7-nss/pkg-plist.x86_64)0
-rw-r--r--security/linux-c7-openssl-compat/Makefile33
-rw-r--r--security/linux-c7-openssl-compat/distinfo.x86_647
-rw-r--r--security/linux-c7-openssl-compat/pkg-plist.x86_6442
-rw-r--r--security/linux-c7-openssl/Makefile17
-rw-r--r--security/linux-c7-openssl/distinfo (renamed from security/linux-c7-openssl/distinfo.x86_64)4
-rw-r--r--security/linux-c7-openssl/pkg-plist.amd6443
-rw-r--r--security/linux-c7-openssl/pkg-plist.x86_64120
90 files changed, 431 insertions, 739 deletions
diff --git a/security/Makefile b/security/Makefile
index c01c446af07d..256716303ac2 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -346,7 +346,6 @@
SUBDIR += linux-c6-libtasn1
SUBDIR += linux-c6-nss
SUBDIR += linux-c6-openssl
- SUBDIR += linux-c6-openssl-compat
SUBDIR += linux-c7-cyrus-sasl2
SUBDIR += linux-c7-gnutls
SUBDIR += linux-c7-libgcrypt
@@ -355,7 +354,6 @@
SUBDIR += linux-c7-libtasn1
SUBDIR += linux-c7-nss
SUBDIR += linux-c7-openssl
- SUBDIR += linux-c7-openssl-compat
SUBDIR += lockdown
SUBDIR += log2timeline
SUBDIR += logcheck
diff --git a/security/linux-c6-cyrus-sasl2/Makefile b/security/linux-c6-cyrus-sasl2/Makefile
index f477e61697f4..c4da1d446430 100644
--- a/security/linux-c6-cyrus-sasl2/Makefile
+++ b/security/linux-c6-cyrus-sasl2/Makefile
@@ -1,22 +1,22 @@
# Created by: Artyom Mirgorodskiy <artyom.mirgorodsky@gmail.com>
# $FreeBSD$
-PORTNAME= cyrus-sasl2
+PORTNAME= cyrus-sasl
PORTVERSION= 2.1.23
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security linux
-DISTNAME= cyrus-sasl-lib-${PORTVERSION}-${RPMVERSION}
-SRC_DISTFILES= cyrus-sasl-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
+PKGNAMESUFFIX= -lib
+LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer) (Linux CentOS ${LINUX_DIST_VER})
+DESCR= ${.CURDIR}/../${PORTNAME}2/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
+LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
RPMVERSION= 15.el6_6.2
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/cyrus-sasl-lib-${PORTVERSION}
-
.include <bsd.port.mk>
diff --git a/security/linux-c6-cyrus-sasl2/distinfo b/security/linux-c6-cyrus-sasl2/distinfo
new file mode 100644
index 000000000000..9877b2599f05
--- /dev/null
+++ b/security/linux-c6-cyrus-sasl2/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485618407
+SHA256 (centos/cyrus-sasl-lib-2.1.23-15.el6_6.2.i686.rpm) = fdff3dbb8d482d9c49d84abdb8421a622344eff4acb047aeeca8fea51823160a
+SIZE (centos/cyrus-sasl-lib-2.1.23-15.el6_6.2.i686.rpm) = 139208
+SHA256 (centos/cyrus-sasl-lib-2.1.23-15.el6_6.2.x86_64.rpm) = 92bf37f8fba52b15726f6cade5bcf35c18acd305a3c472cb9360fedd515965bf
+SIZE (centos/cyrus-sasl-lib-2.1.23-15.el6_6.2.x86_64.rpm) = 139644
+SHA256 (centos/cyrus-sasl-2.1.23-15.el6_6.2.src.rpm) = a12449366385bb4ad18c1639c79e8999013e9e5cbd90474dfcc3c9269d8554ee
+SIZE (centos/cyrus-sasl-2.1.23-15.el6_6.2.src.rpm) = 1671069
diff --git a/security/linux-c6-cyrus-sasl2/distinfo.i386 b/security/linux-c6-cyrus-sasl2/distinfo.i386
deleted file mode 100644
index 330a716d1f44..000000000000
--- a/security/linux-c6-cyrus-sasl2/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256782
-SHA256 (rpm/i686/centos/6.8/cyrus-sasl-lib-2.1.23-15.el6_6.2.i686.rpm) = fdff3dbb8d482d9c49d84abdb8421a622344eff4acb047aeeca8fea51823160a
-SIZE (rpm/i686/centos/6.8/cyrus-sasl-lib-2.1.23-15.el6_6.2.i686.rpm) = 139208
-SHA256 (rpm/i686/centos/6.8/cyrus-sasl-2.1.23-15.el6_6.2.src.rpm) = a12449366385bb4ad18c1639c79e8999013e9e5cbd90474dfcc3c9269d8554ee
-SIZE (rpm/i686/centos/6.8/cyrus-sasl-2.1.23-15.el6_6.2.src.rpm) = 1671069
diff --git a/security/linux-c6-cyrus-sasl2/distinfo.x86_64 b/security/linux-c6-cyrus-sasl2/distinfo.x86_64
deleted file mode 100644
index 2da2f3b0fc65..000000000000
--- a/security/linux-c6-cyrus-sasl2/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257353
-SHA256 (rpm/x86_64/centos/6.8/cyrus-sasl-lib-2.1.23-15.el6_6.2.x86_64.rpm) = 92bf37f8fba52b15726f6cade5bcf35c18acd305a3c472cb9360fedd515965bf
-SIZE (rpm/x86_64/centos/6.8/cyrus-sasl-lib-2.1.23-15.el6_6.2.x86_64.rpm) = 139644
-SHA256 (rpm/x86_64/centos/6.8/cyrus-sasl-lib-2.1.23-15.el6_6.2.i686.rpm) = fdff3dbb8d482d9c49d84abdb8421a622344eff4acb047aeeca8fea51823160a
-SIZE (rpm/x86_64/centos/6.8/cyrus-sasl-lib-2.1.23-15.el6_6.2.i686.rpm) = 139208
-SHA256 (rpm/x86_64/centos/6.8/cyrus-sasl-2.1.23-15.el6_6.2.src.rpm) = a12449366385bb4ad18c1639c79e8999013e9e5cbd90474dfcc3c9269d8554ee
-SIZE (rpm/x86_64/centos/6.8/cyrus-sasl-2.1.23-15.el6_6.2.src.rpm) = 1671069
diff --git a/security/linux-c6-cyrus-sasl2/pkg-plist.x86_64 b/security/linux-c6-cyrus-sasl2/pkg-plist.amd64
index 905283cb9ef5..905283cb9ef5 100644
--- a/security/linux-c6-cyrus-sasl2/pkg-plist.x86_64
+++ b/security/linux-c6-cyrus-sasl2/pkg-plist.amd64
diff --git a/security/linux-c6-gnutls/Makefile b/security/linux-c6-gnutls/Makefile
index 74cb9656c956..28f5ed5f8c59 100644
--- a/security/linux-c6-gnutls/Makefile
+++ b/security/linux-c6-gnutls/Makefile
@@ -7,16 +7,16 @@ PORTREVISION= 5
CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
-COMMENT= GNU Transport Layer Security library
-
-USES= linux:c6
-USE_LINUX_RPM= yes
-USE_LINUX= libtasn1 libgcrypt libgpg-error
+COMMENT= GNU Transport Layer Security library (Linux CentOS ${LINUX_DIST_VER})
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
RPMVERSION= 19.el6_7
+USES= linux:c6
USE_LDCONFIG= yes
+USE_LINUX= libtasn1 libgcrypt libgpg-error
+USE_LINUX_RPM= yes
-PLIST_SUB= PORTVERSION="${PORTVERSION}"
-DESCR= ${.CURDIR}/../gnutls/pkg-descr
+OPTIONS_DEFINE= DOCS NLS
+OPTIONS_SUB= yes
.include <bsd.port.mk>
diff --git a/security/linux-c6-gnutls/distinfo b/security/linux-c6-gnutls/distinfo
new file mode 100644
index 000000000000..1fe2e55ef610
--- /dev/null
+++ b/security/linux-c6-gnutls/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485618731
+SHA256 (centos/gnutls-2.8.5-19.el6_7.i686.rpm) = 0eb31a49120fa25c404589fd876c9d7cfc4aeef7cd7b2a2a2d24711e967f8279
+SIZE (centos/gnutls-2.8.5-19.el6_7.i686.rpm) = 349720
+SHA256 (centos/gnutls-2.8.5-19.el6_7.x86_64.rpm) = 93478fbb225e309223547a6cfe0c0fdffe7e67d8c6fa41a25a75ad3b5aef516f
+SIZE (centos/gnutls-2.8.5-19.el6_7.x86_64.rpm) = 355536
+SHA256 (centos/gnutls-2.8.5-19.el6_7.src.rpm) = a562cd4f57e2d3a65a61a233190b1efa90750a3ec2a8f63301222d65928dfb1d
+SIZE (centos/gnutls-2.8.5-19.el6_7.src.rpm) = 6330363
diff --git a/security/linux-c6-gnutls/distinfo.i386 b/security/linux-c6-gnutls/distinfo.i386
deleted file mode 100644
index 076209903a96..000000000000
--- a/security/linux-c6-gnutls/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256791
-SHA256 (rpm/i686/centos/6.8/gnutls-2.8.5-19.el6_7.i686.rpm) = 0eb31a49120fa25c404589fd876c9d7cfc4aeef7cd7b2a2a2d24711e967f8279
-SIZE (rpm/i686/centos/6.8/gnutls-2.8.5-19.el6_7.i686.rpm) = 349720
-SHA256 (rpm/i686/centos/6.8/gnutls-2.8.5-19.el6_7.src.rpm) = a562cd4f57e2d3a65a61a233190b1efa90750a3ec2a8f63301222d65928dfb1d
-SIZE (rpm/i686/centos/6.8/gnutls-2.8.5-19.el6_7.src.rpm) = 6330363
diff --git a/security/linux-c6-gnutls/distinfo.x86_64 b/security/linux-c6-gnutls/distinfo.x86_64
deleted file mode 100644
index e64362141c45..000000000000
--- a/security/linux-c6-gnutls/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257380
-SHA256 (rpm/x86_64/centos/6.8/gnutls-2.8.5-19.el6_7.x86_64.rpm) = 93478fbb225e309223547a6cfe0c0fdffe7e67d8c6fa41a25a75ad3b5aef516f
-SIZE (rpm/x86_64/centos/6.8/gnutls-2.8.5-19.el6_7.x86_64.rpm) = 355536
-SHA256 (rpm/x86_64/centos/6.8/gnutls-2.8.5-19.el6_7.i686.rpm) = 0eb31a49120fa25c404589fd876c9d7cfc4aeef7cd7b2a2a2d24711e967f8279
-SIZE (rpm/x86_64/centos/6.8/gnutls-2.8.5-19.el6_7.i686.rpm) = 349720
-SHA256 (rpm/x86_64/centos/6.8/gnutls-2.8.5-19.el6_7.src.rpm) = a562cd4f57e2d3a65a61a233190b1efa90750a3ec2a8f63301222d65928dfb1d
-SIZE (rpm/x86_64/centos/6.8/gnutls-2.8.5-19.el6_7.src.rpm) = 6330363
diff --git a/security/linux-c6-gnutls/pkg-plist.amd64 b/security/linux-c6-gnutls/pkg-plist.amd64
new file mode 100644
index 000000000000..851a67d9a835
--- /dev/null
+++ b/security/linux-c6-gnutls/pkg-plist.amd64
@@ -0,0 +1,26 @@
+usr/lib/libgnutls-extra.so.26
+usr/lib/libgnutls-extra.so.26.14.12
+usr/lib/libgnutls.so.26
+usr/lib/libgnutls.so.26.14.12
+usr/lib/libgnutlsxx.so.26
+usr/lib/libgnutlsxx.so.26.14.12
+usr/lib64/libgnutls-extra.so.26
+usr/lib64/libgnutls-extra.so.26.14.12
+usr/lib64/libgnutls.so.26
+usr/lib64/libgnutls.so.26.14.12
+usr/lib64/libgnutlsxx.so.26
+usr/lib64/libgnutlsxx.so.26.14.12
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%NLS%%usr/share/locale/cs/LC_MESSAGES/libgnutls.mo
+%%NLS%%usr/share/locale/de/LC_MESSAGES/libgnutls.mo
+%%NLS%%usr/share/locale/en@boldquot/LC_MESSAGES/libgnutls.mo
+%%NLS%%usr/share/locale/en@quot/LC_MESSAGES/libgnutls.mo
+%%NLS%%usr/share/locale/fr/LC_MESSAGES/libgnutls.mo
+%%NLS%%usr/share/locale/ms/LC_MESSAGES/libgnutls.mo
+%%NLS%%usr/share/locale/nl/LC_MESSAGES/libgnutls.mo
+%%NLS%%usr/share/locale/pl/LC_MESSAGES/libgnutls.mo
+%%NLS%%usr/share/locale/sv/LC_MESSAGES/libgnutls.mo
+%%NLS%%usr/share/locale/vi/LC_MESSAGES/libgnutls.mo
diff --git a/security/linux-c6-gnutls/pkg-plist.i386 b/security/linux-c6-gnutls/pkg-plist.i386
index 06b01e5fff9e..df7373a9726a 100644
--- a/security/linux-c6-gnutls/pkg-plist.i386
+++ b/security/linux-c6-gnutls/pkg-plist.i386
@@ -1,20 +1,20 @@
-usr/lib/libgnutls-extra.so.26.14.12
usr/lib/libgnutls-extra.so.26
-usr/lib/libgnutls.so.26.14.12
+usr/lib/libgnutls-extra.so.26.14.12
usr/lib/libgnutls.so.26
-usr/lib/libgnutlsxx.so.26.14.12
+usr/lib/libgnutls.so.26.14.12
usr/lib/libgnutlsxx.so.26
-usr/share/doc/gnutls-%%PORTVERSION%%/AUTHORS
-usr/share/doc/gnutls-%%PORTVERSION%%/COPYING
-usr/share/doc/gnutls-%%PORTVERSION%%/COPYING.LIB
-usr/share/doc/gnutls-%%PORTVERSION%%/README
-usr/share/locale/cs/LC_MESSAGES/libgnutls.mo
-usr/share/locale/de/LC_MESSAGES/libgnutls.mo
-usr/share/locale/en@boldquot/LC_MESSAGES/libgnutls.mo
-usr/share/locale/en@quot/LC_MESSAGES/libgnutls.mo
-usr/share/locale/fr/LC_MESSAGES/libgnutls.mo
-usr/share/locale/ms/LC_MESSAGES/libgnutls.mo
-usr/share/locale/nl/LC_MESSAGES/libgnutls.mo
-usr/share/locale/pl/LC_MESSAGES/libgnutls.mo
-usr/share/locale/sv/LC_MESSAGES/libgnutls.mo
-usr/share/locale/vi/LC_MESSAGES/libgnutls.mo
+usr/lib/libgnutlsxx.so.26.14.12
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%NLS%%usr/share/locale/cs/LC_MESSAGES/libgnutls.mo
+%%NLS%%usr/share/locale/de/LC_MESSAGES/libgnutls.mo
+%%NLS%%usr/share/locale/en@boldquot/LC_MESSAGES/libgnutls.mo
+%%NLS%%usr/share/locale/en@quot/LC_MESSAGES/libgnutls.mo
+%%NLS%%usr/share/locale/fr/LC_MESSAGES/libgnutls.mo
+%%NLS%%usr/share/locale/ms/LC_MESSAGES/libgnutls.mo
+%%NLS%%usr/share/locale/nl/LC_MESSAGES/libgnutls.mo
+%%NLS%%usr/share/locale/pl/LC_MESSAGES/libgnutls.mo
+%%NLS%%usr/share/locale/sv/LC_MESSAGES/libgnutls.mo
+%%NLS%%usr/share/locale/vi/LC_MESSAGES/libgnutls.mo
diff --git a/security/linux-c6-gnutls/pkg-plist.x86_64 b/security/linux-c6-gnutls/pkg-plist.x86_64
deleted file mode 100644
index 743afe3f3302..000000000000
--- a/security/linux-c6-gnutls/pkg-plist.x86_64
+++ /dev/null
@@ -1,26 +0,0 @@
-usr/lib/libgnutls-extra.so.26.14.12
-usr/lib/libgnutls-extra.so.26
-usr/lib/libgnutls.so.26.14.12
-usr/lib/libgnutls.so.26
-usr/lib/libgnutlsxx.so.26.14.12
-usr/lib/libgnutlsxx.so.26
-usr/lib64/libgnutls-extra.so.26.14.12
-usr/lib64/libgnutls-extra.so.26
-usr/lib64/libgnutls.so.26.14.12
-usr/lib64/libgnutls.so.26
-usr/lib64/libgnutlsxx.so.26.14.12
-usr/lib64/libgnutlsxx.so.26
-usr/share/doc/gnutls-%%PORTVERSION%%/AUTHORS
-usr/share/doc/gnutls-%%PORTVERSION%%/COPYING
-usr/share/doc/gnutls-%%PORTVERSION%%/COPYING.LIB
-usr/share/doc/gnutls-%%PORTVERSION%%/README
-usr/share/locale/cs/LC_MESSAGES/libgnutls.mo
-usr/share/locale/de/LC_MESSAGES/libgnutls.mo
-usr/share/locale/en@boldquot/LC_MESSAGES/libgnutls.mo
-usr/share/locale/en@quot/LC_MESSAGES/libgnutls.mo
-usr/share/locale/fr/LC_MESSAGES/libgnutls.mo
-usr/share/locale/ms/LC_MESSAGES/libgnutls.mo
-usr/share/locale/nl/LC_MESSAGES/libgnutls.mo
-usr/share/locale/pl/LC_MESSAGES/libgnutls.mo
-usr/share/locale/sv/LC_MESSAGES/libgnutls.mo
-usr/share/locale/vi/LC_MESSAGES/libgnutls.mo
diff --git a/security/linux-c6-libgcrypt/Makefile b/security/linux-c6-libgcrypt/Makefile
index 35ee808a439a..152f795539e9 100644
--- a/security/linux-c6-libgcrypt/Makefile
+++ b/security/linux-c6-libgcrypt/Makefile
@@ -3,21 +3,16 @@
PORTNAME= libgcrypt
PORTVERSION= 1.4.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= General purpose crypto library based on code used in GnuPG (Linux CentOS ${LINUX_DIST_VER})
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
RPMVERSION= 12.el6_8
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
-PORTDOCS= AUTHORS COPYING.LIB NEWS THANKS
-DESCR= ${.CURDIR}/../libgcrypt/pkg-descr
-
-post-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/etc/gcrypt
-
.include <bsd.port.mk>
diff --git a/security/linux-c6-libgcrypt/distinfo b/security/linux-c6-libgcrypt/distinfo
new file mode 100644
index 000000000000..59d3de4929a3
--- /dev/null
+++ b/security/linux-c6-libgcrypt/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485619407
+SHA256 (centos/libgcrypt-1.4.5-12.el6_8.i686.rpm) = 12f569a66c65aedcf6899fdc85fd4a7ece9179735863e8863c3819b03b901faf
+SIZE (centos/libgcrypt-1.4.5-12.el6_8.i686.rpm) = 233772
+SHA256 (centos/libgcrypt-1.4.5-12.el6_8.x86_64.rpm) = 81c29e7ec131ff3f1e867679b355228ebf9c10a57a680c40766a118a71d7ba71
+SIZE (centos/libgcrypt-1.4.5-12.el6_8.x86_64.rpm) = 234088
+SHA256 (centos/libgcrypt-1.4.5-12.el6_8.src.rpm) = e7510256aa30561185faf8b9e6881f714a19d18ee39f0a39a949d28a97d83114
+SIZE (centos/libgcrypt-1.4.5-12.el6_8.src.rpm) = 1259217
diff --git a/security/linux-c6-libgcrypt/distinfo.i386 b/security/linux-c6-libgcrypt/distinfo.i386
deleted file mode 100644
index 45281559da5b..000000000000
--- a/security/linux-c6-libgcrypt/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1478991104
-SHA256 (rpm/i686/centos/6.8/libgcrypt-1.4.5-12.el6_8.i686.rpm) = 12f569a66c65aedcf6899fdc85fd4a7ece9179735863e8863c3819b03b901faf
-SIZE (rpm/i686/centos/6.8/libgcrypt-1.4.5-12.el6_8.i686.rpm) = 233772
-SHA256 (rpm/i686/centos/6.8/libgcrypt-1.4.5-12.el6_8.src.rpm) = e7510256aa30561185faf8b9e6881f714a19d18ee39f0a39a949d28a97d83114
-SIZE (rpm/i686/centos/6.8/libgcrypt-1.4.5-12.el6_8.src.rpm) = 1259217
diff --git a/security/linux-c6-libgcrypt/distinfo.x86_64 b/security/linux-c6-libgcrypt/distinfo.x86_64
deleted file mode 100644
index ed77b5029d91..000000000000
--- a/security/linux-c6-libgcrypt/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1478992169
-SHA256 (rpm/x86_64/centos/6.8/libgcrypt-1.4.5-12.el6_8.i686.rpm) = 12f569a66c65aedcf6899fdc85fd4a7ece9179735863e8863c3819b03b901faf
-SIZE (rpm/x86_64/centos/6.8/libgcrypt-1.4.5-12.el6_8.i686.rpm) = 233772
-SHA256 (rpm/x86_64/centos/6.8/libgcrypt-1.4.5-12.el6_8.x86_64.rpm) = 81c29e7ec131ff3f1e867679b355228ebf9c10a57a680c40766a118a71d7ba71
-SIZE (rpm/x86_64/centos/6.8/libgcrypt-1.4.5-12.el6_8.x86_64.rpm) = 234088
-SHA256 (rpm/x86_64/centos/6.8/libgcrypt-1.4.5-12.el6_8.src.rpm) = e7510256aa30561185faf8b9e6881f714a19d18ee39f0a39a949d28a97d83114
-SIZE (rpm/x86_64/centos/6.8/libgcrypt-1.4.5-12.el6_8.src.rpm) = 1259217
diff --git a/security/linux-c6-libgcrypt/pkg-plist.amd64 b/security/linux-c6-libgcrypt/pkg-plist.amd64
new file mode 100644
index 000000000000..83bc984598fd
--- /dev/null
+++ b/security/linux-c6-libgcrypt/pkg-plist.amd64
@@ -0,0 +1,11 @@
+usr/lib/.libgcrypt.so.11.hmac
+usr/lib/libgcrypt.so.11
+usr/lib/libgcrypt.so.11.5.3
+usr/lib64/.libgcrypt.so.11.hmac
+usr/lib64/libgcrypt.so.11
+usr/lib64/libgcrypt.so.11.5.3
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+@dir etc/gcrypt
diff --git a/security/linux-c6-libgcrypt/pkg-plist.i386 b/security/linux-c6-libgcrypt/pkg-plist.i386
index 82854eea1c93..41b2980a9caa 100644
--- a/security/linux-c6-libgcrypt/pkg-plist.i386
+++ b/security/linux-c6-libgcrypt/pkg-plist.i386
@@ -1,4 +1,8 @@
-lib/.libgcrypt.so.11.hmac
-lib/libgcrypt.so.11
-lib/libgcrypt.so.11.5.3
+usr/lib/.libgcrypt.so.11.hmac
+usr/lib/libgcrypt.so.11
+usr/lib/libgcrypt.so.11.5.3
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
@dir etc/gcrypt
diff --git a/security/linux-c6-libgcrypt/pkg-plist.x86_64 b/security/linux-c6-libgcrypt/pkg-plist.x86_64
deleted file mode 100644
index 4f7a0dcdbc53..000000000000
--- a/security/linux-c6-libgcrypt/pkg-plist.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-lib/.libgcrypt.so.11.hmac
-lib/libgcrypt.so.11
-lib/libgcrypt.so.11.5.3
-lib64/.libgcrypt.so.11.hmac
-lib64/libgcrypt.so.11
-lib64/libgcrypt.so.11.5.3
-@dir etc/gcrypt
diff --git a/security/linux-c6-libgpg-error/Makefile b/security/linux-c6-libgpg-error/Makefile
index f7696eeb43b5..5a2853f8cda3 100644
--- a/security/linux-c6-libgpg-error/Makefile
+++ b/security/linux-c6-libgpg-error/Makefile
@@ -3,17 +3,19 @@
PORTNAME= libgpg-error
PORTVERSION= 1.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
-COMMENT= Common error values for all GnuPG components
+COMMENT= Common error values for all GnuPG components (Linux CentOS ${LINUX_DIST_VER})
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
RPMVERSION= 4.el6
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
-DESCR= ${.CURDIR}/../libgpg-error/pkg-descr
+OPTIONS_DEFINE= DOCS NLS
+OPTIONS_SUB= yes
.include <bsd.port.mk>
diff --git a/security/linux-c6-libgpg-error/distinfo b/security/linux-c6-libgpg-error/distinfo
new file mode 100644
index 000000000000..6d80c8aaafb6
--- /dev/null
+++ b/security/linux-c6-libgpg-error/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485619629
+SHA256 (centos/libgpg-error-1.7-4.el6.i686.rpm) = ee1e0dfaa0e6bf4e06b1d6f1f3ce7da90abe8b1d1d46fe61bc1fe79e3227c4ad
+SIZE (centos/libgpg-error-1.7-4.el6.i686.rpm) = 60532
+SHA256 (centos/libgpg-error-1.7-4.el6.x86_64.rpm) = cb494b9932409f9b592d213b8cf8f3ef2ca9a7af16b9cdfcca7998e33a20674a
+SIZE (centos/libgpg-error-1.7-4.el6.x86_64.rpm) = 60628
+SHA256 (centos/libgpg-error-1.7-4.el6.src.rpm) = 955d0a4d5aaa3539c7a58d94cef41ef09a0d8cc08c0aeb5b0986c623aebd53be
+SIZE (centos/libgpg-error-1.7-4.el6.src.rpm) = 413579
diff --git a/security/linux-c6-libgpg-error/distinfo.i386 b/security/linux-c6-libgpg-error/distinfo.i386
deleted file mode 100644
index d743e202ed1b..000000000000
--- a/security/linux-c6-libgpg-error/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256801
-SHA256 (rpm/i686/centos/6.8/libgpg-error-1.7-4.el6.i686.rpm) = ee1e0dfaa0e6bf4e06b1d6f1f3ce7da90abe8b1d1d46fe61bc1fe79e3227c4ad
-SIZE (rpm/i686/centos/6.8/libgpg-error-1.7-4.el6.i686.rpm) = 60532
-SHA256 (rpm/i686/centos/6.8/libgpg-error-1.7-4.el6.src.rpm) = 955d0a4d5aaa3539c7a58d94cef41ef09a0d8cc08c0aeb5b0986c623aebd53be
-SIZE (rpm/i686/centos/6.8/libgpg-error-1.7-4.el6.src.rpm) = 413579
diff --git a/security/linux-c6-libgpg-error/distinfo.x86_64 b/security/linux-c6-libgpg-error/distinfo.x86_64
deleted file mode 100644
index a6830ec4582c..000000000000
--- a/security/linux-c6-libgpg-error/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257412
-SHA256 (rpm/x86_64/centos/6.8/libgpg-error-1.7-4.el6.x86_64.rpm) = cb494b9932409f9b592d213b8cf8f3ef2ca9a7af16b9cdfcca7998e33a20674a
-SIZE (rpm/x86_64/centos/6.8/libgpg-error-1.7-4.el6.x86_64.rpm) = 60628
-SHA256 (rpm/x86_64/centos/6.8/libgpg-error-1.7-4.el6.i686.rpm) = ee1e0dfaa0e6bf4e06b1d6f1f3ce7da90abe8b1d1d46fe61bc1fe79e3227c4ad
-SIZE (rpm/x86_64/centos/6.8/libgpg-error-1.7-4.el6.i686.rpm) = 60532
-SHA256 (rpm/x86_64/centos/6.8/libgpg-error-1.7-4.el6.src.rpm) = 955d0a4d5aaa3539c7a58d94cef41ef09a0d8cc08c0aeb5b0986c623aebd53be
-SIZE (rpm/x86_64/centos/6.8/libgpg-error-1.7-4.el6.src.rpm) = 413579
diff --git a/security/linux-c6-libgpg-error/pkg-plist.amd64 b/security/linux-c6-libgpg-error/pkg-plist.amd64
new file mode 100644
index 000000000000..610d9f698c6a
--- /dev/null
+++ b/security/linux-c6-libgpg-error/pkg-plist.amd64
@@ -0,0 +1,17 @@
+usr/bin/gpg-error
+usr/lib/libgpg-error.so.0
+usr/lib/libgpg-error.so.0.5.0
+usr/lib64/libgpg-error.so.0
+usr/lib64/libgpg-error.so.0.5.0
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%NLS%%usr/share/locale/de/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/fr/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/pl/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/ro/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/sv/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/vi/LC_MESSAGES/libgpg-error.mo
diff --git a/security/linux-c6-libgpg-error/pkg-plist.i386 b/security/linux-c6-libgpg-error/pkg-plist.i386
index cb2f2977fd6c..01a51f3e11c5 100644
--- a/security/linux-c6-libgpg-error/pkg-plist.i386
+++ b/security/linux-c6-libgpg-error/pkg-plist.i386
@@ -1,15 +1,15 @@
-lib/libgpg-error.so.0
-lib/libgpg-error.so.0.5.0
usr/bin/gpg-error
-usr/share/doc/libgpg-error-1.7/AUTHORS
-usr/share/doc/libgpg-error-1.7/COPYING
-usr/share/doc/libgpg-error-1.7/COPYING.LIB
-usr/share/doc/libgpg-error-1.7/ChangeLog
-usr/share/doc/libgpg-error-1.7/NEWS
-usr/share/doc/libgpg-error-1.7/README
-usr/share/locale/de/LC_MESSAGES/libgpg-error.mo
-usr/share/locale/fr/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/vi/LC_MESSAGES/libgpg-error.mo
+usr/lib/libgpg-error.so.0
+usr/lib/libgpg-error.so.0.5.0
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%NLS%%usr/share/locale/de/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/fr/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/pl/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/ro/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/sv/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/vi/LC_MESSAGES/libgpg-error.mo
diff --git a/security/linux-c6-libgpg-error/pkg-plist.x86_64 b/security/linux-c6-libgpg-error/pkg-plist.x86_64
deleted file mode 100644
index d2468c6449a5..000000000000
--- a/security/linux-c6-libgpg-error/pkg-plist.x86_64
+++ /dev/null
@@ -1,17 +0,0 @@
-lib/libgpg-error.so.0
-lib/libgpg-error.so.0.5.0
-lib64/libgpg-error.so.0
-lib64/libgpg-error.so.0.5.0
-usr/bin/gpg-error
-usr/share/doc/libgpg-error-1.7/AUTHORS
-usr/share/doc/libgpg-error-1.7/COPYING
-usr/share/doc/libgpg-error-1.7/COPYING.LIB
-usr/share/doc/libgpg-error-1.7/ChangeLog
-usr/share/doc/libgpg-error-1.7/NEWS
-usr/share/doc/libgpg-error-1.7/README
-usr/share/locale/de/LC_MESSAGES/libgpg-error.mo
-usr/share/locale/fr/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/vi/LC_MESSAGES/libgpg-error.mo
diff --git a/security/linux-c6-libssh2/Makefile b/security/linux-c6-libssh2/Makefile
index a56ce73a6d4a..0b33b4fe59c5 100644
--- a/security/linux-c6-libssh2/Makefile
+++ b/security/linux-c6-libssh2/Makefile
@@ -9,16 +9,11 @@ CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Library implementing the SSH2 protocol (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-f10-libssh2-[0-9]*
-
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
RPMVERSION= 2.el6_7.1
USES= linux:c6
+USE_LDCONFIG= yes
USE_LINUX= openssl
-
USE_LINUX_RPM= yes
-USE_LDCONFIG= yes
-
-PORTDOCS= AUTHORS COPYING ChangeLog NEWS README
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
.include <bsd.port.mk>
diff --git a/security/linux-c6-libssh2/distinfo b/security/linux-c6-libssh2/distinfo
new file mode 100644
index 000000000000..aa642b99f92c
--- /dev/null
+++ b/security/linux-c6-libssh2/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485619857
+SHA256 (centos/libssh2-1.4.2-2.el6_7.1.i686.rpm) = 3dd5f11872a5254b65711f88a89b4400c87329ed185af7d69d1d705f94abe13d
+SIZE (centos/libssh2-1.4.2-2.el6_7.1.i686.rpm) = 127152
+SHA256 (centos/libssh2-1.4.2-2.el6_7.1.x86_64.rpm) = 729dc417c94e9efbe67f10fe848ce3571945f054bd87fec428179b58dd09bef6
+SIZE (centos/libssh2-1.4.2-2.el6_7.1.x86_64.rpm) = 125760
+SHA256 (centos/libssh2-1.4.2-2.el6_7.1.src.rpm) = 042b1f294e214d514f5b16332956e168cc168c90a416bcfe4bbc1625636581fc
+SIZE (centos/libssh2-1.4.2-2.el6_7.1.src.rpm) = 694227
diff --git a/security/linux-c6-libssh2/distinfo.i386 b/security/linux-c6-libssh2/distinfo.i386
deleted file mode 100644
index 9d2175b7262a..000000000000
--- a/security/linux-c6-libssh2/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256783
-SHA256 (rpm/i686/centos/6.8/libssh2-1.4.2-2.el6_7.1.i686.rpm) = 3dd5f11872a5254b65711f88a89b4400c87329ed185af7d69d1d705f94abe13d
-SIZE (rpm/i686/centos/6.8/libssh2-1.4.2-2.el6_7.1.i686.rpm) = 127152
-SHA256 (rpm/i686/centos/6.8/libssh2-1.4.2-2.el6_7.1.src.rpm) = 042b1f294e214d514f5b16332956e168cc168c90a416bcfe4bbc1625636581fc
-SIZE (rpm/i686/centos/6.8/libssh2-1.4.2-2.el6_7.1.src.rpm) = 694227
diff --git a/security/linux-c6-libssh2/distinfo.x86_64 b/security/linux-c6-libssh2/distinfo.x86_64
deleted file mode 100644
index a9e6b98831e0..000000000000
--- a/security/linux-c6-libssh2/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257356
-SHA256 (rpm/x86_64/centos/6.8/libssh2-1.4.2-2.el6_7.1.x86_64.rpm) = 729dc417c94e9efbe67f10fe848ce3571945f054bd87fec428179b58dd09bef6
-SIZE (rpm/x86_64/centos/6.8/libssh2-1.4.2-2.el6_7.1.x86_64.rpm) = 125760
-SHA256 (rpm/x86_64/centos/6.8/libssh2-1.4.2-2.el6_7.1.i686.rpm) = 3dd5f11872a5254b65711f88a89b4400c87329ed185af7d69d1d705f94abe13d
-SIZE (rpm/x86_64/centos/6.8/libssh2-1.4.2-2.el6_7.1.i686.rpm) = 127152
-SHA256 (rpm/x86_64/centos/6.8/libssh2-1.4.2-2.el6_7.1.src.rpm) = 042b1f294e214d514f5b16332956e168cc168c90a416bcfe4bbc1625636581fc
-SIZE (rpm/x86_64/centos/6.8/libssh2-1.4.2-2.el6_7.1.src.rpm) = 694227
diff --git a/security/linux-c6-libssh2/pkg-plist.amd64 b/security/linux-c6-libssh2/pkg-plist.amd64
new file mode 100644
index 000000000000..64a98107e465
--- /dev/null
+++ b/security/linux-c6-libssh2/pkg-plist.amd64
@@ -0,0 +1,9 @@
+usr/lib/libssh2.so.1
+usr/lib/libssh2.so.1.0.1
+usr/lib64/libssh2.so.1
+usr/lib64/libssh2.so.1.0.1
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/security/linux-c6-libssh2/pkg-plist.i386 b/security/linux-c6-libssh2/pkg-plist.i386
index 108739ce7acf..0b3c598270bd 100644
--- a/security/linux-c6-libssh2/pkg-plist.i386
+++ b/security/linux-c6-libssh2/pkg-plist.i386
@@ -1,2 +1,7 @@
usr/lib/libssh2.so.1
usr/lib/libssh2.so.1.0.1
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/security/linux-c6-libssh2/pkg-plist.x86_64 b/security/linux-c6-libssh2/pkg-plist.x86_64
deleted file mode 100644
index 15c8cac04181..000000000000
--- a/security/linux-c6-libssh2/pkg-plist.x86_64
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/libssh2.so.1
-usr/lib/libssh2.so.1.0.1
-usr/lib64/libssh2.so.1
-usr/lib64/libssh2.so.1.0.1
diff --git a/security/linux-c6-libtasn1/Makefile b/security/linux-c6-libtasn1/Makefile
index 01f31a455bca..c8533b88f3b3 100644
--- a/security/linux-c6-libtasn1/Makefile
+++ b/security/linux-c6-libtasn1/Makefile
@@ -7,16 +7,13 @@ PORTREVISION= 3
CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
-COMMENT= ASN.1 structure parser library
+COMMENT= ASN.1 structure parser library (Linux CentOS ${LINUX_DIST_VER})
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+RPMVERSION= 6.el6_5
USES= cpe linux:c6
CPE_VENDOR= gnu
-USE_LINUX_RPM= yes
-
-RPMVERSION= 6.el6_5
USE_LDCONFIG= yes
-
-PORTDOCS= AUTHORS COPYING COPYING.LIB ChangeLog NEWS README THANKS TODO libtasn1.pdf
-DESCR= ${.CURDIR}/../libtasn1/pkg-descr
+USE_LINUX_RPM= yes
.include <bsd.port.mk>
diff --git a/security/linux-c6-libtasn1/distinfo b/security/linux-c6-libtasn1/distinfo
new file mode 100644
index 000000000000..45ce42077cc5
--- /dev/null
+++ b/security/linux-c6-libtasn1/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485620024
+SHA256 (centos/libtasn1-2.3-6.el6_5.i686.rpm) = 159a21c14eec8ba904bb9940116d1e43ea73c164522f5665c0556bf478e23ca4
+SIZE (centos/libtasn1-2.3-6.el6_5.i686.rpm) = 245140
+SHA256 (centos/libtasn1-2.3-6.el6_5.x86_64.rpm) = ee516dac9b0d36fbee5f77e443be13a7e4ca60c3f3105bdc50e112c7ae834780
+SIZE (centos/libtasn1-2.3-6.el6_5.x86_64.rpm) = 243868
+SHA256 (centos/libtasn1-2.3-6.el6_5.src.rpm) = 24fe6cafdf3ed4c45d49395bdfd7a73e1a4b8c7fab9503fea801a6b68234b199
+SIZE (centos/libtasn1-2.3-6.el6_5.src.rpm) = 1501312
diff --git a/security/linux-c6-libtasn1/distinfo.i386 b/security/linux-c6-libtasn1/distinfo.i386
deleted file mode 100644
index 5a5d0747393f..000000000000
--- a/security/linux-c6-libtasn1/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466263228
-SHA256 (rpm/i686/centos/6.8/libtasn1-2.3-6.el6_5.i686.rpm) = 159a21c14eec8ba904bb9940116d1e43ea73c164522f5665c0556bf478e23ca4
-SIZE (rpm/i686/centos/6.8/libtasn1-2.3-6.el6_5.i686.rpm) = 245140
-SHA256 (rpm/i686/centos/6.8/libtasn1-2.3-6.el6_5.src.rpm) = 24fe6cafdf3ed4c45d49395bdfd7a73e1a4b8c7fab9503fea801a6b68234b199
-SIZE (rpm/i686/centos/6.8/libtasn1-2.3-6.el6_5.src.rpm) = 1501312
diff --git a/security/linux-c6-libtasn1/distinfo.x86_64 b/security/linux-c6-libtasn1/distinfo.x86_64
deleted file mode 100644
index 80e9a5d4a9ae..000000000000
--- a/security/linux-c6-libtasn1/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257408
-SHA256 (rpm/x86_64/centos/6.8/libtasn1-2.3-6.el6_5.x86_64.rpm) = ee516dac9b0d36fbee5f77e443be13a7e4ca60c3f3105bdc50e112c7ae834780
-SIZE (rpm/x86_64/centos/6.8/libtasn1-2.3-6.el6_5.x86_64.rpm) = 243868
-SHA256 (rpm/x86_64/centos/6.8/libtasn1-2.3-6.el6_5.i686.rpm) = 159a21c14eec8ba904bb9940116d1e43ea73c164522f5665c0556bf478e23ca4
-SIZE (rpm/x86_64/centos/6.8/libtasn1-2.3-6.el6_5.i686.rpm) = 245140
-SHA256 (rpm/x86_64/centos/6.8/libtasn1-2.3-6.el6_5.src.rpm) = 24fe6cafdf3ed4c45d49395bdfd7a73e1a4b8c7fab9503fea801a6b68234b199
-SIZE (rpm/x86_64/centos/6.8/libtasn1-2.3-6.el6_5.src.rpm) = 1501312
diff --git a/security/linux-c6-libtasn1/pkg-plist.amd64 b/security/linux-c6-libtasn1/pkg-plist.amd64
new file mode 100644
index 000000000000..80d4fc887ff0
--- /dev/null
+++ b/security/linux-c6-libtasn1/pkg-plist.amd64
@@ -0,0 +1,13 @@
+usr/lib/libtasn1.so.3
+usr/lib/libtasn1.so.3.1.6
+usr/lib64/libtasn1.so.3
+usr/lib64/libtasn1.so.3.1.6
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/libtasn1.pdf
diff --git a/security/linux-c6-libtasn1/pkg-plist.i386 b/security/linux-c6-libtasn1/pkg-plist.i386
index e59abd0f5a69..13cd2accbd08 100644
--- a/security/linux-c6-libtasn1/pkg-plist.i386
+++ b/security/linux-c6-libtasn1/pkg-plist.i386
@@ -1,2 +1,11 @@
usr/lib/libtasn1.so.3
usr/lib/libtasn1.so.3.1.6
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/libtasn1.pdf
diff --git a/security/linux-c6-libtasn1/pkg-plist.x86_64 b/security/linux-c6-libtasn1/pkg-plist.x86_64
deleted file mode 100644
index b9825555a9e1..000000000000
--- a/security/linux-c6-libtasn1/pkg-plist.x86_64
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/libtasn1.so.3
-usr/lib/libtasn1.so.3.1.6
-usr/lib64/libtasn1.so.3
-usr/lib64/libtasn1.so.3.1.6
diff --git a/security/linux-c6-nss/Makefile b/security/linux-c6-nss/Makefile
index f70e6fd703ff..ae784fe5d027 100644
--- a/security/linux-c6-nss/Makefile
+++ b/security/linux-c6-nss/Makefile
@@ -3,28 +3,26 @@
PORTNAME= nss
PORTVERSION= 3.21.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security linux
-LIB_DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
- nss-util-${PORTVERSION}-1.el6_8${EXTRACT_SUFX} \
- nss-softokn-3.14.3-23.3.el6_8${EXTRACT_SUFX} \
- nss-softokn-freebl-3.14.3-23.3.el6_8${EXTRACT_SUFX}
+LIB_DISTNAMES= ${DISTNAME} \
+ ${PORTNAME}-util-${PORTVERSION}-1.el6_8 \
+ ${PORTNAME}-softokn-3.14.3-23.3.el6_8 \
+ ${PORTNAME}-softokn-freebl-3.14.3-23.3.el6_8
+SRC_DISTFILES= ${DISTNAME}${SRC_SUFX}:SOURCE \
+ ${PORTNAME}-util-${PORTVERSION}-1.el6_8${SRC_SUFX}:SOURCE \
+ ${PORTNAME}-softokn-3.14.3-23.3.el6_8${SRC_SUFX}:SOURCE
MAINTAINER= emulation@FreeBSD.org
COMMENT= Network Security Services (Linux CentOS ${LINUX_DIST_VER})
LICENSE= MPL
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
RPMVERSION= 2.el6_8
USES= linux:c6
+USE_LDCONFIG= yes
USE_LINUX= nspr sqlite3
USE_LINUX_RPM= yes
-USE_LDCONFIG= yes
-
-SRC_DISTFILES= ${DISTNAME}${SRC_SUFX}:SOURCE \
- nss-util-${PORTVERSION}-1.el6_8.src.rpm:SOURCE \
- nss-softokn-3.14.3-23.3.el6_8.src.rpm:SOURCE
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
.include <bsd.port.mk>
diff --git a/security/linux-c6-nss/distinfo b/security/linux-c6-nss/distinfo
new file mode 100644
index 000000000000..c30e89d3ff59
--- /dev/null
+++ b/security/linux-c6-nss/distinfo
@@ -0,0 +1,23 @@
+TIMESTAMP = 1485620509
+SHA256 (centos/nss-3.21.3-2.el6_8.i686.rpm) = f715cf616cb68f87d7e182a043e145afea7493e6b43f9cec966340cabf1d44ef
+SIZE (centos/nss-3.21.3-2.el6_8.i686.rpm) = 881768
+SHA256 (centos/nss-3.21.3-2.el6_8.x86_64.rpm) = 7b8e3cf3ed3d0ae94b6a2161f73354ecfd2195d603ec45c1f079324c08d7cff9
+SIZE (centos/nss-3.21.3-2.el6_8.x86_64.rpm) = 880044
+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.21.3-1.el6_8.i686.rpm) = 2b1b1266d666edc9b6ea677d418ba62c208ffd52e7033b03887d646a90c22eba
+SIZE (centos/nss-util-3.21.3-1.el6_8.i686.rpm) = 68328
+SHA256 (centos/nss-util-3.21.3-1.el6_8.x86_64.rpm) = bd859704174322d1260f00a9ce08d7167cba9b8aef3fb6570c2e8c33bb8c7570
+SIZE (centos/nss-util-3.21.3-1.el6_8.x86_64.rpm) = 68892
+SHA256 (centos/nss-3.21.3-2.el6_8.src.rpm) = e7beaea47d4af5a3f35bf85fa0a4907717b5e5e555e51e8e49d78be98b67b867
+SIZE (centos/nss-3.21.3-2.el6_8.src.rpm) = 5680931
+SHA256 (centos/nss-util-3.21.3-1.el6_8.src.rpm) = cb62c2b82021eb8f1063999fbb99cd30728b289e20e9df943405db1733d7524c
+SIZE (centos/nss-util-3.21.3-1.el6_8.src.rpm) = 764093
+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
diff --git a/security/linux-c6-nss/distinfo.i386 b/security/linux-c6-nss/distinfo.i386
deleted file mode 100644
index 0eb871c926a4..000000000000
--- a/security/linux-c6-nss/distinfo.i386
+++ /dev/null
@@ -1,15 +0,0 @@
-TIMESTAMP = 1479846995
-SHA256 (rpm/i686/centos/6.8/nss-3.21.3-2.el6_8.i686.rpm) = f715cf616cb68f87d7e182a043e145afea7493e6b43f9cec966340cabf1d44ef
-SIZE (rpm/i686/centos/6.8/nss-3.21.3-2.el6_8.i686.rpm) = 881768
-SHA256 (rpm/i686/centos/6.8/nss-util-3.21.3-1.el6_8.i686.rpm) = 2b1b1266d666edc9b6ea677d418ba62c208ffd52e7033b03887d646a90c22eba
-SIZE (rpm/i686/centos/6.8/nss-util-3.21.3-1.el6_8.i686.rpm) = 68328
-SHA256 (rpm/i686/centos/6.8/nss-softokn-3.14.3-23.3.el6_8.i686.rpm) = 05ddcfdc1ac5e369ce1fc6c11b5d11e96ee14a87e30d16b150950bf769029022
-SIZE (rpm/i686/centos/6.8/nss-softokn-3.14.3-23.3.el6_8.i686.rpm) = 276536
-SHA256 (rpm/i686/centos/6.8/nss-softokn-freebl-3.14.3-23.3.el6_8.i686.rpm) = c691e669816890bc0de9c05e83ce632836f9098acad04781c95abb9dc3de34dc
-SIZE (rpm/i686/centos/6.8/nss-softokn-freebl-3.14.3-23.3.el6_8.i686.rpm) = 161168
-SHA256 (rpm/i686/centos/6.8/nss-3.21.3-2.el6_8.src.rpm) = e7beaea47d4af5a3f35bf85fa0a4907717b5e5e555e51e8e49d78be98b67b867
-SIZE (rpm/i686/centos/6.8/nss-3.21.3-2.el6_8.src.rpm) = 5680931
-SHA256 (rpm/i686/centos/6.8/nss-util-3.21.3-1.el6_8.src.rpm) = cb62c2b82021eb8f1063999fbb99cd30728b289e20e9df943405db1733d7524c
-SIZE (rpm/i686/centos/6.8/nss-util-3.21.3-1.el6_8.src.rpm) = 764093
-SHA256 (rpm/i686/centos/6.8/nss-softokn-3.14.3-23.3.el6_8.src.rpm) = 01fe8fafbbfcf904b24e8ea78cc064b2e89fb4c2c14eb8176fb13d15b542b91e
-SIZE (rpm/i686/centos/6.8/nss-softokn-3.14.3-23.3.el6_8.src.rpm) = 1305116
diff --git a/security/linux-c6-nss/distinfo.x86_64 b/security/linux-c6-nss/distinfo.x86_64
deleted file mode 100644
index 93e676f8283d..000000000000
--- a/security/linux-c6-nss/distinfo.x86_64
+++ /dev/null
@@ -1,23 +0,0 @@
-TIMESTAMP = 1479847070
-SHA256 (rpm/x86_64/centos/6.8/nss-3.21.3-2.el6_8.i686.rpm) = f715cf616cb68f87d7e182a043e145afea7493e6b43f9cec966340cabf1d44ef
-SIZE (rpm/x86_64/centos/6.8/nss-3.21.3-2.el6_8.i686.rpm) = 881768
-SHA256 (rpm/x86_64/centos/6.8/nss-util-3.21.3-1.el6_8.i686.rpm) = 2b1b1266d666edc9b6ea677d418ba62c208ffd52e7033b03887d646a90c22eba
-SIZE (rpm/x86_64/centos/6.8/nss-util-3.21.3-1.el6_8.i686.rpm) = 68328
-SHA256 (rpm/x86_64/centos/6.8/nss-softokn-3.14.3-23.3.el6_8.i686.rpm) = 05ddcfdc1ac5e369ce1fc6c11b5d11e96ee14a87e30d16b150950bf769029022
-SIZE (rpm/x86_64/centos/6.8/nss-softokn-3.14.3-23.3.el6_8.i686.rpm) = 276536
-SHA256 (rpm/x86_64/centos/6.8/nss-softokn-freebl-3.14.3-23.3.el6_8.i686.rpm) = c691e669816890bc0de9c05e83ce632836f9098acad04781c95abb9dc3de34dc
-SIZE (rpm/x86_64/centos/6.8/nss-softokn-freebl-3.14.3-23.3.el6_8.i686.rpm) = 161168
-SHA256 (rpm/x86_64/centos/6.8/nss-3.21.3-2.el6_8.x86_64.rpm) = 7b8e3cf3ed3d0ae94b6a2161f73354ecfd2195d603ec45c1f079324c08d7cff9
-SIZE (rpm/x86_64/centos/6.8/nss-3.21.3-2.el6_8.x86_64.rpm) = 880044
-SHA256 (rpm/x86_64/centos/6.8/nss-util-3.21.3-1.el6_8.x86_64.rpm) = bd859704174322d1260f00a9ce08d7167cba9b8aef3fb6570c2e8c33bb8c7570
-SIZE (rpm/x86_64/centos/6.8/nss-util-3.21.3-1.el6_8.x86_64.rpm) = 68892
-SHA256 (rpm/x86_64/centos/6.8/nss-softokn-3.14.3-23.3.el6_8.x86_64.rpm) = 7e4298904daec41067f01c8943055560cd153d1f39c668c6d2fa978a3d66dd81
-SIZE (rpm/x86_64/centos/6.8/nss-softokn-3.14.3-23.3.el6_8.x86_64.rpm) = 268680
-SHA256 (rpm/x86_64/centos/6.8/nss-softokn-freebl-3.14.3-23.3.el6_8.x86_64.rpm) = bccc1e55c5cf90d7ee5ef2d25253fc8dd2c3854121a65711f5f5618b097ffb70
-SIZE (rpm/x86_64/centos/6.8/nss-softokn-freebl-3.14.3-23.3.el6_8.x86_64.rpm) = 171680
-SHA256 (rpm/x86_64/centos/6.8/nss-3.21.3-2.el6_8.src.rpm) = e7beaea47d4af5a3f35bf85fa0a4907717b5e5e555e51e8e49d78be98b67b867
-SIZE (rpm/x86_64/centos/6.8/nss-3.21.3-2.el6_8.src.rpm) = 5680931
-SHA256 (rpm/x86_64/centos/6.8/nss-util-3.21.3-1.el6_8.src.rpm) = cb62c2b82021eb8f1063999fbb99cd30728b289e20e9df943405db1733d7524c
-SIZE (rpm/x86_64/centos/6.8/nss-util-3.21.3-1.el6_8.src.rpm) = 764093
-SHA256 (rpm/x86_64/centos/6.8/nss-softokn-3.14.3-23.3.el6_8.src.rpm) = 01fe8fafbbfcf904b24e8ea78cc064b2e89fb4c2c14eb8176fb13d15b542b91e
-SIZE (rpm/x86_64/centos/6.8/nss-softokn-3.14.3-23.3.el6_8.src.rpm) = 1305116
diff --git a/security/linux-c6-nss/pkg-plist.x86_64 b/security/linux-c6-nss/pkg-plist.amd64
index 0263818fd9b1..770677e71e5e 100644
--- a/security/linux-c6-nss/pkg-plist.x86_64
+++ b/security/linux-c6-nss/pkg-plist.amd64
@@ -2,14 +2,6 @@ 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
-lib64/libfreebl3.chk
-lib64/libfreebl3.so
-lib64/libfreeblpriv3.chk
-lib64/libfreeblpriv3.so
usr/lib/libfreebl3.chk
usr/lib/libfreebl3.so
usr/lib/libfreeblpriv3.chk
diff --git a/security/linux-c6-nss/pkg-plist.i386 b/security/linux-c6-nss/pkg-plist.i386
index 3d265042f259..019d7d6bf14f 100644
--- a/security/linux-c6-nss/pkg-plist.i386
+++ b/security/linux-c6-nss/pkg-plist.i386
@@ -2,10 +2,6 @@ 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
diff --git a/security/linux-c6-openssl-compat/Makefile b/security/linux-c6-openssl-compat/Makefile
deleted file mode 100644
index 0189358c6489..000000000000
--- a/security/linux-c6-openssl-compat/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# Created by: Artyom Mirgorodskiy <artyom.mirgorodsky@gmail.com>
-# $FreeBSD$
-
-PORTNAME= openssl-compat
-PORTVERSION= 0.9.8e
-PORTREVISION= 5
-CATEGORIES= security linux
-DISTNAME= openssl098e-${PORTVERSION}-${RPMVERSION}
-
-MAINTAINER= emulation@FreeBSD.org
-COMMENT= OpenSSL toolkit (Linux CentOS ${LINUX_DIST_VER})
-
-LICENSE= OpenSSL
-LICENSE_FILE= ${WRKSRC}/usr/share/doc/openssl098e-${PORTVERSION}/LICENSE
-
-CONFLICTS= linux-f10-openssl-[0-9]*
-
-USES= linux:c6
-USE_LINUX_RPM= yes
-RPMVERSION= 20.el6.centos.1
-USE_LDCONFIG= yes
-
-PLIST_SUB+= PORTVERSION="${PORTVERSION}"
-DESCR= ${.CURDIR}/../openssl/pkg-descr
-
-post-install:
-# For libflashsupport.so in www/linux-c6-flashplugin11.
- ${LN} -sf libssl.so.6 ${STAGEDIR}${PREFIX}/usr/lib/libssl.so.7
-
-.include <bsd.port.mk>
diff --git a/security/linux-c6-openssl-compat/distinfo.i386 b/security/linux-c6-openssl-compat/distinfo.i386
deleted file mode 100644
index badc568f356f..000000000000
--- a/security/linux-c6-openssl-compat/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256785
-SHA256 (rpm/i686/centos/6.8/openssl098e-0.9.8e-20.el6.centos.1.i686.rpm) = e87cdaa0c6d6528e4395026ed75dd8c06d1d9cd20cbfc2b88b0d6046482aaa82
-SIZE (rpm/i686/centos/6.8/openssl098e-0.9.8e-20.el6.centos.1.i686.rpm) = 792292
-SHA256 (rpm/i686/centos/6.8/openssl098e-0.9.8e-20.el6.centos.1.src.rpm) = 7fea74c0623b0c425d9ff03e2412731c99a75e86eaa87d67a66b9903bb4aca2b
-SIZE (rpm/i686/centos/6.8/openssl098e-0.9.8e-20.el6.centos.1.src.rpm) = 3104495
diff --git a/security/linux-c6-openssl-compat/distinfo.x86_64 b/security/linux-c6-openssl-compat/distinfo.x86_64
deleted file mode 100644
index 7e0d1b57881f..000000000000
--- a/security/linux-c6-openssl-compat/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257364
-SHA256 (rpm/x86_64/centos/6.8/openssl098e-0.9.8e-20.el6.centos.1.x86_64.rpm) = 5c8881e272b9b1415d175bc1f4eecce80ea15b4090aac9725dfe67c19db53f70
-SIZE (rpm/x86_64/centos/6.8/openssl098e-0.9.8e-20.el6.centos.1.x86_64.rpm) = 780104
-SHA256 (rpm/x86_64/centos/6.8/openssl098e-0.9.8e-20.el6.centos.1.i686.rpm) = e87cdaa0c6d6528e4395026ed75dd8c06d1d9cd20cbfc2b88b0d6046482aaa82
-SIZE (rpm/x86_64/centos/6.8/openssl098e-0.9.8e-20.el6.centos.1.i686.rpm) = 792292
-SHA256 (rpm/x86_64/centos/6.8/openssl098e-0.9.8e-20.el6.centos.1.src.rpm) = 7fea74c0623b0c425d9ff03e2412731c99a75e86eaa87d67a66b9903bb4aca2b
-SIZE (rpm/x86_64/centos/6.8/openssl098e-0.9.8e-20.el6.centos.1.src.rpm) = 3104495
diff --git a/security/linux-c6-openssl-compat/pkg-plist.i386 b/security/linux-c6-openssl-compat/pkg-plist.i386
deleted file mode 100644
index 84c1ac1c9eb8..000000000000
--- a/security/linux-c6-openssl-compat/pkg-plist.i386
+++ /dev/null
@@ -1,26 +0,0 @@
-@comment file listing
-usr/lib/.libcrypto.so.0.9.8e.hmac
-usr/lib/.libcrypto.so.6.hmac
-usr/lib/.libssl.so.0.9.8e.hmac
-usr/lib/.libssl.so.6.hmac
-usr/lib/libcrypto.so.0.9.8e
-usr/lib/libcrypto.so.6
-usr/lib/libssl.so.0.9.8e
-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
-usr/share/doc/openssl098e-0.9.8e/CHANGES
-usr/share/doc/openssl098e-0.9.8e/FAQ
-usr/share/doc/openssl098e-0.9.8e/INSTALL
-usr/share/doc/openssl098e-0.9.8e/LICENSE
-usr/share/doc/openssl098e-0.9.8e/NEWS
-usr/share/doc/openssl098e-0.9.8e/README
-usr/share/doc/openssl098e-0.9.8e/README.FIPS
diff --git a/security/linux-c6-openssl-compat/pkg-plist.x86_64 b/security/linux-c6-openssl-compat/pkg-plist.x86_64
deleted file mode 100644
index 06d9fdae9adc..000000000000
--- a/security/linux-c6-openssl-compat/pkg-plist.x86_64
+++ /dev/null
@@ -1,42 +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
-usr/lib64/.libcrypto.so.%%PORTVERSION%%.hmac
-usr/lib64/.libcrypto.so.6.hmac
-usr/lib64/.libssl.so.%%PORTVERSION%%.hmac
-usr/lib64/.libssl.so.6.hmac
-usr/lib64/libcrypto.so.%%PORTVERSION%%
-usr/lib64/libcrypto.so.6
-usr/lib64/libssl.so.%%PORTVERSION%%
-usr/lib64/libssl.so.6
-usr/lib64/openssl098e/engines/lib4758cca.so
-usr/lib64/openssl098e/engines/libaep.so
-usr/lib64/openssl098e/engines/libatalla.so
-usr/lib64/openssl098e/engines/libchil.so
-usr/lib64/openssl098e/engines/libcswift.so
-usr/lib64/openssl098e/engines/libgmp.so
-usr/lib64/openssl098e/engines/libnuron.so
-usr/lib64/openssl098e/engines/libsureware.so
-usr/lib64/openssl098e/engines/libubsec.so
-usr/share/doc/openssl098e-%%PORTVERSION%%/CHANGES
-usr/share/doc/openssl098e-%%PORTVERSION%%/FAQ
-usr/share/doc/openssl098e-%%PORTVERSION%%/INSTALL
-usr/share/doc/openssl098e-%%PORTVERSION%%/LICENSE
-usr/share/doc/openssl098e-%%PORTVERSION%%/NEWS
-usr/share/doc/openssl098e-%%PORTVERSION%%/README
-usr/share/doc/openssl098e-%%PORTVERSION%%/README.FIPS
diff --git a/security/linux-c6-openssl/Makefile b/security/linux-c6-openssl/Makefile
index 63d57c8aca9a..9e14c4a2ae25 100644
--- a/security/linux-c6-openssl/Makefile
+++ b/security/linux-c6-openssl/Makefile
@@ -9,14 +9,10 @@ CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= OpenSSL toolkit (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-f10-openssl-[0-9]*
-
-USES= linux:c6
-USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
RPMVERSION= 48.el6_8.3
+USES= linux:c6
USE_LDCONFIG= yes
-
-PLIST_SUB+= PORTVERSION="${PORTVERSION}"
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+USE_LINUX_RPM= yes
.include <bsd.port.mk>
diff --git a/security/linux-c6-openssl/distinfo b/security/linux-c6-openssl/distinfo
new file mode 100644
index 000000000000..9f27c6a09752
--- /dev/null
+++ b/security/linux-c6-openssl/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485620921
+SHA256 (centos/openssl-1.0.1e-48.el6_8.3.i686.rpm) = 9874c5eca9551dfddb6ed3ca0ef22d2a18ebd841357efde25a2ff666ed2fef40
+SIZE (centos/openssl-1.0.1e-48.el6_8.3.i686.rpm) = 1590452
+SHA256 (centos/openssl-1.0.1e-48.el6_8.3.x86_64.rpm) = 1df60e7215f4ef3aba3dfc49dd58f8b7aa74338dff8d3f43fc010a0588edaaff
+SIZE (centos/openssl-1.0.1e-48.el6_8.3.x86_64.rpm) = 1598920
+SHA256 (centos/openssl-1.0.1e-48.el6_8.3.src.rpm) = 5c25d5c38f69cfd74a758396335c606b0c3ad094d84a3b1927f4d5a672facfe1
+SIZE (centos/openssl-1.0.1e-48.el6_8.3.src.rpm) = 3264783
diff --git a/security/linux-c6-openssl/distinfo.i386 b/security/linux-c6-openssl/distinfo.i386
deleted file mode 100644
index b55a19cdd42a..000000000000
--- a/security/linux-c6-openssl/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1475153503
-SHA256 (rpm/i686/centos/6.8/openssl-1.0.1e-48.el6_8.3.i686.rpm) = 9874c5eca9551dfddb6ed3ca0ef22d2a18ebd841357efde25a2ff666ed2fef40
-SIZE (rpm/i686/centos/6.8/openssl-1.0.1e-48.el6_8.3.i686.rpm) = 1590452
-SHA256 (rpm/i686/centos/6.8/openssl-1.0.1e-48.el6_8.3.src.rpm) = 5c25d5c38f69cfd74a758396335c606b0c3ad094d84a3b1927f4d5a672facfe1
-SIZE (rpm/i686/centos/6.8/openssl-1.0.1e-48.el6_8.3.src.rpm) = 3264783
diff --git a/security/linux-c6-openssl/distinfo.x86_64 b/security/linux-c6-openssl/distinfo.x86_64
deleted file mode 100644
index 11ecb0fa5ff6..000000000000
--- a/security/linux-c6-openssl/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1475153489
-SHA256 (rpm/x86_64/centos/6.8/openssl-1.0.1e-48.el6_8.3.i686.rpm) = 9874c5eca9551dfddb6ed3ca0ef22d2a18ebd841357efde25a2ff666ed2fef40
-SIZE (rpm/x86_64/centos/6.8/openssl-1.0.1e-48.el6_8.3.i686.rpm) = 1590452
-SHA256 (rpm/x86_64/centos/6.8/openssl-1.0.1e-48.el6_8.3.x86_64.rpm) = 1df60e7215f4ef3aba3dfc49dd58f8b7aa74338dff8d3f43fc010a0588edaaff
-SIZE (rpm/x86_64/centos/6.8/openssl-1.0.1e-48.el6_8.3.x86_64.rpm) = 1598920
-SHA256 (rpm/x86_64/centos/6.8/openssl-1.0.1e-48.el6_8.3.src.rpm) = 5c25d5c38f69cfd74a758396335c606b0c3ad094d84a3b1927f4d5a672facfe1
-SIZE (rpm/x86_64/centos/6.8/openssl-1.0.1e-48.el6_8.3.src.rpm) = 3264783
diff --git a/security/linux-c6-openssl/pkg-plist.x86_64 b/security/linux-c6-openssl/pkg-plist.amd64
index f9bbd54019d2..2a64ab46a3d2 100644
--- a/security/linux-c6-openssl/pkg-plist.x86_64
+++ b/security/linux-c6-openssl/pkg-plist.amd64
@@ -8,13 +8,13 @@ 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.1.0.1e.hmac
usr/lib/.libcrypto.so.10.hmac
-usr/lib/.libssl.so.%%PORTVERSION%%.hmac
+usr/lib/.libssl.so.1.0.1e.hmac
usr/lib/.libssl.so.10.hmac
-usr/lib/libcrypto.so.%%PORTVERSION%%
+usr/lib/libcrypto.so.1.0.1e
usr/lib/libcrypto.so.10
-usr/lib/libssl.so.%%PORTVERSION%%
+usr/lib/libssl.so.1.0.1e
usr/lib/libssl.so.10
usr/lib/openssl/engines/lib4758cca.so
usr/lib/openssl/engines/libaep.so
@@ -27,13 +27,13 @@ usr/lib/openssl/engines/libnuron.so
usr/lib/openssl/engines/libpadlock.so
usr/lib/openssl/engines/libsureware.so
usr/lib/openssl/engines/libubsec.so
-usr/lib64/.libcrypto.so.%%PORTVERSION%%.hmac
+usr/lib64/.libcrypto.so.1.0.1e.hmac
usr/lib64/.libcrypto.so.10.hmac
-usr/lib64/.libssl.so.%%PORTVERSION%%.hmac
+usr/lib64/.libssl.so.1.0.1e.hmac
usr/lib64/.libssl.so.10.hmac
-usr/lib64/libcrypto.so.%%PORTVERSION%%
+usr/lib64/libcrypto.so.1.0.1e
usr/lib64/libcrypto.so.10
-usr/lib64/libssl.so.%%PORTVERSION%%
+usr/lib64/libssl.so.1.0.1e
usr/lib64/libssl.so.10
usr/lib64/openssl/engines/lib4758cca.so
usr/lib64/openssl/engines/libaep.so
diff --git a/security/linux-c6-openssl/pkg-plist.i386 b/security/linux-c6-openssl/pkg-plist.i386
index 8af38af21c68..a479595c21f2 100644
--- a/security/linux-c6-openssl/pkg-plist.i386
+++ b/security/linux-c6-openssl/pkg-plist.i386
@@ -7,15 +7,15 @@ etc/pki/tls/misc/c_info
etc/pki/tls/misc/c_issuer
etc/pki/tls/misc/c_name
etc/pki/tls/openssl.cnf
-usr/lib/libcrypto.so.%%PORTVERSION%%
-usr/lib/libcrypto.so.10
-usr/lib/libssl.so.%%PORTVERSION%%
-usr/lib/libssl.so.10
-usr/lib/.libcrypto.so.%%PORTVERSION%%.hmac
+usr/bin/openssl
+usr/lib/.libcrypto.so.1.0.1e.hmac
usr/lib/.libcrypto.so.10.hmac
-usr/lib/.libssl.so.%%PORTVERSION%%.hmac
+usr/lib/.libssl.so.1.0.1e.hmac
usr/lib/.libssl.so.10.hmac
-usr/bin/openssl
+usr/lib/libcrypto.so.1.0.1e
+usr/lib/libcrypto.so.10
+usr/lib/libssl.so.1.0.1e
+usr/lib/libssl.so.10
usr/lib/openssl/engines/lib4758cca.so
usr/lib/openssl/engines/libaep.so
usr/lib/openssl/engines/libatalla.so
@@ -42,14 +42,8 @@ usr/lib/openssl/engines/libubsec.so
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/crl.1ssl.gz
usr/share/man/man1/cms.1ssl.gz
-usr/share/man/man1/genpkey.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/ts.1ssl.gz
-usr/share/man/man1/tsget.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
@@ -60,6 +54,7 @@ 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
@@ -71,6 +66,9 @@ 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
@@ -86,6 +84,8 @@ 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
@@ -93,8 +93,8 @@ 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/private
@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
diff --git a/security/linux-c7-cyrus-sasl2/Makefile b/security/linux-c7-cyrus-sasl2/Makefile
index a0803a32c602..16b6d96270c2 100644
--- a/security/linux-c7-cyrus-sasl2/Makefile
+++ b/security/linux-c7-cyrus-sasl2/Makefile
@@ -1,24 +1,24 @@
# Created by: Piotr Kubaj <pkubaj@anongoth.pl>
# $FreeBSD$
-PORTNAME= cyrus-sasl2
+PORTNAME= cyrus-sasl
PORTVERSION= 2.1.26
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security linux
-DISTNAME= cyrus-sasl-lib-${PORTVERSION}-${RPMVERSION}
-SRC_DISTFILES= cyrus-sasl-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
+PKGNAMESUFFIX= -lib
+LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer) (Linux CentOS ${LINUX_DIST_VER})
-CONFLICT= linux-c6-${PORTNAME}-[0-9]*
+CONFLICT= linux-c6-${LINUXNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}2/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
+LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
RPMVERSION= 20.el7_2
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/cyrus-sasl-lib-${PORTVERSION}
-
.include <bsd.port.mk>
diff --git a/security/linux-c7-cyrus-sasl2/distinfo.x86_64 b/security/linux-c7-cyrus-sasl2/distinfo
index 816db3441ad8..816db3441ad8 100644
--- a/security/linux-c7-cyrus-sasl2/distinfo.x86_64
+++ b/security/linux-c7-cyrus-sasl2/distinfo
diff --git a/security/linux-c7-cyrus-sasl2/pkg-plist.x86_64 b/security/linux-c7-cyrus-sasl2/pkg-plist.amd64
index f6585a22e5ca..f6585a22e5ca 100644
--- a/security/linux-c7-cyrus-sasl2/pkg-plist.x86_64
+++ b/security/linux-c7-cyrus-sasl2/pkg-plist.amd64
diff --git a/security/linux-c7-gnutls/Makefile b/security/linux-c7-gnutls/Makefile
index 68be17340531..7947055f5277 100644
--- a/security/linux-c7-gnutls/Makefile
+++ b/security/linux-c7-gnutls/Makefile
@@ -6,16 +6,18 @@ PORTVERSION= 3.3.24
CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
-COMMENT= GNU Transport Layer Security library
+COMMENT= GNU Transport Layer Security library (Linux CentOS ${LINUX_DIST_VER})
CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
RPMVERSION= 1.el7
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= libtasn1 libgcrypt libgpg-error
USE_LINUX_RPM= yes
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+OPTIONS_DEFINE= DOCS NLS
+OPTIONS_SUB= yes
.include <bsd.port.mk>
diff --git a/security/linux-c7-gnutls/distinfo.x86_64 b/security/linux-c7-gnutls/distinfo
index c445ab8f1a87..c445ab8f1a87 100644
--- a/security/linux-c7-gnutls/distinfo.x86_64
+++ b/security/linux-c7-gnutls/distinfo
diff --git a/security/linux-c7-gnutls/pkg-plist.amd64 b/security/linux-c7-gnutls/pkg-plist.amd64
new file mode 100644
index 000000000000..74381947c47b
--- /dev/null
+++ b/security/linux-c7-gnutls/pkg-plist.amd64
@@ -0,0 +1,29 @@
+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.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.16
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LESSER
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%NLS%%usr/share/locale/cs/LC_MESSAGES/gnutls.mo
+%%NLS%%usr/share/locale/de/LC_MESSAGES/gnutls.mo
+%%NLS%%usr/share/locale/en@boldquot/LC_MESSAGES/gnutls.mo
+%%NLS%%usr/share/locale/en@quot/LC_MESSAGES/gnutls.mo
+%%NLS%%usr/share/locale/eo/LC_MESSAGES/gnutls.mo
+%%NLS%%usr/share/locale/fi/LC_MESSAGES/gnutls.mo
+%%NLS%%usr/share/locale/fr/LC_MESSAGES/gnutls.mo
+%%NLS%%usr/share/locale/it/LC_MESSAGES/gnutls.mo
+%%NLS%%usr/share/locale/ms/LC_MESSAGES/gnutls.mo
+%%NLS%%usr/share/locale/nl/LC_MESSAGES/gnutls.mo
+%%NLS%%usr/share/locale/pl/LC_MESSAGES/gnutls.mo
+%%NLS%%usr/share/locale/sv/LC_MESSAGES/gnutls.mo
+%%NLS%%usr/share/locale/uk/LC_MESSAGES/gnutls.mo
+%%NLS%%usr/share/locale/vi/LC_MESSAGES/gnutls.mo
+%%NLS%%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
deleted file mode 100644
index 2c1ec0296b15..000000000000
--- a/security/linux-c7-gnutls/pkg-plist.x86_64
+++ /dev/null
@@ -1,29 +0,0 @@
-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.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.16
-%%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-libgcrypt/Makefile b/security/linux-c7-libgcrypt/Makefile
index f779a5506753..a0013c8ce5cd 100644
--- a/security/linux-c7-libgcrypt/Makefile
+++ b/security/linux-c7-libgcrypt/Makefile
@@ -13,15 +13,10 @@ CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
LICENSE= LGPL21+
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
RPMVERSION= 13.el7_3.1
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
-PORTDOCS= AUTHORS COPYING.LIB NEWS THANKS
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-
-post-install:
- ${RM} -r ${STAGEDIR}${PREFIX}/etc
-
.include <bsd.port.mk>
diff --git a/security/linux-c7-libgcrypt/distinfo.x86_64 b/security/linux-c7-libgcrypt/distinfo
index 803e7e72306e..803e7e72306e 100644
--- a/security/linux-c7-libgcrypt/distinfo.x86_64
+++ b/security/linux-c7-libgcrypt/distinfo
diff --git a/security/linux-c7-libgcrypt/pkg-plist.x86_64 b/security/linux-c7-libgcrypt/pkg-plist.amd64
index 3542232a0dbe..eda5ca6684f3 100644
--- a/security/linux-c7-libgcrypt/pkg-plist.x86_64
+++ b/security/linux-c7-libgcrypt/pkg-plist.amd64
@@ -4,3 +4,8 @@ usr/lib/libgcrypt.so.11.8.2
usr/lib64/.libgcrypt.so.11.hmac
usr/lib64/libgcrypt.so.11
usr/lib64/libgcrypt.so.11.8.2
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+@dir etc/gcrypt
diff --git a/security/linux-c7-libgpg-error/Makefile b/security/linux-c7-libgpg-error/Makefile
index d09aa94af44f..55909de160b0 100644
--- a/security/linux-c7-libgpg-error/Makefile
+++ b/security/linux-c7-libgpg-error/Makefile
@@ -3,21 +3,20 @@
PORTNAME= libgpg-error
PORTVERSION= 1.12
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
-COMMENT= Common error values for all GnuPG components
+COMMENT= Common error values for all GnuPG components (Linux CentOS ${LINUX_DIST_VER})
CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
LICENSE= LGPL21+
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
RPMVERSION= 3.el7
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-
.include <bsd.port.mk>
diff --git a/security/linux-c7-libgpg-error/distinfo.x86_64 b/security/linux-c7-libgpg-error/distinfo
index c257064b2758..c257064b2758 100644
--- a/security/linux-c7-libgpg-error/distinfo.x86_64
+++ b/security/linux-c7-libgpg-error/distinfo
diff --git a/security/linux-c7-libgpg-error/pkg-plist.amd64 b/security/linux-c7-libgpg-error/pkg-plist.amd64
new file mode 100644
index 000000000000..5c4b170b7888
--- /dev/null
+++ b/security/linux-c7-libgpg-error/pkg-plist.amd64
@@ -0,0 +1,25 @@
+usr/bin/gpg-error
+usr/lib/libgpg-error.so.0
+usr/lib/libgpg-error.so.0.10.0
+usr/lib64/libgpg-error.so.0
+usr/lib64/libgpg-error.so.0.10.0
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%NLS%%usr/share/locale/cs/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/da/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/de/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/eo/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/fr/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/it/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/ja/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/nl/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/pl/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/ro/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/sv/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/uk/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/vi/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/libgpg-error.mo
diff --git a/security/linux-c7-libgpg-error/pkg-plist.x86_64 b/security/linux-c7-libgpg-error/pkg-plist.x86_64
deleted file mode 100644
index 440b55343331..000000000000
--- a/security/linux-c7-libgpg-error/pkg-plist.x86_64
+++ /dev/null
@@ -1,25 +0,0 @@
-lib/libgpg-error.so.0
-lib/libgpg-error.so.0.10.0
-lib64/libgpg-error.so.0
-lib64/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 d17c8c571b6b..d838dc2a0f5d 100644
--- a/security/linux-c7-libssh2/Makefile
+++ b/security/linux-c7-libssh2/Makefile
@@ -3,21 +3,19 @@
PORTNAME= libssh2
PORTVERSION= 1.4.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Library implementing the SSH2 protocol (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-f10-${PORTNAME}-[0-9]* linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
RPMVERSION= 10.el7_2.1
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= openssl
USE_LINUX_RPM= yes
-PORTDOCS= AUTHORS COPYING ChangeLog NEWS README
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-
.include <bsd.port.mk>
diff --git a/security/linux-c7-libssh2/distinfo.x86_64 b/security/linux-c7-libssh2/distinfo
index 0ba22e2d0edd..0ba22e2d0edd 100644
--- a/security/linux-c7-libssh2/distinfo.x86_64
+++ b/security/linux-c7-libssh2/distinfo
diff --git a/security/linux-c7-libssh2/pkg-plist.amd64 b/security/linux-c7-libssh2/pkg-plist.amd64
new file mode 100644
index 000000000000..64a98107e465
--- /dev/null
+++ b/security/linux-c7-libssh2/pkg-plist.amd64
@@ -0,0 +1,9 @@
+usr/lib/libssh2.so.1
+usr/lib/libssh2.so.1.0.1
+usr/lib64/libssh2.so.1
+usr/lib64/libssh2.so.1.0.1
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/security/linux-c7-libssh2/pkg-plist.x86_64 b/security/linux-c7-libssh2/pkg-plist.x86_64
deleted file mode 100644
index 15c8cac04181..000000000000
--- a/security/linux-c7-libssh2/pkg-plist.x86_64
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/libssh2.so.1
-usr/lib/libssh2.so.1.0.1
-usr/lib64/libssh2.so.1
-usr/lib64/libssh2.so.1.0.1
diff --git a/security/linux-c7-libtasn1/Makefile b/security/linux-c7-libtasn1/Makefile
index 7067bb41bff2..4b5a4102873d 100644
--- a/security/linux-c7-libtasn1/Makefile
+++ b/security/linux-c7-libtasn1/Makefile
@@ -7,19 +7,17 @@ PORTREVISION= 1
CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
-COMMENT= ASN.1 structure parser library
+COMMENT= ASN.1 structure parser library (Linux CentOS ${LINUX_DIST_VER})
LICENSE= LGPL21+
CONFLICT= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
RPMVERSION= 3.el7
USES= cpe linux:c7
CPE_VENDOR= gnu
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
-PORTDOCS= AUTHORS COPYING COPYING.LIB NEWS README THANKS TODO libtasn1.pdf
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-
.include <bsd.port.mk>
diff --git a/security/linux-c7-libtasn1/distinfo.x86_64 b/security/linux-c7-libtasn1/distinfo
index 2d8dee680f07..2d8dee680f07 100644
--- a/security/linux-c7-libtasn1/distinfo.x86_64
+++ b/security/linux-c7-libtasn1/distinfo
diff --git a/security/linux-c7-libtasn1/pkg-plist.amd64 b/security/linux-c7-libtasn1/pkg-plist.amd64
new file mode 100644
index 000000000000..e9ce7099a661
--- /dev/null
+++ b/security/linux-c7-libtasn1/pkg-plist.amd64
@@ -0,0 +1,12 @@
+usr/lib/libtasn1.so.6
+usr/lib/libtasn1.so.6.2.3
+usr/lib64/libtasn1.so.6
+usr/lib64/libtasn1.so.6.2.3
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/libtasn1.pdf
diff --git a/security/linux-c7-libtasn1/pkg-plist.x86_64 b/security/linux-c7-libtasn1/pkg-plist.x86_64
deleted file mode 100644
index 02141bc60a3c..000000000000
--- a/security/linux-c7-libtasn1/pkg-plist.x86_64
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/libtasn1.so.6
-usr/lib/libtasn1.so.6.2.3
-usr/lib64/libtasn1.so.6
-usr/lib64/libtasn1.so.6.2.3
diff --git a/security/linux-c7-nss/Makefile b/security/linux-c7-nss/Makefile
index 3fa2aaf84404..8c6c71810e7a 100644
--- a/security/linux-c7-nss/Makefile
+++ b/security/linux-c7-nss/Makefile
@@ -5,11 +5,11 @@ PORTNAME= nss
PORTVERSION= 3.21.3
PORTREVISION= 1
CATEGORIES= security linux
-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 \
+LIB_DISTNAMES= ${DISTNAME} \
+ ${PORTNAME}-util-${PORTVERSION}-1.1.el7_3 \
+ ${PORTNAME}-softokn-3.16.2.3-14.4.el7 \
+ ${PORTNAME}-softokn-freebl-3.16.2.3-14.4.el7
+SRC_DISTFILES= ${DISTNAME}${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
@@ -18,12 +18,11 @@ COMMENT= Network Security Services (Linux CentOS ${LINUX_DIST_VER})
CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
RPMVERSION= 2.el7_3
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= nspr sqlite3
USE_LINUX_RPM= yes
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-
.include <bsd.port.mk>
diff --git a/security/linux-c7-nss/distinfo.x86_64 b/security/linux-c7-nss/distinfo
index 73305c54c24d..f6caed5e9b70 100644
--- a/security/linux-c7-nss/distinfo.x86_64
+++ b/security/linux-c7-nss/distinfo
@@ -1,20 +1,20 @@
-TIMESTAMP = 1482083963
+TIMESTAMP = 1485620811
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.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.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-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-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
diff --git a/security/linux-c7-nss/pkg-plist.x86_64 b/security/linux-c7-nss/pkg-plist.amd64
index 59121153225b..59121153225b 100644
--- a/security/linux-c7-nss/pkg-plist.x86_64
+++ b/security/linux-c7-nss/pkg-plist.amd64
diff --git a/security/linux-c7-openssl-compat/Makefile b/security/linux-c7-openssl-compat/Makefile
deleted file mode 100644
index 2a4cb73568bd..000000000000
--- a/security/linux-c7-openssl-compat/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# Created by: Piotr Kubaj <pkubaj@anongoth.pl>
-# $FreeBSD$
-
-PORTNAME= openssl
-PKGNAMESUFFIX= -compat
-PORTVERSION= 0.9.8e
-PORTREVISION= 1
-CATEGORIES= security linux
-DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
-
-MAINTAINER= emulation@FreeBSD.org
-COMMENT= OpenSSL toolkit (Linux CentOS ${LINUX_DIST_VER})
-
-LICENSE= OpenSSL
-LICENSE_FILE= ${WRKSRC}/usr/share/doc/${LINUX_NAME}-${PORTVERSION}/LICENSE
-
-CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
-
-LINUX_NAME= openssl098e
-RPMVERSION= 29.el7.centos.3
-USES= linux:c7
-USE_LDCONFIG= yes
-USE_LINUX_RPM= yes
-
-PLIST_SUB+= PORTVERSION="${PORTVERSION}"
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUX_NAME}-${PORTVERSION}
-
-post-install:
-# For libflashsupport.so in www/linux-c7-flashplugin11.
- ${LN} -sf libssl.so.6 ${STAGEDIR}${PREFIX}/usr/lib/libssl.so.7
-
-.include <bsd.port.mk>
diff --git a/security/linux-c7-openssl-compat/distinfo.x86_64 b/security/linux-c7-openssl-compat/distinfo.x86_64
deleted file mode 100644
index 20cae2a62de6..000000000000
--- a/security/linux-c7-openssl-compat/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-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.x86_64 b/security/linux-c7-openssl-compat/pkg-plist.x86_64
deleted file mode 100644
index a87a73183f6a..000000000000
--- a/security/linux-c7-openssl-compat/pkg-plist.x86_64
+++ /dev/null
@@ -1,42 +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
-usr/lib64/.libcrypto.so.%%PORTVERSION%%.hmac
-usr/lib64/.libcrypto.so.6.hmac
-usr/lib64/.libssl.so.%%PORTVERSION%%.hmac
-usr/lib64/.libssl.so.6.hmac
-usr/lib64/libcrypto.so.%%PORTVERSION%%
-usr/lib64/libcrypto.so.6
-usr/lib64/libssl.so.%%PORTVERSION%%
-usr/lib64/libssl.so.6
-usr/lib64/openssl098e/engines/lib4758cca.so
-usr/lib64/openssl098e/engines/libaep.so
-usr/lib64/openssl098e/engines/libatalla.so
-usr/lib64/openssl098e/engines/libchil.so
-usr/lib64/openssl098e/engines/libcswift.so
-usr/lib64/openssl098e/engines/libgmp.so
-usr/lib64/openssl098e/engines/libnuron.so
-usr/lib64/openssl098e/engines/libsureware.so
-usr/lib64/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 ac1e03de9ff0..b000822f4d7e 100644
--- a/security/linux-c7-openssl/Makefile
+++ b/security/linux-c7-openssl/Makefile
@@ -3,26 +3,25 @@
PORTNAME= openssl
PORTVERSION= 1.0.1e
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security linux
-BIN_DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
-LIB_DISTFILES= ${PORTNAME}-libs-${PORTVERSION}-${RPMVERSION}${EXTRACT_SUFX}
-SRC_DISTFILES= ${DISTNAME}${SRC_SUFX}:SOURCE
+PKGNAMESUFFIX= -libs
+LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
-COMMENT= OpenSSL toolkit (Linux CentOS ${LINUX_DIST_VER})
+COMMENT= OpenSSL libraries (Linux CentOS ${LINUX_DIST_VER})
LICENSE= OpenSSL
-LICENSE_FILE= ${WRKSRC}/usr/share/doc/${PORTNAME}-${PORTVERSION}/LICENSE
+LICENSE_FILE= ${WRKSRC}/usr/share/doc/${LINUXNAME}-${PORTVERSION}/LICENSE
CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
+LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
RPMVERSION= 60.el7
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
-PLIST_SUB+= PORTVERSION="${PORTVERSION}"
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-
.include <bsd.port.mk>
diff --git a/security/linux-c7-openssl/distinfo.x86_64 b/security/linux-c7-openssl/distinfo
index e5f92b58ce61..3d036f926cda 100644
--- a/security/linux-c7-openssl/distinfo.x86_64
+++ b/security/linux-c7-openssl/distinfo
@@ -1,9 +1,7 @@
-TIMESTAMP = 1482090117
+TIMESTAMP = 1485621314
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.amd64 b/security/linux-c7-openssl/pkg-plist.amd64
new file mode 100644
index 000000000000..a59a149b33da
--- /dev/null
+++ b/security/linux-c7-openssl/pkg-plist.amd64
@@ -0,0 +1,43 @@
+etc/pki/tls/openssl.cnf
+usr/lib/.libcrypto.so.1.0.1e.hmac
+usr/lib/.libcrypto.so.10.hmac
+usr/lib/.libssl.so.1.0.1e.hmac
+usr/lib/.libssl.so.10.hmac
+usr/lib/libcrypto.so.1.0.1e
+usr/lib/libcrypto.so.10
+usr/lib/libssl.so.1.0.1e
+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
+usr/lib64/.libcrypto.so.1.0.1e.hmac
+usr/lib64/.libcrypto.so.10.hmac
+usr/lib64/.libssl.so.1.0.1e.hmac
+usr/lib64/.libssl.so.10.hmac
+usr/lib64/libcrypto.so.1.0.1e
+usr/lib64/libcrypto.so.10
+usr/lib64/libssl.so.1.0.1e
+usr/lib64/libssl.so.10
+usr/lib64/openssl/engines/lib4758cca.so
+usr/lib64/openssl/engines/libaep.so
+usr/lib64/openssl/engines/libatalla.so
+usr/lib64/openssl/engines/libcapi.so
+usr/lib64/openssl/engines/libchil.so
+usr/lib64/openssl/engines/libcswift.so
+usr/lib64/openssl/engines/libgmp.so
+usr/lib64/openssl/engines/libnuron.so
+usr/lib64/openssl/engines/libpadlock.so
+usr/lib64/openssl/engines/libsureware.so
+usr/lib64/openssl/engines/libubsec.so
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+@dir etc/pki/tls/certs
+@dir etc/pki/tls/misc
+@dir etc/pki/tls/private
diff --git a/security/linux-c7-openssl/pkg-plist.x86_64 b/security/linux-c7-openssl/pkg-plist.x86_64
deleted file mode 100644
index 5b15be1dcb53..000000000000
--- a/security/linux-c7-openssl/pkg-plist.x86_64
+++ /dev/null
@@ -1,120 +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
-usr/lib64/.libcrypto.so.%%PORTVERSION%%.hmac
-usr/lib64/.libcrypto.so.10.hmac
-usr/lib64/.libssl.so.%%PORTVERSION%%.hmac
-usr/lib64/.libssl.so.10.hmac
-usr/lib64/libcrypto.so.%%PORTVERSION%%
-usr/lib64/libcrypto.so.10
-usr/lib64/libssl.so.%%PORTVERSION%%
-usr/lib64/libssl.so.10
-usr/lib64/openssl/engines/lib4758cca.so
-usr/lib64/openssl/engines/libaep.so
-usr/lib64/openssl/engines/libatalla.so
-usr/lib64/openssl/engines/libcapi.so
-usr/lib64/openssl/engines/libchil.so
-usr/lib64/openssl/engines/libcswift.so
-usr/lib64/openssl/engines/libgmp.so
-usr/lib64/openssl/engines/libnuron.so
-usr/lib64/openssl/engines/libpadlock.so
-usr/lib64/openssl/engines/libsureware.so
-usr/lib64/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