Index: sqlmap/Makefile
===================================================================
RCS file: /home/pcvs/ports/security/sqlmap/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- sqlmap/Makefile	15 Mar 2010 21:28:07 -0000	1.3
+++ sqlmap/Makefile	18 Mar 2010 06:52:00 -0000
@@ -6,20 +6,34 @@
 #
 
 PORTNAME=	sqlmap
-PORTVERSION=	0.7
+PORTVERSION=	0.8
 CATEGORIES=	security python
 MASTER_SITES=	SF
 
 MAINTAINER=	niels@FreeBSD.org
 COMMENT=	An automatic SQL injection tool
 
-USE_PYTHON=	yes
-SQLMAP_DOCS=	AUTHORS COPYING ChangeLog README.html README.pdf THANKS
-SUB_FILES=	${PORTNAME}
+USE_PYTHON=	2.5+
+USE_BZIP2=	YES
+WRKSRC=		${WRKDIR}/${PORTNAME}
+SUB_FILES=	${PORTNAME}.sh
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} \
 		PATH=${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}
 
+OPTIONS=	MSF "Enable Metasploit Framework integration" off \
+		PSY "Enable Psyco optimizer (recommended)" on
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_MSF)
+RUN_DEPENDS+=	${LOCALBASE}/bin/msfcli:${PORTSDIR}/security/metasploit
+.endif
+.if defined(WITH_PSY)
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psyco/core.py:${PORTSDIR}/devel/py-psyco
+.endif
+
 post-patch:
+	(cd ${WRKSRC} && ${RM} -rf `${FIND} . -type d -name .svn`)
 	@${GREP} -lr '/usr/bin/env python' ${WRKSRC} | \
 		${XARGS} ${REINPLACE_CMD} -i "" \
 		-e "s!/usr/bin/env python!${PYTHON_CMD}!"
@@ -27,22 +41,25 @@
 do-build:
 	@${PYTHON_CMD} -m compileall ${WRKSRC}
 	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
-	${MKDIR} ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}
-.	for F in lib shell plugins txt udf xml
-		${MKDIR} ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/${F}
-		( cd ${WRKSRC}/${F} && ${COPYTREE_SHARE} . ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/${F} )
+	${MKDIR} ${WRKDIR}/build/extra/
+	${MV} ${WRKSRC}/doc/ ${WRKDIR}/build/
+.	for F in msfauxmod runcmd udfhack
+		${MV} ${WRKSRC}/extra/${F} ${WRKDIR}/build/extra/${F}
 .	endfor
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${PREFIX}/etc/${PORTNAME}.conf-dist
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.py ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/
 
-.if !defined(NOPORTDOCS)
+do-install:
+.	if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for F in ${SQLMAP_DOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${F} ${DOCSDIR}/
-.endfor
+.	for F in AUTHORS COPYING ChangeLog README.html README.pdf THANKS
+		${INSTALL_DATA} ${WRKDIR}/build/doc/${F} ${DOCSDIR}/
+.	endfor
 .endif
 
+	${MKDIR} ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/extra
+	( cd ${WRKDIR}/build/extra/ && ${COPYTREE_SHARE} . ${DATADIR} )
+	( cd ${WRKSRC} && ${COPYTREE_SHARE} . ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME} )
+
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${PREFIX}/etc/${PORTNAME}.conf-dist
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/bin/${PORTNAME}
+
 .include <bsd.port.mk>
Index: sqlmap/distinfo
===================================================================
RCS file: /home/pcvs/ports/security/sqlmap/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- sqlmap/distinfo	15 Mar 2010 21:28:07 -0000	1.2
+++ sqlmap/distinfo	18 Mar 2010 06:52:00 -0000
@@ -1,3 +1,3 @@
-MD5 (sqlmap-0.7.tar.gz) = edb1a625fb18b0b8aae2fc15a66a055e
-SHA256 (sqlmap-0.7.tar.gz) = 064615194602c26710703b3deed8a2816ed54cc60be8158ba43dfffed85c1e3b
-SIZE (sqlmap-0.7.tar.gz) = 1887120
+MD5 (sqlmap-0.8.tar.bz2) = 4290925414e56978bde2310cf12b8864
+SHA256 (sqlmap-0.8.tar.bz2) = a6fd38686ae4001e2e16cefa046bed955de0bd772b26968f2bdfea29761bb197
+SIZE (sqlmap-0.8.tar.bz2) = 3108618
Index: sqlmap/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/security/sqlmap/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- sqlmap/pkg-plist	15 Mar 2010 21:28:07 -0000	1.2
+++ sqlmap/pkg-plist	18 Mar 2010 06:52:00 -0000
@@ -1,274 +1,356 @@
+@comment $FreeBSD$
 bin/sqlmap
