From 585e2be200597f3bd64887f466dcbfabc2294d07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= <mitr@redhat.com>
Date: Wed, 1 Sep 2010 16:36:55 +0200
Subject: [PATCH] Change default crypt_style to sha512

Resolves: #629001
---
 libuser-0.56.17-crypt_style.patch | 16 ++++++++++++++++
 libuser.spec                      |  9 ++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 libuser-0.56.17-crypt_style.patch

diff --git a/libuser-0.56.17-crypt_style.patch b/libuser-0.56.17-crypt_style.patch
new file mode 100644
index 0000000..c271971
--- /dev/null
+++ b/libuser-0.56.17-crypt_style.patch
@@ -0,0 +1,16 @@
+2010-09-01  Miloslav Trmač  <mitr@redhat.com>
+
+	* libuser.conf (crypt_style): Change default to sha512.
+
+diff -r f359c24398cc -r 276fa0a3078b libuser.conf
+--- a/libuser.conf	Sun Aug 29 12:08:06 2010 +0000
++++ b/libuser.conf	Wed Sep 01 16:13:31 2010 +0200
+@@ -17,7 +17,7 @@
+ # skeleton = /etc/skel
+ # mailspooldir = /var/mail
+ 
+-crypt_style = md5
++crypt_style = sha512
+ modules = files shadow
+ create_modules = files shadow
+ # modules = files shadow ldap
diff --git a/libuser.spec b/libuser.spec
index c3435d1..d12ec5f 100644
--- a/libuser.spec
+++ b/libuser.spec
@@ -2,11 +2,13 @@
 
 Name: libuser
 Version: 0.56.17
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Base
 License: LGPLv2+
 URL: https://fedorahosted.org/libuser/
 Source: https://fedorahosted.org/releases/l/i/libuser/libuser-%{version}.tar.xz
+# Upstream commit 276fa0a3078b431e18289285f84a77381b89726c
+Patch0: libuser-0.56.17-crypt_style.patch
 BuildRequires: glib2-devel, linuxdoc-tools, pam-devel, popt-devel, python2-devel
 BuildRequires: cyrus-sasl-devel, libselinux-devel, openldap-devel
 # To make sure the configure script can find it
@@ -43,6 +45,7 @@ administering user and group accounts.
 
 %prep
 %setup -q
+%patch0 -p1 -b .crypt_style
 
 %build
 %configure --with-selinux --with-ldap --with-html-dir=%{_datadir}/gtk-doc/html
@@ -98,6 +101,10 @@ python -c "import libuser"
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Sep  1 2010 Miloslav Trmač <mitr@redhat.com> - 0.56.17-2
+- Change default crypt_style to sha512
+  Resolves: #629001
+
 * Thu Aug 26 2010 Miloslav Trmač <mitr@redhat.com> - 0.56.17-1
 - Update to libuser-0.56.17