From nobody@FreeBSD.org  Mon Jul  2 19:53:11 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A56D01065670
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  2 Jul 2012 19:53:11 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 935B18FC16
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  2 Jul 2012 19:53:11 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q62JrABn060551
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 2 Jul 2012 19:53:10 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q62Jr9Re060550;
	Mon, 2 Jul 2012 19:53:09 GMT
	(envelope-from nobody)
Message-Id: <201207021953.q62Jr9Re060550@red.freebsd.org>
Date: Mon, 2 Jul 2012 19:53:09 GMT
From: Joe Holden <joe@rewt.org.uk>
To: freebsd-gnats-submit@FreeBSD.org
Subject: security/botan: Fix ECDSA for dns/powerdns and maybe others
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: lapo@lapo.it

>Number:         169613
>Category:       ports
>Synopsis:       security/botan: Fix ECDSA for dns/powerdns and maybe others
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 02 20:00:26 UTC 2012
>Closed-Date:    Fri Feb 08 02:47:16 UTC 2013
>Last-Modified:  Fri Feb 08 02:47:16 UTC 2013
>Originator:     Joe Holden
>Release:        9.0-RELEASE
>Organization:
Pseudo Networks Limited
>Environment:
FreeBSD abby.lhr1.as41113.net 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC 2012     root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
As it stands the botan port deletes the required headers after install, which means that powerdns is unable to build due to a hardcoded dependency (which is configurable in my other patch).  This fixes that and also makes build options configurable.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- Makefile.orig	2012-03-31 17:49:45.000000000 +0100
+++ Makefile	2012-03-31 19:37:40.000000000 +0100
@@ -1,13 +1,6 @@
-# ex:ts=8
-# New ports collection makefile for:	botan
-# Date created:			Mar 3, 2001
-# Whom:				Ying-Chieh Liao <ijliao@FreeBSD.org>
-#
-# $FreeBSD: ports/security/botan/Makefile,v 1.56 2011/12/03 18:39:28 scheidell Exp $
-#
-
 PORTNAME=	botan
 PORTVERSION=	1.8.13
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://files.randombit.net/botan/v1.8/
 DISTNAME=	Botan-${PORTVERSION}
@@ -19,55 +12,60 @@
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/doc/license.txt
 
-OPTIONS=	SSL "Enable OpenSSL engine" on \
-		GMP "Enable GMP engine" on \
-		ECC "Enable ECC support" on
-
 USE_BZIP2=	yes
 USE_PYTHON_BUILD=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	configure.py
-CONFIGURE_ARGS=	--prefix=${PREFIX} --with-tr1-implementation=boost \
-		--with-bzip2 --with-zlib
+CONFIGURE_ARGS=	--prefix=${PREFIX} --with-bzip2 --with-zlib
 USE_GMAKE=	yes
 MAKE_ARGS=	CXX="${CXX}" LIB_OPT="${CXXFLAGS}"
 USE_LDCONFIG=	yes
 PLIST_FILES=	bin/botan-config lib/libbotan.a lib/libbotan.so lib/libbotan.so.0 libdata/pkgconfig/botan-1.8.pc
 
-PORTDOCS=	*
+OPTIONS=	SSL "Enable OpenSSL engine" on \
+		GMP "Enable GMP engine" on \
+		ECC "Enable ECC support" on \
+		ECDSA "Enable ECDSA (PowerDNS et al.)" on 
+
 
-.include <bsd.port.options.mk>
+PORTDOCS=	${WRKSRC}/doc
 
-.if !defined(WITHOUT_SSL)
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_SSL)
 USE_OPENSSL=	yes
-CONFIGURE_ARGS+=--with-openssl
+CONFIGURE_ARGS+= --with-openssl
 .endif
 
-.if !defined(WITHOUT_GMP)
+.if defined(WITH_GMP)
 LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gmp
-CONFIGURE_ARGS+=--with-gnump
+CONFIGURE_ARGS+= --with-gnump
 MAKE_ARGS+=	LDFLAGS="-L${LOCALBASE}/lib"
 .endif
 
