From 74ce6932554435f6ef2a590e433427abbc3e0531 Mon Sep 17 00:00:00 2001
From: Miloslav Trmac <mitr@fedoraproject.org>
Date: Sat, 8 Aug 2009 03:34:48 +0000
Subject: [PATCH] - Handle changed "TYPE=crypto_LUKS" from libblkid - Preserve
 file timestamps during installation

---
 volume_key-0.2-libblkid-type.patch | 17 +++++++++++++++++
 volume_key.spec                    | 12 +++++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 volume_key-0.2-libblkid-type.patch

diff --git a/volume_key-0.2-libblkid-type.patch b/volume_key-0.2-libblkid-type.patch
new file mode 100644
index 0000000..dc740a9
--- /dev/null
+++ b/volume_key-0.2-libblkid-type.patch
@@ -0,0 +1,17 @@
+diff --git a/lib/volume.c b/lib/volume.c
+index 91c9dbc..62fc6ec 100644
+--- a/lib/volume.c
++++ b/lib/volume.c
+@@ -311,7 +311,11 @@ libvk_volume_open (const char *path, GError **error)
+     }
+   vol = g_new (struct libvk_volume, 1);
+   vol->source = VOLUME_SOURCE_LOCAL;
+-  vol->format = g_strdup (c);
++  /* The LUKS type identifier returned by blkid has changed. */
++  if (strcmp (c, "crypto_LUKS") == 0)
++    vol->format = g_strdup (LIBVK_VOLUME_FORMAT_LUKS);
++  else
++    vol->format = g_strdup (c);
+   free (c);
+ 
+   vol->hostname = g_strdup (g_get_host_name ());
diff --git a/volume_key.spec b/volume_key.spec
index a391b06..16b8e3f 100644
--- a/volume_key.spec
+++ b/volume_key.spec
@@ -3,7 +3,7 @@
 Summary: An utility for manipulating storage encryption keys and passphrases
 Name: volume_key
 Version: 0.2
-Release: 2
+Release: 3
 License: GPLv2
 Group: Applications/System
 URL: https://fedorahosted.org/volume_key/
@@ -13,6 +13,7 @@ Source0: https://fedorahosted.org/releases/v/o/volume_key/volume_key-%{version}.
 Source1: http://cryptsetup.googlecode.com/files/cryptsetup-1.0.7-rc1.tar.bz2
 # http://code.google.com/p/cryptsetup/issues/detail?id=15
 Patch0: https://fedorahosted.org/releases/v/o/volume_key/cryptsetup-svn-r62.patch
+Patch1: volume_key-0.2-libblkid-type.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: gettext-devel, glib2-devel, gnupg, gpgme-devel, libblkid-devel
 BuildRequires: nss-devel, python-devel
@@ -81,6 +82,7 @@ for other formats is possible, some formats are planned for future releases.
 
 %prep
 %setup -q -a 1
+%patch1 -p1 -b .libblkid-type
 pushd cryptsetup-1.0.7-rc1
 %patch0 -p0 -b .cs-vk
 popd
@@ -91,7 +93,7 @@ cryptsetup_root=$(pwd)/cryptsetup-root
 pushd cryptsetup-1.0.7-rc1
 %configure --enable-static --disable-shared --with-pic
 make %{?_smp_mflags}
-make install "DESTDIR=$cryptsetup_root" INSTALL='install -p'
+make install "DESTDIR=$cryptsetup_root"
 popd
 
 %configure "CPPFLAGS=-I$cryptsetup_root"%{_includedir} \
@@ -101,7 +103,7 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
 %find_lang volume_key
 
@@ -135,6 +137,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/volume_key.py*
 
 %changelog
+* Sat Aug  8 2009 Miloslav Trmač <mitr@redhat.com> - 0.2-3
+- Handle changed "TYPE=crypto_LUKS" from libblkid
+- Preserve file timestamps during installation
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild