From 494f640a9c58292967548005193caa92391af49470783da9c3bf6d19371f2fb0 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <lnussel@suse.com>
Date: Mon, 31 May 2010 11:18:36 +0000
Subject: [PATCH] - new version 1.1.2 fixes keyfile regression introduced by
 1.1.1  * Fix luksFormat/luksOpen reading passphrase from stdin and "-"
 keyfile.  * Support --key-file/-d option for luksFormat.  * Fix description
 of --key-file and add --verbose and --debug options to man page.  * Add
 verbose log level and move unlocking message there.  * Remove device even if
 underlying device disappeared (remove, luksClose).  * Fix (deprecated) reload
 device command to accept new device argument.

OBS-URL: https://build.opensuse.org/package/show/security/cryptsetup?expand=0&rev=45
---
 cryptsetup-1.1.1.tar.bz2     |  3 ---
 cryptsetup-1.1.1.tar.bz2.asc |  7 -------
 cryptsetup-1.1.2.tar.bz2     |  3 +++
 cryptsetup-1.1.2.tar.bz2.asc |  7 +++++++
 cryptsetup.changes           | 11 +++++++++++
 cryptsetup.spec              |  2 +-
 6 files changed, 22 insertions(+), 11 deletions(-)
 delete mode 100644 cryptsetup-1.1.1.tar.bz2
 delete mode 100644 cryptsetup-1.1.1.tar.bz2.asc
 create mode 100644 cryptsetup-1.1.2.tar.bz2
 create mode 100644 cryptsetup-1.1.2.tar.bz2.asc

diff --git a/cryptsetup-1.1.1.tar.bz2 b/cryptsetup-1.1.1.tar.bz2
deleted file mode 100644
index aeda7b5..0000000
--- a/cryptsetup-1.1.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a0d07cfc03d3a12d54e68eebb509e6ce45bbd5169ae277256ea7bd165cc246bd
-size 477800
diff --git a/cryptsetup-1.1.1.tar.bz2.asc b/cryptsetup-1.1.1.tar.bz2.asc
deleted file mode 100644
index b70268d..0000000
--- a/cryptsetup-1.1.1.tar.bz2.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-iEYEABECAAYFAkv5MTUACgkQf1Jlc7shgi/7NgCffzJroywTA9rBo8SPvHZdpmYo
-JOgAoIn6v5wuMlTBDHQ8gLU1RZ4d3xMr
-=UWDV
------END PGP SIGNATURE-----
diff --git a/cryptsetup-1.1.2.tar.bz2 b/cryptsetup-1.1.2.tar.bz2
new file mode 100644
index 0000000..93d7a9e
--- /dev/null
+++ b/cryptsetup-1.1.2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:45972839fbb169b3ad5649454c217b7f5b0b3c8bf07e32f51a334a88217c7293
+size 478501
diff --git a/cryptsetup-1.1.2.tar.bz2.asc b/cryptsetup-1.1.2.tar.bz2.asc
new file mode 100644
index 0000000..67bc516
--- /dev/null
+++ b/cryptsetup-1.1.2.tar.bz2.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.10 (GNU/Linux)
+
+iEYEABECAAYFAkwCo+4ACgkQf1Jlc7shgi+ejACfT+aFnv1CY13deNC3ggmOGXX4
+6WkAn3SWXkIF0GOGWwG4L5nFc57ozBdy
+=01i4
+-----END PGP SIGNATURE-----
diff --git a/cryptsetup.changes b/cryptsetup.changes
index a4ff333..23bc11f 100644
--- a/cryptsetup.changes
+++ b/cryptsetup.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon May 31 09:42:27 UTC 2010 - lnussel@suse.de
+
+- new version 1.1.2 fixes keyfile regression introduced by 1.1.1
+ * Fix luksFormat/luksOpen reading passphrase from stdin and "-" keyfile.
+ * Support --key-file/-d option for luksFormat.
+ * Fix description of --key-file and add --verbose and --debug options to man page.
+ * Add verbose log level and move unlocking message there.
+ * Remove device even if underlying device disappeared (remove, luksClose).
+ * Fix (deprecated) reload device command to accept new device argument.
+
 -------------------------------------------------------------------
 Tue May 25 08:11:30 UTC 2010 - lnussel@suse.de
 
diff --git a/cryptsetup.spec b/cryptsetup.spec
index fd15edf..28feeaf 100644
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -29,7 +29,7 @@ BuildRequires:  libselinux-devel pkgconfig
 License:        BSD3c(or similar) ; GPLv2 ; GPLv2+
 Group:          System/Base
 AutoReqProv:    on
-Version:        1.1.1
+Version:        1.1.2
 Release:        4
 Summary:        Set Up dm-crypt Based Encrypted Block Devices
 Source:         http://cryptsetup.googlecode.com/files/cryptsetup-%{version}.tar.bz2