-.if !defined(WITHOUT_ECC)
+.if defined(WITH_ECDSA)
+CONFIGURE_ARGS+= --enable-modules=ecdsa
+.if !defined(WITH_ECC)
+BROKEN="ECC required but not enabled, bailing."
+.endif
+.endif
+
+.if defined(WITH_ECC)
 BUILD_DEPENDS+=	${LOCALBASE}/include/boost/tr1/memory.hpp:${PORTSDIR}/devel/boost-libs
-CONFIGURE_ARGS+=--with-tr1-implementation=boost
+CONFIGURE_ARGS+= --with-tr1-implementation=boost
 CXXFLAGS+=	-I${LOCALBASE}/include
 .else
-CONFIGURE_ARGS+=--with-tr1-implementation=none
+CONFIGURE_ARGS+= --with-tr1-implementation=none
 .endif
 
-post-patch:
+post-extract:
 	${REINPLACE_CMD} -e "s|#!/usr/bin/env python|#!${PYTHON_CMD}|" \
 			${WRKSRC}/configure.py
+
 .if defined(NOPORTDOCS)
 	${REINPLACE_CMD} -e '/$$(MKDIR_INSTALL) $$(DOCDIR)/d' \
 			-e '/$$(INSTALL_CMD_DATA) $$$$i $$(DOCDIR); /d' \
 			${WRKSRC}/src/build-data/makefile/unix_shr.in
 .endif
 
-post-install:
-	@(cd ${PREFIX}; ${FIND} -s include/botan -not -type d) >> ${TMPPLIST}
-	@${ECHO_CMD} @dirrm include/botan >> ${TMPPLIST}
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon Jul 2 20:00:54 UTC 2012 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: lapo@lapo.it
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/169613: security/botan: Fix ECDSA for dns/powerdns and maybe others
Date: Mon, 2 Jul 2012 20:00:52 UT

 Maintainer of security/botan,
 
 Please note that PR ports/169613 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/169613
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->scheidell 
Responsible-Changed-By: scheidell 
Responsible-Changed-When: Tue Aug 28 03:30:25 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

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

From: Michael Scheidell <scheidell@FreeBSD.org>
To: bug-followup@freebsd.org
Cc: Joe Holden <joe@rewt.org.uk>
Subject: Re: ports/169613: security/botan: Fix ECDSA for dns/powerdns and
 maybe others
