From fa5652474f91c1c5931c43fdc9fcc02f0f304c34d61d74a3630e06d6c8c56697 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <lnussel@suse.com>
Date: Tue, 16 Nov 2010 14:06:15 +0000
Subject: [PATCH] - boot.crypto:   * add a few tweaks for systemd (bnc#652767)

OBS-URL: https://build.opensuse.org/package/show/security/cryptsetup?expand=0&rev=52
---
 ...mp-mappings-in-early-stage-bnc-591704.diff | 25 -------------------
 boot.crypto-0_201003091150.tar.bz2            |  3 ---
 boot.crypto-0_201011161504.tar.bz2            |  3 +++
 cryptsetup.changes                            |  6 +++++
 cryptsetup.spec                               |  3 +--
 5 files changed, 10 insertions(+), 30 deletions(-)
 delete mode 100644 0001-skip-tmp-mappings-in-early-stage-bnc-591704.diff
 delete mode 100644 boot.crypto-0_201003091150.tar.bz2
 create mode 100644 boot.crypto-0_201011161504.tar.bz2

diff --git a/0001-skip-tmp-mappings-in-early-stage-bnc-591704.diff b/0001-skip-tmp-mappings-in-early-stage-bnc-591704.diff
deleted file mode 100644
index d42abf1..0000000
--- a/0001-skip-tmp-mappings-in-early-stage-bnc-591704.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3533bf2521a9829d7042f604dcac39c9dc472b43 Mon Sep 17 00:00:00 2001
-From: Ludwig Nussel <ludwig.nussel@suse.de>
-Date: Thu, 1 Jul 2010 16:18:13 +0200
-Subject: [PATCH] skip 'tmp' mappings in early stage (bnc#591704)
-
----
- boot.crypto.functions |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/boot.crypto.functions b/boot.crypto.functions
-index 977c589..db9185b 100755
---- a/boot.crypto.functions
-+++ b/boot.crypto.functions
-@@ -602,7 +602,7 @@ start_crypttab ()
- 	    continue
- 	fi
- 
--	if test "$CRYPT_EARLY" = "yes" -a "$noearly" = "yes"; then
-+	if test "$CRYPT_EARLY" = "yes" -a \( "$noearly" = "yes" -o "$maketmp" = "yes" \); then
- 	    report 5 "$name... will be set up later"
- 	    continue
- 	fi
--- 
-1.7.1
-
diff --git a/boot.crypto-0_201003091150.tar.bz2 b/boot.crypto-0_201003091150.tar.bz2
deleted file mode 100644
index b47daba..0000000
--- a/boot.crypto-0_201003091150.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bc038edfa8df990b7f1b909bd4833feff1cf0b4f1e7749cec3ec4fdeef51a093
-size 18502
diff --git a/boot.crypto-0_201011161504.tar.bz2 b/boot.crypto-0_201011161504.tar.bz2
new file mode 100644
index 0000000..50c57f0
--- /dev/null
+++ b/boot.crypto-0_201011161504.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f934193a79e3c4dbc057158957a05d1a378f54f724c86622575693ab2851dffd
+size 18499
diff --git a/cryptsetup.changes b/cryptsetup.changes
index d4feb30..f7eea58 100644
--- a/cryptsetup.changes
+++ b/cryptsetup.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Nov 16 14:05:47 UTC 2010 - lnussel@suse.de
+
+- boot.crypto:
+  * add a few tweaks for systemd (bnc#652767)
+
 -------------------------------------------------------------------
 Wed Jul  7 14:38:11 UTC 2010 - lnussel@suse.de
 
diff --git a/cryptsetup.spec b/cryptsetup.spec
index d5547aa..69cf203 100644
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -48,7 +48,6 @@ Patch13:        hashalot-timeout.diff
 Patch14:        hashalot-manpage.diff
 Patch15:        bug-476290_hashalot-hashlen.diff
 Patch16:        hashalot-glibc210.diff
-Patch20:        0001-skip-tmp-mappings-in-early-stage-bnc-591704.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       aaa_base:/etc/init.d/boot.crypto
 Obsoletes:      util-linux-crypto <= 2.12r
@@ -129,7 +128,7 @@ pushd ../hashalot-%haver
 %patch16 -p1
 popd
 pushd ../boot.crypto-%bcver
-%patch20 -p1
+#patch20 -p1
 popd
 
 %build