From lx@redundancy.redundancy.org  Wed Jul 12 00:24:33 2006
Return-Path: <lx@redundancy.redundancy.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5497116A4DE
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 12 Jul 2006 00:24:33 +0000 (UTC)
	(envelope-from lx@redundancy.redundancy.org)
Received: from redundancy.redundancy.org (redundancy.redundancy.org [64.147.160.152])
	by mx1.FreeBSD.org (Postfix) with SMTP id 21B6D43D49
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 12 Jul 2006 00:24:33 +0000 (GMT)
	(envelope-from lx@redundancy.redundancy.org)
Received: (qmail 83178 invoked by uid 1001); 12 Jul 2006 00:24:56 -0000
Message-Id: <20060712002456.83177.qmail@redundancy.redundancy.org>
Date: 12 Jul 2006 00:24:56 -0000
From: David Thiel <lx@redundancy.redundancy.org>
Reply-To: David Thiel <lx@redundancy.redundancy.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Maintainer update: security/medusa. Mark broken on 64bit, OPTIONSify
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         100131
>Category:       ports
>Synopsis:       Maintainer update: security/medusa. Mark broken on 64bit, OPTIONSify
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    itetcu
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 12 00:30:13 GMT 2006
>Closed-Date:    Wed Jul 12 01:06:22 GMT 2006
>Last-Modified:  Wed Jul 12 01:06:22 GMT 2006
>Originator:     David Thiel
>Release:        FreeBSD 6.0-RELEASE i386
>Organization:
>Environment:
System: FreeBSD redundancy.redundancy.org 6.0-RELEASE FreeBSD 6.0-RELEASE #0: Thu Nov 3 09:36:13 UTC 2005 root@x64.samsco.home:/usr/obj/usr/src/sys/GENERIC i386


>Description:

Marking medusa BROKEN on amd64 and ia64. I have no access to machines on
which I can test fixes for those. While I'm at it, update to use OPTIONS
for Postgres and Subversion support, and enable all the optional modules.

>How-To-Repeat:
>Fix:

diff -ruN medusa.old/Makefile medusa/Makefile
--- medusa.old/Makefile	Tue Jul 11 16:06:09 2006
+++ medusa/Makefile	Tue Jul 11 17:23:03 2006
@@ -14,11 +14,31 @@
 MAINTAINER=	lx@redundancy.redundancy.org
 COMMENT=	A speedy, massively parallel, modular, login brute-forcer
 
-LIB_DEPENDS=	ssh2:${PORTSDIR}/security/libssh2
+OPTIONS=	SVN "Enable Subversion module" off \
+		POSTGRESQL "Enable PostgreSQL module" off
+
+LIB_DEPENDS+=	ssh2:${PORTSDIR}/security/libssh2
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	"--program-transform="
+CONFIGURE_ARGS+=	--enable-untested --program-transform=
 
 MAN1=		medusa.1
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "ia64"
+BROKEN=		Does not build on ia64
+.elif ${ARCH} == "amd64"
+BROKEN=		Does not build on amd64
+.endif
+
+.if defined(WITH_SVN)
+LIB_DEPENDS+=	svn_client-1:${PORTSDIR}/devel/subversion
+CFLAGS+=	-I${LOCALBASE}/include/subversion-1 -I${LOCALBASE}/include/apr-1
+.endif
+
+.if defined(WITH_POSTGRESQL)
+USE_PGSQL=	yes
+.endif
+
+.include <bsd.port.post.mk>
diff -ruN medusa.old/pkg-plist medusa/pkg-plist
--- medusa.old/pkg-plist	Tue Jul 11 16:06:09 2006
+++ medusa/pkg-plist	Tue Jul 11 17:10:24 2006
@@ -14,5 +14,14 @@
 lib/medusa/modules/rexec.mod
 lib/medusa/modules/wrapper.mod
 lib/medusa/modules/rlogin.mod
+lib/medusa/modules/ncp.mod
+lib/medusa/modules/vnc.mod
+lib/medusa/modules/postgres.mod
+lib/medusa/modules/cvs.mod
+lib/medusa/modules/vmauthd.mod
+lib/medusa/modules/snmp.mod
+lib/medusa/modules/smtp-vrfy.mod
+lib/medusa/modules/smtp-auth.mod
+lib/medusa/modules/svn.mod
 @dirrm lib/medusa/modules
 @dirrm lib/medusa
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->itetcu 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Jul 12 00:30:22 UTC 2006 
Responsible-Changed-Why:  
itetcu@ wants to have OPTIONS PRs 

http://www.freebsd.org/cgi/query-pr.cgi?pr=100131 
State-Changed-From-To: open->closed 
State-Changed-By: itetcu 
State-Changed-When: Wed Jul 12 01:06:20 UTC 2006 
State-Changed-Why:  
Committed. Thanks! Also marked broken on 4.x: 
http://sce-tindy.tecnik93.com/tb/errors/4-STABLE-i386-myPT/medusa-1.1.log 

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