Date: Mon, 27 Aug 2012 23:43:12 -0400

 --e89a8fb1ef3cd9201404c84b3dbd
 Content-Type: text/plain; charset=ISO-8859-1
 
 Thank you for your submission and support of FreeBSD ports.
 
 Please review the patch you submitted.
 #1, you should never edit these lines: (generally, it means you did not
 submit your patch against current ports tree.
 please update your ports tree and try again
 
 -# ex:ts=8
 -# New ports collection makefile for:   botan
 -# Date created:                  Mar 3, 2001
 -# Whom:                            Ying-Chieh Liao <ijliao@FreeBSD.org>
 -#
 -# $FreeBSD: ports/security/botan/Makefile,v 1.56 2011/12/03 18:39:28
 scheidell Exp $
 -#
 
 #2, please run 'portlint -abmt' against your patched port.
 
 Currently, I get these warnings and errors: (fix as many as possible)
 
 
 portlint -abmt
 WARN: Makefile: [36]: whitespace before end of line.
 WARN: Makefile: [45]: use a tab (not space) after a variable name
 WARN: Makefile: [50]: use a tab (not space) after a variable name
 WARN: Makefile: [55]: use a tab (not space) after a variable name
 WARN: Makefile: [63]: use a tab (not space) after a variable name
 WARN: Makefile: [66]: use a tab (not space) after a variable name
 FATAL: Makefile: [37]: contiguous blank lines (> 1 lines) found.
 WARN: Makefile: [75]: use ${VARIABLE}, instead of $(VARIABLE).
 FATAL: Makefile: [44]: USE_OPENSSL is set after including bsd.port.pre.mk.
 WARN: Makefile: only one MASTER_SITE configured.  Consider adding
 additional mirrors.
 2 fatal errors and 8 warnings found.
 
 If you need assistance, please join and email freebsd-ports@ mailing list.
 
 once you fix this submission, you can upload an ascii/text attachment back
 to bug-followup (group reply to this email)
 
 If you think this will take more than two weeks, please request this pr to
 be closed and open a new one.
 
 thank you again
 -- 
 Michael Scheidell
 
 --e89a8fb1ef3cd9201404c84b3dbd
 Content-Type: text/html; charset=ISO-8859-1
 Content-Transfer-Encoding: quoted-printable
 
 Thank you for your submission and support of FreeBSD ports.<div><br></div><=
 div>Please review the patch you submitted.</div><div>#1, you should never e=
 dit these lines: (generally, it means you did not submit your patch against=
  current ports tree.</div>
 <div>please update your ports tree and try again</div><div>=A0</div><div><d=
 iv>-# ex:ts=3D8</div><div>-# New ports collection makefile for: =A0 botan</=
 div><div>-# Date created: =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0Mar 3, 2001</d=
 iv><div>-# Whom: =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0Yin=
 g-Chieh Liao &lt;ijliao@FreeBSD.org&gt;</div>
 <div>-#</div><div>-# $FreeBSD: ports/security/botan/Makefile,v 1.56 2011/12=
 /03 18:39:28 scheidell Exp $</div><div>-#</div></div><div><br></div><div>#2=
 , please run &#39;portlint -abmt&#39; against your patched port.</div><div>
 <br></div><div>Currently, I get these warnings and errors: (fix as many as =
 possible)</div><div><br></div><div><br></div><div><div>portlint -abmt</div>=
 <div>WARN: Makefile: [36]: whitespace before end of line.</div><div>WARN: M=
 akefile: [45]: use a tab (not space) after a variable name</div>
 <div>WARN: Makefile: [50]: use a tab (not space) after a variable name</div=
 ><div>WARN: Makefile: [55]: use a tab (not space) after a variable name</di=
 v><div>WARN: Makefile: [63]: use a tab (not space) after a variable name</d=
 iv>
 <div>WARN: Makefile: [66]: use a tab (not space) after a variable name</div=
 ><div>FATAL: Makefile: [37]: contiguous blank lines (&gt; 1 lines) found.</=
 div><div>WARN: Makefile: [75]: use ${VARIABLE}, instead of $(VARIABLE).</di=
 v>
 <div>FATAL: Makefile: [44]: USE_OPENSSL is set after including <a href=3D"h=
 ttp://bsd.port.pre.mk">bsd.port.pre.mk</a>.</div><div>WARN: Makefile: only =
 one MASTER_SITE configured. =A0Consider adding additional mirrors.</div><di=
 v>
 2 fatal errors and 8 warnings found.</div></div><div><br></div><div>If you =
 need assistance, please join and email freebsd-ports@ mailing list.</div><d=
 iv><br></div><div>once you fix this submission, you can upload an ascii/tex=
 t attachment back to bug-followup (group reply to this email)</div>
 <div><br></div><div>If you think this will take more than two weeks, please=
  request this pr to be closed and open a new one.</div><div><br></div><div>=
 thank you again</div><div>--=A0</div><div>Michael Scheidell</div><div><br>
 </div>
 
 --e89a8fb1ef3cd9201404c84b3dbd--

From: Lapo Luchini <lapo@lapo.it>
To: bug-followup@FreeBSD.org, Joe Holden <joe@rewt.org.uk>
Cc:  
Subject: Re: ports/169613: security/botan: Fix ECDSA for dns/powerdns and
 maybe others
Date: Tue, 28 Aug 2012 15:23:27 +0200

 I'm producing a new patch with the requests of this PR.
Responsible-Changed-From-To: scheidell->freebsd-ports-bugs 
Responsible-Changed-By: scheidell 
Responsible-Changed-When: Mon Oct 15 12:23:06 UTC 2012 
Responsible-Changed-Why:  
Submitter timeout.  Back to the pool. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=169613 
State-Changed-From-To: feedback->closed 
State-Changed-By: miwi 
State-Changed-When: Fri Feb 8 02:47:12 UTC 2013 
State-Changed-Why:  
feedback timeout. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=169613 
>Unformatted:
