5 files changed, 14 insertions, 44 deletions

diff --git a/security/linux-c7-gnutls/Makefile b/security/linux-c7-gnutls/Makefile
index b3d8c906f35e..68be17340531 100644
--- a/security/linux-c7-gnutls/Makefile
+++ b/security/linux-c7-gnutls/Makefile
@@ -2,15 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	gnutls
-PORTVERSION=	3.3.8
+PORTVERSION=	3.3.24
 CATEGORIES=	security linux
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	GNU Transport Layer Security library
 
-CONFLICTS=	linux-f10-${PORTNAME}-[0-9]* linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
 
-RPMVERSION=	14.el7_2
+RPMVERSION=	1.el7
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	libtasn1 libgcrypt libgpg-error
diff --git a/security/linux-c7-gnutls/distinfo.i386 b/security/linux-c7-gnutls/distinfo.i386
deleted file mode 100644
index 8e7a1bc9eaf0..000000000000
--- a/security/linux-c7-gnutls/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1473355565
-SHA256 (rpm/centos/7.2.1511/i386/gnutls-3.3.8-14.el7_2.i686.rpm) = b2a82e473add3e5dbda27c34d836ab84b7c6b922a6038638b25ad62fe1952273
-SIZE (rpm/centos/7.2.1511/i386/gnutls-3.3.8-14.el7_2.i686.rpm) = 647504
-SHA256 (rpm/centos/7.2.1511/i386/gnutls-3.3.8-14.el7_2.src.rpm) = 6bb78e62521dbbba7e8ff0f8e42b1b94f1fc80ed0fede9fc0f285ca460af424d
-SIZE (rpm/centos/7.2.1511/i386/gnutls-3.3.8-14.el7_2.src.rpm) = 6205031
diff --git a/security/linux-c7-gnutls/distinfo.x86_64 b/security/linux-c7-gnutls/distinfo.x86_64
index 2813c5f7f88e..c445ab8f1a87 100644
--- a/security/linux-c7-gnutls/distinfo.x86_64
+++ b/security/linux-c7-gnutls/distinfo.x86_64
@@ -1,7 +1,7 @@
-TIMESTAMP = 1473674592
-SHA256 (rpm/centos/7.2.1511/x86_64/gnutls-3.3.8-14.el7_2.i686.rpm) = b2a82e473add3e5dbda27c34d836ab84b7c6b922a6038638b25ad62fe1952273
-SIZE (rpm/centos/7.2.1511/x86_64/gnutls-3.3.8-14.el7_2.i686.rpm) = 647504
-SHA256 (rpm/centos/7.2.1511/x86_64/gnutls-3.3.8-14.el7_2.x86_64.rpm) = 9a6b1d3d392510c197bfb56ac57cb1451944f30a009bd7c4dabd86702089299a
-SIZE (rpm/centos/7.2.1511/x86_64/gnutls-3.3.8-14.el7_2.x86_64.rpm) = 678176
-SHA256 (rpm/centos/7.2.1511/x86_64/gnutls-3.3.8-14.el7_2.src.rpm) = 6bb78e62521dbbba7e8ff0f8e42b1b94f1fc80ed0fede9fc0f285ca460af424d
-SIZE (rpm/centos/7.2.1511/x86_64/gnutls-3.3.8-14.el7_2.src.rpm) = 6205031
+TIMESTAMP = 1482092240
+SHA256 (centos/gnutls-3.3.24-1.el7.i686.rpm) = ac6a918032dff2407ff5c8f0a659a6449de667d2c1b5e1c5b7ae086659df3e47
+SIZE (centos/gnutls-3.3.24-1.el7.i686.rpm) = 656664
+SHA256 (centos/gnutls-3.3.24-1.el7.x86_64.rpm) = a790c99f574807326bc72fc2addc063bf5ff5cd79d8e40806e55dd4779c649b3
+SIZE (centos/gnutls-3.3.24-1.el7.x86_64.rpm) = 688468
+SHA256 (centos/gnutls-3.3.24-1.el7.src.rpm) = b3b35cddc7338fac4226c180bf9f3a228c824c53092060582a66203cf2469de1
+SIZE (centos/gnutls-3.3.24-1.el7.src.rpm) = 6282294
diff --git a/security/linux-c7-gnutls/pkg-plist.i386 b/security/linux-c7-gnutls/pkg-plist.i386
deleted file mode 100644
index 0bf4426a5447..000000000000
--- a/security/linux-c7-gnutls/pkg-plist.i386
+++ /dev/null
@@ -1,25 +0,0 @@
-usr/lib/.libgnutls.so.28.41.0.hmac
-usr/lib/.libgnutls.so.28.hmac
-usr/lib/libgnutls.so.28
-usr/lib/libgnutls.so.28.41.0
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/COPYING.LESSER
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
-usr/share/locale/cs/LC_MESSAGES/gnutls.mo
-usr/share/locale/de/LC_MESSAGES/gnutls.mo
-usr/share/locale/en@boldquot/LC_MESSAGES/gnutls.mo
-usr/share/locale/en@quot/LC_MESSAGES/gnutls.mo
-usr/share/locale/eo/LC_MESSAGES/gnutls.mo
-usr/share/locale/fi/LC_MESSAGES/gnutls.mo
-usr/share/locale/fr/LC_MESSAGES/gnutls.mo
-usr/share/locale/it/LC_MESSAGES/gnutls.mo
-usr/share/locale/ms/LC_MESSAGES/gnutls.mo
-usr/share/locale/nl/LC_MESSAGES/gnutls.mo
-usr/share/locale/pl/LC_MESSAGES/gnutls.mo
-usr/share/locale/sv/LC_MESSAGES/gnutls.mo
-usr/share/locale/uk/LC_MESSAGES/gnutls.mo
-usr/share/locale/vi/LC_MESSAGES/gnutls.mo
-usr/share/locale/zh_CN/LC_MESSAGES/gnutls.mo
diff --git a/security/linux-c7-gnutls/pkg-plist.x86_64 b/security/linux-c7-gnutls/pkg-plist.x86_64
index 3857b7a77aed..2c1ec0296b15 100644
--- a/security/linux-c7-gnutls/pkg-plist.x86_64
+++ b/security/linux-c7-gnutls/pkg-plist.x86_64
@@ -1,11 +1,11 @@
-usr/lib/.libgnutls.so.28.41.0.hmac
+usr/lib/.libgnutls.so.28.41.16.hmac
 usr/lib/.libgnutls.so.28.hmac
 usr/lib/libgnutls.so.28
-usr/lib/libgnutls.so.28.41.0
-usr/lib64/.libgnutls.so.28.41.0.hmac
+usr/lib/libgnutls.so.28.41.16
+usr/lib64/.libgnutls.so.28.41.16.hmac
 usr/lib64/.libgnutls.so.28.hmac
 usr/lib64/libgnutls.so.28
-usr/lib64/libgnutls.so.28.41.0
+usr/lib64/libgnutls.so.28.41.16
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.LESSER