From owner-svn-ports-head@FreeBSD.ORG Wed Oct 3 20:01:10 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5BB7B106566B; Wed, 3 Oct 2012 20:01:10 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 46AAB8FC08; Wed, 3 Oct 2012 20:01:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q93K1AVb085284; Wed, 3 Oct 2012 20:01:10 GMT (envelope-from rm@svn.freebsd.org) Received: (from rm@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q93K1ADF085281; Wed, 3 Oct 2012 20:01:10 GMT (envelope-from rm@svn.freebsd.org) Message-Id: <201210032001.q93K1ADF085281@svn.freebsd.org> From: Ruslan Mahmatkhanov Date: Wed, 3 Oct 2012 20:01:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r305221 - in head/security/sqlmap: . files X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Oct 2012 20:01:10 -0000 Author: rm Date: Wed Oct 3 20:01:09 2012 New Revision: 305221 URL: http://svn.freebsd.org/changeset/ports/305221 Log: - fix runtime when devel/subversion and/or devel/pysvn is installed [1] - bump PORTREVISION As side effect, I completely disabled --update feature. It was done for number of reasons: - subversion relationship starts not only if --update feature is requested by user, but when pysvn or svn is available - we do not installing repository metadata from the source tarball (exactly this breaks the --update option, but it is broken anyway, see below) - aforementioned repository metadata is not compatible with svn 1.7, that is in ports now - development repository moved to github from subversion hosting anyway This is accomplished with replacing the call of getRevisionNumber() with static const, that represents the svn last revision from tarball. while here: - trim Makefile header - remove indefinite article from COMMENT - convert to optionsng Reported by: Fausto Marzi (by mail) [1] Added: head/security/sqlmap/files/patch-lib_core-settings.py (contents, props changed) Modified: head/security/sqlmap/Makefile Modified: head/security/sqlmap/Makefile ============================================================================== --- head/security/sqlmap/Makefile Wed Oct 3 19:51:47 2012 (r305220) +++ head/security/sqlmap/Makefile Wed Oct 3 20:01:09 2012 (r305221) @@ -1,18 +1,15 @@ -# New ports collection makefile for: sqlmap -# Date created: 2008-05-21 -# Whom: Tomoyuki Sakurai -# +# Created by: Tomoyuki Sakurai # $FreeBSD$ -# PORTNAME= sqlmap PORTVERSION= 0.9 +PORTREVISION= 1 CATEGORIES= security python MASTER_SITES= https://github.com/sqlmapproject/sqlmap/downloads/ \ SF MAINTAINER= rm@FreeBSD.org -COMMENT= An automatic SQL injection tool +COMMENT= Automatic SQL injection tool LICENSE= GPLv2 @@ -23,16 +20,18 @@ SUB_FILES= ${PORTNAME}.sh SUB_LIST= PYTHON_CMD=${PYTHON_CMD} \ PATH=${PYTHONPREFIX_SITELIBDIR}/${PORTNAME} -OPTIONS= MSF "Enable Metasploit Framework integration" off +OPTIONS_DEFINE= MSF +MSF_DESC= Enable Metasploit Framework integration .include -.if defined(WITH_MSF) +.if ${PORT_OPTIONS:MMSF} RUN_DEPENDS+= ${LOCALBASE}/bin/msfcli:${PORTSDIR}/security/metasploit .endif post-patch: (cd ${WRKSRC} && ${RM} -rf `${FIND} . -type d -name .svn`) + @${RM} -f ${WRKSRC}/lib/core/settings.py.orig @${GREP} -lr '/usr/bin/env python' ${WRKSRC} | \ ${XARGS} ${REINPLACE_CMD} -i "" \ -e "s!/usr/bin/env python!${PYTHON_CMD}!" @@ -47,7 +46,7 @@ do-build: .endfor do-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for F in AUTHORS ChangeLog README.html README.pdf THANKS ${INSTALL_DATA} ${WRKDIR}/build/doc/${F} ${DOCSDIR}/ Added: head/security/sqlmap/files/patch-lib_core-settings.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/sqlmap/files/patch-lib_core-settings.py Wed Oct 3 20:01:09 2012 (r305221) @@ -0,0 +1,11 @@ +--- ./lib/core/settings.py.orig 2011-04-11 04:23:42.000000000 +0400 ++++ ./lib/core/settings.py 2012-10-03 23:09:17.000000000 +0400 +@@ -18,7 +18,7 @@ + + # sqlmap version and site + VERSION = "0.9" +-REVISION = getRevisionNumber() ++REVISION = 3630 + VERSION_STRING = "sqlmap/%s" % VERSION + DESCRIPTION = "automatic SQL injection and database takeover tool" + SITE = "http://sqlmap.sourceforge.net"