From a8fcc915150b81ca55ae3313a2f2c73b737f0258 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Wed, 27 Oct 2010 20:54:28 +0000 Subject: Multiple QA fixes. Thanks to Anton Bolshakov and montjoie for the fixes and patches. Bug #272200 Package-Manager: portage-2.2.0_alpha1/cvs/Linux x86_64 --- net-analyzer/w3af/ChangeLog | 10 +- net-analyzer/w3af/Manifest | 17 +++- .../files/use_simplejson_instead_of_jsonpy.patch | 105 +++++++++++++++++++++ net-analyzer/w3af/files/w3af_console | 3 + net-analyzer/w3af/files/w3af_gui | 3 + net-analyzer/w3af/w3af-1.0_rc3-r1.ebuild | 51 ---------- net-analyzer/w3af/w3af-1.0_rc3-r2.ebuild | 57 +++++++++++ 7 files changed, 192 insertions(+), 54 deletions(-) create mode 100644 net-analyzer/w3af/files/use_simplejson_instead_of_jsonpy.patch create mode 100644 net-analyzer/w3af/files/w3af_console create mode 100644 net-analyzer/w3af/files/w3af_gui delete mode 100644 net-analyzer/w3af/w3af-1.0_rc3-r1.ebuild create mode 100644 net-analyzer/w3af/w3af-1.0_rc3-r2.ebuild (limited to 'net-analyzer/w3af') diff --git a/net-analyzer/w3af/ChangeLog b/net-analyzer/w3af/ChangeLog index d61e4638b66c..1ae32a854249 100644 --- a/net-analyzer/w3af/ChangeLog +++ b/net-analyzer/w3af/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-analyzer/w3af # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/w3af/ChangeLog,v 1.3 2010/09/06 17:37:25 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/w3af/ChangeLog,v 1.4 2010/10/27 20:54:28 hwoarang Exp $ + +*w3af-1.0_rc3-r2 (27 Oct 2010) + + 27 Oct 2010; Markos Chandras + +w3af-1.0_rc3-r2.ebuild, +files/use_simplejson_instead_of_jsonpy.patch, + +files/w3af_console, +files/w3af_gui, -w3af-1.0_rc3-r1.ebuild: + Multiple QA fixes. Thanks to Anton Bolshakov and montjoie for the fixes + and patches. Bug #272200 06 Sep 2010; Jeroen Roovers metadata.xml: Fix empty herd tag. diff --git a/net-analyzer/w3af/Manifest b/net-analyzer/w3af/Manifest index fbe10b424449..b752daf3efdd 100644 --- a/net-analyzer/w3af/Manifest +++ b/net-analyzer/w3af/Manifest @@ -1,4 +1,17 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX use_simplejson_instead_of_jsonpy.patch 3622 RMD160 0491466d3b2b739d2d18b3797563aef8f39f4cc5 SHA1 eee1ca89da73466d4b93e9cc42196b974b356c36 SHA256 5a15a6d6ce05466ac13ae4490e36bbaebf3dc25a72d75a5c9cfebe839acb715a +AUX w3af_console 45 RMD160 0090458f417ae79f17afbfb281d6f83532f89843 SHA1 c8e598281327f733a5e7bb3004b340e93e362dd8 SHA256 baec5ace41ba0ff29b792dd288ee9a14eef83546af633620125644ad29fd19c7 +AUX w3af_gui 41 RMD160 ef08894b771089f92271cb57fe508f429b5a2c49 SHA1 0d213bd93b317bc37d1a1f69caea8c24bde69952 SHA256 12f98d26f6c844b74e9d12a4df12ac8430eeb627dd15e8452e37202d254dda69 DIST w3af-1.0-rc3.tar.bz2 19128303 RMD160 63f775c967d0c5d5149befc868f1872a021b0d68 SHA1 f0004aece2a21c12acddb90c71cc40b9cc5d557f SHA256 36bf724726ec152f125680597f7314a424717cf2f1aa464ca4f18b7c5361ac86 -EBUILD w3af-1.0_rc3-r1.ebuild 1452 RMD160 a26fb7b73e4f9c1c9b84053ed877a1b4e341fc70 SHA1 7341132f86e6adc7168ce3d5889ee32dc58b616e SHA256 e76a910de57329c4559e274428d807a27a10f34923cff5b94dc9f4359ff2184b -MISC ChangeLog 786 RMD160 af184ab70cd6b899cc0364a4d622ab0ef3351bf8 SHA1 1592bf843a92240bed4286c0f046293d20bb39a9 SHA256 fc54e845ca0c78b39a50735bf7c7230bdf3800039b1b985b4df6ba3af3dd6c1e +EBUILD w3af-1.0_rc3-r2.ebuild 1563 RMD160 bf1b3b9bfdd3eaf24907b3a96b8ad7e55ae92ceb SHA1 2790127f8316e14ac4e5cfbcdf5f33f966e3def1 SHA256 b8622d32407830fd4626edc30cf0bb7fb1602419faba86f3eec6afbf71afa5a7 +MISC ChangeLog 1117 RMD160 9c49607f0c812c9d971dd2dd2e07c94053935fab SHA1 eb1a7fb0acb8292b8568195200c8a55b4fbc1d46 SHA256 09ab09712a69b59b7c4bcc783a07aff40f8d3e12eae8d182da49781e741cb7e8 MISC metadata.xml 525 RMD160 bf54d14435c5598c98426793f23dd20d607d7363 SHA1 52f55c88ccb0833d05d4ff184f36d4bda3ee5c19 SHA256 0881b32f9de12bebc6eccf7d40513b9f41a76c320783b528aa6bb8278918c994 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.16 (GNU/Linux) + +iEYEARECAAYFAkzIkXMACgkQ9/cejkQaxBAuhQCdHY7zGoqbC2Gl6xK7c1VSfgk5 +ZqQAn3vOyhOl8ky9BItkR6OncXRSa0EV +=FGe3 +-----END PGP SIGNATURE----- diff --git a/net-analyzer/w3af/files/use_simplejson_instead_of_jsonpy.patch b/net-analyzer/w3af/files/use_simplejson_instead_of_jsonpy.patch new file mode 100644 index 000000000000..306c24a59f8a --- /dev/null +++ b/net-analyzer/w3af/files/use_simplejson_instead_of_jsonpy.patch @@ -0,0 +1,105 @@ +--- ./core/controllers/misc/dependencyCheck.py.old 2010-10-19 09:58:19.000000000 +0200 ++++ ./core/controllers/misc/dependencyCheck.py 2010-10-19 09:58:32.000000000 +0200 +@@ -95,15 +95,6 @@ + except: + print 'You have to install pyPdf lib. Debian based distributions: apt-get install python-pypdf' + sys.exit( 1 ) +- +- try: +- from extlib.jsonpy import json as json +- except: +- try: +- import json +- except: +- print 'You have to install python-json lib. Debian based distributions: apt-get install python-json' +- sys.exit( 1 ) + + try: + from OpenSSL import SSL +--- core/data/fuzzer/fuzzer.py.old 2010-10-19 10:00:59.000000000 +0200 ++++ core/data/fuzzer/fuzzer.py 2010-10-19 10:02:14.000000000 +0200 +@@ -38,9 +38,9 @@ + from core.data.dc.cookie import cookie as cookie + from core.data.dc.dataContainer import dataContainer as dc + try: +- from extlib.jsonpy import json as json ++ import extlib.simplejson as json + except: +- import json ++ import simplejson as json + from core.data.request.httpPostDataRequest import httpPostDataRequest + from core.data.request.httpQsRequest import httpQsRequest + +@@ -210,7 +210,7 @@ + + # Now, fuzz the parsed JSON data... + postdata = freq.getData() +- jsonPostData = json.read( postdata ) ++ jsonPostData = json.loads( postdata ) + return _makeMutants( freq, mutantClass, mutant_str_list, fuzzableParamList , append, jsonPostData ) + + def isJSON( freq ): +@@ -222,7 +222,7 @@ + # We have something that's not URL encoded in the postdata, it could be something + # like JSON, XML, or multipart encoding. Let's try with JSON + try: +- jsonPostData = json.read( postdata ) ++ jsonPostData = json.loads( postdata ) + except: + # It's not json, maybe XML or multipart, I don't really care ( at least not in this section of the code ) + return False +--- core/data/request/frFactory.py.old 2010-10-19 10:03:50.000000000 +0200 ++++ core/data/request/frFactory.py 2010-10-19 10:04:38.000000000 +0200 +@@ -37,9 +37,9 @@ + + # for json + try: +- from extlib.jsonpy import json as json ++ import extlib.simplejson as json + except: +- import json ++ import simplejson as json + + from core.controllers.w3afException import w3afException + import core.controllers.outputManager as om +@@ -200,7 +200,7 @@ + # Case #2, JSON request + # + try: +- dc = json.read( postData ) ++ dc = json.loads( postData ) + except: + pass + else: +--- core/data/request/jsonPostDataRequest.py.old 2010-10-19 10:12:22.000000000 +0200 ++++ core/data/request/jsonPostDataRequest.py 2010-10-19 10:15:05.000000000 +0200 +@@ -25,9 +25,9 @@ + from core.data.request.httpPostDataRequest import httpPostDataRequest + import core.data.dc.dataContainer as dc + try: +- from extlib.jsonpy import json as json ++ import extlib.simplejson as json + except: +- import json ++ import simplejson + + class jsonPostDataRequest(httpPostDataRequest): + ''' +@@ -43,7 +43,7 @@ + ''' + @return: A string that represents the JSON data saved in the dc. + ''' +- res = json.write(self._dc) ++ res = json.dumps(self._dc) + return res + + def __str__( self ): +@@ -54,7 +54,7 @@ + strRes += self._url + strRes += ' | Method: ' + self._method + strRes += ' | JSON: (' +- strRes += json.write(self._dc) ++ strRes += json.dumps(self._dc) + strRes += ')' + return strRes + diff --git a/net-analyzer/w3af/files/w3af_console b/net-analyzer/w3af/files/w3af_console new file mode 100644 index 000000000000..93212cefb237 --- /dev/null +++ b/net-analyzer/w3af/files/w3af_console @@ -0,0 +1,3 @@ +#!/bin/sh +cd /usr/lib/w3af +./w3af_console $* diff --git a/net-analyzer/w3af/files/w3af_gui b/net-analyzer/w3af/files/w3af_gui new file mode 100644 index 000000000000..41f4802e3ae1 --- /dev/null +++ b/net-analyzer/w3af/files/w3af_gui @@ -0,0 +1,3 @@ +#!/bin/sh +cd /usr/lib/w3af +./w3af_gui $* diff --git a/net-analyzer/w3af/w3af-1.0_rc3-r1.ebuild b/net-analyzer/w3af/w3af-1.0_rc3-r1.ebuild deleted file mode 100644 index 88ad5703eb10..000000000000 --- a/net-analyzer/w3af/w3af-1.0_rc3-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/w3af/w3af-1.0_rc3-r1.ebuild,v 1.1 2010/08/31 12:29:41 hwoarang Exp $ - -EAPI=2 - -PYTHON_USE_WITH="sqlite" -PYTHON_DEPEND="2" - -inherit multilib python versionator - -MY_P=${PN}-"$(replace_version_separator 2 '-')" -DESCRIPTION="Web Application Attack and Audit Framework" -HOMEPAGE="http://w3af.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc gtk" - -RDEPEND="dev-python/beautifulsoup - >=dev-python/fpconst-0.7.2 - dev-python/nltk - dev-python/pyopenssl - dev-python/pyPdf - dev-python/pysqlite - dev-python/soappy - net-analyzer/scapy - gtk? ( media-gfx/graphviz - >dev-python/pygtk-2.0 )" - -S=${WORKDIR}/${PN} - -src_prepare(){ - rm -r extlib/{BeautifulSoup.py,fpconst-0.7.2,nltk,nltk_contrib,pyPdf,scapy,SOAPpy,yaml} || die - rm readme/{GPL,INSTALL} || die -} - -src_install() { - insinto /usr/$(get_libdir)/w3af - doins -r core extlib locales plugins profiles scripts tools w3af_gui w3af_console || die - dosym /usr/$(get_libdir)/w3af/w3af_gui usr/bin/w3af_gui || die - dosym /usr/$(get_libdir)/w3af/w3af_console usr/bin/w3af_console || die - fperms +x /usr/$(get_libdir)/w3af/w3af_{gui,console} || die - #use flag doc is here because doc is bigger than 3 Mb - if use doc ; then - insinto /usr/share/doc/${PF}/ - doins -r readme/* || die - fi -} diff --git a/net-analyzer/w3af/w3af-1.0_rc3-r2.ebuild b/net-analyzer/w3af/w3af-1.0_rc3-r2.ebuild new file mode 100644 index 000000000000..8f76e9b49d20 --- /dev/null +++ b/net-analyzer/w3af/w3af-1.0_rc3-r2.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/w3af/w3af-1.0_rc3-r2.ebuild,v 1.1 2010/10/27 20:54:28 hwoarang Exp $ + +EAPI=2 + +PYTHON_USE_WITH="sqlite" +PYTHON_DEPEND="2" + +inherit multilib python versionator + +MY_P=${PN}-"$(replace_version_separator 2 '-')" +DESCRIPTION="Web Application Attack and Audit Framework" +HOMEPAGE="http://w3af.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc gtk" + +RDEPEND="dev-python/beautifulsoup + >=dev-python/fpconst-0.7.2 + dev-python/nltk + dev-python/pyopenssl + dev-python/pyPdf + dev-python/pysqlite + dev-python/python-cluster + dev-python/pyyaml + dev-python/simplejson + dev-python/soappy + net-analyzer/scapy + gtk? ( media-gfx/graphviz + >dev-python/pygtk-2.0 )" + +S=${WORKDIR}/${PN} + +src_prepare(){ + rm -r extlib/{BeautifulSoup.py,cluster,fpconst-0.7.2,jsonpy,nltk,nltk_contrib,pyPdf,scapy,SOAPpy,yaml} || die + rm readme/{GPL,INSTALL} || die + epatch "${FILESDIR}"/use_simplejson_instead_of_jsonpy.patch +} + +src_install() { + insinto /usr/$(get_libdir)/w3af + doins -r core extlib locales plugins profiles scripts tools w3af_gui w3af_console || die + fperms +x /usr/$(get_libdir)/w3af/w3af_{gui,console} || die + dobin "${FILESDIR}"/w3af_console || die + if use gtk ; then + dobin "${FILESDIR}"/w3af_gui || die + fi + #use flag doc is here because doc is bigger than 3 Mb + if use doc ; then + insinto /usr/share/doc/${PF}/ + doins -r readme/* || die + fi +} -- cgit v1.2.3-65-gdbad