Merge lp:~logan/ubuntu/quantal/python-bcrypt/new-upstream into lp:ubuntu/quantal/python-bcrypt

[Logan Rosen]

[Luke Yelavich (themuso)]

Thanks for your work. Please make sure Debian knows about the new upstream release. Debian is currently in freeze, but the sooner they know, the sooner the upstrea version can be uploaded to Debian post freeze, and Ubuntu can sync from there.

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2007-12-22 13:45:05 +0000
+++ ChangeLog	2012-07-17 01:14:19 +0000
@@ -1,2 +1,14 @@
[phone]
+ - (djm) Prefer setuptools for packaging. Based on patch from Niall
+   O'Higgins.
+ - (djm) Release py-bcrypt-0.2
+
[phone]
+ - (djm) Allow Python threads to run during (potentially lengthy) bcrypt
+   operation. Patch from vijay AT meebo-inc.com
+
[phone]
+ - (djm) Add support for Win32
+
 20060522
  - (djm) Start

=== modified file 'PKG-INFO'
--- PKG-INFO	2007-12-22 13:45:05 +0000
+++ PKG-INFO	2012-07-17 01:14:19 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: py-bcrypt
-Version: 0.1
+Version: 0.2
 Summary: Blowfish password hashing library
 Home-page: http://www.mindrot.org/py-bcrypt.html
 Author: Damien Miller

=== modified file 'TODO'
--- TODO	2007-12-22 13:45:05 +0000
+++ TODO	2012-07-17 01:14:19 +0000
@@ -1,3 +1,3 @@
-Nothing yet
+Python 3 support
 
-$Id: TODO,v 1.1.1.1 2006/05/22 11:53:27 djm Exp $
+$Id: TODO,v 1.2 2010/06/13 23:18:52 djm Exp $

=== modified file 'bcrypt/bcrypt.c'
--- bcrypt/bcrypt.c	2007-12-22 13:45:05 +0000
+++ bcrypt/bcrypt.c	2012-07-17 01:14:19 +0000
@@ -49,8 +49,13 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <string.h>
+
 #include "pybc_blf.h"
 
+#if defined(_MSC_VER)
+#define snprintf _snprintf
+#endif
+
 /* This implementation is adaptable to current computing power.
  * You can have up to 2^31 rounds which should be enough for some
  * time to come.

=== modified file 'bcrypt/bcrypt_python.c'
--- bcrypt/bcrypt_python.c	2007-12-22 13:45:05 +0000
+++ bcrypt/bcrypt_python.c	2012-07-17 01:14:19 +0000
@@ -16,7 +16,13 @@
 
 #include "Python.h"
 
-/* $Id: bcrypt_python.c,v 1.1.1.1 2006/05/22 11:53:27 djm Exp $ */
+#if defined(_MSC_VER)
+typedef unsigned __int8		u_int8_t;
+typedef unsigned __int16	u_int16_t;
+typedef unsigned __int32	u_int32_t;
+#endif
+
+/* $Id: bcrypt_python.c,v 1.3 2009/10/01 13:09:52 djm Exp $ */
 
 /* Import */
 char *pybc_bcrypt(const char *, const char *);
@@ -66,7 +72,17 @@
 	if (!PyArg_ParseTupleAndKeywords(args, kw_args, "ss:hashpw", keywords,
 	    &password, &salt))
                 return NULL;
-	if ((ret = pybc_bcrypt(password, salt)) == NULL ||
+
+	char *password_copy = strdup(password);
+	char *salt_copy = strdup(salt);
+
+	Py_BEGIN_ALLOW_THREADS;
+	ret = pybc_bcrypt(password_copy, salt_copy);
+	Py_END_ALLOW_THREADS;
+
+	free(password_copy);
+	free(salt_copy);
+	if ((ret == NULL) ||
 	    strcmp(ret, ":") == 0) {
 		PyErr_SetString(PyExc_ValueError, "Invalid salt");
 		return NULL;
@@ -91,6 +107,6 @@
 	PyObject *m;
 
 	m = Py_InitModule3("bcrypt._bcrypt", bcrypt_methods, module_doc);
-	PyModule_AddStringConstant(m, "__version__", PROGVER);
+	PyModule_AddStringConstant(m, "__version__", "0.1");
 }
 

=== modified file 'bcrypt/pybc_blf.h'
--- bcrypt/pybc_blf.h	2007-12-22 13:45:05 +0000
+++ bcrypt/pybc_blf.h	2012-07-17 01:14:19 +0000
@@ -34,6 +34,12 @@
 #ifndef _PYBC_BLF_H_
 #define _PYBC_BLF_H_
 
+#if defined(_MSC_VER)
+typedef unsigned __int8		u_int8_t;
+typedef unsigned __int16	u_int16_t;
+typedef unsigned __int32	u_int32_t;
+#endif
+
 /* Schneier specifies a maximum key length of 56 bytes.
  * This ensures that every key bit affects every cipher
  * bit.  However, the subkeys can hold up to 72 bytes.

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-03 00:09:33 +0000
+++ debian/changelog	2012-07-17 01:14:19 +0000
@@ -1,3 +1,10 @@
+python-bcrypt (0.2-0ubuntu1) quantal; urgency=low
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.3.
+
+ -- Logan Rosen <[e-mail]>  Mon, 16 Jul 2012 21:11:14 -0400
+
 python-bcrypt (0.1-1build2) natty; urgency=low
 
   * Rebuild to add support for python 2.7.

=== modified file 'debian/control'
--- debian/control	2009-03-10 08:00:57 +0000
+++ debian/control	2012-07-17 01:14:19 +0000
@@ -8,7 +8,7 @@
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-bcrypt/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/python-bcrypt/?op=log
 Homepage: http://www.mindrot.org/projects/py-bcrypt/
-Standards-Version: 3.7.3
+Standards-Version: 3.9.3
 
 Package: python-bcrypt
 Architecture: any

=== modified file 'setup.py'
--- setup.py	2007-12-22 13:45:05 +0000
+++ setup.py	2012-07-17 01:14:19 +0000
@@ -14,19 +14,21 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.py,v 1.1.1.1 2006/05/22 11:53:27 djm Exp $
+# $Id: setup.py,v 1.3 2010/06/13 23:18:52 djm Exp $
 
 import sys
-from distutils.core import setup, Extension
-
-VERSION = "0.1"
-
+try:
+	from setuptools import setup, Extension
+except ImportError:
+	from distutils.core import setup, Extension
+ 
+VERSION = "0.2"
+ 
 if __name__ == '__main__':
 	bcrypt = Extension('bcrypt._bcrypt',
-		define_macros = [('PROGVER', '"' + VERSION + '"')],
 		sources = ['bcrypt/bcrypt_python.c', 'bcrypt/blowfish.c',
 		    'bcrypt/bcrypt.c'])
-	setup(	name = "bcrypt",
+	setup(	name = "py-bcrypt",
 		version = VERSION,
 		author = "Damien Miller",
 		author_email = "[e-mail]",