From d5c06ae59e22625047cccfc32aefeca685e2d6ba9e448b13e1455c03b3b24fbe Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <lnussel@suse.com>
Date: Thu, 27 Aug 2009 07:03:56 +0000
Subject: [PATCH] - new cryptetup version 1.0.7

OBS-URL: https://build.opensuse.org/package/show/security/cryptsetup?expand=0&rev=6
---
 cryptsetup-1.0.5-udevadm.patch  | 13 -------------
 cryptsetup-1.0.5_SVNr46.tar.bz2 |  3 ---
 cryptsetup-1.0.7.tar.bz2        |  3 +++
 cryptsetup-mktar                |  4 ++--
 cryptsetup.changes              |  5 +++++
 cryptsetup.spec                 |  6 ++----
 6 files changed, 12 insertions(+), 22 deletions(-)
 delete mode 100644 cryptsetup-1.0.5-udevadm.patch
 delete mode 100644 cryptsetup-1.0.5_SVNr46.tar.bz2
 create mode 100644 cryptsetup-1.0.7.tar.bz2

diff --git a/cryptsetup-1.0.5-udevadm.patch b/cryptsetup-1.0.5-udevadm.patch
deleted file mode 100644
index 12c55c1..0000000
--- a/cryptsetup-1.0.5-udevadm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: cryptsetup-1.0.5_SVNr46/lib/libdevmapper.c
-===================================================================
---- cryptsetup-1.0.5_SVNr46.orig/lib/libdevmapper.c	2007-10-24 22:47:53.000000000 +0200
-+++ cryptsetup-1.0.5_SVNr46/lib/libdevmapper.c	2008-07-23 11:42:29.000000000 +0200
-@@ -18,7 +18,7 @@
- 
- #define	CRYPT_TARGET	"crypt"
- 
--#define UDEVSETTLE	"/sbin/udevsettle"
-+#define UDEVSETTLE	"/sbin/udevadm settle"
- 
- static void run_udevsettle(void)
- {
diff --git a/cryptsetup-1.0.5_SVNr46.tar.bz2 b/cryptsetup-1.0.5_SVNr46.tar.bz2
deleted file mode 100644
index 245684b..0000000
--- a/cryptsetup-1.0.5_SVNr46.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ef8319f3d60b956f4cdfc45589d9e73cc3359ca0a3bb2fe072a49b5ba4bee956
-size 246372
diff --git a/cryptsetup-1.0.7.tar.bz2 b/cryptsetup-1.0.7.tar.bz2
new file mode 100644
index 0000000..a96c573
--- /dev/null
+++ b/cryptsetup-1.0.7.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:829af59ab5bb47e4ff384a927458b4ffbb86380825de5f9ac751a89df599ed99
+size 417339
diff --git a/cryptsetup-mktar b/cryptsetup-mktar
index ac7086c..4ef003f 100644
--- a/cryptsetup-mktar
+++ b/cryptsetup-mktar
@@ -1,7 +1,7 @@
 #!/bin/sh
-# repo is at http://luks.endorphin.org/svn/cryptsetup
+# repo is at http://cryptsetup.googlecode.com/svn/trunk
 set -e -x
-SVN_VERSION="1.0.5_SVNr`svnversion .`"
+SVN_VERSION="1.0.7_SVNr`svnversion .`"
 rm -rf cryptsetup-${SVN_VERSION}
 svn export . cryptsetup-${SVN_VERSION}
 tar --owner=root --group=root --force-local -cjf cryptsetup-${SVN_VERSION}.tar.bz2 cryptsetup-${SVN_VERSION}
diff --git a/cryptsetup.changes b/cryptsetup.changes
index 397fdac..a3ad6d2 100644
--- a/cryptsetup.changes
+++ b/cryptsetup.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug 27 06:59:55 UTC 2009 - lnussel@suse.de
+
+- new cryptetup version 1.0.7
+
 -------------------------------------------------------------------
 Wed Aug 19 14:08:40 CEST 2009 - lnussel@suse.de
 
diff --git a/cryptsetup.spec b/cryptsetup.spec
index a0dda0d..f74eb57 100644
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -29,8 +29,8 @@ BuildRequires:  libselinux-devel
 License:        BSD 3-clause (or similar) ; GPL v2 only ; GPL v2 or later
 Group:          System/Base
 AutoReqProv:    on
-Version:        1.0.5_SVNr46
-Release:        67
+Version:        1.0.7
+Release:        1
 Summary:        Set Up dm-crypt Based Encrypted Block Devices
 Source:         cryptsetup-%{version}.tar.bz2
 Source1:        hashalot-%haver.tar.bz2
@@ -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
-Patch1:         cryptsetup-1.0.5-udevadm.patch
 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
-%patch1 -p1
 pushd ../hashalot-%haver
 %patch10 -p1
 %patch11 -p1