From afd9ac749aa22649968205256b0c7f7060454daded4b8f3d2d9be5e9c765e191 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Thu, 24 Sep 2009 22:02:29 +0000
Subject: [PATCH] checked in

OBS-URL: https://build.opensuse.org/package/show/security/cryptsetup?expand=0&rev=21
---
 boot.crypto-0_200909211050.tar.bz2 |  3 +++
 boot.crypto-0_200909241541.tar.bz2 |  3 ---
 cryptsetup-1.0.7-eofpw.diff        | 13 -------------
 cryptsetup.changes                 | 11 -----------
 cryptsetup.spec                    |  4 +---
 5 files changed, 4 insertions(+), 30 deletions(-)
 create mode 100644 boot.crypto-0_200909211050.tar.bz2
 delete mode 100644 boot.crypto-0_200909241541.tar.bz2
 delete mode 100644 cryptsetup-1.0.7-eofpw.diff

diff --git a/boot.crypto-0_200909211050.tar.bz2 b/boot.crypto-0_200909211050.tar.bz2
new file mode 100644
index 0000000..3ab0113
--- /dev/null
+++ b/boot.crypto-0_200909211050.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:32bdc236d3d90ee0d099d78b0d931fb3d179907a547fea83bc8d043bedb3d752
+size 17650
diff --git a/boot.crypto-0_200909241541.tar.bz2 b/boot.crypto-0_200909241541.tar.bz2
deleted file mode 100644
index 8e675da..0000000
--- a/boot.crypto-0_200909241541.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7ac820de8fc0c338c0686854dd8d923bc4e50040ed4147a0dcd84715e9f6cc16
-size 17758
diff --git a/cryptsetup-1.0.7-eofpw.diff b/cryptsetup-1.0.7-eofpw.diff
deleted file mode 100644
index 6914ea7..0000000
--- a/cryptsetup-1.0.7-eofpw.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: cryptsetup-1.0.7/lib/utils.c
-===================================================================
---- cryptsetup-1.0.7.orig/lib/utils.c
-+++ cryptsetup-1.0.7/lib/utils.c
-@@ -452,6 +452,8 @@ int get_key(char *prompt, char **key, un
- 		}
- 		if(key_file)
- 			close(fd);
-+		if(!i) // we didn't read anything, user pressed ^D?
-+			goto out_err;
- 		pass[i] = 0;
- 		*key = pass;
- 		*passLen = i;
diff --git a/cryptsetup.changes b/cryptsetup.changes
index b56e376..66d3ec4 100644
--- a/cryptsetup.changes
+++ b/cryptsetup.changes
@@ -1,14 +1,3 @@
--------------------------------------------------------------------
-Thu Sep 24 13:36:52 UTC 2009 - lnussel@suse.de
-
-- boot.crypto:
-  * don't use hashalot if keyfile is specified
-  * to comply with Debian, keyscripts must only output the password.
-    In order to allow keyscript to use different methods to retrieve
-    a key, add a keyscript_rawkey option.
-- cryptsetup:
-  * When reading no single byte for the key abort.
-
 -------------------------------------------------------------------
 Mon Sep 21 08:51:40 UTC 2009 - lnussel@suse.de
 
diff --git a/cryptsetup.spec b/cryptsetup.spec
index 14aaa5e..7271d6c 100644
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -25,7 +25,7 @@ BuildRequires:  libselinux-devel
 # hashalot version
 %define haver 0.3 
 # boot.crypto version
-%define bcver 0_200909241541
+%define bcver 0_200909211050
 License:        BSD 3-clause (or similar) ; GPL v2 only ; GPL v2 or later
 Group:          System/Base
 AutoReqProv:    on
@@ -38,7 +38,6 @@ Source1:        hashalot-%haver.tar.bz2
 Source2:        boot.crypto-%{bcver}.tar.bz2
 # use this to create the tarball from svn
 Source99:       cryptsetup-mktar
-Patch0:         cryptsetup-1.0.7-eofpw.diff
 Patch10:        hashalot-fixes.diff
 Patch11:        hashalot-libgcrypt.diff
 Patch12:        hashalot-ctrl-d.diff
@@ -115,7 +114,6 @@ Authors:
 
 %prep
 %setup -q -b 1 -b 2
-%patch0 -p1
 pushd ../hashalot-%haver
 %patch10 -p1
 %patch11 -p1