[Python-apps-commits] r6703 - in packages/pyrit/trunk/debian (13 files)
chrisk-guest at users.alioth.debian.org
chrisk-guest at users.alioth.debian.org
Fri Feb 25 23:01:51 UTC 2011
Date: Friday, February 25, 2011 @ 23:01:41
Author: chrisk-guest
Revision: 6703
New upstream release 0.4
Modified:
packages/pyrit/trunk/debian/changelog
packages/pyrit/trunk/debian/control
packages/pyrit/trunk/debian/patches/series
Deleted:
packages/pyrit/trunk/debian/patches/0001-Add-OpenSSL-linking-exception-from-upstream.patch
packages/pyrit/trunk/debian/patches/0002-Clean-up-after-unit-tests.patch
packages/pyrit/trunk/debian/patches/0004-Fixed-deprecation-warning-generated-by-sql-alchemy.patch
packages/pyrit/trunk/debian/patches/0005-Link-against-libcrypto-not-libssl.patch
packages/pyrit/trunk/debian/patches/0007-add-option-to-limit-cores.patch
packages/pyrit/trunk/debian/patches/0009-exception-handling-fix.patch
packages/pyrit/trunk/debian/patches/0010-Add-SHA1-licensing-update-from-upstream.patch
packages/pyrit/trunk/debian/patches/0011-fix-list-index-error.patch
packages/pyrit/trunk/debian/patches/0012-fix-SSE2-detection.patch
packages/pyrit/trunk/debian/patches/0013-FTBFS-on-failed-unit-tests.patch
Modified: packages/pyrit/trunk/debian/changelog
===================================================================
--- packages/pyrit/trunk/debian/changelog 2011-02-25 18:06:11 UTC (rev 6702)
+++ packages/pyrit/trunk/debian/changelog 2011-02-25 23:01:41 UTC (rev 6703)
@@ -1,3 +1,27 @@
+pyrit (0.4-1) UNRELEASED; urgency=low
+
+ * New upstream version.
+ * debian/control:
+ - Changed Dependency python-all-dev to versioned Dependency(>= 2.5) due to
+ use of "with" statement
+ - Added Dependency for libpcap-dev (new upstream requirement)
+ - Downgraded Dependency for python-sqlalchemy to 0.5 (new upstream feature)
+ * debian/patches (implemented/included upstream):
+ + included upstream:
+ - 0001-Add-OpenSSL-linking-exception-from-upstream
+ - 0002-Clean-up-after-unit-tests
+ - 0004-Fixed-deprecation-warning-generated-by-sql-alchemy
+ - 0005-Link-against-libcrypto-not-libssl
+ - 0007-add-option-to-limit-cores
+ - 0008-disable-optimizations-on-i386
+ - 0009-exception-handling-fix
+ - 0010-Add-SHA1-licensing-update-from-upstream
+ - 0011-fix-list-index-error
+ - 0012-fix-SSE2-detection
+ - 0013-FTBFS-on-failed-unit-tests
+
+ -- Christian Kastner <debian at kvr.at> Tue, 21 Dec 2010 17:39:35 +0100
+
pyrit (0.3.0-2) unstable; urgency=low
* debian/control:
Modified: packages/pyrit/trunk/debian/control
===================================================================
--- packages/pyrit/trunk/debian/control 2011-02-25 18:06:11 UTC (rev 6702)
+++ packages/pyrit/trunk/debian/control 2011-02-25 23:01:41 UTC (rev 6703)
@@ -5,11 +5,12 @@
Uploaders: Christian Kastner <debian at kvr.at>
Build-Depends:
debhelper (>= 7.0.50~),
- python-all-dev,
+ python-all-dev (>= 2.5),
python-support (>= 0.90),
python-scapy (>= 2.0),
- python-sqlalchemy (>= 0.6.1),
- libssl-dev
+ python-sqlalchemy (>= 0.5),
+ libssl-dev,
+ libpcap-dev
Standards-Version: 3.9.1
Homepage: http://code.google.com/p/pyrit/
Vcs-Svn: svn://svn.debian.org/python-apps/packages/pyrit/trunk/
@@ -23,7 +24,7 @@
${shlibs:Depends}
Recommends:
python-scapy (>= 2.0),
- python-sqlalchemy (>= 0.6.1)
+ python-sqlalchemy (>= 0.5)
Suggests:
python-psycopg2 | python-pymssql | python-mysqldb
Description: A GPGPU-driven WPA/WPA2-PSK key cracker
Deleted: packages/pyrit/trunk/debian/patches/0001-Add-OpenSSL-linking-exception-from-upstream.patch
===================================================================
--- packages/pyrit/trunk/debian/patches/0001-Add-OpenSSL-linking-exception-from-upstream.patch 2011-02-25 18:06:11 UTC (rev 6702)
+++ packages/pyrit/trunk/debian/patches/0001-Add-OpenSSL-linking-exception-from-upstream.patch 2011-02-25 23:01:41 UTC (rev 6703)
@@ -1,37 +0,0 @@
-From: Christian Kastner <debian at kvr.at>
-Date: Thu, 20 May 2010 04:32:28 +0200
-Subject: [PATCH] Add OpenSSL linking exception from upstream
-
-Upstream has added a linking exception for OpenSSL in SVN. Upstream has
-authorized me to add this exception to the current version 0.3.0.
-
-Origin: upstream, http://code.google.com/p/pyrit/source/detail?r=257
-Applied-Upstream: 0.3.1
-Last-Update: 2010-05-19
----
- cpyrit/_cpyrit_cpu.c | 11 +++++++++++
- 1 files changed, 11 insertions(+), 0 deletions(-)
-
-diff --git a/cpyrit/_cpyrit_cpu.c b/cpyrit/_cpyrit_cpu.c
-index b082b74..63a0008 100644
---- a/cpyrit/_cpyrit_cpu.c
-+++ b/cpyrit/_cpyrit_cpu.c
-@@ -16,6 +16,17 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with Pyrit. If not, see <http://www.gnu.org/licenses/>.
-+#
-+# Additional permission under GNU GPL version 3 section 7
-+#
-+# If you modify this Program, or any covered work, by linking or
-+# combining it with the OpenSSL project's "OpenSSL" library (or a
-+# modified version of that library), containing parts covered by
-+# the terms of OpenSSL/SSLeay license, the licensors of this
-+# Program grant you additional permission to convey the resulting
-+# work. Corresponding Source for a non-source form of such a
-+# combination shall include the source code for the parts of the
-+# OpenSSL library used as well as that of the covered work.
- */
-
- #include <Python.h>
---
Deleted: packages/pyrit/trunk/debian/patches/0002-Clean-up-after-unit-tests.patch
===================================================================
--- packages/pyrit/trunk/debian/patches/0002-Clean-up-after-unit-tests.patch 2011-02-25 18:06:11 UTC (rev 6702)
+++ packages/pyrit/trunk/debian/patches/0002-Clean-up-after-unit-tests.patch 2011-02-25 23:01:41 UTC (rev 6703)
@@ -1,36 +0,0 @@
-From: Christian Kastner <debian at kvr.at>
-Date: Thu, 20 May 2010 01:50:51 +0200
-Subject: [PATCH] Clean up after unit tests
-
-The setup code for unit tests in test/ creates temporary directories without
-removing them afterwards. This patch does this.
-
-Applied-Upstream: 0.3.1, http://code.google.com/p/pyrit/source/detail?r=272
-Last-Update: 2010-08-23
-
----
- test/test_pyrit.py | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/test/test_pyrit.py b/test/test_pyrit.py
-index 939abb3..cb11695 100755
---- a/test/test_pyrit.py
-+++ b/test/test_pyrit.py
-@@ -21,6 +21,7 @@
- from __future__ import with_statement
-
- import os
-+import shutil
- import random
- import unittest
- import cStringIO
-@@ -44,7 +45,7 @@ class Pyrit_CLI_TestFunctions(unittest.TestCase):
- self.cli.verbose = False
-
- def tearDown(self):
-- pass
-+ shutil.rmtree(self.storage_path)
-
- def _createPasswords(self, filename, count=5000):
- test_passwds = ['test123%i' % i for i in xrange(count-1)]
---
Deleted: packages/pyrit/trunk/debian/patches/0004-Fixed-deprecation-warning-generated-by-sql-alchemy.patch
===================================================================
--- packages/pyrit/trunk/debian/patches/0004-Fixed-deprecation-warning-generated-by-sql-alchemy.patch 2011-02-25 18:06:11 UTC (rev 6702)
+++ packages/pyrit/trunk/debian/patches/0004-Fixed-deprecation-warning-generated-by-sql-alchemy.patch 2011-02-25 23:01:41 UTC (rev 6703)
@@ -1,53 +0,0 @@
-From: Christian Kastner <debian at kvr.at>
-Date: Wed, 9 Jun 2010 22:25:09 +0200
-Subject: [PATCH] Fixed deprecation warning generated by sql-alchemy
-
-sql.Binary was renamed to sql.LargeBinary in python-sqlalchemy-0.6.1, causing a
-warning to be emitted everytime Pyrit is run. This patch resolves the issue.
-
-This patch is Debian-specific.
-
-Bug: http://code.google.com/p/pyrit/issues/detail?id=134
-Forwarded: not-needed
-Last-Update: 2010-08-23
----
- cpyrit/storage.py | 11 +++++++----
- 1 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/cpyrit/storage.py b/cpyrit/storage.py
-index a31cb73..69787c5 100644
---- a/cpyrit/storage.py
-+++ b/cpyrit/storage.py
-@@ -738,7 +738,8 @@ if 'sqlalchemy' in sys.modules:
-
- essids_table = sql.Table('essids', metadata, \
- sql.Column('essid_id', sql.Integer, primary_key=True),
-- sql.Column('essid', sql.Binary(32), nullable=False),
-+ sql.Column('essid', sql.LargeBinary(32), \
-+ nullable=False),
- sql.Column('uid', sql.String(32), unique=True, \
- nullable=False), \
- mysql_engine='InnoDB')
-@@ -747,8 +748,9 @@ if 'sqlalchemy' in sys.modules:
- sql.Column('_key', sql.String(32), primary_key=True),
- sql.Column('h1', sql.String(2), nullable=False),
- sql.Column('numElems', sql.Integer, nullable=False),
-- sql.Column('collection_buffer', sql.Binary(2**24-1), \
-- nullable=False), \
-+ sql.Column('collection_buffer', \
-+ sql.LargeBinary(2**24-1), \
-+ nullable=False), \
- mysql_engine='InnoDB')
-
- results_table = sql.Table('results', metadata, \
-@@ -759,7 +761,8 @@ if 'sqlalchemy' in sys.modules:
- sql.ForeignKey('essids.essid_id'), \
- primary_key=True),
- sql.Column('numElems', sql.Integer, nullable=False),
-- sql.Column('results_buffer', sql.Binary(2**24 - 1), \
-+ sql.Column('results_buffer', \
-+ sql.LargeBinary(2**24 - 1), \
- nullable=False), \
- mysql_engine='InnoDB')
-
---
Deleted: packages/pyrit/trunk/debian/patches/0005-Link-against-libcrypto-not-libssl.patch
===================================================================
--- packages/pyrit/trunk/debian/patches/0005-Link-against-libcrypto-not-libssl.patch 2011-02-25 18:06:11 UTC (rev 6702)
+++ packages/pyrit/trunk/debian/patches/0005-Link-against-libcrypto-not-libssl.patch 2011-02-25 23:01:41 UTC (rev 6703)
@@ -1,24 +0,0 @@
-From: Christian Kastner <debian at kvr.at>
-Date: Sat, 3 Jul 2010 20:15:09 +0200
-Subject: [PATCH] Link against libcrypto, not libssl
-
-Jakub Wilk noticed that setup.py links against libssl when it should be linking
-against libcrypto instead.
-
-Bug: http://code.google.com/p/pyrit/issues/detail?id=168
-Applied-Upstream: 0.3.1, http://code.google.com/p/pyrit/source/detail?r=265
-Last-Update: 2010-08-23
-
-Index: pyrit-0.3.0/setup.py
-===================================================================
---- pyrit-0.3.0.orig/setup.py 2010-07-03 20:14:45.869830217 +0200
-+++ pyrit-0.3.0/setup.py 2010-07-03 20:18:45.033839895 +0200
-@@ -38,7 +38,7 @@
- cpu_extension = Extension(name='cpyrit._cpyrit_cpu',
- sources = ['cpyrit/_cpyrit_cpu.c',
- 'cpyrit/_cpyrit_cpu_sse2.S'],
-- libraries = ['ssl'],
-+ libraries = ['crypto'],
- extra_compile_args=EXTRA_COMPILE_ARGS)
-
- setup_args = dict(
Deleted: packages/pyrit/trunk/debian/patches/0007-add-option-to-limit-cores.patch
===================================================================
--- packages/pyrit/trunk/debian/patches/0007-add-option-to-limit-cores.patch 2011-02-25 18:06:11 UTC (rev 6702)
+++ packages/pyrit/trunk/debian/patches/0007-add-option-to-limit-cores.patch 2011-02-25 23:01:41 UTC (rev 6703)
@@ -1,61 +0,0 @@
-From: Christian Kastner <debian at kvr.at>
-Date: Tue, 6 Jul 2010 21:28:47 +0200
-Subject: [PATCH] Add option to limit number of cores used
-
-This patch adds a configuration option that allows one to limit the number of
-cores Pyrit will use. This only affects non-GPU processors.
-
-Forwarded: yes
-Applied-Upstream: 0.3.1, http://code.google.com/p/pyrit/source/detail?r=275
-Last-Update: 2010-08-23
-
-Index: pyrit-0.3.0/cpyrit/config.py
-===================================================================
---- pyrit-0.3.0.orig/cpyrit/config.py 2010-07-06 21:29:17.637835162 +0200
-+++ pyrit-0.3.0/cpyrit/config.py 2010-07-06 21:29:33.133837906 +0200
-@@ -28,7 +28,8 @@
- 'rpc_server': 'true', \
- 'rpc_announce': 'true', \
- 'rpc_announce_broadcast': 'false', \
-- 'rpc_knownclients': ''}
-+ 'rpc_knownclients': '',
-+ 'limit_ncpus': 0}
- return config
-
-
-Index: pyrit-0.3.0/cpyrit/util.py
-===================================================================
---- pyrit-0.3.0.orig/cpyrit/util.py 2010-07-06 21:29:17.701834961 +0200
-+++ pyrit-0.3.0/cpyrit/util.py 2010-07-06 21:29:33.133837906 +0200
-@@ -49,6 +49,7 @@
- from _cpyrit_cpu import VERSION, grouper
- import cpyrit
- import storage
-+import config
-
-
- def _detect_ncpus():
-@@ -72,7 +73,22 @@
- #return the default value
- return 1
-
--ncpus = _detect_ncpus()
-+def _limit_ncpus():
-+ """Limit the number of reported CPUs if so requested"""
-+ detected_ncpus = _detect_ncpus()
-+ try:
-+ limited_ncpus = int(config.cfg['limit_ncpus'])
-+ except ValueError:
-+ raise ValueError("Invalid 'limit_ncpus' in configuration")
-+
-+ if limited_ncpus < 0:
-+ raise ValueError("Invalid 'limit_ncpus' in configuration")
-+ if limited_ncpus > 0 and limited_ncpus < detected_ncpus:
-+ return limited_ncpus
-+ return detected_ncpus
-+
-+
-+ncpus = _limit_ncpus()
- """ Number of effective CPUs (in the moment the module was loaded)."""
-
-
Deleted: packages/pyrit/trunk/debian/patches/0009-exception-handling-fix.patch
===================================================================
--- packages/pyrit/trunk/debian/patches/0009-exception-handling-fix.patch 2011-02-25 18:06:11 UTC (rev 6702)
+++ packages/pyrit/trunk/debian/patches/0009-exception-handling-fix.patch 2011-02-25 23:01:41 UTC (rev 6703)
@@ -1,31 +0,0 @@
-From: Christian Kastner <debian at kvr.at>
-Date: Tue, 9 Jul 2010 20:34:27 +0200
-Subject: [PATCH] Correctly handle exceptions in pyrit_cli.py
-
-Jakub Wilk discovered a bug when handling multiple exceptions in pyrit_cli.py.
-
-Applied-Upstream: 0.3.1, http://code.google.com/p/pyrit/source/detail?r=271
-Last-Update: 2010-08-23
-
-Index: pyrit-0.3.0/pyrit_cli.py
-===================================================================
---- pyrit-0.3.0.orig/pyrit_cli.py 2010-07-09 20:33:06.437838810 +0200
-+++ pyrit-0.3.0/pyrit_cli.py 2010-07-09 20:33:35.609842821 +0200
-@@ -601,7 +601,7 @@
- self.tell("Server started...")
- try:
- rpcd.serve_forever()
-- except KeyboardInterrupt, SystemExit:
-+ except (KeyboardInterrupt, SystemExit):
- pass
- self.tell("Server closed")
- relay.cli_options = (('-u', ), ())
-@@ -622,7 +622,7 @@
- else:
- y = 0
- self.tell("\rServing %i active clients; %i PMKs/s; %.1f TTS" % (len(server), perfcounter.avg, y), end=None)
-- except KeyboardInterrupt, SystemExit:
-+ except (KeyboardInterrupt, SystemExit):
- self.tell("\nShutdown with %i active clients..." % len(server))
- listener.shutdown()
- server.shutdown()
Deleted: packages/pyrit/trunk/debian/patches/0010-Add-SHA1-licensing-update-from-upstream.patch
===================================================================
--- packages/pyrit/trunk/debian/patches/0010-Add-SHA1-licensing-update-from-upstream.patch 2011-02-25 18:06:11 UTC (rev 6702)
+++ packages/pyrit/trunk/debian/patches/0010-Add-SHA1-licensing-update-from-upstream.patch 2011-02-25 23:01:41 UTC (rev 6703)
@@ -1,46 +0,0 @@
-From: Christian Kastner <debian at kvr.at>
-Date: Tue, 20 Jul 2010 20:43:28 +0200
-Subject: [PATCH] Add SSE2-SHA1 licensing update from upstream
-
-Upstream has also re-confirmed GPLv3 + OpenSSL linking exception with the
-original authors of the SSE2 SHA1 implementation.
-
-Origin: upstream, http://code.google.com/p/pyrit/source/detail?r=269
-Applied-Upstream: 0.3.1
-Last-Update: 2010-07-20
-
-Index: pyrit-0.3.0/cpyrit/_cpyrit_cpu_sse2.S
-===================================================================
---- pyrit-0.3.0.orig/cpyrit/_cpyrit_cpu_sse2.S 2010-07-20 20:42:16.402033612 +0200
-+++ pyrit-0.3.0/cpyrit/_cpyrit_cpu_sse2.S 2010-07-20 20:42:28.186041128 +0200
-@@ -2,8 +2,10 @@
- #
- # Copyright 2009-2010, Lukas Lueg, lukas.lueg at gmail.com
- #
--# SHA-1 SSE2 Copyright 2008, 2009, Alvaro Salmador, naplam33 at msn.com
--# ported from SHA-1 MMX by Simon Marechal, simon at banquise.net
-+# SHA-1 SSE2 Copyright 2008, 2009, Alvaro Salmador, naplam33 at msn.com,
-+# included here with permission, under the licensing terms specified below.
-+# ported from SHA-1 MMX by Simon Marechal, simon at banquise.net,
-+# included here with permission, under the licensing terms specified below.
- #
- # This file is part of Pyrit.
- #
-@@ -19,6 +21,17 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with Pyrit. If not, see <http://www.gnu.org/licenses/>.
-+#
-+# Additional permission under GNU GPL version 3 section 7
-+#
-+# If you modify this Program, or any covered work, by linking or
-+# combining it with the OpenSSL project's "OpenSSL" library (or a
-+# modified version of that library), containing parts covered by
-+# the terms of OpenSSL/SSLeay license, the licensors of this
-+# Program grant you additional permission to convey the resulting
-+# work. Corresponding Source for a non-source form of such a
-+# combination shall include the source code for the parts of the
-+# OpenSSL library used as well as that of the covered work.
- */
-
- #include "_cpyrit_cpu.h"
Deleted: packages/pyrit/trunk/debian/patches/0011-fix-list-index-error.patch
===================================================================
--- packages/pyrit/trunk/debian/patches/0011-fix-list-index-error.patch 2011-02-25 18:06:11 UTC (rev 6702)
+++ packages/pyrit/trunk/debian/patches/0011-fix-list-index-error.patch 2011-02-25 23:01:41 UTC (rev 6703)
@@ -1,33 +0,0 @@
-From: Luks Lueg <lukas.lueg at gmail.com>
-Date: Wed, 21 Jul 2010 15:26:38 +0200
-Subject: [PATCH] Fix list index error
-
-On very rare occasions, repeated use of a certain buffer (as it is done when
-running the unit tests) may raise an IndexError because an attempt is made to
-access a not-yet initilialized part of that buffer. This patch adds appropriate
-boundary checks.
-
-Origin: upstream, http://code.google.com/p/pyrit/source/detail?r=270
-Applied-Upstream: 0.3.1
-Last-Update: 2010-07-21
-
-Index: pyrit-0.3.0/cpyrit/_cpyrit_cpu.c
-===================================================================
---- pyrit-0.3.0.orig/cpyrit/_cpyrit_cpu.c 2010-07-21 18:50:08.130035042 +0200
-+++ pyrit-0.3.0/cpyrit/_cpyrit_cpu.c 2010-07-21 18:50:19.968641014 +0200
-@@ -1020,13 +1020,13 @@
- if (self->keyscheme == HMAC_MD5_RC4)
- {
- fourwise_md5hmac(self->eapolframe, self->eapolframe_size, (unsigned char*)&kck, 16, (unsigned char*)&md5mics);
-- for (j = 0; j < 4; j++)
-+ for (j = 0; j < 4 && i + j < buffersize / 32; j++)
- if (memcmp(&md5mics[j], self->keymic, 16) == 0)
- solution_idx = i + j;
- } else
- {
- fourwise_sha1hmac(self->eapolframe, self->eapolframe_size, (unsigned char*)&kck, 16, (unsigned char*)&sha1mics);
-- for (j = 0; j < 4; j++)
-+ for (j = 0; j < 4 && i + j < buffersize / 32; j++)
- if (memcmp(&sha1mics[j], self->keymic, 16) == 0)
- solution_idx = i + j;
- }
Deleted: packages/pyrit/trunk/debian/patches/0012-fix-SSE2-detection.patch
===================================================================
--- packages/pyrit/trunk/debian/patches/0012-fix-SSE2-detection.patch 2011-02-25 18:06:11 UTC (rev 6702)
+++ packages/pyrit/trunk/debian/patches/0012-fix-SSE2-detection.patch 2011-02-25 23:01:41 UTC (rev 6703)
@@ -1,24 +0,0 @@
-From: Luks Lueg <lukas.lueg at gmail.com>
-Date: Wed, 23 Jul 2010 18:25:32 +0200
-Subject: [PATCH] Fix SSE2 detection
-
-The MMX/SSE2 detection code led to a crash on those (now) rare CPUs supporting
-MMX but not SSE2.
-
-Origin: upstream, http://code.google.com/p/pyrit/source/detail?r=271
-Applied-Upstream: 0.3.1
-Last-Update: 2010-07-27
-
-Index: pyrit-0.3.0/cpyrit/_cpyrit_cpu_sse2.S
-===================================================================
---- pyrit-0.3.0.orig/cpyrit/_cpyrit_cpu_sse2.S 2010-07-27 00:25:28.990044350 +0200
-+++ pyrit-0.3.0/cpyrit/_cpyrit_cpu_sse2.S 2010-07-27 00:26:16.462043069 +0200
-@@ -498,7 +498,7 @@
-
- movl $1, %eax
- cpuid
-- testl $(0x00800000 | 0x04000000), %edx // bits 23 and 26 (MMX/SSE2)
-+ testl $0x04000000, %edx // bit 26 (SSE2)
- jz no_sse2
- movl $1, %eax
- jmp cpuid_exit
Deleted: packages/pyrit/trunk/debian/patches/0013-FTBFS-on-failed-unit-tests.patch
===================================================================
--- packages/pyrit/trunk/debian/patches/0013-FTBFS-on-failed-unit-tests.patch 2011-02-25 18:06:11 UTC (rev 6702)
+++ packages/pyrit/trunk/debian/patches/0013-FTBFS-on-failed-unit-tests.patch 2011-02-25 23:01:41 UTC (rev 6703)
@@ -1,43 +0,0 @@
-From: Christian Kastner <debian at kvr.at>
-Date: Wed, 27 Jul 2010 23:33:17 +0200
-Subject: [PATCH] Build should FTBFS on failed unit tests
-
-This patch modifies the unit testing script such that it sets the exit code to
-1 if any of the unit tests failed, causing a FTBFS.
-
-Bug-Debian: http://bugs.debian.org/590520
-Forwarded: yes
-Last-Update: 2010-08-23
-
-Index: pyrit-0.3.0/test/test_pyrit.py
-===================================================================
---- pyrit-0.3.0.orig/test/test_pyrit.py 2010-07-27 23:40:34.000000000 +0200
-+++ pyrit-0.3.0/test/test_pyrit.py 2010-07-27 23:48:08.766042196 +0200
-@@ -22,6 +22,7 @@
-
- import os
- import shutil
-+import sys
- import random
- import unittest
- import cStringIO
-@@ -291,7 +292,8 @@
- print "Testing with filesystem-storage..."
- loader = unittest.TestLoader()
- suite = loader.loadTestsFromTestCase(Pyrit_CLI_FS_TestFunctions)
-- unittest.TextTestRunner(verbosity=2).run(suite)
-+ result = unittest.TextTestRunner(verbosity=2).run(suite)
-+ success = result.wasSuccessful()
-
- try:
- storage = cpyrit.storage.getStorage('sqlite:///:memory:')
-@@ -301,4 +303,8 @@
- print "Testing with database-storage..."
- loader = unittest.TestLoader()
- suite = loader.loadTestsFromTestCase(Pyrit_CLI_DB_TestFunctions)
-- unittest.TextTestRunner(verbosity=2).run(suite)
-+ result = unittest.TextTestRunner(verbosity=2).run(suite)
-+ if success:
-+ success = result.wasSuccessful()
-+
-+ sys.exit(not success)
Modified: packages/pyrit/trunk/debian/patches/series
===================================================================
--- packages/pyrit/trunk/debian/patches/series 2011-02-25 18:06:11 UTC (rev 6702)
+++ packages/pyrit/trunk/debian/patches/series 2011-02-25 23:01:41 UTC (rev 6703)
@@ -1,12 +1,2 @@
-0001-Add-OpenSSL-linking-exception-from-upstream.patch
-0002-Clean-up-after-unit-tests.patch
0003-Add-man-page-for-pyrit-1.patch
-0004-Fixed-deprecation-warning-generated-by-sql-alchemy.patch
-0005-Link-against-libcrypto-not-libssl.patch
0006-custom-config-file.patch
-0007-add-option-to-limit-cores.patch
-0009-exception-handling-fix.patch
-0010-Add-SHA1-licensing-update-from-upstream.patch
-0011-fix-list-index-error.patch
-0012-fix-SSE2-detection.patch
-0013-FTBFS-on-failed-unit-tests.patch
More information about the Python-apps-commits
mailing list