[Python-apps-commits] r5767 - in packages/pyrit/trunk/debian (4 files)

chrisk-guest at users.alioth.debian.org chrisk-guest at users.alioth.debian.org
Tue Jul 6 19:35:16 UTC 2010


    Date: Tuesday, July 6, 2010 @ 19:35:08
  Author: chrisk-guest
Revision: 5767

Renamed patch (spelling mistake)

Added:
  packages/pyrit/trunk/debian/patches/0004-Fixed-deprecation-warning-generated-by-sql-alchemy.patch
    (from rev 5766, packages/pyrit/trunk/debian/patches/0004-Fixed-depreciation-warning-generated-by-sql-alchemy.patch)
Modified:
  packages/pyrit/trunk/debian/changelog
  packages/pyrit/trunk/debian/patches/series
Deleted:
  packages/pyrit/trunk/debian/patches/0004-Fixed-depreciation-warning-generated-by-sql-alchemy.patch

Modified: packages/pyrit/trunk/debian/changelog
===================================================================
--- packages/pyrit/trunk/debian/changelog	2010-07-06 19:33:13 UTC (rev 5766)
+++ packages/pyrit/trunk/debian/changelog	2010-07-06 19:35:08 UTC (rev 5767)
@@ -5,7 +5,7 @@
     - 0001-Add-OpenSSL-linking-exception-from-upstream
     - 0002-Clean-up-after-unit-tests
     - 0003-Add-man-page-for-pyrit-1
-    - 0004-Fixed-depreciation-warning-generated-by-sql-alchemy
+    - 0004-Fixed-deprecation-warning-generated-by-sql-alchemy
     - 0005-Link-against-libcrypto-not-libssl
 
  -- Christian Kastner <debian at kvr.at>  Thu, 20 May 2010 14:43:26 +0200

Copied: packages/pyrit/trunk/debian/patches/0004-Fixed-deprecation-warning-generated-by-sql-alchemy.patch (from rev 5766, packages/pyrit/trunk/debian/patches/0004-Fixed-depreciation-warning-generated-by-sql-alchemy.patch)
===================================================================
--- packages/pyrit/trunk/debian/patches/0004-Fixed-deprecation-warning-generated-by-sql-alchemy.patch	                        (rev 0)
+++ packages/pyrit/trunk/debian/patches/0004-Fixed-deprecation-warning-generated-by-sql-alchemy.patch	2010-07-06 19:35:08 UTC (rev 5767)
@@ -0,0 +1,53 @@
+From: Christian Kastner <debian at kvr.at>
+Date: Wed, 9 Jun 2010 22:25:09 +0200
+Subject: [PATCH] Fixed depreciation warning generated by sql-alchemy
+
+sql.Binary was renamed to sql.LargeBinary in sql-alchemy v0.6.1. This generates
+a warning everytime pyrit is run.
+
+This patch is Debian-specific.
+
+Bug: http://code.google.com/p/pyrit/issues/detail?id=134
+Forwarded: no
+Last-Update: 2010-06-09
+---
+ 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/0004-Fixed-depreciation-warning-generated-by-sql-alchemy.patch
===================================================================
--- packages/pyrit/trunk/debian/patches/0004-Fixed-depreciation-warning-generated-by-sql-alchemy.patch	2010-07-06 19:33:13 UTC (rev 5766)
+++ packages/pyrit/trunk/debian/patches/0004-Fixed-depreciation-warning-generated-by-sql-alchemy.patch	2010-07-06 19:35:08 UTC (rev 5767)
@@ -1,53 +0,0 @@
-From: Christian Kastner <debian at kvr.at>
-Date: Wed, 9 Jun 2010 22:25:09 +0200
-Subject: [PATCH] Fixed depreciation warning generated by sql-alchemy
-
-sql.Binary was renamed to sql.LargeBinary in sql-alchemy v0.6.1. This generates
-a warning everytime pyrit is run.
-
-This patch is Debian-specific.
-
-Bug: http://code.google.com/p/pyrit/issues/detail?id=134
-Forwarded: no
-Last-Update: 2010-06-09
----
- 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')
- 
--- 

Modified: packages/pyrit/trunk/debian/patches/series
===================================================================
--- packages/pyrit/trunk/debian/patches/series	2010-07-06 19:33:13 UTC (rev 5766)
+++ packages/pyrit/trunk/debian/patches/series	2010-07-06 19:35:08 UTC (rev 5767)
@@ -1,5 +1,5 @@
 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-depreciation-warning-generated-by-sql-alchemy.patch
+0004-Fixed-deprecation-warning-generated-by-sql-alchemy.patch
 0005-Link-against-libcrypto-not-libssl.patch




More information about the Python-apps-commits mailing list