- Update to 1.0-rc4

PR:		ports/152417
Submitted by:	Sofian Brabez <sbrabez AT gmail.com>

3 files changed, 294 insertions, 104 deletions

diff --git a/security/w3af/Makefile b/security/w3af/Makefile
index fd46225ea416..1742edaad214 100644
--- a/security/w3af/Makefile
+++ b/security/w3af/Makefile
@@ -6,22 +6,22 @@
 #
 
 PORTNAME=	w3af
-DISTVERSION=	1.0-rc3
+DISTVERSION=	1.0-rc4
 CATEGORIES=	security python www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/${PORTNAME}%20${DISTVERSION}%20%5bmoyogui%5d
+MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/${PORTNAME}%20${DISTVERSION}
 DISTNAME=	${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	sbrabez@gmail.com
 COMMENT=	Web Application Attack and Audit Framework
 
 LIB_DEPENDS=	tidy-0.99.0:${PORTSDIR}/www/py-utidy
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/BeautifulSoup.py:${PORTSDIR}/www/py-beautifulsoup \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.1:${PORTSDIR}/devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:${PORTSDIR}/devel/py-simplejson \
 		${PYTHON_SITELIBDIR}/OpenSSL/SSL.so:${PORTSDIR}/security/py-openssl \
 		${PYTHON_SITELIBDIR}/SOAPpy:${PORTSDIR}/net/py-soappy \
 		${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \
 		${PYTHON_SITELIBDIR}/fpconst.py:${PORTSDIR}/math/py-fpconst \
-		${PYTHON_SITELIBDIR}/json.py:${PORTSDIR}/devel/py-json-py \
 		${PYTHON_SITELIBDIR}/nltk/util.py:${PORTSDIR}/textproc/nltk \
 		${PYTHON_SITELIBDIR}/pyPdf/pdf.py:${PORTSDIR}/print/py-pdf \
 		${PYTHON_SITELIBDIR}/scapy/main.py:${PORTSDIR}/net/scapy \
@@ -51,11 +51,9 @@ PLIST_SUB+=	GUI="@comment "
 .endif
 
 do-patch:
-.for f in SOAPpy fpconst-0.7.2 jsonpy nltk nltk_contrib pyPdf scapy yaml
+.for f in SOAPpy fpconst-0.7.2 nltk nltk_contrib pyPdf scapy yaml
 	@${RM} -rf ${WRKSRC}/extlib/${f}
 .endfor
-	@${MV} ${WRKSRC}/extlib/pygoogle/build/lib/* ${WRKSRC}/extlib/pygoogle/
-	@${RM} -rf ${WRKSRC}/extlib/pygoogle/build
 	@${GREP} -lr '/usr/bin/python' ${WRKSRC} | \
 		${XARGS} ${REINPLACE_CMD} -i "" \
 			-E "s!/usr/bin/python2?!${PYTHON_CMD}!"
@@ -70,7 +68,7 @@ do-build:
 	@${MKDIR} ${WRKDIR}/build/${f}
 	@(cd ${WRKSRC}/${f}/ && ${COPYTREE_SHARE} \* ${WRKDIR}/build/${f})
 .endfor
-.for ext in cluster gtkcodebuffer ntlm pygoogle socksipy xdot
+.for ext in cluster gtkcodebuffer ntlm socksipy xdot
 	@${MKDIR} ${WRKDIR}/build/extlib/${ext}
 	@(cd ${WRKSRC}/extlib/${ext}/ && ${COPYTREE_SHARE} \* ${WRKDIR}/build/extlib/${ext})
 .endfor
diff --git a/security/w3af/distinfo b/security/w3af/distinfo
index 836f3db599d7..868ed5603672 100644
--- a/security/w3af/distinfo
+++ b/security/w3af/distinfo
@@ -1,3 +1,2 @@
-MD5 (w3af-1.0-rc3.tar.bz2) = 0a6e803636ab3b46ec950c07e6d4baf5
-SHA256 (w3af-1.0-rc3.tar.bz2) = 36bf724726ec152f125680597f7314a424717cf2f1aa464ca4f18b7c5361ac86
-SIZE (w3af-1.0-rc3.tar.bz2) = 19128303
+SHA256 (w3af-1.0-rc4.tar.bz2) = e36997741f1b457a6eefa1e1c8454ef87e0d9023592db876a6c300d82d468b24
+SIZE (w3af-1.0-rc4.tar.bz2) = 19197699
diff --git a/security/w3af/pkg-plist b/security/w3af/pkg-plist
index a7debd2c0988..8fe8e1698d50 100644
--- a/security/w3af/pkg-plist
+++ b/security/w3af/pkg-plist
@@ -1,6 +1,9 @@
 @comment $FreeBSD$
 bin/w3af_console
 %%GUI%%bin/w3af_gui
+%%GUI%%%%PYTHON_SITELIBDIR%%/w3af/w3af_gui.py
+%%GUI%%%%PYTHON_SITELIBDIR%%/w3af/w3af_gui.pyc
+%%GUI%%%%PYTHON_SITELIBDIR%%/w3af/w3af_gui.pyo
 %%PYTHON_SITELIBDIR%%/w3af/core/__init__.py
 %%PYTHON_SITELIBDIR%%/w3af/core/__init__.pyc
 %%PYTHON_SITELIBDIR%%/w3af/core/__init__.pyo
@@ -115,6 +118,9 @@ bin/w3af_console
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/intrusionTools/execMethodHelpers.py
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/intrusionTools/execMethodHelpers.pyc
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/intrusionTools/execMethodHelpers.pyo
+%%PYTHON_SITELIBDIR%%/w3af/core/controllers/intrusionTools/readMethodHelpers.py
+%%PYTHON_SITELIBDIR%%/w3af/core/controllers/intrusionTools/readMethodHelpers.pyc
+%%PYTHON_SITELIBDIR%%/w3af/core/controllers/intrusionTools/readMethodHelpers.pyo
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/misc/__init__.py
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/misc/__init__.pyc
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/misc/__init__.pyo
@@ -145,6 +151,9 @@ bin/w3af_console
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/misc/homeDir.py
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/misc/homeDir.pyc
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/misc/homeDir.pyo
+%%PYTHON_SITELIBDIR%%/w3af/core/controllers/misc/is_ip_address.py
+%%PYTHON_SITELIBDIR%%/w3af/core/controllers/misc/is_ip_address.pyc
+%%PYTHON_SITELIBDIR%%/w3af/core/controllers/misc/is_ip_address.pyo
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/misc/is_private_site.py
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/misc/is_private_site.pyc
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/misc/is_private_site.pyo
@@ -172,6 +181,9 @@ bin/w3af_console
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/misc/timeout_function.py
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/misc/timeout_function.pyc
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/misc/timeout_function.pyo
+%%PYTHON_SITELIBDIR%%/w3af/core/controllers/misc/upper_bounds.py
+%%PYTHON_SITELIBDIR%%/w3af/core/controllers/misc/upper_bounds.pyc
+%%PYTHON_SITELIBDIR%%/w3af/core/controllers/misc/upper_bounds.pyo
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/misc/w3afTest.py
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/misc/w3afTest.pyc
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/misc/w3afTest.pyo
@@ -244,9 +256,6 @@ bin/w3af_console
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/vdaemon/elf.py
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/vdaemon/elf.pyc
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/vdaemon/elf.pyo
-%%PYTHON_SITELIBDIR%%/w3af/core/controllers/vdaemon/install.py
-%%PYTHON_SITELIBDIR%%/w3af/core/controllers/vdaemon/install.pyc
-%%PYTHON_SITELIBDIR%%/w3af/core/controllers/vdaemon/install.pyo
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/vdaemon/lnxVd.py
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/vdaemon/lnxVd.pyc
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/vdaemon/lnxVd.pyo
@@ -262,7 +271,6 @@ bin/w3af_console
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/vdaemon/vdaemon.py
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/vdaemon/vdaemon.pyc
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/vdaemon/vdaemon.pyo
-%%PYTHON_SITELIBDIR%%/w3af/core/controllers/vdaemon/w3af_vdaemon.rb
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/vdaemon/winVd.py
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/vdaemon/winVd.pyc
 %%PYTHON_SITELIBDIR%%/w3af/core/controllers/vdaemon/winVd.pyo
@@ -446,6 +454,9 @@ bin/w3af_console
 %%PYTHON_SITELIBDIR%%/w3af/core/data/kb/config.py
 %%PYTHON_SITELIBDIR%%/w3af/core/data/kb/config.pyc
 %%PYTHON_SITELIBDIR%%/w3af/core/data/kb/config.pyo
+%%PYTHON_SITELIBDIR%%/w3af/core/data/kb/exec_shell.py
+%%PYTHON_SITELIBDIR%%/w3af/core/data/kb/exec_shell.pyc
+%%PYTHON_SITELIBDIR%%/w3af/core/data/kb/exec_shell.pyo
 %%PYTHON_SITELIBDIR%%/w3af/core/data/kb/exploitResult.py
 %%PYTHON_SITELIBDIR%%/w3af/core/data/kb/exploitResult.pyc
 %%PYTHON_SITELIBDIR%%/w3af/core/data/kb/exploitResult.pyo
@@ -458,6 +469,9 @@ bin/w3af_console
 %%PYTHON_SITELIBDIR%%/w3af/core/data/kb/proxy.py
 %%PYTHON_SITELIBDIR%%/w3af/core/data/kb/proxy.pyc
 %%PYTHON_SITELIBDIR%%/w3af/core/data/kb/proxy.pyo
+%%PYTHON_SITELIBDIR%%/w3af/core/data/kb/read_shell.py
+%%PYTHON_SITELIBDIR%%/w3af/core/data/kb/read_shell.pyc
+%%PYTHON_SITELIBDIR%%/w3af/core/data/kb/read_shell.pyo
 %%PYTHON_SITELIBDIR%%/w3af/core/data/kb/shell.py
 %%PYTHON_SITELIBDIR%%/w3af/core/data/kb/shell.pyc
 %%PYTHON_SITELIBDIR%%/w3af/core/data/kb/shell.pyo
@@ -566,12 +580,21 @@ bin/w3af_console
 %%PYTHON_SITELIBDIR%%/w3af/core/data/searchEngines/searchEngine.py
 %%PYTHON_SITELIBDIR%%/w3af/core/data/searchEngines/searchEngine.pyc
 %%PYTHON_SITELIBDIR%%/w3af/core/data/searchEngines/searchEngine.pyo
+%%PYTHON_SITELIBDIR%%/w3af/core/data/searchEngines/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/w3af/core/data/searchEngines/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/w3af/core/data/searchEngines/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/w3af/core/data/searchEngines/tests/test_googleSearchEngine.py
+%%PYTHON_SITELIBDIR%%/w3af/core/data/searchEngines/tests/test_googleSearchEngine.pyc
+%%PYTHON_SITELIBDIR%%/w3af/core/data/searchEngines/tests/test_googleSearchEngine.pyo
 %%PYTHON_SITELIBDIR%%/w3af/core/data/searchEngines/yahooSiteExplorer.py
 %%PYTHON_SITELIBDIR%%/w3af/core/data/searchEngines/yahooSiteExplorer.pyc
 %%PYTHON_SITELIBDIR%%/w3af/core/data/searchEngines/yahooSiteExplorer.pyo
 %%PYTHON_SITELIBDIR%%/w3af/core/data/timeAnalysis.py
 %%PYTHON_SITELIBDIR%%/w3af/core/data/timeAnalysis.pyc
 %%PYTHON_SITELIBDIR%%/w3af/core/data/timeAnalysis.pyo
+%%PYTHON_SITELIBDIR%%/w3af/core/data/url/HTTPRequest.py
+%%PYTHON_SITELIBDIR%%/w3af/core/data/url/HTTPRequest.pyc
+%%PYTHON_SITELIBDIR%%/w3af/core/data/url/HTTPRequest.pyo
 %%PYTHON_SITELIBDIR%%/w3af/core/data/url/__init__.py
 %%PYTHON_SITELIBDIR%%/w3af/core/data/url/__init__.pyc
 %%PYTHON_SITELIBDIR%%/w3af/core/data/url/__init__.pyo
@@ -731,6 +754,7 @@ bin/w3af_console
 %%PYTHON_SITELIBDIR%%/w3af/core/ui/gtkUi/craftedRequests.pyo
 %%PYTHON_SITELIBDIR%%/w3af/core/ui/gtkUi/data/cluster_data.png
 %%PYTHON_SITELIBDIR%%/w3af/core/ui/gtkUi/data/information.png
+%%PYTHON_SITELIBDIR%%/w3af/core/ui/gtkUi/data/missing-image.png
 %%PYTHON_SITELIBDIR%%/w3af/core/ui/gtkUi/data/request-body.png
 %%PYTHON_SITELIBDIR%%/w3af/core/ui/gtkUi/data/request-headers.png
 %%PYTHON_SITELIBDIR%%/w3af/core/ui/gtkUi/data/response-body.png
@@ -824,17 +848,17 @@ bin/w3af_console
 %%PYTHON_SITELIBDIR%%/w3af/core/ui/gtkUi/scanrun.py
 %%PYTHON_SITELIBDIR%%/w3af/core/ui/gtkUi/scanrun.pyc
 %%PYTHON_SITELIBDIR%%/w3af/core/ui/gtkUi/scanrun.pyo
+%%PYTHON_SITELIBDIR%%/w3af/core/ui/gtkUi/speed/arrow.png
+%%PYTHON_SITELIBDIR%%/w3af/core/ui/gtkUi/speed/speedometer.png
+%%PYTHON_SITELIBDIR%%/w3af/core/ui/gtkUi/speed/speedometer.py
+%%PYTHON_SITELIBDIR%%/w3af/core/ui/gtkUi/speed/speedometer.pyc
+%%PYTHON_SITELIBDIR%%/w3af/core/ui/gtkUi/speed/speedometer.pyo
 %%PYTHON_SITELIBDIR%%/w3af/core/ui/gtkUi/splash.py
 %%PYTHON_SITELIBDIR%%/w3af/core/ui/gtkUi/splash.pyc
 %%PYTHON_SITELIBDIR%%/w3af/core/ui/gtkUi/splash.pyo
 %%PYTHON_SITELIBDIR%%/w3af/core/ui/gtkUi/wizard.py
 %%PYTHON_SITELIBDIR%%/w3af/core/ui/gtkUi/wizard.pyc
 %%PYTHON_SITELIBDIR%%/w3af/core/ui/gtkUi/wizard.pyo
-%%PYTHON_SITELIBDIR%%/w3af/core/ui/gtkUi/speed/arrow.png
-%%PYTHON_SITELIBDIR%%/w3af/core/ui/gtkUi/speed/speedometer.png
-%%PYTHON_SITELIBDIR%%/w3af/core/ui/gtkUi/speed/speedometer.py
-%%PYTHON_SITELIBDIR%%/w3af/core/ui/gtkUi/speed/speedometer.pyc
-%%PYTHON_SITELIBDIR%%/w3af/core/ui/gtkUi/speed/speedometer.pyo
 %%PYTHON_SITELIBDIR%%/w3af/core/ui/userInterface.dtd
 %%PYTHON_SITELIBDIR%%/w3af/extlib/__init__.py
 %%PYTHON_SITELIBDIR%%/w3af/extlib/__init__.pyc
@@ -859,12 +883,12 @@ bin/w3af_console
 %%PYTHON_SITELIBDIR%%/w3af/extlib/cluster/setup.py
 %%PYTHON_SITELIBDIR%%/w3af/extlib/cluster/setup.pyc
 %%PYTHON_SITELIBDIR%%/w3af/extlib/cluster/setup.pyo
-%%PYTHON_SITELIBDIR%%/w3af/extlib/gtkcodebuffer/__init__.pyo
-%%PYTHON_SITELIBDIR%%/w3af/extlib/gtkcodebuffer/__init__.pyc
 %%PYTHON_SITELIBDIR%%/w3af/extlib/gtkcodebuffer/__init__.py
-%%PYTHON_SITELIBDIR%%/w3af/extlib/gtkcodebuffer/gtkcodebuffer.pyo
-%%PYTHON_SITELIBDIR%%/w3af/extlib/gtkcodebuffer/gtkcodebuffer.pyc
+%%PYTHON_SITELIBDIR%%/w3af/extlib/gtkcodebuffer/__init__.pyc
+%%PYTHON_SITELIBDIR%%/w3af/extlib/gtkcodebuffer/__init__.pyo
 %%PYTHON_SITELIBDIR%%/w3af/extlib/gtkcodebuffer/gtkcodebuffer.py
+%%PYTHON_SITELIBDIR%%/w3af/extlib/gtkcodebuffer/gtkcodebuffer.pyc
+%%PYTHON_SITELIBDIR%%/w3af/extlib/gtkcodebuffer/gtkcodebuffer.pyo
 %%PYTHON_SITELIBDIR%%/w3af/extlib/gtkcodebuffer/syntax/python.xml
 %%PYTHON_SITELIBDIR%%/w3af/extlib/gtkcodebuffer/syntax/xml.xml
 %%PYTHON_SITELIBDIR%%/w3af/extlib/ntlm/U32.py
@@ -885,60 +909,6 @@ bin/w3af_console
 %%PYTHON_SITELIBDIR%%/w3af/extlib/ntlm/ntlm.py
 %%PYTHON_SITELIBDIR%%/w3af/extlib/ntlm/ntlm.pyc
 %%PYTHON_SITELIBDIR%%/w3af/extlib/ntlm/ntlm.pyo
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/GoogleSOAPFacade.py
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/GoogleSOAPFacade.pyc
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/GoogleSOAPFacade.pyo
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/SOAP.py
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/SOAP.pyc
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/SOAP.pyo
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/__init__.py
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/__init__.pyc
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/__init__.pyo
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/epydoc.css
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/index.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/private/epydoc.css
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/private/exceptions.Exception-class.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/private/frames.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/private/google-module.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/private/google.NoLicenseKey-class.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/private/google.SearchResult-class.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/private/google.SearchResultsMetaData-class.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/private/google.SearchReturnValue-class.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/private/google._OutputFormatter-class.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/private/google._SearchBase-class.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/private/google._TextOutputFormatter-class.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/private/help.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/private/index.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/private/indices.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/private/toc-everything.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/private/toc-google-module.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/private/toc.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/private/trees.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/public/epydoc.css
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/public/exceptions.Exception-class.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/public/frames.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/public/google-module.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/public/google.NoLicenseKey-class.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/public/google.SearchResult-class.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/public/google.SearchResultsMetaData-class.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/public/google.SearchReturnValue-class.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/public/help.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/public/index.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/public/indices.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/public/toc-everything.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/public/toc-google-module.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/public/toc.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/public/trees.html
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/google.py
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/google.pyc
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/google.pyo
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/googletest.py
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/googletest.pyc
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/googletest.pyo
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/readme.txt
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/setup.py
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/setup.pyc
-%%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/setup.pyo
 %%PYTHON_SITELIBDIR%%/w3af/extlib/socksipy/__init__.py
 %%PYTHON_SITELIBDIR%%/w3af/extlib/socksipy/__init__.pyc
 %%PYTHON_SITELIBDIR%%/w3af/extlib/socksipy/__init__.pyo
@@ -1004,10 +974,218 @@ bin/w3af_console
 %%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/__init__.py
 %%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/__init__.pyc
 %%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/__init__.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/base_payload.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/base_payload.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/base_payload.pyo
 %%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/code/code.php
-%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads.py
-%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads.pyc
-%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/code/netcat
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/decorators/__init__.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/decorators/__init__.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/decorators/__init__.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/decorators/download_decorator.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/decorators/download_decorator.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/decorators/download_decorator.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/decorators/exec_decorator.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/decorators/exec_decorator.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/decorators/exec_decorator.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/decorators/read_decorator.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/decorators/read_decorator.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/decorators/read_decorator.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/misc/__init__.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/misc/__init__.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/misc/__init__.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/misc/file_crawler.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/misc/file_crawler.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/misc/file_crawler.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/misc/get_files.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/misc/get_files.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/misc/get_files.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payload_handler.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payload_handler.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payload_handler.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/__init__.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/__init__.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/__init__.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/apache_config_directory.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/apache_config_directory.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/apache_config_directory.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/apache_config_files.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/apache_config_files.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/apache_config_files.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/apache_htaccess.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/apache_htaccess.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/apache_htaccess.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/apache_modsecurity.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/apache_modsecurity.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/apache_modsecurity.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/apache_root_directory.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/apache_root_directory.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/apache_root_directory.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/apache_run_group.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/apache_run_group.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/apache_run_group.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/apache_run_user.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/apache_run_user.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/apache_run_user.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/apache_ssl.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/apache_ssl.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/apache_ssl.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/apache_version.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/apache_version.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/apache_version.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/arp_cache.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/arp_cache.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/arp_cache.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/cpu_info.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/cpu_info.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/cpu_info.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/current_user.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/current_user.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/current_user.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/dhcp_config_files.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/dhcp_config_files.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/dhcp_config_files.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/dns_config_files.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/dns_config_files.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/dns_config_files.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/domainname.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/domainname.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/domainname.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/filesystem.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/filesystem.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/filesystem.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/firefox_stealer.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/firefox_stealer.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/firefox_stealer.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/ftp_config_files.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/ftp_config_files.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/ftp_config_files.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/gcc_version.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/gcc_version.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/gcc_version.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/get_hashes.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/get_hashes.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/get_hashes.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/get_source_code.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/get_source_code.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/get_source_code.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/hostname.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/hostname.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/hostname.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/hosts.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/hosts.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/hosts.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/iis_root_directory.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/iis_root_directory.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/iis_root_directory.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/interesting_files.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/interesting_files.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/interesting_files.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/kerberos_config_files.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/kerberos_config_files.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/kerberos_config_files.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/kernel_version.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/kernel_version.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/kernel_version.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/ldap_config_files.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/ldap_config_files.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/ldap_config_files.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/list_kernel_modules.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/list_kernel_modules.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/list_kernel_modules.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/list_processes.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/list_processes.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/list_processes.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/log_reader.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/log_reader.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/log_reader.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/mail_config_files.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/mail_config_files.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/mail_config_files.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/metasploit.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/metasploit.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/metasploit.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/msf_linux_x86_meterpreter_reverse.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/msf_linux_x86_meterpreter_reverse.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/msf_linux_x86_meterpreter_reverse.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/msf_windows_meterpreter_reverse_tcp.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/msf_windows_meterpreter_reverse_tcp.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/msf_windows_meterpreter_reverse_tcp.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/msf_windows_vncinject_reverse.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/msf_windows_vncinject_reverse.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/msf_windows_vncinject_reverse.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/mysql_config.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/mysql_config.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/mysql_config.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/mysql_config_directory.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/mysql_config_directory.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/mysql_config_directory.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/netcat_installed.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/netcat_installed.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/netcat_installed.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/os_fingerprint.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/os_fingerprint.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/os_fingerprint.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/pixy.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/pixy.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/pixy.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/portscan.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/portscan.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/portscan.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/read_mail.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/read_mail.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/read_mail.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/root_login_allowed.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/root_login_allowed.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/root_login_allowed.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/rootkit_hunter.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/rootkit_hunter.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/rootkit_hunter.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/route.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/route.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/route.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/running_honeypot.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/running_honeypot.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/running_honeypot.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/running_vm.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/running_vm.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/running_vm.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/smb_config_files.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/smb_config_files.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/smb_config_files.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/spider.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/spider.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/spider.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/ssh_config_files.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/ssh_config_files.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/ssh_config_files.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/ssh_version.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/ssh_version.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/ssh_version.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/svn_config_files.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/svn_config_files.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/svn_config_files.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/tcp.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/tcp.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/tcp.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/udp.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/udp.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/udp.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/uptime.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/uptime.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/uptime.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/users.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/users.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/users.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/users_config_files.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/users_config_files.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/users_config_files.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/w3af_agent.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/w3af_agent.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads/w3af_agent.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/shell_handler.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/shell_handler.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/shell_handler.pyo
 %%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/webshell/webshell.asp
 %%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/webshell/webshell.aspx
 %%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/webshell/webshell.jsp
@@ -1148,6 +1326,10 @@ bin/w3af_console
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/bing_spider.py
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/bing_spider.pyc
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/bing_spider.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/content_negotiation.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/content_negotiation.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/content_negotiation.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/content_negotiation/common_filenames.db
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/detectReverseProxy.py
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/detectReverseProxy.pyc
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/detectReverseProxy.pyo
@@ -1157,6 +1339,10 @@ bin/w3af_console
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/digitSum.py
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/digitSum.pyc
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/digitSum.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/dir_bruter.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/dir_bruter.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/dir_bruter.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/dir_bruter/common_dirs_small.db
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/dnsWildcard.py
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/dnsWildcard.pyc
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/dnsWildcard.pyo
@@ -1166,12 +1352,19 @@ bin/w3af_console
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/dotNetErrors.py
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/dotNetErrors.pyc
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/dotNetErrors.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/favicon/favicon-md5
+%%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/favicon_identification.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/favicon_identification.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/favicon_identification.pyo
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/findBackdoor.py
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/findBackdoor.pyc
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/findBackdoor.pyo
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/findCaptchas.py
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/findCaptchas.pyc
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/findCaptchas.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/findGit.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/findGit.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/findGit.pyo
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/findvhost.py
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/findvhost.pyc
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/findvhost.pyo
@@ -1209,18 +1402,6 @@ bin/w3af_console
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/importResults.py
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/importResults.pyc
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/importResults.pyo
-%%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/content_negotiation/common_filenames.db
-%%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/content_negotiation.py
-%%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/content_negotiation.pyc
-%%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/content_negotiation.pyo
-%%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/dir_bruter/common_dirs_small.db
-%%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/dir_bruter.py
-%%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/dir_bruter.pyo
-%%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/dir_bruter.pyc
-%%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/favicon/favicon-md5
-%%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/favicon_identification.py
-%%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/favicon_identification.pyc
-%%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/favicon_identification.pyo
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/oHalberd/AUTHORS
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/oHalberd/ChangeLog
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/oHalberd/GNUmakefile
@@ -1540,10 +1721,10 @@ bin/w3af_console
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/pykto/scan_database.db
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/pykto/versions.txt
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/pykto/w3af_scan_database.db
-%%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/ria_enumerator/common_filenames.db
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/ria_enumerator.py
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/ria_enumerator.pyc
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/ria_enumerator.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/ria_enumerator/common_filenames.db
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/robotsReader.py
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/robotsReader.pyc
 %%PYTHON_SITELIBDIR%%/w3af/plugins/discovery/robotsReader.pyo
@@ -1673,6 +1854,9 @@ bin/w3af_console
 %%PYTHON_SITELIBDIR%%/w3af/plugins/grep/findComments.py
 %%PYTHON_SITELIBDIR%%/w3af/plugins/grep/findComments.pyc
 %%PYTHON_SITELIBDIR%%/w3af/plugins/grep/findComments.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/grep/formAutocomplete.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/grep/formAutocomplete.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/grep/formAutocomplete.pyo
 %%PYTHON_SITELIBDIR%%/w3af/plugins/grep/getMails.py
 %%PYTHON_SITELIBDIR%%/w3af/plugins/grep/getMails.pyc
 %%PYTHON_SITELIBDIR%%/w3af/plugins/grep/getMails.pyo
@@ -1739,6 +1923,11 @@ bin/w3af_console
 %%PYTHON_SITELIBDIR%%/w3af/plugins/grep/svnUsers.py
 %%PYTHON_SITELIBDIR%%/w3af/plugins/grep/svnUsers.pyc
 %%PYTHON_SITELIBDIR%%/w3af/plugins/grep/svnUsers.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/grep/user_defined_regex.py
+%%PYTHON_SITELIBDIR%%/w3af/plugins/grep/user_defined_regex.pyc
+%%PYTHON_SITELIBDIR%%/w3af/plugins/grep/user_defined_regex.pyo
+%%PYTHON_SITELIBDIR%%/w3af/plugins/grep/user_defined_regex/README.txt
+%%PYTHON_SITELIBDIR%%/w3af/plugins/grep/user_defined_regex/exampleRegexesErrors.txt
 %%PYTHON_SITELIBDIR%%/w3af/plugins/grep/wsdlGreper.py
 %%PYTHON_SITELIBDIR%%/w3af/plugins/grep/wsdlGreper.pyc
 %%PYTHON_SITELIBDIR%%/w3af/plugins/grep/wsdlGreper.pyo
@@ -1847,7 +2036,7 @@ bin/w3af_console
 %%PYTHON_SITELIBDIR%%/w3af/readme/EN/w3af-users-guide.html
 %%PYTHON_SITELIBDIR%%/w3af/readme/EN/w3af-users-guide.odt
 %%PYTHON_SITELIBDIR%%/w3af/readme/EN/w3af-users-guide.pdf
-%%PYTHON_SITELIBDIR%%/w3af/readme/EN/w3afUsersGuide_html_m51b850c5.png
+%%PYTHON_SITELIBDIR%%/w3af/readme/EN/w3af-users-guide_html_m51b850c5.png
 %%PYTHON_SITELIBDIR%%/w3af/readme/FR/README.FIRST
 %%PYTHON_SITELIBDIR%%/w3af/readme/FR/w3af-users-guide.html
 %%PYTHON_SITELIBDIR%%/w3af/readme/FR/w3af-users-guide.odt
@@ -1856,6 +2045,7 @@ bin/w3af_console
 %%PYTHON_SITELIBDIR%%/w3af/readme/GPL
 %%PYTHON_SITELIBDIR%%/w3af/readme/INSTALL
 %%PYTHON_SITELIBDIR%%/w3af/readme/README
+%%PYTHON_SITELIBDIR%%/w3af/readme/RU/w3afUsersGuide_ru.odt
 %%PYTHON_SITELIBDIR%%/w3af/readme/TODO
 %%PYTHON_SITELIBDIR%%/w3af/scripts/input-test.csv
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-404pageTest.w3af
@@ -1863,6 +2053,7 @@ bin/w3af_console
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-MX_injection.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-SQLi-falsepositive.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-afd.w3af
+%%PYTHON_SITELIBDIR%%/w3af/scripts/script-ajax.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-all.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-allowed_methods.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-allowed_methods_dav.w3af
@@ -1919,13 +2110,14 @@ bin/w3af_console
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-find_comments.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-find_vhost-2.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-find_vhost.w3af
-%%PYTHON_SITELIBDIR%%/w3af/scripts/script-finger_Bing.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-fingerGoogle-fast.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-fingerGoogle.w3af
+%%PYTHON_SITELIBDIR%%/w3af/scripts/script-finger_Bing.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-finger_PKS.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-fingerprint_waf.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-formLoginBrute-threads.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-formLoginBrute.w3af
+%%PYTHON_SITELIBDIR%%/w3af/scripts/script-form_automplete.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-form_login_password_only.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-format_string.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-frontpage_version.w3af
@@ -1962,6 +2154,8 @@ bin/w3af_console
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-localProxy.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-local_file_include-false_positive.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-local_file_include-list.w3af
+%%PYTHON_SITELIBDIR%%/w3af/scripts/script-local_file_include-payload-debug.w3af
+%%PYTHON_SITELIBDIR%%/w3af/scripts/script-local_file_include-payload.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-local_file_include.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-mailer.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-mangle_request.w3af
@@ -2061,13 +2255,13 @@ bin/w3af_console
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-xsrf.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-xssBeEF_reflected_xss.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-xssBeEF_stored_xss.w3af
-%%PYTHON_SITELIBDIR%%/w3af/scripts/script-xssed_dot_com.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-xss_forms.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-xss_ireplace_script.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-xss_no_quotes.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-xss_replace_javascript.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-xss_replace_script.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-xss_with_threading.w3af
+%%PYTHON_SITELIBDIR%%/w3af/scripts/script-xssed_dot_com.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-xst.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-yahooSiteExplorer.w3af
 %%PYTHON_SITELIBDIR%%/w3af/scripts/script-zone_h.w3af
@@ -2081,11 +2275,9 @@ bin/w3af_console
 %%PYTHON_SITELIBDIR%%/w3af/w3af_console.py
 %%PYTHON_SITELIBDIR%%/w3af/w3af_console.pyc
 %%PYTHON_SITELIBDIR%%/w3af/w3af_console.pyo
-%%GUI%%%%PYTHON_SITELIBDIR%%/w3af/w3af_gui.py
-%%GUI%%%%PYTHON_SITELIBDIR%%/w3af/w3af_gui.pyc
-%%GUI%%%%PYTHON_SITELIBDIR%%/w3af/w3af_gui.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/w3af/tools
 @dirrm %%PYTHON_SITELIBDIR%%/w3af/scripts
+@dirrm %%PYTHON_SITELIBDIR%%/w3af/readme/RU
 @dirrm %%PYTHON_SITELIBDIR%%/w3af/readme/FR
 @dirrm %%PYTHON_SITELIBDIR%%/w3af/readme/EN/gtkui-graphs
 @dirrm %%PYTHON_SITELIBDIR%%/w3af/readme/EN/gtkUiHTML
@@ -2095,6 +2287,7 @@ bin/w3af_console
 @dirrm %%PYTHON_SITELIBDIR%%/w3af/plugins/output/htmlFile
 @dirrm %%PYTHON_SITELIBDIR%%/w3af/plugins/output
 @dirrm %%PYTHON_SITELIBDIR%%/w3af/plugins/mangle
+@dirrm %%PYTHON_SITELIBDIR%%/w3af/plugins/grep/user_defined_regex
 @dirrm %%PYTHON_SITELIBDIR%%/w3af/plugins/grep/passwordProfilingPlugins
 @dirrm %%PYTHON_SITELIBDIR%%/w3af/plugins/grep
 @dirrm %%PYTHON_SITELIBDIR%%/w3af/plugins/evasion
@@ -2125,6 +2318,9 @@ bin/w3af_console
 @dirrm %%PYTHON_SITELIBDIR%%/w3af/plugins/audit
 @dirrm %%PYTHON_SITELIBDIR%%/w3af/plugins/attack/rfiProxy
 @dirrm %%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/webshell
+@dirrm %%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/payloads
+@dirrm %%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/misc
+@dirrm %%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/decorators
 @dirrm %%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads/code
 @dirrm %%PYTHON_SITELIBDIR%%/w3af/plugins/attack/payloads
 @dirrm %%PYTHON_SITELIBDIR%%/w3af/plugins/attack/db
@@ -2137,10 +2333,6 @@ bin/w3af_console
 @dirrm %%PYTHON_SITELIBDIR%%/w3af/locales
 @dirrm %%PYTHON_SITELIBDIR%%/w3af/extlib/xdot
 @dirrm %%PYTHON_SITELIBDIR%%/w3af/extlib/socksipy
-@dirrm %%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/public
-@dirrm %%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc/private
-@dirrm %%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle/doc
-@dirrm %%PYTHON_SITELIBDIR%%/w3af/extlib/pygoogle
 @dirrm %%PYTHON_SITELIBDIR%%/w3af/extlib/ntlm
 @dirrm %%PYTHON_SITELIBDIR%%/w3af/extlib/gtkcodebuffer/syntax
 @dirrm %%PYTHON_SITELIBDIR%%/w3af/extlib/gtkcodebuffer
@@ -2156,6 +2348,7 @@ bin/w3af_console
 @dirrm %%PYTHON_SITELIBDIR%%/w3af/core/ui
 @dirrm %%PYTHON_SITELIBDIR%%/w3af/core/data/url/handlers
 @dirrm %%PYTHON_SITELIBDIR%%/w3af/core/data/url
+@dirrm %%PYTHON_SITELIBDIR%%/w3af/core/data/searchEngines/tests/
 @dirrm %%PYTHON_SITELIBDIR%%/w3af/core/data/searchEngines
 @dirrm %%PYTHON_SITELIBDIR%%/w3af/core/data/request
 @dirrm %%PYTHON_SITELIBDIR%%/w3af/core/data/profile