tags 571110 + patch tags 571110 + pending tags 580645 + patch tags 580645 + pending thanks
Dear maintainer, I've prepared an NMU for w3af (versioned as 1.0~rc2svn3429-1.1) and uploaded it to DELAYED/7. Please feel free to tell me if I should delay it longer. Sorry that I'm a bit in a hurry, but I'd like to have this fixed instead of seing a removal of w3af from testing during the Python2.6 migration. Also python-json needs to go out of the archive. Regards, Bernd diff -u w3af-1.0~rc2svn3429/debian/w3af.sh w3af-1.0~rc2svn3429/debian/w3af.sh --- w3af-1.0~rc2svn3429/debian/w3af.sh +++ w3af-1.0~rc2svn3429/debian/w3af.sh @@ -2,5 +2,5 @@ if [ ! -z "$DISPLAY" -a -r /usr/share/w3af/w3af_gui ] ; then - /usr/bin/python2.5 /usr/share/w3af/w3af_gui $@ + /usr/bin/python /usr/share/w3af/w3af_gui $@ else - /usr/bin/python2.5 /usr/share/w3af/w3af_console $@ + /usr/bin/python /usr/share/w3af/w3af_console $@ fi diff -u w3af-1.0~rc2svn3429/debian/control w3af-1.0~rc2svn3429/debian/control --- w3af-1.0~rc2svn3429/debian/control +++ w3af-1.0~rc2svn3429/debian/control @@ -5,7 +5,7 @@ Build-Depends: debhelper (>= 5), python-support, dpatch Standards-Version: 3.8.4 Homepage: http://w3af.sourceforge.net/ -XS-Python-Version: 2.5 +XS-Python-Version: all Package: w3af Architecture: all @@ -29,7 +29,8 @@ Package: w3af-console Architecture: all XB-Python-Version: ${python:Versions} -Depends: ${python:Depends}, ${misc:Depends}, python-json, python-beautifulsoup, python-soappy, python-pypdf, python-openssl, python-pysqlite2 +Depends: ${python:Depends}, ${misc:Depends}, python (>= 2.6) | python-simplejson, python-beautifulsoup, python-soappy, python-pypdf, python-openssl, python-pysqlite2 +Conflicts: python-json Description: framework to find and exploit web application vulnerabilities (CLI only) w3af is a Web Application Attack and Audit Framework which aims to identify and exploit all web application vulnerabilities. diff -u w3af-1.0~rc2svn3429/debian/changelog w3af-1.0~rc2svn3429/debian/changelog --- w3af-1.0~rc2svn3429/debian/changelog +++ w3af-1.0~rc2svn3429/debian/changelog @@ -1,3 +1,11 @@ +w3af (1.0~rc2svn3429-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Replace python-json by python-simplejson. (Closes: #571110, #580645) + * Build for all Python versions and use the default Python version. + + -- Bernd Zeimetz <[email protected]> Mon, 10 May 2010 23:41:04 +0200 + w3af (1.0~rc2svn3429-1) unstable; urgency=low * Now, only for python2.5. diff -u w3af-1.0~rc2svn3429/debian/w3af_gui.sh w3af-1.0~rc2svn3429/debian/w3af_gui.sh --- w3af-1.0~rc2svn3429/debian/w3af_gui.sh +++ w3af-1.0~rc2svn3429/debian/w3af_gui.sh @@ -2,3 +2,3 @@ if [ -r /usr/share/w3af/w3af_gui ] ; then - /usr/bin/python2.5 /usr/share/w3af/w3af_gui $@ + /usr/bin/python /usr/share/w3af/w3af_gui $@ fi diff -u w3af-1.0~rc2svn3429/debian/patches/00list w3af-1.0~rc2svn3429/debian/patches/00list --- w3af-1.0~rc2svn3429/debian/patches/00list +++ w3af-1.0~rc2svn3429/debian/patches/00list @@ -3,0 +4 @@ +04_json-fix.dpatch only in patch2: unchanged: --- w3af-1.0~rc2svn3429.orig/debian/patches/04_json-fix.dpatch +++ w3af-1.0~rc2svn3429/debian/patches/04_json-fix.dpatch @@ -0,0 +1,114 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## json-fix.dpatch by Bernd Zeimetz <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +...@dpatch@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' w3af-1.0~rc2svn3429~/core/controllers/misc/dependencyCheck.py w3af-1.0~rc2svn3429/core/controllers/misc/dependencyCheck.py +--- w3af-1.0~rc2svn3429~/core/controllers/misc/dependencyCheck.py 2010-03-06 16:14:46.000000000 +0100 ++++ w3af-1.0~rc2svn3429/core/controllers/misc/dependencyCheck.py 2010-05-10 22:48:57.191003428 +0200 +@@ -97,10 +97,10 @@ + sys.exit( 1 ) + + try: +- from extlib.jsonpy import json as json +- except: ++ import json ++ except ImportError: + try: +- import json ++ import simplejson as json + except: + print 'You have to install python-json lib. Debian based distributions: apt-get install python-json' + sys.exit( 1 ) +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' w3af-1.0~rc2svn3429~/core/data/fuzzer/fuzzer.py w3af-1.0~rc2svn3429/core/data/fuzzer/fuzzer.py +--- w3af-1.0~rc2svn3429~/core/data/fuzzer/fuzzer.py 2010-03-06 16:14:48.000000000 +0100 ++++ w3af-1.0~rc2svn3429/core/data/fuzzer/fuzzer.py 2010-05-10 22:48:57.192000714 +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 +-except: + import json ++except ImportError: ++ 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 +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' w3af-1.0~rc2svn3429~/core/data/request/frFactory.py w3af-1.0~rc2svn3429/core/data/request/frFactory.py +--- w3af-1.0~rc2svn3429~/core/data/request/frFactory.py 2010-03-06 16:14:48.000000000 +0100 ++++ w3af-1.0~rc2svn3429/core/data/request/frFactory.py 2010-05-10 22:48:57.192000714 +0200 +@@ -37,9 +37,9 @@ + + # for json + try: +- from extlib.jsonpy import json as json +-except: + import json ++except importError: ++ 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: +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' w3af-1.0~rc2svn3429~/core/data/request/jsonPostDataRequest.py w3af-1.0~rc2svn3429/core/data/request/jsonPostDataRequest.py +--- w3af-1.0~rc2svn3429~/core/data/request/jsonPostDataRequest.py 2009-11-26 00:09:09.000000000 +0100 ++++ w3af-1.0~rc2svn3429/core/data/request/jsonPostDataRequest.py 2010-05-10 22:48:57.193000724 +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 +-except: + import json ++except ImportError: ++ import simplejson as json + + 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 + -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