-etc/sqlmap.conf-dist
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/parenthesis.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/resume.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/__init__.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/google.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/__init__.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/google.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/parenthesis.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/resume.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/multipartpost.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/magic.py
+%%ETCDIR%%.conf-dist
+%%PYTHON_SITELIBDIR%%/sqlmap/extra/__init__.py
+%%PYTHON_SITELIBDIR%%/sqlmap/extra/__init__.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/extra/__init__.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/extra/cloak/README.txt
+%%PYTHON_SITELIBDIR%%/sqlmap/extra/cloak/__init__.py
+%%PYTHON_SITELIBDIR%%/sqlmap/extra/cloak/__init__.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/extra/cloak/__init__.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/extra/cloak/cloak.py
+%%PYTHON_SITELIBDIR%%/sqlmap/extra/cloak/cloak.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/extra/cloak/cloak.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/extra/dbgtool/README.txt
+%%PYTHON_SITELIBDIR%%/sqlmap/extra/dbgtool/dbgtool.py
+%%PYTHON_SITELIBDIR%%/sqlmap/extra/dbgtool/dbgtool.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/extra/dbgtool/dbgtool.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/__init__.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/__init__.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/__init__.pyo
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/__init__.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/tokenkidnapping/Churrasco.exe
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/upx/linux/upx
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/upx/macosx/upx
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/upx/windows/upx.exe
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/upx/doc/upx.html
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/upx/doc/README
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/upx/doc/LICENSE
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/__init__.pyc
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/magic.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/magic.pyc
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/magic.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/multipartpost.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/multipartpost.pyc
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/multipartpost.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/upx.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/xp_cmdshell.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/abstraction.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/__init__.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/dep.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/metasploit.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/udf.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/registry.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/__init__.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/abstraction.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/dep.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/metasploit.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/registry.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/udf.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/upx.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/xp_cmdshell.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/inband/__init__.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/inband/union/__init__.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/inband/union/test.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/inband/union/use.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/inband/union/__init__.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/inband/union/test.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/inband/union/use.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/inband/__init__.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/outband/__init__.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/outband/stacked.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/outband/__init__.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/outband/stacked.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/__init__.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/blind/inference.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/blind/__init__.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/blind/timebased.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/blind/__init__.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/blind/inference.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/blind/timebased.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/__init__.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/banner.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/configfile.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/__init__.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/headers.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/html.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/queriesfile.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/handler.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/cmdline.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/__init__.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/banner.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/cmdline.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/configfile.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/handler.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/headers.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/html.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/queriesfile.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/request/inject.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/request/comparison.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/request/basic.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/request/connect.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/request/__init__.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/request/proxy.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/request/__init__.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/request/basic.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/request/comparison.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/request/connect.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/request/inject.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/request/proxy.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/agent.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/unescaper.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/settings.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/dump.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/subprocessng.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/shell.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/session.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/exception.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/update.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/progress.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/datatype.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/upx/doc/LICENSE
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/upx/doc/README
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/upx/doc/upx.html
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/upx/linux/upx
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/upx/macosx/upx
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/upx/windows/README.txt
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/upx/windows/upx.exe_
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/__init__.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/__init__.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/__init__.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/action.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/action.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/action.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/checks.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/checks.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/checks.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/controller.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/controller.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/controller.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/handler.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/handler.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/handler.pyo
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/core/__init__.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/common.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/optiondict.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/data.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/target.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/option.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/readlineng.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/convert.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/__init__.pyc
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/core/__init__.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/agent.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/agent.pyc
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/core/agent.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/common.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/common.pyc
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/core/common.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/convert.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/convert.pyc
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/core/convert.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/data.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/data.pyc
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/core/data.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/datatype.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/datatype.pyc
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/core/datatype.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/dump.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/dump.pyc
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/core/dump.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/exception.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/exception.pyc
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/core/exception.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/option.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/option.pyc
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/core/option.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/optiondict.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/optiondict.pyc
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/core/optiondict.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/progress.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/progress.pyc
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/core/progress.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/readlineng.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/readlineng.pyc
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/core/readlineng.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/session.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/session.pyc
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/core/session.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/settings.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/settings.pyc
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/core/settings.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/shell.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/shell.pyc
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/core/shell.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/subprocessng.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/subprocessng.pyc
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/core/subprocessng.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/target.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/target.pyc
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/core/target.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/unescaper.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/unescaper.pyc
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/core/unescaper.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/update.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/update.pyc
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/core/update.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/__init__.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/action.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/controller.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/__init__.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/handler.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/checks.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/__init__.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/action.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/checks.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/controller.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/handler.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/shell/backdoor.php
-%%PYTHON_SITELIBDIR%%/sqlmap/shell/backdoor.asp
-%%PYTHON_SITELIBDIR%%/sqlmap/shell/uploader.php
-%%PYTHON_SITELIBDIR%%/sqlmap/shell/backdoor.aspx
-%%PYTHON_SITELIBDIR%%/sqlmap/shell/uploader.aspx.vb
-%%PYTHON_SITELIBDIR%%/sqlmap/shell/uploader.aspx
-%%PYTHON_SITELIBDIR%%/sqlmap/shell/backdoor.jsp
-%%PYTHON_SITELIBDIR%%/sqlmap/shell/uploader.asp
-%%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/mysql.py
-%%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/mssqlserver.py
-%%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/postgresql.py
-%%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/oracle.py
-%%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/__init__.py
-%%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/__init__.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/mssqlserver.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/mysql.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/oracle.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/postgresql.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/fingerprint.py
-%%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/misc.py
-%%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/enumeration.py
-%%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/__init__.py
-%%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/filesystem.py
-%%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/takeover.py
-%%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/__init__.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/enumeration.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/filesystem.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/fingerprint.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/misc.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/takeover.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/plugins/__init__.py
-%%PYTHON_SITELIBDIR%%/sqlmap/plugins/__init__.pyo
-%%PYTHON_SITELIBDIR%%/sqlmap/txt/user-agents.txt
-%%PYTHON_SITELIBDIR%%/sqlmap/udf/mysql/linux/lib_mysqludf_sys.so
-%%PYTHON_SITELIBDIR%%/sqlmap/udf/mysql/windows/lib_mysqludf_sys.dll
-%%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/linux/8.3/lib_postgresqludf_sys.so
-%%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/linux/8.2/lib_postgresqludf_sys.so
-%%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/windows/8.3/lib_postgresqludf_sys.dll
-%%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/windows/8.2/lib_postgresqludf_sys.dll
-%%PYTHON_SITELIBDIR%%/sqlmap/xml/queries.xml
-%%PYTHON_SITELIBDIR%%/sqlmap/xml/banner/server.xml
-%%PYTHON_SITELIBDIR%%/sqlmap/xml/banner/cookie.xml
-%%PYTHON_SITELIBDIR%%/sqlmap/xml/banner/x-aspnet-version.xml
-%%PYTHON_SITELIBDIR%%/sqlmap/xml/banner/oracle.xml
-%%PYTHON_SITELIBDIR%%/sqlmap/xml/banner/postgresql.xml
-%%PYTHON_SITELIBDIR%%/sqlmap/xml/banner/generic.xml
-%%PYTHON_SITELIBDIR%%/sqlmap/xml/banner/mysql.xml
-%%PYTHON_SITELIBDIR%%/sqlmap/xml/banner/servlet.xml
-%%PYTHON_SITELIBDIR%%/sqlmap/xml/banner/x-powered-by.xml
-%%PYTHON_SITELIBDIR%%/sqlmap/xml/banner/sharepoint.xml
-%%PYTHON_SITELIBDIR%%/sqlmap/xml/banner/mssql.xml
-%%PYTHON_SITELIBDIR%%/sqlmap/xml/errors.xml
-%%PYTHON_SITELIBDIR%%/sqlmap/sqlmap.py
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/__init__.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/google.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/parenthesis.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/resume.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/magic.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/multipartpost.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/__init__.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/abstraction.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/dep.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/metasploit.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/registry.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/udf.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/upx.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/xp_cmdshell.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/inband/union/__init__.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/inband/union/test.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/inband/union/use.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/inband/__init__.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/outband/__init__.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/outband/stacked.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/blind/__init__.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/blind/inference.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/blind/timebased.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/__init__.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/__init__.py
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/__init__.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/__init__.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/banner.py
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/banner.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/banner.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/cmdline.py
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/cmdline.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/cmdline.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/configfile.py
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/configfile.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/configfile.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/handler.py
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/handler.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/handler.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/headers.py
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/headers.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/headers.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/html.py
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/html.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/html.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/queriesfile.py
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/queriesfile.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/parse/queriesfile.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/request/__init__.py
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/request/__init__.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/request/__init__.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/request/basic.py
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/request/basic.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/request/basic.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/request/certhandler.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/request/certhandler.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/request/certhandler.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/request/comparison.py
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/request/comparison.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/request/comparison.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/request/connect.py
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/request/connect.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/request/connect.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/request/inject.py
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/request/inject.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/request/inject.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/request/proxy.py
 %%PYTHON_SITELIBDIR%%/sqlmap/lib/request/proxy.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/__init__.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/agent.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/common.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/convert.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/data.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/datatype.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/dump.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/exception.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/option.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/optiondict.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/progress.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/readlineng.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/session.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/settings.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/shell.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/subprocessng.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/target.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/unescaper.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/core/update.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/__init__.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/action.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/checks.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/controller.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/controller/handler.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/lib/__init__.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/request/proxy.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/__init__.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/__init__.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/__init__.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/abstraction.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/abstraction.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/abstraction.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/metasploit.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/metasploit.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/metasploit.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/registry.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/registry.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/registry.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/udf.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/udf.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/udf.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/upx.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/upx.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/upx.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/web.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/web.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/web.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/xp_cmdshell.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/xp_cmdshell.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover/xp_cmdshell.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/__init__.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/__init__.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/__init__.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/blind/__init__.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/blind/__init__.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/blind/__init__.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/blind/inference.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/blind/inference.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/blind/inference.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/blind/timebased.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/blind/timebased.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/blind/timebased.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/inband/__init__.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/inband/__init__.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/inband/__init__.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/inband/union/__init__.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/inband/union/__init__.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/inband/union/__init__.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/inband/union/test.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/inband/union/test.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/inband/union/test.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/inband/union/use.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/inband/union/use.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/inband/union/use.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/outband/__init__.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/outband/__init__.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/outband/__init__.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/outband/stacked.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/outband/stacked.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/outband/stacked.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/__init__.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/__init__.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/__init__.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/detection.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/detection.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/detection.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/getch.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/getch.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/getch.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/google.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/google.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/google.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/parenthesis.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/parenthesis.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/parenthesis.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/resume.py
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/resume.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/lib/utils/resume.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/plugins/__init__.py
+%%PYTHON_SITELIBDIR%%/sqlmap/plugins/__init__.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/plugins/__init__.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/__init__.py
 %%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/__init__.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/__init__.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/mssqlserver.py
 %%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/mssqlserver.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/mssqlserver.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/mysql.py
 %%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/mysql.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/mysql.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/oracle.py
 %%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/oracle.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/oracle.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/postgresql.py
 %%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/postgresql.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/postgresql.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/__init__.py
 %%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/__init__.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/__init__.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/enumeration.py
 %%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/enumeration.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/enumeration.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/filesystem.py
 %%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/filesystem.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/filesystem.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/fingerprint.py
 %%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/fingerprint.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/fingerprint.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/misc.py
 %%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/misc.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/misc.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/takeover.py
 %%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/takeover.pyc
