Package: w3af
Version: 1.1svn5547-1
Followup-For: Bug #684722
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch is ready to be applied to achieve the following:

  * Rediff existing dependency patch into new
    remove_pybloomfilter_import.patch and apply it (closes: #684722)


Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-35-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru w3af-1.1svn5547/debian/changelog w3af-1.1svn5547/debian/changelog
diff -Nru w3af-1.1svn5547/debian/patches/remove_pybloomfiltermmap_import.patch w3af-1.1svn5547/debian/patches/remove_pybloomfiltermmap_import.patch
--- w3af-1.1svn5547/debian/patches/remove_pybloomfiltermmap_import.patch	1969-12-31 19:00:00.000000000 -0500
+++ w3af-1.1svn5547/debian/patches/remove_pybloomfiltermmap_import.patch	2013-01-06 01:18:30.000000000 -0500
@@ -0,0 +1,22 @@
+Index: w3af-1.1svn5547/core/controllers/dependency_check/dependency_check.py
+===================================================================
+--- w3af-1.1svn5547.orig/core/controllers/dependency_check/dependency_check.py	2013-01-05 23:48:46.000000000 -0500
++++ w3af-1.1svn5547/core/controllers/dependency_check/dependency_check.py	2013-01-05 23:55:07.164913283 -0500
+@@ -53,17 +53,6 @@
+     packages_mac_ports = []
+     additional_information = []
+ 
+-    if platform.system() != 'Windows':
+-        try:
+-            from pybloomfilter import BloomFilter as mmap_filter
+-        except Exception, e:
+-            msg = '    pybloomfiltermmap is a required dependency in *nix systems,'
+-            msg += '    in order to install it please run the following commands:'
+-            msg += '    sudo apt-get install python2.6-dev\n'
+-            msg += '    sudo easy_install pybloomfiltermmap'
+-            additional_information.append(msg)
+-            reasonForExit = True
+-    #mem_test('after bloom filter import')
+     try:
+         import esmre
+         import esm
diff -Nru w3af-1.1svn5547/debian/patches/series w3af-1.1svn5547/debian/patches/series
--- w3af-1.1svn5547/debian/patches/series	2012-08-08 21:21:42.000000000 -0400
+++ w3af-1.1svn5547/debian/patches/series	2013-01-06 01:18:30.000000000 -0500
@@ -3,3 +3,4 @@
 disable-auto-update.patch
 dep-a-la-deb_01_nltk.patch
 disable-pybloom.patch
+remove_pybloomfiltermmap_import.patch

Reply via email to