-
Committer:
Bazaar Package Importer
-
Author(s):
Oliver Grawert
-
Date:
2010-11-24 13:42:42 UTC
-
mfrom:
(1.1.9 upstream)
(18.1.4 sid)
-
Revision ID:
james.westby@ubuntu.com-20101124134242-832f4tew5s81ntj7
Tags: 1:4.1.4.2+svn3283-2ubuntu1
* Merge from debian unstable. Remaining changes:
- Ubuntu specific:
+ debian/login.defs: use SHA512 by default for password crypt routine.
- debian/{source_shadow.py,rules}: Add apport hook
- debian/rules: fix FTBFS from newer libtools
- debian/patches/495_stdout-encrypted-password: chpasswd can report
password hashes on stdout (Debian bug 505640).
- Rework 495_stdout-encrypted-password to cope with chpasswd using PAM.