-%%PYTHON_SITELIBDIR%%/sqlmap/plugins/__init__.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic/takeover.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/shell/README.txt
+%%PYTHON_SITELIBDIR%%/sqlmap/shell/backdoor.asp_
+%%PYTHON_SITELIBDIR%%/sqlmap/shell/backdoor.aspx_
+%%PYTHON_SITELIBDIR%%/sqlmap/shell/backdoor.jsp_
+%%PYTHON_SITELIBDIR%%/sqlmap/shell/backdoor.php_
+%%PYTHON_SITELIBDIR%%/sqlmap/shell/runcmd.exe_
+%%PYTHON_SITELIBDIR%%/sqlmap/shell/uploader.asp_
+%%PYTHON_SITELIBDIR%%/sqlmap/shell/uploader.aspx.vb_
+%%PYTHON_SITELIBDIR%%/sqlmap/shell/uploader.aspx_
+%%PYTHON_SITELIBDIR%%/sqlmap/shell/uploader.php_
+%%PYTHON_SITELIBDIR%%/sqlmap/sqlmap.conf
+%%PYTHON_SITELIBDIR%%/sqlmap/sqlmap.py
+%%PYTHON_SITELIBDIR%%/sqlmap/sqlmap.pyc
+%%PYTHON_SITELIBDIR%%/sqlmap/sqlmap.pyo
+%%PYTHON_SITELIBDIR%%/sqlmap/txt/user-agents.txt
+%%PYTHON_SITELIBDIR%%/sqlmap/udf/README.txt
+%%PYTHON_SITELIBDIR%%/sqlmap/udf/mysql/linux/lib_mysqludf_sys.so
+%%PYTHON_SITELIBDIR%%/sqlmap/udf/mysql/windows/lib_mysqludf_sys.dll
+%%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/linux/8.2/lib_postgresqludf_sys.so
+%%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/linux/8.3/lib_postgresqludf_sys.so
+%%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/linux/8.4/lib_postgresqludf_sys.so
+%%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/windows/8.2/lib_postgresqludf_sys.dll
+%%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/windows/8.3/lib_postgresqludf_sys.dll
+%%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/windows/8.4/lib_postgresqludf_sys.dll
+%%PYTHON_SITELIBDIR%%/sqlmap/xml/banner/cookie.xml
+%%PYTHON_SITELIBDIR%%/sqlmap/xml/banner/generic.xml
+%%PYTHON_SITELIBDIR%%/sqlmap/xml/banner/mssql.xml
+%%PYTHON_SITELIBDIR%%/sqlmap/xml/banner/mysql.xml
+%%PYTHON_SITELIBDIR%%/sqlmap/xml/banner/oracle.xml
+%%PYTHON_SITELIBDIR%%/sqlmap/xml/banner/postgresql.xml
+%%PYTHON_SITELIBDIR%%/sqlmap/xml/banner/server.xml
+%%PYTHON_SITELIBDIR%%/sqlmap/xml/banner/servlet.xml
+%%PYTHON_SITELIBDIR%%/sqlmap/xml/banner/sharepoint.xml
+%%PYTHON_SITELIBDIR%%/sqlmap/xml/banner/x-aspnet-version.xml
+%%PYTHON_SITELIBDIR%%/sqlmap/xml/banner/x-powered-by.xml
+%%PYTHON_SITELIBDIR%%/sqlmap/xml/detection.xml
+%%PYTHON_SITELIBDIR%%/sqlmap/xml/errors.xml
+%%PYTHON_SITELIBDIR%%/sqlmap/xml/queries.xml
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README.html
+%%PORTDOCS%%%%DOCSDIR%%/README.pdf
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%DATADIR%%/msfauxmod/README.txt
+%%DATADIR%%/msfauxmod/wmap_sqlmap.rb
+%%DATADIR%%/runcmd/README.txt
+%%DATADIR%%/runcmd/windows/README.txt
+%%DATADIR%%/runcmd/windows/runcmd.sln
+%%DATADIR%%/runcmd/windows/runcmd/runcmd.cpp
+%%DATADIR%%/runcmd/windows/runcmd/runcmd.vcproj
+%%DATADIR%%/runcmd/windows/runcmd/stdafx.cpp
+%%DATADIR%%/runcmd/windows/runcmd/stdafx.h
+%%DATADIR%%/udfhack/README.txt
+%%DATADIR%%/udfhack/linux/README.txt
+%%DATADIR%%/udfhack/linux/lib_mysqludf_sys/Makefile
+%%DATADIR%%/udfhack/linux/lib_mysqludf_sys/install.sh
+%%DATADIR%%/udfhack/linux/lib_mysqludf_sys/lib_mysqludf_sys.c
+%%DATADIR%%/udfhack/linux/lib_mysqludf_sys/lib_mysqludf_sys.sql
+%%DATADIR%%/udfhack/linux/lib_postgresqludf_sys/Makefile
+%%DATADIR%%/udfhack/linux/lib_postgresqludf_sys/install.sh
+%%DATADIR%%/udfhack/linux/lib_postgresqludf_sys/lib_postgresqludf_sys.c
+%%DATADIR%%/udfhack/linux/lib_postgresqludf_sys/lib_postgresqludf_sys.sql
+%%DATADIR%%/udfhack/windows/README.txt
+%%DATADIR%%/udfhack/windows/lib_mysqludf_sys/lib_mysqludf_sys.sln
+%%DATADIR%%/udfhack/windows/lib_mysqludf_sys/lib_mysqludf_sys/lib_mysqludf_sys.c
+%%DATADIR%%/udfhack/windows/lib_mysqludf_sys/lib_mysqludf_sys/lib_mysqludf_sys.vcproj
+%%DATADIR%%/udfhack/windows/lib_postgresqludf_sys/lib_postgresqludf_sys.sln
+%%DATADIR%%/udfhack/windows/lib_postgresqludf_sys/lib_postgresqludf_sys/lib_postgresqludf_sys.c
+%%DATADIR%%/udfhack/windows/lib_postgresqludf_sys/lib_postgresqludf_sys/lib_postgresqludf_sys.vcproj
+@dirrm %%DATADIR%%/udfhack/windows/lib_postgresqludf_sys/lib_postgresqludf_sys
+@dirrm %%DATADIR%%/udfhack/windows/lib_postgresqludf_sys
+@dirrm %%DATADIR%%/udfhack/windows/lib_mysqludf_sys/lib_mysqludf_sys
+@dirrm %%DATADIR%%/udfhack/windows/lib_mysqludf_sys
+@dirrm %%DATADIR%%/udfhack/windows
+@dirrm %%DATADIR%%/udfhack/linux/lib_postgresqludf_sys
+@dirrm %%DATADIR%%/udfhack/linux/lib_mysqludf_sys
+@dirrm %%DATADIR%%/udfhack/linux
+@dirrm %%DATADIR%%/udfhack
+@dirrm %%DATADIR%%/runcmd/windows/runcmd
+@dirrm %%DATADIR%%/runcmd/windows
+@dirrm %%DATADIR%%/runcmd
+@dirrm %%DATADIR%%/msfauxmod
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/sqlmap/xml/banner
 @dirrm %%PYTHON_SITELIBDIR%%/sqlmap/xml
