Accepting request 53167 from security

Accepted submit request 53167 from user lnussel

OBS-URL: https://build.opensuse.org/request/show/53167
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cryptsetup?expand=0&rev=51

0001-skip-tmp-mappings-in-early-stage-bnc-591704.diff

@@ -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
-

boot.crypto-0_201003091150.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bc038edfa8df990b7f1b909bd4833feff1cf0b4f1e7749cec3ec4fdeef51a093
-size 18502

boot.crypto-0_201011161518.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e70807bc7b3d3cd396319ebc554a168d6b8f1d9c5673674be5a3e0e4faf7af84
+size 18511

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
 

cryptsetup.spec

@@ -25,7 +25,7 @@ BuildRequires:  libselinux-devel pkgconfig
 # hashalot version
 %define haver 0.3 
 # boot.crypto version
-%define bcver 0_201003091150
+%define bcver 0_201011161518
 License:        GPLv2+
 Group:          System/Base
 AutoReqProv:    on
@@ -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