[Python-apps-commits] r8446 - in packages/wapiti/trunk/debian (6 files)

[adejong at users.alioth.debian.org]

    Date: Sunday, April 8, 2012 @ 17:58:53
  Author: adejong
Revision: 8446

  * Don't install bundled BeautifulSoup and httplib2 and instead use the
    system ones.

Added:
  packages/wapiti/trunk/debian/patches/use-global-beautifulsoup.patch
  packages/wapiti/trunk/debian/patches/use-global-httplib2.patch
Modified:
  packages/wapiti/trunk/debian/changelog
  packages/wapiti/trunk/debian/control
  packages/wapiti/trunk/debian/patches/series
  packages/wapiti/trunk/debian/rules

Modified: packages/wapiti/trunk/debian/changelog
===================================================================
--- packages/wapiti/trunk/debian/changelog	2012-04-08 16:39:09 UTC (rev 8445)
+++ packages/wapiti/trunk/debian/changelog	2012-04-08 17:58:53 UTC (rev 8446)
@@ -7,9 +7,11 @@
   * Install upstream manual page.
   * Provide a get-orig-source target that drops the unused and non-free
     json.js from the upstream tarball.
+  * Don't install bundled BeautifulSoup and httplib2 and instead use the
+    system ones.
   * Update debian/watch file.
 
- -- Arthur de Jong <adejong at debian.org>  Sun, 08 Apr 2012 18:38:48 +0200
+ -- Arthur de Jong <adejong at debian.org>  Sun, 08 Apr 2012 19:58:30 +0200
 
 wapiti (1.1.6-4) unstable; urgency=low
 

Modified: packages/wapiti/trunk/debian/control
===================================================================
--- packages/wapiti/trunk/debian/control	2012-04-08 16:39:09 UTC (rev 8445)
+++ packages/wapiti/trunk/debian/control	2012-04-08 17:58:53 UTC (rev 8446)
@@ -11,7 +11,7 @@
 
 Package: wapiti
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}
+Depends: ${misc:Depends}, ${python:Depends}, python-beautifulsoup, python-httplib2
 Homepage: http://wapiti.sourceforge.net/
 Description: Web application vulnerability scanner
  Wapiti allows you to audit the security of your web applications.

Modified: packages/wapiti/trunk/debian/patches/series
===================================================================
--- packages/wapiti/trunk/debian/patches/series	2012-04-08 16:39:09 UTC (rev 8445)
+++ packages/wapiti/trunk/debian/patches/series	2012-04-08 17:58:53 UTC (rev 8446)
@@ -1,2 +1,4 @@
 use-wapiti-command.patch
 fix-man-page.patch
+use-global-beautifulsoup.patch
+use-global-httplib2.patch

Added: packages/wapiti/trunk/debian/patches/use-global-beautifulsoup.patch
===================================================================
--- packages/wapiti/trunk/debian/patches/use-global-beautifulsoup.patch	                        (rev 0)
+++ packages/wapiti/trunk/debian/patches/use-global-beautifulsoup.patch	2012-04-08 17:58:53 UTC (rev 8446)
@@ -0,0 +1,44 @@
+Description: Use the system-provided BeautifulSoup instead of a bundled one.
+Author: Arthur de Jong <adejong at debian.org>
+
+--- a/src/attack/mod_backup.py
++++ b/src/attack/mod_backup.py
+@@ -5,7 +5,6 @@
+ # Guillaume TRANCHANT
+ # Gregory FONTAINE
+
+-from net import BeautifulSoup
+ from attack import Attack
+ from vulnerability import Vulnerability
+ from vulnerabilitiesdescriptions import VulnerabilitiesDescriptions as VulDescrip
+--- a/src/attack/mod_nikto.py
++++ b/src/attack/mod_nikto.py
+@@ -1,5 +1,5 @@
+ #!/usr/bin/env python
+-from net import BeautifulSoup
++import BeautifulSoup
+ from net.httplib2 import ServerNotFoundError
+ from attack import Attack
+ from vulnerability import Vulnerability
+--- a/src/attack/mod_permanentxss.py
++++ b/src/attack/mod_permanentxss.py
+@@ -2,7 +2,7 @@
+ import random
+ import re
+ import socket
+-from net import BeautifulSoup
++import BeautifulSoup
+ from attack import Attack
+ from vulnerability import Vulnerability
+ from vulnerabilitiesdescriptions import VulnerabilitiesDescriptions as VulDescrip
+--- a/src/attack/mod_xss.py
++++ b/src/attack/mod_xss.py
+@@ -2,7 +2,7 @@
+ import random
+ import re
+ import socket
+-from net import BeautifulSoup
++import BeautifulSoup
+ from attack import Attack
+ from vulnerability import Vulnerability
+ from vulnerabilitiesdescriptions import VulnerabilitiesDescriptions as VulDescrip

Added: packages/wapiti/trunk/debian/patches/use-global-httplib2.patch
===================================================================
--- packages/wapiti/trunk/debian/patches/use-global-httplib2.patch	                        (rev 0)
+++ packages/wapiti/trunk/debian/patches/use-global-httplib2.patch	2012-04-08 17:58:53 UTC (rev 8446)
@@ -0,0 +1,16 @@
+Description: Use the system-provided httplib2 instead of a bundled one.
+ The bug report
+   http://sourceforge.net/tracker/?func=detail&aid=2954109&group_id=168625&atid=847490
+ contains some more information and the implementation of a missing
+ parse_proxy() function.
+Author: Arthur de Jong <adejong at debian.org>
+
+--- a/src/attack/mod_nikto.py
++++ b/src/attack/mod_nikto.py
+@@ -1,6 +1,5 @@
+ #!/usr/bin/env python
+ import BeautifulSoup
+-from net.httplib2 import ServerNotFoundError
+ from attack import Attack
+ from vulnerability import Vulnerability
+ from vulnerabilitiesdescriptions import VulnerabilitiesDescriptions as VulDescrip

Modified: packages/wapiti/trunk/debian/rules
===================================================================
--- packages/wapiti/trunk/debian/rules	2012-04-08 16:39:09 UTC (rev 8445)
+++ packages/wapiti/trunk/debian/rules	2012-04-08 17:58:53 UTC (rev 8446)
@@ -3,6 +3,10 @@
 %:
 	dh $@ --with python2
 
+override_dh_install:
+	dh_install --exclude=generateSources.sh --exclude=generateTranslations.sh \
+	           --exclude=BeautifulSoup.py --exclude=httplib2
+
 override_dh_link:
 	dh_link
 	chmod a+rx $(CURDIR)/debian/wapiti/usr/bin/*