+@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/windows/8.4
 @dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/windows/8.3
 @dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/windows/8.2
 @dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/windows
+@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/linux/8.4
 @dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/linux/8.3
 @dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/linux/8.2
 @dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/linux
@@ -298,14 +380,9 @@
 @dirrm %%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/upx/linux
 @dirrm %%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/upx/doc
 @dirrm %%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/upx
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/tokenkidnapping
 @dirrm %%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib
 @dirrm %%PYTHON_SITELIBDIR%%/sqlmap/lib
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
-%%PORTDOCS%%%%DOCSDIR%%/README.pdf
-%%PORTDOCS%%%%DOCSDIR%%/README.html
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/extra/dbgtool
+@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/extra/cloak
+@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/extra
+@dirrm %%PYTHON_SITELIBDIR%%/sqlmap
Index: sqlmap/files/sqlmap.in
===================================================================
RCS file: sqlmap/files/sqlmap.in
diff -N sqlmap/files/sqlmap.in
--- sqlmap/files/sqlmap.in	15 Mar 2010 21:28:07 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD: ports/security/sqlmap/files/sqlmap.in,v 1.1 2010/03/15 21:28:07 niels Exp $
-
-cd %%PATH%%
-exec %%PYTHON_CMD%% sqlmap.py $@
-
Index: sqlmap/files/sqlmap.sh.in
===================================================================
RCS file: sqlmap/files/sqlmap.sh.in
diff -N sqlmap/files/sqlmap.sh.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sqlmap/files/sqlmap.sh.in	18 Mar 2010 06:52:00 -0000
@@ -0,0 +1,6 @@
+#!/bin/sh
+# $FreeBSD: ports/security/sqlmap/files/sqlmap.in,v 1.1 2010/03/15 21:28:07 niels Exp $
+
+cd %%PATH%%
+exec %%PYTHON_CMD%% sqlmap.py "$@"
+