aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorxmj <xmj@FreeBSD.org>2014-11-11 21:06:39 +0800
committerxmj <xmj@FreeBSD.org>2014-11-11 21:06:39 +0800
commitaeaea25e285c636bf645fbc7d7cbf6c909251327 (patch)
treef6afff664949229557403f2ab9f595530366c4cc /security
parentaa3d7e7e8bdeccda07fe9305433fc971f49f9cb2 (diff)
downloadfreebsd-ports-gnome-aeaea25e285c636bf645fbc7d7cbf6c909251327.tar.gz
freebsd-ports-gnome-aeaea25e285c636bf645fbc7d7cbf6c909251327.tar.zst
freebsd-ports-gnome-aeaea25e285c636bf645fbc7d7cbf6c909251327.zip
Upgrade CentOS to 6.6
- Upgrade all things linux-c6- to CentOS 6.6 - Add ports: devel/linux-c6-libsigc++20 graphics/linux-c6-gdk-pixbuf [1] graphics/linux-c6-glx-utils - Add pkg-plists for net/linux-c6-openldap and security/linux-c6-cyrus-sasl2 - Misc. cleanups Differential Revision: https://reviews.freebsd.org/D1108 Submitted by: kmoore [1] Reviewed by: rene (emulation) Approved by: portmgr (swills) Approved by: swills (mentor) Sponsored by: Perceivon Hosting Inc.
Diffstat (limited to 'security')
-rw-r--r--security/linux-c6-cyrus-sasl2/Makefile9
-rw-r--r--security/linux-c6-cyrus-sasl2/distinfo.i6868
-rw-r--r--security/linux-c6-cyrus-sasl2/pkg-plist30
-rw-r--r--security/linux-c6-gnutls/Makefile3
-rw-r--r--security/linux-c6-gnutls/distinfo.i6868
-rw-r--r--security/linux-c6-gnutls/pkg-plist26
-rw-r--r--security/linux-c6-libgcrypt/Makefile1
-rw-r--r--security/linux-c6-libgcrypt/distinfo.i6868
-rw-r--r--security/linux-c6-libgpg-error/Makefile1
-rw-r--r--security/linux-c6-libgpg-error/distinfo.i6868
-rw-r--r--security/linux-c6-libssh2/Makefile1
-rw-r--r--security/linux-c6-libssh2/distinfo.i6868
-rw-r--r--security/linux-c6-libtasn1/Makefile3
-rw-r--r--security/linux-c6-libtasn1/distinfo.i6868
-rw-r--r--security/linux-c6-nss/Makefile14
-rw-r--r--security/linux-c6-nss/distinfo.i68628
-rw-r--r--security/linux-c6-openssl-compat/Makefile3
-rw-r--r--security/linux-c6-openssl-compat/distinfo.i6868
-rw-r--r--security/linux-c6-openssl-compat/pkg-plist4
-rw-r--r--security/linux-c6-openssl/Makefile5
-rw-r--r--security/linux-c6-openssl/distinfo.i6868
-rw-r--r--security/linux-c6-openssl/pkg-plist21
22 files changed, 101 insertions, 112 deletions
diff --git a/security/linux-c6-cyrus-sasl2/Makefile b/security/linux-c6-cyrus-sasl2/Makefile
index 7d8b6b4e82db..ed4099f86fe7 100644
--- a/security/linux-c6-cyrus-sasl2/Makefile
+++ b/security/linux-c6-cyrus-sasl2/Makefile
@@ -3,6 +3,7 @@
PORTNAME= cyrus-sasl2
PORTVERSION= 2.1.23
+PORTREVISION= 1
CATEGORIES= security linux
DISTNAME= cyrus-sasl-lib-${PORTVERSION}-${RPMVERSION}
@@ -13,20 +14,16 @@ COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer) (Linux CentOS
ONLY_FOR_ARCHS= i386 amd64
.if defined(PACKAGE_BUILDING)
-SRC_DISTFILES= cyrus-sasl-2.1.23-13.el6_3.1.src.rpm
+SRC_DISTFILES= cyrus-sasl-${PORTVERSION}-${RPMVERSION}.src.rpm
.endif
USE_LINUX= c6
USE_LINUX_RPM= yes
-RPMVERSION= 13.el6_3.1
+RPMVERSION= 15.el6
USE_LDCONFIG= yes
BRANDELF_FILES= usr/sbin/sasldblistusers2 usr/sbin/saslpasswd2
DESCR= ${.CURDIR}/../cyrus-sasl2/pkg-descr
-PLIST_DIRS= etc/sasl2 usr/lib/sasl2
-PLIST_FILES= usr/lib/libsasl2.so.2 usr/lib/libsasl2.so.2.0.23 usr/lib/sasl2/libanonymous.so usr/lib/sasl2/libanonymous.so.2 usr/lib/sasl2/libanonymous.so.2.0.23 usr/lib/sasl2/libsasldb.so usr/lib/sasl2/libsasldb.so.2 usr/lib/sasl2/libsasldb.so.2.0.23 usr/sbin/sasldblistusers2 usr/sbin/saslpasswd2
-PLIST_FILES+= "@exec mkdir -p %D/etc/sasl2"
DOCSDIR= usr/share/doc/cyrus-sasl-lib-${PORTVERSION}
-PORTDOCS= AUTHORS COPYING NEWS README advanced.html appconvert.html components.html gssapi.html index.html install.html macosx.html mechanisms.html options.html plugprog.html programming.html readme.html sysadmin.html upgrading.html windows.html
.include <bsd.port.mk>
diff --git a/security/linux-c6-cyrus-sasl2/distinfo.i686 b/security/linux-c6-cyrus-sasl2/distinfo.i686
index 5401cf7f31a2..ce14dc912bad 100644
--- a/security/linux-c6-cyrus-sasl2/distinfo.i686
+++ b/security/linux-c6-cyrus-sasl2/distinfo.i686
@@ -1,4 +1,4 @@
-SHA256 (rpm/i686/centos/6.5/cyrus-sasl-lib-2.1.23-13.el6_3.1.i686.rpm) = 268cac2b4d8edf1491c5a2d8ae9d76ee20f73d3d8000ada1d1081c77b5ba98ff
-SIZE (rpm/i686/centos/6.5/cyrus-sasl-lib-2.1.23-13.el6_3.1.i686.rpm) = 138808
-SHA256 (rpm/i686/centos/6.5/cyrus-sasl-2.1.23-13.el6_3.1.src.rpm) = 49ff5360a67b62fe95a841f54c5fcf6c9d6ae7c2f651721aefebb98f649e698b
-SIZE (rpm/i686/centos/6.5/cyrus-sasl-2.1.23-13.el6_3.1.src.rpm) = 1666942
+SHA256 (rpm/i686/centos/6.6/cyrus-sasl-lib-2.1.23-15.el6.i686.rpm) = dc5ae32a8cf710da51961da3664f78e18a5e12388c6a9ac679e79b12c0496960
+SIZE (rpm/i686/centos/6.6/cyrus-sasl-lib-2.1.23-15.el6.i686.rpm) = 139000
+SHA256 (rpm/i686/centos/6.6/cyrus-sasl-2.1.23-15.el6.src.rpm) = a1192a223c6c116d090c72bfcb217c08065619ec976bf0fff11424896669d5a7
+SIZE (rpm/i686/centos/6.6/cyrus-sasl-2.1.23-15.el6.src.rpm) = 1669908
diff --git a/security/linux-c6-cyrus-sasl2/pkg-plist b/security/linux-c6-cyrus-sasl2/pkg-plist
new file mode 100644
index 000000000000..339989fec8b7
--- /dev/null
+++ b/security/linux-c6-cyrus-sasl2/pkg-plist
@@ -0,0 +1,30 @@
+usr/lib/libsasl2.so.2
+usr/lib/libsasl2.so.2.0.23
+usr/lib/sasl2/libanonymous.so
+usr/lib/sasl2/libanonymous.so.2
+usr/lib/sasl2/libanonymous.so.2.0.23
+usr/lib/sasl2/libsasldb.so
+usr/lib/sasl2/libsasldb.so.2
+usr/lib/sasl2/libsasldb.so.2.0.23
+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-c6-gnutls/Makefile b/security/linux-c6-gnutls/Makefile
index cf978a67e970..fd7f3e46d77d 100644
--- a/security/linux-c6-gnutls/Makefile
+++ b/security/linux-c6-gnutls/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gnutls
PORTVERSION= 2.8.5
+PORTREVISION= 1
CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
@@ -12,7 +13,7 @@ USE_LINUX= c6
USE_LINUX_RPM= yes
USE_LINUX_APPS= libtasn1 libgcrypt libgpg-error
-RPMVERSION= 10.el6_4.2
+RPMVERSION= 14.el6_5
USE_LDCONFIG= yes
PLIST_SUB= PORTVERSION="${PORTVERSION}"
diff --git a/security/linux-c6-gnutls/distinfo.i686 b/security/linux-c6-gnutls/distinfo.i686
index b634209230b8..e720b5420d96 100644
--- a/security/linux-c6-gnutls/distinfo.i686
+++ b/security/linux-c6-gnutls/distinfo.i686
@@ -1,4 +1,4 @@
-SHA256 (rpm/i686/centos/6.5/gnutls-2.8.5-10.el6_4.2.i686.rpm) = 67db64c6503776a303693ce1f8813df40bbc1724d172ebbcb931e3f93a367db9
-SIZE (rpm/i686/centos/6.5/gnutls-2.8.5-10.el6_4.2.i686.rpm) = 348616
-SHA256 (rpm/i686/centos/6.5/gnutls-2.8.5-10.el6_4.2.src.rpm) = d7fa200c501d1f16178ead48f883455ef443b46e97748603b34a762e7db6b99a
-SIZE (rpm/i686/centos/6.5/gnutls-2.8.5-10.el6_4.2.src.rpm) = 6321241
+SHA256 (rpm/i686/centos/6.6/gnutls-2.8.5-14.el6_5.i686.rpm) = 66cb5f85a5893510e888d010b724740069d027838320a95ff489d76c4f96c606
+SIZE (rpm/i686/centos/6.6/gnutls-2.8.5-14.el6_5.i686.rpm) = 348960
+SHA256 (rpm/i686/centos/6.6/gnutls-2.8.5-14.el6_5.src.rpm) = c501ecc43d6caf9432cd44f040363c8ed5001e923001c5c7d28a6055766fb5f1
+SIZE (rpm/i686/centos/6.6/gnutls-2.8.5-14.el6_5.src.rpm) = 6322859
diff --git a/security/linux-c6-gnutls/pkg-plist b/security/linux-c6-gnutls/pkg-plist
index 27f2c79612d1..06b01e5fff9e 100644
--- a/security/linux-c6-gnutls/pkg-plist
+++ b/security/linux-c6-gnutls/pkg-plist
@@ -18,29 +18,3 @@ 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
-@dirrmtry usr/share/locale/vi/LC_MESSAGES
-@dirrmtry usr/share/locale/vi
-@dirrmtry usr/share/locale/sv/LC_MESSAGES
-@dirrmtry usr/share/locale/sv
-@dirrmtry usr/share/locale/pl/LC_MESSAGES
-@dirrmtry usr/share/locale/pl
-@dirrmtry usr/share/locale/nl/LC_MESSAGES
-@dirrmtry usr/share/locale/nl
-@dirrmtry usr/share/locale/ms/LC_MESSAGES
-@dirrmtry usr/share/locale/ms
-@dirrmtry usr/share/locale/fr/LC_MESSAGES
-@dirrmtry usr/share/locale/fr
-@dirrmtry usr/share/locale/en@quot/LC_MESSAGES
-@dirrmtry usr/share/locale/en@quot
-@dirrmtry usr/share/locale/en@boldquot/LC_MESSAGES
-@dirrmtry usr/share/locale/en@boldquot
-@dirrmtry usr/share/locale/de/LC_MESSAGES
-@dirrmtry usr/share/locale/de
-@dirrmtry usr/share/locale/cs/LC_MESSAGES
-@dirrmtry usr/share/locale/cs
-@dirrmtry usr/share/locale
-@dirrmtry usr/share/doc/gnutls-%%PORTVERSION%%
-@dirrmtry usr/share/doc
-@dirrmtry usr/share
-@dirrmtry usr/lib
-@dirrmtry usr
diff --git a/security/linux-c6-libgcrypt/Makefile b/security/linux-c6-libgcrypt/Makefile
index ae1feb937125..e10c5629d617 100644
--- a/security/linux-c6-libgcrypt/Makefile
+++ b/security/linux-c6-libgcrypt/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libgcrypt
PORTVERSION= 1.4.5
+PORTREVISION= 1
CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
diff --git a/security/linux-c6-libgcrypt/distinfo.i686 b/security/linux-c6-libgcrypt/distinfo.i686
index f026e43f6028..b6283a426752 100644
--- a/security/linux-c6-libgcrypt/distinfo.i686
+++ b/security/linux-c6-libgcrypt/distinfo.i686
@@ -1,4 +1,4 @@
-SHA256 (rpm/i686/centos/6.5/libgcrypt-1.4.5-11.el6_4.i686.rpm) = 800d11a507a330b28e59d300bf7383b19c95b5a857863b1501b8aa1f0b9388dc
-SIZE (rpm/i686/centos/6.5/libgcrypt-1.4.5-11.el6_4.i686.rpm) = 233684
-SHA256 (rpm/i686/centos/6.5/libgcrypt-1.4.5-11.el6_4.src.rpm) = c963b5bf4c84d5798d987e86b4e600ce3c7ae03e035096d88982385a81dcdbbc
-SIZE (rpm/i686/centos/6.5/libgcrypt-1.4.5-11.el6_4.src.rpm) = 1257444
+SHA256 (rpm/i686/centos/6.6/libgcrypt-1.4.5-11.el6_4.i686.rpm) = 800d11a507a330b28e59d300bf7383b19c95b5a857863b1501b8aa1f0b9388dc
+SIZE (rpm/i686/centos/6.6/libgcrypt-1.4.5-11.el6_4.i686.rpm) = 233684
+SHA256 (rpm/i686/centos/6.6/libgcrypt-1.4.5-11.el6_4.src.rpm) = c963b5bf4c84d5798d987e86b4e600ce3c7ae03e035096d88982385a81dcdbbc
+SIZE (rpm/i686/centos/6.6/libgcrypt-1.4.5-11.el6_4.src.rpm) = 1257444
diff --git a/security/linux-c6-libgpg-error/Makefile b/security/linux-c6-libgpg-error/Makefile
index 8e2155fd5019..a03199d17c79 100644
--- a/security/linux-c6-libgpg-error/Makefile
+++ b/security/linux-c6-libgpg-error/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libgpg-error
PORTVERSION= 1.7
+PORTREVISION= 1
CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
diff --git a/security/linux-c6-libgpg-error/distinfo.i686 b/security/linux-c6-libgpg-error/distinfo.i686
index b48da78fe17e..2b531bcaf5d6 100644
--- a/security/linux-c6-libgpg-error/distinfo.i686
+++ b/security/linux-c6-libgpg-error/distinfo.i686
@@ -1,4 +1,4 @@
-SHA256 (rpm/i686/centos/6.5/libgpg-error-1.7-4.el6.i686.rpm) = ee1e0dfaa0e6bf4e06b1d6f1f3ce7da90abe8b1d1d46fe61bc1fe79e3227c4ad
-SIZE (rpm/i686/centos/6.5/libgpg-error-1.7-4.el6.i686.rpm) = 60532
-SHA256 (rpm/i686/centos/6.5/libgpg-error-1.7-4.el6.src.rpm) = 955d0a4d5aaa3539c7a58d94cef41ef09a0d8cc08c0aeb5b0986c623aebd53be
-SIZE (rpm/i686/centos/6.5/libgpg-error-1.7-4.el6.src.rpm) = 413579
+SHA256 (rpm/i686/centos/6.6/libgpg-error-1.7-4.el6.i686.rpm) = ee1e0dfaa0e6bf4e06b1d6f1f3ce7da90abe8b1d1d46fe61bc1fe79e3227c4ad
+SIZE (rpm/i686/centos/6.6/libgpg-error-1.7-4.el6.i686.rpm) = 60532
+SHA256 (rpm/i686/centos/6.6/libgpg-error-1.7-4.el6.src.rpm) = 955d0a4d5aaa3539c7a58d94cef41ef09a0d8cc08c0aeb5b0986c623aebd53be
+SIZE (rpm/i686/centos/6.6/libgpg-error-1.7-4.el6.src.rpm) = 413579
diff --git a/security/linux-c6-libssh2/Makefile b/security/linux-c6-libssh2/Makefile
index 19ac5c826f52..251c6c9b1521 100644
--- a/security/linux-c6-libssh2/Makefile
+++ b/security/linux-c6-libssh2/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libssh2
PORTVERSION= 1.4.2
+PORTREVISION= 1
CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
diff --git a/security/linux-c6-libssh2/distinfo.i686 b/security/linux-c6-libssh2/distinfo.i686
index 84edf2787d64..115adcdd7cf4 100644
--- a/security/linux-c6-libssh2/distinfo.i686
+++ b/security/linux-c6-libssh2/distinfo.i686
@@ -1,4 +1,4 @@
-SHA256 (rpm/i686/centos/6.5/libssh2-1.4.2-1.el6.i686.rpm) = fba45fff361bf17448c9850ba298e02cecc9ca52f7988feed6bb00a86fec4dcd
-SIZE (rpm/i686/centos/6.5/libssh2-1.4.2-1.el6.i686.rpm) = 126784
-SHA256 (rpm/i686/centos/6.5/libssh2-1.4.2-1.el6.src.rpm) = 0ec26ee80811d7c94c08719ad0a6565e792ea39d6cc3e6e0bf537b65fa421eb1
-SIZE (rpm/i686/centos/6.5/libssh2-1.4.2-1.el6.src.rpm) = 689537
+SHA256 (rpm/i686/centos/6.6/libssh2-1.4.2-1.el6.i686.rpm) = fba45fff361bf17448c9850ba298e02cecc9ca52f7988feed6bb00a86fec4dcd
+SIZE (rpm/i686/centos/6.6/libssh2-1.4.2-1.el6.i686.rpm) = 126784
+SHA256 (rpm/i686/centos/6.6/libssh2-1.4.2-1.el6.src.rpm) = 0ec26ee80811d7c94c08719ad0a6565e792ea39d6cc3e6e0bf537b65fa421eb1
+SIZE (rpm/i686/centos/6.6/libssh2-1.4.2-1.el6.src.rpm) = 689537
diff --git a/security/linux-c6-libtasn1/Makefile b/security/linux-c6-libtasn1/Makefile
index 1cfcf8ac2f5a..b92d61440e3f 100644
--- a/security/linux-c6-libtasn1/Makefile
+++ b/security/linux-c6-libtasn1/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libtasn1
PORTVERSION= 2.3
+PORTREVISION= 1
CATEGORIES= security linux
MAINTAINER= emulation@FreeBSD.org
@@ -11,7 +12,7 @@ COMMENT= ASN.1 structure parser library
USE_LINUX= c6
USE_LINUX_RPM= yes
-RPMVERSION= 3.el6_2.1
+RPMVERSION= 6.el6_5
USE_LDCONFIG= yes
PLIST_FILES= usr/lib/libtasn1.so.3 usr/lib/libtasn1.so.3.1.6
diff --git a/security/linux-c6-libtasn1/distinfo.i686 b/security/linux-c6-libtasn1/distinfo.i686
index 6e70d2101981..965e3b706b32 100644
--- a/security/linux-c6-libtasn1/distinfo.i686
+++ b/security/linux-c6-libtasn1/distinfo.i686
@@ -1,4 +1,4 @@
-SHA256 (rpm/i686/centos/6.5/libtasn1-2.3-3.el6_2.1.i686.rpm) = f69bdc12199cd1875d8c3ba3bac9307866cb45124c88353fc5cd2d681719cc0e
-SIZE (rpm/i686/centos/6.5/libtasn1-2.3-3.el6_2.1.i686.rpm) = 244628
-SHA256 (rpm/i686/centos/6.5/libtasn1-2.3-3.el6_2.1.src.rpm) = 1ca23e510872e2579b586924fe3533bcb9b9d2161533d2ec802e958efedd9625
-SIZE (rpm/i686/centos/6.5/libtasn1-2.3-3.el6_2.1.src.rpm) = 1494282
+SHA256 (rpm/i686/centos/6.6/libtasn1-2.3-6.el6_5.i686.rpm) = 159a21c14eec8ba904bb9940116d1e43ea73c164522f5665c0556bf478e23ca4
+SIZE (rpm/i686/centos/6.6/libtasn1-2.3-6.el6_5.i686.rpm) = 245140
+SHA256 (rpm/i686/centos/6.6/libtasn1-2.3-6.el6_5.src.rpm) = 24fe6cafdf3ed4c45d49395bdfd7a73e1a4b8c7fab9503fea801a6b68234b199
+SIZE (rpm/i686/centos/6.6/libtasn1-2.3-6.el6_5.src.rpm) = 1501312
diff --git a/security/linux-c6-nss/Makefile b/security/linux-c6-nss/Makefile
index 2628a2d3e4dc..307b70284ca8 100644
--- a/security/linux-c6-nss/Makefile
+++ b/security/linux-c6-nss/Makefile
@@ -5,11 +5,9 @@ PORTNAME= nss
PORTVERSION= 3.16.1
CATEGORIES= security linux
DISTFILES= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}.${LINUX_RPM_ARCH}.rpm \
- nss-util-3.16.1-2.el6_5.${LINUX_RPM_ARCH}.rpm \
- nss-softokn-3.14.3-12.el6_5.${LINUX_RPM_ARCH}.rpm \
- nss-softokn-freebl-3.14.3-12.el6_5.${LINUX_RPM_ARCH}.rpm
-#
-MASTER_SITES= CENTOS_LINUX_UPDATES
+ nss-util-3.16.1-3.el6.${LINUX_RPM_ARCH}.rpm \
+ nss-softokn-3.14.3-17.el6.${LINUX_RPM_ARCH}.rpm \
+ nss-softokn-freebl-3.14.3-17.el6.${LINUX_RPM_ARCH}.rpm
MAINTAINER= emulation@FreeBSD.org
COMMENT= Network Security Services (Linux CentOS ${LINUX_DIST_VER})
@@ -17,7 +15,7 @@ COMMENT= Network Security Services (Linux CentOS ${LINUX_DIST_VER})
CONFLICTS= linux-f10-nss-[0-9]*
ONLY_FOR_ARCHS= i386 amd64
-RPMVERSION= 7.el6_5
+RPMVERSION= 14.el6
USE_LINUX= c6
USE_LINUX_APPS= nspr sqlite3
@@ -25,8 +23,8 @@ USE_LINUX_RPM= yes
USE_LDCONFIG= yes
SRC_DISTFILES= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX} \
- nss-util-3.16.1-2.el6_5.src.rpm \
- nss-softokn-3.14.3-12.el6_5.src.rpm
+ nss-util-3.16.1-3.el6.src.rpm \
+ nss-softokn-3.14.3-17.el6.src.rpm
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/security/linux-c6-nss/distinfo.i686 b/security/linux-c6-nss/distinfo.i686
index 03244eac0061..4074d9d2c055 100644
--- a/security/linux-c6-nss/distinfo.i686
+++ b/security/linux-c6-nss/distinfo.i686
@@ -1,14 +1,14 @@
-SHA256 (rpm/i686/centos/6.5/nss-3.16.1-7.el6_5.i686.rpm) = e5ed74d34ab7b95fbba83147d8203e51d55991989bb752b41fc9c584fe2b3a87
-SIZE (rpm/i686/centos/6.5/nss-3.16.1-7.el6_5.i686.rpm) = 856296
-SHA256 (rpm/i686/centos/6.5/nss-util-3.16.1-2.el6_5.i686.rpm) = 9cc3f91c58c4b966dd42e5984f80c178b497a3ae7dd10b8bacef7bf5dd190c46
-SIZE (rpm/i686/centos/6.5/nss-util-3.16.1-2.el6_5.i686.rpm) = 65980
-SHA256 (rpm/i686/centos/6.5/nss-softokn-3.14.3-12.el6_5.i686.rpm) = 9f20ee80c05274d5d03c9d8dd160522edfa118d4e917b9b6e6bcbf614f302bd2
-SIZE (rpm/i686/centos/6.5/nss-softokn-3.14.3-12.el6_5.i686.rpm) = 279392
-SHA256 (rpm/i686/centos/6.5/nss-softokn-freebl-3.14.3-12.el6_5.i686.rpm) = 1de05de7eff837e18a8e7e021ce991494015326616f178bdc0715772e8e082e6
-SIZE (rpm/i686/centos/6.5/nss-softokn-freebl-3.14.3-12.el6_5.i686.rpm) = 151032
-SHA256 (rpm/i686/centos/6.5/nss-3.16.1-7.el6_5.src.rpm) = bac25a155ae2e52e323d7f1edb2a49e78587941c94785526daee283dc4a3be58
-SIZE (rpm/i686/centos/6.5/nss-3.16.1-7.el6_5.src.rpm) = 5136474
-SHA256 (rpm/i686/centos/6.5/nss-util-3.16.1-2.el6_5.src.rpm) = d6bea5d9a5b4b7067439fe9c1c1ce515c0f6ebb0b7a35d4fdf1b034be3095f76
-SIZE (rpm/i686/centos/6.5/nss-util-3.16.1-2.el6_5.src.rpm) = 346621
-SHA256 (rpm/i686/centos/6.5/nss-softokn-3.14.3-12.el6_5.src.rpm) = 6267c9b6c31b452c86a6277e3af0736287e5274f1043f1935ae1c95aad245f43
-SIZE (rpm/i686/centos/6.5/nss-softokn-3.14.3-12.el6_5.src.rpm) = 1279999
+SHA256 (rpm/i686/centos/6.6/nss-3.16.1-14.el6.i686.rpm) = 0fdb70060fcc83514bbf01c968a1574706650cd76b937803bada67fb7f615023
+SIZE (rpm/i686/centos/6.6/nss-3.16.1-14.el6.i686.rpm) = 858848
+SHA256 (rpm/i686/centos/6.6/nss-util-3.16.1-3.el6.i686.rpm) = f54a000a717d015577bc721392f5fac7792ee24a3e502e114f235cda62986022
+SIZE (rpm/i686/centos/6.6/nss-util-3.16.1-3.el6.i686.rpm) = 66704
+SHA256 (rpm/i686/centos/6.6/nss-softokn-3.14.3-17.el6.i686.rpm) = 586ff1bb135c327fd8b5c259ad6cd059d58c5cb62e002c716298062e9494cc4a
+SIZE (rpm/i686/centos/6.6/nss-softokn-3.14.3-17.el6.i686.rpm) = 275292
+SHA256 (rpm/i686/centos/6.6/nss-softokn-freebl-3.14.3-17.el6.i686.rpm) = 56b54c4d9f13bac765896300c07f43a281a5651c03902962cef6ee13636736c4
+SIZE (rpm/i686/centos/6.6/nss-softokn-freebl-3.14.3-17.el6.i686.rpm) = 156932
+SHA256 (rpm/i686/centos/6.6/nss-3.16.1-14.el6.src.rpm) = 5236665e5fa3cae7c5ebc18949f7706512b95ea6ca0740d7f321aa1bfad4705d
+SIZE (rpm/i686/centos/6.6/nss-3.16.1-14.el6.src.rpm) = 5144624
+SHA256 (rpm/i686/centos/6.6/nss-util-3.16.1-3.el6.src.rpm) = fb9403d2eb1f4a6b5d53f222a206bc8aab1fd05fe81dbee341efc02c07aeff46
+SIZE (rpm/i686/centos/6.6/nss-util-3.16.1-3.el6.src.rpm) = 347593
+SHA256 (rpm/i686/centos/6.6/nss-softokn-3.14.3-17.el6.src.rpm) = 877d91d6c2159758827624bc96689f9b3563fe08caddb601a704a277f8fb861f
+SIZE (rpm/i686/centos/6.6/nss-softokn-3.14.3-17.el6.src.rpm) = 1296314
diff --git a/security/linux-c6-openssl-compat/Makefile b/security/linux-c6-openssl-compat/Makefile
index 760182e571db..2e93e812bfa8 100644
--- a/security/linux-c6-openssl-compat/Makefile
+++ b/security/linux-c6-openssl-compat/Makefile
@@ -3,6 +3,7 @@
PORTNAME= openssl-compat
PORTVERSION= 0.9.8e
+PORTREVISION= 1
CATEGORIES= security linux
DISTNAME= openssl098e-${PORTVERSION}-${RPMVERSION}
@@ -14,7 +15,7 @@ CONFLICTS= linux-openssl-[0-9]* linux-f8-openssl-[0-9]* linux-f10-openssl-[0-9]*
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX= c6
USE_LINUX_RPM= yes
-RPMVERSION= 17.el6.centos.2
+RPMVERSION= 18.el6_5.2
USE_LDCONFIG= yes
PLIST_SUB+= PORTVERSION="${PORTVERSION}"
diff --git a/security/linux-c6-openssl-compat/distinfo.i686 b/security/linux-c6-openssl-compat/distinfo.i686
index d843759fc987..8b84f154d700 100644
--- a/security/linux-c6-openssl-compat/distinfo.i686
+++ b/security/linux-c6-openssl-compat/distinfo.i686
@@ -1,4 +1,4 @@
-SHA256 (rpm/i686/centos/6.5/openssl098e-0.9.8e-17.el6.centos.2.i686.rpm) = 862142d2d7adc74311d7312c6ace396d36b6c8f3a0708f6fe5e0d3977d00a871
-SIZE (rpm/i686/centos/6.5/openssl098e-0.9.8e-17.el6.centos.2.i686.rpm) = 791760
-SHA256 (rpm/i686/centos/6.5/openssl098e-0.9.8e-17.el6.centos.2.src.rpm) = cb47c1a6274027b8eda9650022c6bfd0b929a47ab2790a4e5e32727283c458a0
-SIZE (rpm/i686/centos/6.5/openssl098e-0.9.8e-17.el6.centos.2.src.rpm) = 3100581
+SHA256 (rpm/i686/centos/6.6/openssl098e-0.9.8e-18.el6_5.2.i686.rpm) = 4911acddf50a3f48cc5d2ce6f4011193a06112142a2d93e7e9f36aa7fd44e1bd
+SIZE (rpm/i686/centos/6.6/openssl098e-0.9.8e-18.el6_5.2.i686.rpm) = 791692
+SHA256 (rpm/i686/centos/6.6/openssl098e-0.9.8e-18.el6_5.2.src.rpm) = 25cdd2928d00f8aec7e84cd5937ecf9ad869256c980634a9c7132e75cfeccce2
+SIZE (rpm/i686/centos/6.6/openssl098e-0.9.8e-18.el6_5.2.src.rpm) = 3101400
diff --git a/security/linux-c6-openssl-compat/pkg-plist b/security/linux-c6-openssl-compat/pkg-plist
index de497f07843a..84c1ac1c9eb8 100644
--- a/security/linux-c6-openssl-compat/pkg-plist
+++ b/security/linux-c6-openssl-compat/pkg-plist
@@ -24,7 +24,3 @@ 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
-
-@dirrm usr/share/doc/openssl098e-%%PORTVERSION%%
-@dirrm usr/lib/openssl098e/engines
-@dirrm usr/lib/openssl098e
diff --git a/security/linux-c6-openssl/Makefile b/security/linux-c6-openssl/Makefile
index 71168b39b278..e47b481f67f4 100644
--- a/security/linux-c6-openssl/Makefile
+++ b/security/linux-c6-openssl/Makefile
@@ -3,9 +3,8 @@
PORTNAME= openssl
PORTVERSION= 1.0.1e
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security linux
-MASTER_SITES= CENTOS_LINUX_UPDATES
MAINTAINER= emulation@FreeBSD.org
COMMENT= OpenSSL toolkit (Linux CentOS ${LINUX_DIST_VER})
@@ -15,7 +14,7 @@ CONFLICTS= linux-openssl-[0-9]* linux-f8-openssl-[0-9]* linux-f10-openssl-[0-9]*
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX= c6
USE_LINUX_RPM= yes
-RPMVERSION= 30.el6_5.2
+RPMVERSION= 30.el6
BRANDELF_FILES= usr/bin/openssl
USE_LDCONFIG= yes
diff --git a/security/linux-c6-openssl/distinfo.i686 b/security/linux-c6-openssl/distinfo.i686
index f168137f87f9..7373f0e7a165 100644
--- a/security/linux-c6-openssl/distinfo.i686
+++ b/security/linux-c6-openssl/distinfo.i686
@@ -1,4 +1,4 @@
-SHA256 (rpm/i686/centos/6.5/openssl-1.0.1e-30.el6_5.2.i686.rpm) = 5898ac3179dfdd904c352badd79b6f5ec702315f4bc7b8989de8f114304fbd78
-SIZE (rpm/i686/centos/6.5/openssl-1.0.1e-30.el6_5.2.i686.rpm) = 1582948
-SHA256 (rpm/i686/centos/6.5/openssl-1.0.1e-30.el6_5.2.src.rpm) = 1a1c3ed0d8eb5775d89b726e7f19ff2d8b52b7ef27f6e36260e83ffc40328460
-SIZE (rpm/i686/centos/6.5/openssl-1.0.1e-30.el6_5.2.src.rpm) = 3172921
+SHA256 (rpm/i686/centos/6.6/openssl-1.0.1e-30.el6.i686.rpm) = ce24bb4bf68da374a9de97a34d9efb4b122a93dc87f55b15c89e78cf69913bd1
+SIZE (rpm/i686/centos/6.6/openssl-1.0.1e-30.el6.i686.rpm) = 1582028
+SHA256 (rpm/i686/centos/6.6/openssl-1.0.1e-30.el6.src.rpm) = f388776bc8efa0f61dbcbb20a305c45e98a697aeb1ef6cd44cf60d44f776ef56
+SIZE (rpm/i686/centos/6.6/openssl-1.0.1e-30.el6.src.rpm) = 3166046
diff --git a/security/linux-c6-openssl/pkg-plist b/security/linux-c6-openssl/pkg-plist
index a02ba11d42da..dd9a2b7ae41c 100644
--- a/security/linux-c6-openssl/pkg-plist
+++ b/security/linux-c6-openssl/pkg-plist
@@ -94,19 +94,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
-@comment deal with empty directories installed by the port
-@exec /bin/mkdir -p %D/etc/pki/CA/private
-@dirrmtry etc/pki/CA/private
-@exec /bin/mkdir -p %D/etc/pki/tls/private
-@dirrmtry etc/pki/tls/private
-@comment non-empty directory listing in revers order
-@dirrm usr/share/doc/openssl-%%PORTVERSION%%
-@dirrm usr/lib/openssl/engines
-@dirrm usr/lib/openssl
-@dirrm etc/pki/tls/misc
-@dirrm etc/pki/tls/certs
-@dirrm etc/pki/tls
-@dirrm etc/pki/CA/certs
-@dirrm etc/pki/CA/crl
-@dirrm etc/pki/CA/newcerts
-@dirrm etc/pki/CA
+@dir etc/pki/CA/private
+@dir etc/pki/CA/certs
+@dir etc/pki/CA/crl
+@dir etc/pki/CA/newcerts
+@dir etc/pki/tls/private