ports/71511: [MAINTAINER] security/gnutls: update to 1.0.20

[Sergei Kolobov]

>Number:         71511
>Category:       ports
>Synopsis:       [MAINTAINER] security/gnutls: update to 1.0.20
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 09 07:10:20 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Sergei Kolobov
>Release:        FreeBSD 5.2.1-RELEASE-p9 i386
>Organization:
Elendil LLC
>Environment:
System: FreeBSD arnor.elendil.ru 5.2.1-RELEASE-p9 FreeBSD 5.2.1-RELEASE-p9 #0: Thu Aug 26 09:51:52 MSD 2004
>Description:
- Update to 1.0.20 - this fixes security vulnerability described in
  http://www.hornik.sk/SA/SA-20040802.txt
- Make security/libtasn1 and security/opencdk dependencies optional:
  use included copies of those libraries unless external dependency
  is requested explicitly via a newly added port knobs (WITH_LIBTASN1,
  WITH_OPENCDK) or is already installed on the system
- Tweak CONFLICTS to please portlint(1)

Supercedes:	ports/71502

Generated with FreeBSD Port Tools 0.70
>How-To-Repeat:
>Fix:

--- gnutls-1.0.20.patch begins here ---
Index: Makefile
===================================================================
RCS file: /FreeBSD/cvs/ports/security/gnutls/Makefile,v
retrieving revision 1.17
diff -u -u -r1.17 Makefile
--- Makefile	9 Jul 2004 17:42:47 -0000	1.17
+++ Makefile	3 Sep 2004 13:55:29 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnutls
-PORTVERSION=	1.0.13
+PORTVERSION=	1.0.20
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_GNUPG} \
 	http://www.mirrors.wiretapped.net/security/network-security/gnutls/ \
@@ -18,14 +18,20 @@
 COMMENT=	GNU Transport Layer Security library
 
 LIB_DEPENDS=	gcrypt.12:${PORTSDIR}/security/libgcrypt \
-		gpg-error.1:${PORTSDIR}/security/libgpg-error \
-		opencdk.8:${PORTSDIR}/security/opencdk \
-		tasn1.2:${PORTSDIR}/security/libtasn1
+		gpg-error.1:${PORTSDIR}/security/libgpg-error
 
-CONFLICTS=	gnutls-devel-*
+.if defined(WITH_OPENCDK) || exists(${LOCALBASE}/lib/libopencdk.so.8)
+LIB_DEPENDS+=	opencdk.8:${PORTSDIR}/security/opencdk
+.endif
+
+.if defined(WITH_LIBTASN1) || exists(${LOCALBASE}/lib/libtasn1.so.2)
+LIB_DEPENDS+=	tasn1.2:${PORTSDIR}/security/libtasn1
+.endif
+
+CONFLICTS=	gnutls-devel-[0-9]*
 
 USE_GPG?=	yes
-SIG_SUFFIX=	.sig.asc
+SIG_SUFFIX=	.sig
 USE_ICONV=	yes
 USE_GETTEXT=	yes
 USE_INC_LIBTOOL_VER=15
@@ -37,7 +43,7 @@
 CONFIGURE_ARGS=	--with-included-lzo
 
 MAN1=		certtool.1 gnutls-cli.1 gnutls-cli-debug.1 \
-       		gnutls-serv.1 gnutls-srpcrypt.1
+       		gnutls-serv.1 srptool.1
 DOCS=		AUTHORS NEWS README THANKS doc/tex/*.ps
 EXAMPLES=	doc/examples/*.c
 
Index: distinfo
===================================================================
RCS file: /FreeBSD/cvs/ports/security/gnutls/distinfo,v
retrieving revision 1.8
diff -u -u -r1.8 distinfo
--- distinfo	4 Jun 2004 21:52:53 -0000	1.8
+++ distinfo	2 Sep 2004 09:46:27 -0000
@@ -1,2 +1,2 @@
-MD5 (gnutls-1.0.13.tar.gz) = f908934e6cbf7c9c8f57368c50a8f95e
-SIZE (gnutls-1.0.13.tar.gz) = 1465802
+MD5 (gnutls-1.0.20.tar.gz) = 3a06e6db06c6c6c9a9929dfd9d361cbe
+SIZE (gnutls-1.0.20.tar.gz) = 1614092
Index: pkg-plist
===================================================================
RCS file: /FreeBSD/cvs/ports/security/gnutls/pkg-plist,v
retrieving revision 1.9
diff -u -u -r1.9 pkg-plist
--- pkg-plist	4 Jun 2004 21:52:53 -0000	1.9
+++ pkg-plist	3 Sep 2004 12:54:53 -0000
@@ -40,16 +40,15 @@
 %%EXAMPLESDIR%%/ex-cert-select.c
 %%EXAMPLESDIR%%/ex-client-resume.c
 %%EXAMPLESDIR%%/ex-client-srp.c
-%%EXAMPLESDIR%%/ex-client1.c
 %%EXAMPLESDIR%%/ex-client2.c
 %%EXAMPLESDIR%%/ex-crq.c
 %%EXAMPLESDIR%%/ex-pkcs12.c
-%%EXAMPLESDIR%%/ex-rfc2818.c
 %%EXAMPLESDIR%%/ex-serv-export.c
 %%EXAMPLESDIR%%/ex-serv-pgp.c
 %%EXAMPLESDIR%%/ex-serv-srp.c
 %%EXAMPLESDIR%%/ex-serv1.c
 %%EXAMPLESDIR%%/ex-session-info.c
+%%EXAMPLESDIR%%/ex-verify.c
 %%EXAMPLESDIR%%/ex-x509-info.c
 @dirrm %%EXAMPLESDIR%%
 @dirrm include/gnutls
--- gnutls-1.0.20.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: