[Python-modules-commits] [python-django] 06/08: merge debian/patched-master into debian/master

[Raphaël Hertzog]

This is an automated email from the git hooks/post-receive script.

hertzog pushed a commit to branch debian/master
in repository python-django.

commit e04104c7b168b43f8982a0cdfd9f369d9cfae190
Merge: 86fd954 8754469
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Wed Dec 30 18:33:58 2015 +0100

    merge debian/patched-master into debian/master

 debian/.git-dpm                                    |  4 ++--
 .../fix-26016-restore-compat-with-py-bcrypt.patch  | 27 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 django/contrib/auth/hashers.py                     |  2 +-
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index bfc09a7,0000000..61bb44d
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 450de89e37211b72eaa293b12e92ac22df3c54ea
- 450de89e37211b72eaa293b12e92ac22df3c54ea
++875446913d7e87fc586e1ec405849b3892fd7239
++875446913d7e87fc586e1ec405849b3892fd7239
 +f3eb470bfb3d3b5f86aac67f1e7be9aedf202edf
 +f3eb470bfb3d3b5f86aac67f1e7be9aedf202edf
 +python-django_1.9.orig.tar.gz
 +2bbf1ce45a030069b3a695db4b16d17783b86175
 +7392116
 +debianTag="debian/%e%v"
 +patchedTag="debian/patches/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/fix-26016-restore-compat-with-py-bcrypt.patch
index 0000000,0000000..bee8345
new file mode 100644
--- /dev/null
+++ b/debian/patches/fix-26016-restore-compat-with-py-bcrypt.patch
@@@ -1,0 -1,0 +1,27 @@@
++From 875446913d7e87fc586e1ec405849b3892fd7239 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <hertzog at debian.org>
++Date: Wed, 30 Dec 2015 18:31:11 +0100
++Subject: Fixed #26016 -- Restore compatibility with py-bcrypt
++
++At least until Debian has a newer bcrypt available in Debian unstable.
++
++Bug: https://code.djangoproject.com/ticket/26016
++Last-Update: 2015-12-30
++Patch-Name: fix-26016-restore-compat-with-py-bcrypt.patch
++---
++ django/contrib/auth/hashers.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/django/contrib/auth/hashers.py b/django/contrib/auth/hashers.py
++index 3d585be..0188f4a 100644
++--- a/django/contrib/auth/hashers.py
+++++ b/django/contrib/auth/hashers.py
++@@ -286,7 +286,7 @@ class BCryptSHA256PasswordHasher(BasePasswordHasher):
++ 
++     def salt(self):
++         bcrypt = self._load_library()
++-        return bcrypt.gensalt(rounds=self.rounds)
+++        return bcrypt.gensalt(self.rounds)
++ 
++     def encode(self, password, salt):
++         bcrypt = self._load_library()
diff --cc debian/patches/series
index 4549594,0000000..d18347f
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,4 @@@
 +02_disable-sources-in-sphinxdoc.diff
 +06_use_debian_geoip_database_as_default.diff
 +fix-25761-add-traceback-attribute.patch
++fix-26016-restore-compat-with-py-bcrypt.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django.git