[Python-apps-commits] r8443 - in packages/wapiti/trunk/debian (11 files)

Sun Apr 8 16:18:41 UTC 2012

Date: Sunday, April 8, 2012 @ 16:18:39
  Author: adejong
Revision: 8443

  * New upstream release (Closes: #550072).
  * Drop no longer relevant recommends.
  * Install wapiti-getcookie and wapiti-lswww commands.
  * Update patches (drop most because no longer relevant).

Added:
  packages/wapiti/trunk/debian/patches/use-wapiti-command.patch
    (from rev 8441, packages/wapiti/trunk/debian/patches/wapiti.py.patch)
Modified:
  packages/wapiti/trunk/debian/changelog
  packages/wapiti/trunk/debian/control
  packages/wapiti/trunk/debian/patches/series
  packages/wapiti/trunk/debian/rules
  packages/wapiti/trunk/debian/wapiti.docs
  packages/wapiti/trunk/debian/wapiti.install
  packages/wapiti/trunk/debian/wapiti.links
Deleted:
  packages/wapiti/trunk/debian/patches/lswww.py.patch
  packages/wapiti/trunk/debian/patches/remove_hashbangs.patch
  packages/wapiti/trunk/debian/patches/wapiti.py.patch

Modified: packages/wapiti/trunk/debian/changelog
===================================================================

--- packages/wapiti/trunk/debian/changelog	2012-04-08 16:01:45 UTC (rev 8442)
+++ packages/wapiti/trunk/debian/changelog	2012-04-08 16:18:39 UTC (rev 8443)
@@ -1,8 +1,12 @@
-wapiti (1.1.6-5) UNRELEASED; urgency=low
+wapiti (2.2.1-1) UNRELEASED; urgency=low
 
+  * New upstream release (Closes: #550072).
+  * Drop no longer relevant recommends.
+  * Install wapiti-getcookie and wapiti-lswww commands.
+  * Update patches (drop most because no longer relevant).
   * Update debian/watch file.
 
- -- Arthur de Jong <adejong at debian.org>  Sun, 08 Apr 2012 18:00:37 +0200
+ -- Arthur de Jong <adejong at debian.org>  Sun, 08 Apr 2012 18:18:16 +0200
 
 wapiti (1.1.6-4) unstable; urgency=low
 

Modified: packages/wapiti/trunk/debian/control
===================================================================
--- packages/wapiti/trunk/debian/control	2012-04-08 16:01:45 UTC (rev 8442)
+++ packages/wapiti/trunk/debian/control	2012-04-08 16:18:39 UTC (rev 8443)
@@ -12,7 +12,6 @@
 Package: wapiti
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}
-Recommends: python-utidylib (>= 0.2), python-ctypes (>= 1.0.1)
 Homepage: http://wapiti.sourceforge.net/
 Description: Web application vulnerability scanner
  Wapiti allows you to audit the security of your web applications.

Deleted: packages/wapiti/trunk/debian/patches/lswww.py.patch
===================================================================
--- packages/wapiti/trunk/debian/patches/lswww.py.patch	2012-04-08 16:01:45 UTC (rev 8442)
+++ packages/wapiti/trunk/debian/patches/lswww.py.patch	2012-04-08 16:18:39 UTC (rev 8443)
@@ -1,18 +0,0 @@
-From: Thomas BlÃ¤sing <thomasbl at frosty.local>
-Subject: fancy output for installing the recommend packages
-
-diff -urNad wapiti-1.1.6~/lswww.py wapiti-1.1.6/lswww.py
---- wapiti-1.1.6~/lswww.py	2007-01-28 17:48:59.000000000 +0000
-+++ wapiti-1.1.6/lswww.py	2008-04-28 20:19:09.000000000 +0000
-@@ -31,9 +31,8 @@
- 	import tidy
- except ImportError:
- 	print "lswww will be far less effective without tidy"
--	print "please install libtidy ( http://tidy.sourceforge.net/ ),"
--	print "ctypes ( http://starship.python.net/crew/theller/ctypes/ )"
--	print "and uTidylib ( http://utidylib.berlios.de/ )"
-+	print "please install libtidy and ctypes:"
-+	print "\tapt-get install python-utidylib python-ctypes"
- 	tidyhere=0
- else:
- 	tidyhere=1

Deleted: packages/wapiti/trunk/debian/patches/remove_hashbangs.patch
===================================================================
--- packages/wapiti/trunk/debian/patches/remove_hashbangs.patch	2012-04-08 16:01:45 UTC (rev 8442)
+++ packages/wapiti/trunk/debian/patches/remove_hashbangs.patch	2012-04-08 16:18:39 UTC (rev 8443)
@@ -1,30 +0,0 @@
-From: Thomas BlÃ¤sing <thomasbl at frosty.local>
-Subject: remove all uneeded hashbangs
-
-diff -urNad wapiti-1.1.6~/cookie.py wapiti-1.1.6/cookie.py
---- wapiti-1.1.6~/cookie.py	2006-07-22 11:14:20.000000000 +0000
-+++ wapiti-1.1.6/cookie.py	2008-04-28 21:18:43.000000000 +0000
-@@ -1,5 +1,3 @@
--#!/usr/bin/env python
--
- # Copyright (C) 2006 Nicolas Surribas
- #
- # This file is part of Wapiti.
-diff -urNad wapiti-1.1.6~/getcookie.py wapiti-1.1.6/getcookie.py
---- wapiti-1.1.6~/getcookie.py	2006-10-07 17:29:27.000000000 +0000
-+++ wapiti-1.1.6/getcookie.py	2008-04-28 21:18:50.000000000 +0000
-@@ -1,5 +1,3 @@
--#!/usr/bin/env python
--
- # Copyright (C) 2006 Nicolas Surribas
- #
- # This file is part of Wapiti.
-diff -urNad wapiti-1.1.6~/lswww.py wapiti-1.1.6/lswww.py
---- wapiti-1.1.6~/lswww.py	2008-04-28 20:41:14.000000000 +0000
-+++ wapiti-1.1.6/lswww.py	2008-04-28 21:18:56.000000000 +0000
-@@ -1,5 +1,3 @@
--#!/usr/bin/env python
--
- # lswww v2.1.5 - A web spider library
- # Copyright (C) 2006 Nicolas Surribas
- #

Modified: packages/wapiti/trunk/debian/patches/series
===================================================================
--- packages/wapiti/trunk/debian/patches/series	2012-04-08 16:01:45 UTC (rev 8442)
+++ packages/wapiti/trunk/debian/patches/series	2012-04-08 16:18:39 UTC (rev 8443)
@@ -1,3 +1 @@
-lswww.py.patch
-wapiti.py.patch
-remove_hashbangs.patch
+use-wapiti-command.patch

Copied: packages/wapiti/trunk/debian/patches/use-wapiti-command.patch (from rev 8441, packages/wapiti/trunk/debian/patches/wapiti.py.patch)
===================================================================
--- packages/wapiti/trunk/debian/patches/use-wapiti-command.patch	                        (rev 0)
+++ packages/wapiti/trunk/debian/patches/use-wapiti-command.patch	2012-04-08 16:18:39 UTC (rev 8443)
@@ -0,0 +1,56 @@
+Description: Ensure that documation refrers to wapiti commands.
+Author: Arhur de Jong <adejong at debian.org>
+Forwarded: not-needed
+
+--- a/src/wapiti.py
++++ b/src/wapiti.py
+@@ -43,7 +43,7 @@
+   """
+ Wapiti-2.2.1 - A web application vulnerability scanner
+ 
+-Usage: python wapiti.py http://server.com/base/url/ [options]
++Usage: wapiti http://server.com/base/url/ [options]
+ 
+ Supported options are:
+ -s <url>
+--- a/example.txt
++++ b/example.txt
+@@ -1,6 +1,6 @@
+ First I use getcookie.py to login in the restricted area and get the cookie in cookies.txt
+ 
+-bash-3.0$ python getcookie.py cookies.txt http://127.0.0.1/vuln/?page=login
++bash-3.0$ wapiti-getcookie cookies.txt http://127.0.0.1/vuln/?page=login
+ Please enter values for the folling form :
+ url = http://127.0.0.1/vuln/login.php
+ login (on) : toto
+@@ -9,7 +9,7 @@
+ 
+ Then I scan the vuln website using the cookie and excluding the logout script
+ 
+-bash-3.0$ python wapiti.py http://127.0.0.1/vuln/ -c cookies.txt -x http://127.0.0.1/vuln/index.php?page=logout
++bash-3.0$ wapiti http://127.0.0.1/vuln/ -c cookies.txt -x http://127.0.0.1/vuln/index.php?page=logout
+ ..........................
+ 
+ Attacking urls (GET)...
+--- a/src/net/getcookie.py
++++ b/src/net/getcookie.py
+@@ -31,7 +31,7 @@
+     return s
+ 
+ if len(sys.argv) != 3:
+-  sys.stderr.write("Usage: python getcookie.py <cookie_file> <url_with_form>\n")
++  sys.stderr.write("Usage: wapiti-getcookie <cookie_file> <url_with_form>\n")
+   sys.exit(1)
+ 
+ COOKIEFILE = sys.argv[1]
+--- a/src/net/lswww.py
++++ b/src/net/lswww.py
+@@ -36,7 +36,7 @@
+   """
+ 	lswww explore a website and extract links and forms fields.
+ 
+-Usage: python lswww.py http://server.com/base/url/ [options]
++Usage: wapiti-lswww http://server.com/base/url/ [options]
+ 
+ Supported options are:
+ -s <url>

Deleted: packages/wapiti/trunk/debian/patches/wapiti.py.patch
===================================================================
--- packages/wapiti/trunk/debian/patches/wapiti.py.patch	2012-04-08 16:01:45 UTC (rev 8442)
+++ packages/wapiti/trunk/debian/patches/wapiti.py.patch	2012-04-08 16:18:39 UTC (rev 8443)
@@ -1,24 +0,0 @@
-From: Thomas BlÃ¤sing <thomasbl at frosty.local>
-Subject: Add search path and fix Usage
-
-diff -urNad wapiti-1.1.6~/wapiti.py wapiti-1.1.6/wapiti.py
---- wapiti-1.1.6~/wapiti.py	2008-04-28 22:16:46.000000000 +0000
-+++ wapiti-1.1.6/wapiti.py	2008-04-28 22:18:12.000000000 +0000
-@@ -20,6 +20,8 @@
- import lswww,urllib,urllib2,urlparse,socket
- import sys,re,getopt,os
- 
-+sys.path.append('/usr/share/wapiti') # added by thomasbl for debian
-+
- try:
- 	import cookielib
- except ImportError:
-@@ -30,7 +32,7 @@
- 	"""
- Wapiti-1.1.6 - A web application vulnerability scanner
- 
--Usage: python wapiti.py http://server.com/base/url/ [options]
-+Usage: wapiti http://server.com/base/url/ [options]
- 
- Supported options are:
- -s <url>

Modified: packages/wapiti/trunk/debian/rules
===================================================================
--- packages/wapiti/trunk/debian/rules	2012-04-08 16:01:45 UTC (rev 8442)
+++ packages/wapiti/trunk/debian/rules	2012-04-08 16:18:39 UTC (rev 8443)
@@ -3,9 +3,9 @@
 %:
 	dh $@ --with python2
 
-override_dh_install:
-	dh_install --exclude='BeautifulSoup.py'
-	chmod a+rx $(CURDIR)/debian/wapiti/usr/share/wapiti/wapiti.py
+override_dh_link:
+	dh_link
+	chmod a+rx $(CURDIR)/debian/wapiti/usr/bin/*
 
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog_Wapiti

Modified: packages/wapiti/trunk/debian/wapiti.docs
===================================================================
--- packages/wapiti/trunk/debian/wapiti.docs	2012-04-08 16:01:45 UTC (rev 8442)
+++ packages/wapiti/trunk/debian/wapiti.docs	2012-04-08 16:18:39 UTC (rev 8443)
@@ -1,2 +1,3 @@
 AUTHORS
 README
+example.txt

Modified: packages/wapiti/trunk/debian/wapiti.install
===================================================================
--- packages/wapiti/trunk/debian/wapiti.install	2012-04-08 16:01:45 UTC (rev 8442)
+++ packages/wapiti/trunk/debian/wapiti.install	2012-04-08 16:18:39 UTC (rev 8443)
@@ -1 +1 @@
-*.py /usr/share/wapiti
+src/* /usr/share/wapiti

Modified: packages/wapiti/trunk/debian/wapiti.links
===================================================================
--- packages/wapiti/trunk/debian/wapiti.links	2012-04-08 16:01:45 UTC (rev 8442)
+++ packages/wapiti/trunk/debian/wapiti.links	2012-04-08 16:18:39 UTC (rev 8443)
@@ -1 +1,3 @@
 /usr/share/wapiti/wapiti.py /usr/bin/wapiti
+/usr/share/wapiti/net/getcookie.py /usr/bin/wapiti-getcookie
+/usr/share/wapiti/net/lswww.py /usr/bin/wapiti-lswww


