From jbeich@tormail.org  Tue Apr 30 15:15:31 2013
Return-Path: <jbeich@tormail.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id 2CB2B26D
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 30 Apr 2013 15:15:31 +0000 (UTC)
	(envelope-from jbeich@tormail.org)
Received: from outgoing.tormail.org (outgoing.tormail.org [82.221.96.22])
	by mx1.freebsd.org (Postfix) with ESMTP id E1167183D
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 30 Apr 2013 15:15:30 +0000 (UTC)
Received: from localhost ([127.0.0.1] helo=internal.tormail.org)
	by outgoing.tormail.org with esmtp (Exim 4.72)
	(envelope-from <jbeich@tormail.org>)
	id 1UXCHA-0007EB-Bb
	for FreeBSD-gnats-submit@freebsd.org; Tue, 30 Apr 2013 19:15:29 +0400
Received: from jbeich by internal.tormail.org with local (Exim 4.63)
	(envelope-from <jbeich@tormail.org>)
	id 1UXCEE-0007yS-1X
	for FreeBSD-gnats-submit@freebsd.org; Tue, 30 Apr 2013 15:12:26 +0000
Message-Id: <1UXCEE-0007yS-1X@internal.tormail.org>
Date: Tue, 30 Apr 2013 09:53:48 +0500
From: Jan Beich <jbeich@tormail.org>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [patch] dns/unbound, dns/ldns: openssl port iff base version < 1.0
X-GNATS-Notify: sem@FreeBSD.org, jaap@NLnetLabs.nl

>Number:         178262
>Category:       ports
>Synopsis:       [patch] dns/unbound, dns/ldns: openssl port iff base version < 1.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sem
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 30 15:20:00 UTC 2013
>Closed-Date:    Thu Sep 05 14:38:01 UTC 2013
>Last-Modified:  Thu Sep  5 14:40:00 UTC 2013
>Originator:     Jan Beich
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
>Description:
Do not depend on security/openssl if openssl in base is sufficient.

/head has v1.0.1e
/stable/9 has 0.9.8y, 9.1R has 0.9.8x, 9.0R (EOL) has 0.9.8q
/stable/8 has 0.9.8y, 8.4R has 0.9.8y, 8.3R has 0.9.8q

ecdsa(3) first appeared in 7.0R (EOL) which had 0.9.8e.
And unbound has EVP workaround for 0.9.8 since 1.4.18.
>How-To-Repeat:
>Fix:
--- unbound_openssl_base.diff begins here ---
Index: dns/ldns/Makefile
===================================================================
--- dns/ldns/Makefile	(revision 315726)
+++ dns/ldns/Makefile	(working copy)
@@ -234,7 +234,9 @@ MAN1+=	ldns-config.1
 .endif
 
 .if ${PORT_OPTIONS:MGOST}
+. if ${OSVERSION} < 1000015
 BUILD_DEPENDS+=	openssl>=1.0:${PORTSDIR}/security/openssl
+. endif
 .else
 NO_GOST=	--disable-gost
 CONFIGURE_ARGS+=${NO_GOST}
Index: dns/unbound/Makefile
===================================================================
--- dns/unbound/Makefile	(revision 316532)
+++ dns/unbound/Makefile	(working copy)
@@ -68,14 +68,15 @@ PYTHON=		"@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGOST}
+. if ${OSVERSION} < 1000015
 WITH_OPENSSL_PORT=	yes
+. endif
 DEPENDS_ARGS+=	WITH_GOST=yes
 .else
 CONFIGURE_ARGS+=--disable-gost
 .endif
 
 .if ${PORT_OPTIONS:MECDSA}
-WITH_OPENSSL_PORT=yes
 DEPENDS_ARGS+=	WITH_ECDSA=yes
 .else
 CONFIGURE_ARGS+=--disable-ecdsa
--- unbound_openssl_base.diff ends here ---
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sem 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Apr 30 15:20:14 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=178262 

From: Jaap Akkerhuis <jaap@NLnetLabs.nl>
To: Jan Beich <jbeich@tormail.org>, freebsd-ports-bugs@FreeBSD.org
Cc: FreeBSD-gnats-submit@freebsd.org, sem@FreeBSD.org
Subject: Re: ports/178262: [patch] dns/unbound, dns/ldns: openssl port iff base version < 1.0
Date: Thu, 05 Sep 2013 15:41:25 +0200

 Oops, forgot about this.
 
     >Description:
     Do not depend on security/openssl if openssl in base is sufficient.
 
 I did actually tested this for ldns and it seems OK.
 
 I'm not maintaining the unbound port so cannot speak for him, but I
 assume he won't have a problem with it either.
 
 	jaap
