packages: sqlmap/sqlmap-paths.patch - adjusted to sqlmap-0.9

[marti]

Author: marti                        Date: Tue Apr 26 19:03:14 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- adjusted to sqlmap-0.9

---- Files affected:
packages/sqlmap:
   sqlmap-paths.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/sqlmap/sqlmap-paths.patch
diff -u packages/sqlmap/sqlmap-paths.patch:1.1 packages/sqlmap/sqlmap-paths.patch:1.2
--- packages/sqlmap/sqlmap-paths.patch:1.1	Wed Apr 15 14:30:14 2009
+++ packages/sqlmap/sqlmap-paths.patch	Tue Apr 26 21:03:08 2011
@@ -1,31 +1,33 @@
---- sqlmap-0.6.4/sqlmap.py~	2009-04-15 14:34:45.592581739 +0300
-+++ sqlmap-0.6.4/sqlmap.py	2009-04-15 14:47:33.299271416 +0300
-@@ -36,6 +36,8 @@
- except ImportError, _:
+diff -ur sqlmap.orig/lib/core/common.py sqlmap/lib/core/common.py
+--- sqlmap.orig/lib/core/common.py	2011-04-10 15:29:21.000000000 +0200
++++ sqlmap/lib/core/common.py	2011-04-26 20:55:38.309567115 +0200
+@@ -846,7 +846,7 @@
+     paths.SQLMAP_UDF_PATH = os.path.join(paths.SQLMAP_ROOT_PATH, "udf")
+     paths.SQLMAP_XML_PATH = os.path.join(paths.SQLMAP_ROOT_PATH, "xml")
+     paths.SQLMAP_XML_BANNER_PATH = os.path.join(paths.SQLMAP_XML_PATH, "banner")
+-    paths.SQLMAP_OUTPUT_PATH = os.path.join(paths.SQLMAP_ROOT_PATH, "output")
++    paths.SQLMAP_OUTPUT_PATH = os.path.expanduser('~/.sqlmap')
+     paths.SQLMAP_DUMP_PATH = os.path.join(paths.SQLMAP_OUTPUT_PATH, "%s", "dump")
+     paths.SQLMAP_FILES_PATH = os.path.join(paths.SQLMAP_OUTPUT_PATH, "%s", "files")
+ 
+diff -ur sqlmap.orig/sqlmap.py sqlmap/sqlmap.py
+--- sqlmap.orig/sqlmap.py	2011-04-08 12:56:38.000000000 +0200
++++ sqlmap/sqlmap.py	2011-04-26 20:50:51.263102512 +0200
+@@ -23,6 +23,8 @@
+ except ImportError:
      pass
  
 +sys.path.insert(0, '/usr/share/sqlmap')
 +
  from lib.controller.controller import start
  from lib.core.common import banner
- from lib.core.common import setPaths
-@@ -58,7 +60,7 @@
+ from lib.core.common import dataToStdout
+@@ -54,7 +56,7 @@
      if weAreFrozen():
-         return os.path.dirname(unicode(sys.executable, sys.getfilesystemencoding()))
+         return os.path.dirname(getUnicode(sys.executable, sys.getfilesystemencoding()))
      else:
 -        return os.path.dirname(os.path.realpath(__file__))
-+        return '/usr/share/sqlmap'
- 
++	return '/usr/share/sqlmap'
  
  def main():
---- sqlmap-0.6.4/lib/core/common.py~	2009-01-28 16:53:11.000000000 +0200
-+++ sqlmap-0.6.4/lib/core/common.py	2009-04-15 15:25:58.012270275 +0300
-@@ -513,7 +513,7 @@
-     paths.SQLMAP_TXT_PATH        = "%s/txt" % paths.SQLMAP_ROOT_PATH
-     paths.SQLMAP_XML_PATH        = "%s/xml" % paths.SQLMAP_ROOT_PATH
-     paths.SQLMAP_XML_BANNER_PATH = "%s/banner" % paths.SQLMAP_XML_PATH
--    paths.SQLMAP_OUTPUT_PATH     = "%s/output" % paths.SQLMAP_ROOT_PATH
-+    paths.SQLMAP_OUTPUT_PATH     =  os.path.expanduser('~/.sqlmap')
-     paths.SQLMAP_DUMP_PATH       = paths.SQLMAP_OUTPUT_PATH + "/%s/dump"
-     paths.SQLMAP_FILES_PATH      = paths.SQLMAP_OUTPUT_PATH + "/%s/files"
- 
+     """
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sqlmap/sqlmap-paths.patch?r1=1.1&r2=1.2&f=u