From efce99dd9de4cc9afd20c7f141bc56ac40f691d0 Mon Sep 17 00:00:00 2001
From: Milan Broz <mbroz@redhat.com>
Date: Dec 29 2012 22:36:04 +0000
Subject: Update to cryptsetup 1.6.0-rc1.

Relax license to GPLv2+ according to new release.
Compile cryptsetup with libpwquality support.

---

diff --git a/.gitignore b/.gitignore
index cafcf89..a2baff5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/cryptsetup-1.5.1.tar.bz2
+/cryptsetup-1.6.0-rc1.tar.bz2
diff --git a/cryptsetup-1.5.1.tar.bz2.asc b/cryptsetup-1.5.1.tar.bz2.asc
deleted file mode 100644
index 91c2bf3..0000000
--- a/cryptsetup-1.5.1.tar.bz2.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-iQIcBAABAgAGBQJQfb41AAoJENmwV3vZPpj8nv4QAJAGr5zYVzCnuBS3j6AKWwIo
-JUcoxRnNPNSuw+qIk3oVhsEfCZKZrhPbVKN4l058r9UVrKfCjH/BpemkEkvPpJXe
-I7xm6H+PI9nSx43h69Y+aW9LVD4y4F5WpBrlzCcYbJbKiDYmobXciaU+c81AuJFe
-s682e0oDp691oiUHtuXD70ivhqi7hkUgm5ftLSDNJ8K2i4V60AsQ6CCHNc7HobJo
-jEnzwwsSXhyad8SCiyWhfyCadHcDfMrlQHcbCOl5DnFRM5hJz7fOedXz2D6jpGhA
-MLQHVEE7ANDCz2RvrX7Bh9BTfGydQfDlelD+gDqVmdrOcy0x9EDQ6Ux3ITroms65
-wLfX5yWA7yaqWUGpoeQhQ0w5Pnsy7SnDxXXRK+yg90QRkJYrS7idrwXHQSPhkaFS
-LSgxnEMEYnyEy6g25nFSEx+gRqkdnXioXpe2ULr4DgZwRcjTeLyQ8aeVu0a/9JWw
-amTLEgq77R5uk10Eco5dlI0bjb/bkSvT/9IrvKSWiPnE3XkaX6isK5F0EmLhnZDj
-uotYrZ0MBHfaqFP/qiqbMQ1kb0AFdhzYyEJ63gGd0gRNcdM/GYxvKOADii9WDOT2
-MSX2KZOnaTxFBUsatgGcedJgcQL3QumHUfPzE2qOkzt5KCthbV5Oe9tyvGoy/UVh
-/TQwxHvPZVH/lpaJsGtx
-=VyhW
------END PGP SIGNATURE-----
diff --git a/cryptsetup.spec b/cryptsetup.spec
index bdf4082..fb95be9 100644
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -1,20 +1,21 @@
 Summary: A utility for setting up encrypted disks
 Name: cryptsetup
-Version: 1.5.1
-Release: 1%{?dist}
-License: GPLv2 and LGPLv2+
+Version: 1.6.0
+Release: 0.1%{?dist}
+License: GPLv2+ and LGPLv2+
 Group: Applications/System
 URL: http://cryptsetup.googlecode.com/
 BuildRequires: libgcrypt-devel, popt-devel, device-mapper-devel
 BuildRequires: libgpg-error-devel, libuuid-devel, libsepol-devel
-BuildRequires: libselinux-devel, python-devel
+BuildRequires: libselinux-devel, python-devel, libpwquality-devel
 BuildRequires: fipscheck-devel >= 1.3.0
 Provides: cryptsetup-luks = %{version}-%{release}
 Obsoletes: cryptsetup-luks < 1.4.0
 Requires: cryptsetup-libs = %{version}-%{release}
 Requires: fipscheck-lib%{_isa} >= 1.3.0
+Requires: libpwquality >= 1.2.0
 
-%define upstream_version %{version}
+%define upstream_version %{version}-rc1
 Source0: http://cryptsetup.googlecode.com/files/cryptsetup-%{upstream_version}.tar.bz2
 
 %description
@@ -79,7 +80,7 @@ chmod -x python/pycryptsetup-test.py
 chmod -x misc/dracut_90reencrypt/*
 
 %build
-%configure --enable-python --enable-fips --enable-cryptsetup-reencrypt
+%configure --enable-python --enable-fips --enable-cryptsetup-reencrypt --enable-pwquality
 # remove rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -139,8 +140,10 @@ install -d %{buildroot}/%{_libdir}/fipscheck
 %clean
 
 %changelog
-* Tue Oct 16 2012 Milan Broz <mbroz@redhat.com> - 1.5.1-1
-- Update to cryptsetup 1.5.1.
+* Sat Dec 29 2012 Milan Broz <mbroz@redhat.com> - 1.6.0-0.1
+- Update to cryptsetup 1.6.0-rc1.
+- Relax license to GPLv2+ according to new release.
+- Compile cryptsetup with libpwquality support.
 
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index d69aa2b..4ac625f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-87cc018c0c65f36043f38ceb8ffd4d81  cryptsetup-1.5.1.tar.bz2
+4e3b6c1b488ce256162198708472492d  cryptsetup-1.6.0-rc1.tar.bz2