State-Changed-From-To: open->closed 
State-Changed-By: sem 
State-Changed-When: Thu Sep 5 14:37:57 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=178262 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/178262: commit references a PR
Date: Thu,  5 Sep 2013 14:37:43 +0000 (UTC)

 Author: sem
 Date: Thu Sep  5 14:37:34 2013
 New Revision: 326404
 URL: http://svnweb.freebsd.org/changeset/ports/326404
 
 Log:
   - Do not depend on security/openssl if openssl in base is sufficient.
   
   PR:		ports/178262
   Submitted by:	Jan Beich <jbeich@tormail.org>
   Reviewed by:	ldns' port maintainer
 
 Modified:
   head/dns/ldns/Makefile
   head/dns/unbound/Makefile
 
 Modified: head/dns/ldns/Makefile
 ==============================================================================
 --- head/dns/ldns/Makefile	Thu Sep  5 14:33:01 2013	(r326403)
 +++ head/dns/ldns/Makefile	Thu Sep  5 14:37:34 2013	(r326404)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	ldns
  PORTVERSION=	1.6.16
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	dns
  MASTER_SITES=	http://www.nlnetlabs.nl/downloads/ldns/ \
  		CRITICAL
 @@ -268,7 +268,9 @@ PLIST_SUB+=	EXAMPLES="@comment "
  .endif # BUILD_PYLDNS
  
  .if ${PORT_OPTIONS:MGOST}
 +. if ${OSVERSION} < 1000015
  BUILD_DEPENDS+=	openssl>=1.0:${PORTSDIR}/security/openssl
 +. endif
  .else
  NO_GOST=	--disable-gost
  CONFIGURE_ARGS+=${NO_GOST}
 
 Modified: head/dns/unbound/Makefile
 ==============================================================================
 --- head/dns/unbound/Makefile	Thu Sep  5 14:33:01 2013	(r326403)
 +++ head/dns/unbound/Makefile	Thu Sep  5 14:37:34 2013	(r326404)
 @@ -1,13 +1,9 @@
 -# New ports collection makefile for:	unbound
 -# Date created:				25 Apr 2008
 -# Whom:					Sergey Matveychuk <sem@FreeBSD.org>
 -#
 +# Created by: Sergey Matveychuk <sem@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	unbound
  PORTVERSION=	1.4.20
 -PORTREVISION=	0
 +PORTREVISION=	1
  CATEGORIES=	dns
  MASTER_SITES=	http://unbound.net/downloads/
  
 @@ -49,13 +45,13 @@ OPTIONS_DEFINE=	THREADS PYTHON GOST ECDS
  OPTIONS_DEFAULT=THREADS ECDSA
  
  OPTIONS_RADIO=	LIBEVENT
 -OPTIONS_RADIO_LIBEVENT= LIBEVENT14 LIBEVENT20
 +OPTIONS_RADIO_LIBEVENT=	LIBEVENT14 LIBEVENT20
  
  LIBEVENT_DESC=	Enable whenever using many (10000) outgoing ports
  LIBEVENT14_DESC=Build against libevent-1.4 (devel/libevent)
  LIBEVENT20_DESC=Build against libevent-2.0 (devel/libevent2)
 -GOST_DESC=	Enable GOST support (requires OpenSSL from ports)
 -ECDSA_DESC=	Enable ECDSA (elliptic curve) support
 +GOST_DESC=	Enable GOST support (requires OpenSSL >= 1.0)
 +ECDSA_DESC=	Enable ECDSA (elliptic curve) support (OpenSSL >= 1.0)
  MUNIN_DESC=	Install Munin plugin
  
  .include <bsd.port.options.mk>
 @@ -73,14 +69,15 @@ PYTHON=		"@comment "
  .endif
  
  .if ${PORT_OPTIONS:MGOST}
 +. if ${OSVERSION} < 1000015
  WITH_OPENSSL_PORT=	yes
 +. endif
  DEPENDS_ARGS+=	WITH_GOST=yes
  .else
  CONFIGURE_ARGS+=--disable-gost
  .endif
  
  .if ${PORT_OPTIONS:MECDSA}
 -WITH_OPENSSL_PORT=yes
  DEPENDS_ARGS+=	WITH_ECDSA=yes
  .else
  CONFIGURE_ARGS+=--disable-ecdsa
 @@ -133,7 +130,7 @@ post-install:
  	@${CAT} ${WRKDIR}/pkg-message
  	@${ECHO_MSG} "============================================================="
  .endif
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	@${MKDIR} ${DOCSDIR}; \
  	for f in ${PORTDOCS}; do \
  		cd ${WRKSRC}/doc && ${INSTALL_DATA} $${f} ${DOCSDIR}/; \
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
