rpms/volume_key/devel volume_key-0.2-libblkid-type.patch, NONE, 1.1 volume_key.spec, 1.2, 1.3
Miloslav Trmac
mitr at fedoraproject.org
Sat Aug 8 03:34:48 UTC 2009
- Previous message (by thread): rpms/trac-tickettemplate-plugin/EL-5 README.license, NONE, 1.1 trac-tickettemplate-plugin.spec, NONE, 1.1 sources, 1.1, 1.2
- Next message (by thread): rpms/xorg-x11-drv-nouveau/F-11 rh508970.patch, NONE, 1.1 xorg-x11-drv-nouveau.spec, 1.53, 1.54
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mitr
Update of /cvs/pkgs/rpms/volume_key/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20176
Modified Files:
volume_key.spec
Added Files:
volume_key-0.2-libblkid-type.patch
Log Message:
* Sat Aug 8 2009 Miloslav Trmač <mitr at redhat.com> - 0.2-3
- Handle changed "TYPE=crypto_LUKS" from libblkid
- Preserve file timestamps during installation
volume_key-0.2-libblkid-type.patch:
volume.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- NEW FILE volume_key-0.2-libblkid-type.patch ---
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 ());
Index: volume_key.spec
===================================================================
RCS file: /cvs/pkgs/rpms/volume_key/devel/volume_key.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- volume_key.spec 27 Jul 2009 06:58:12 -0000 1.2
+++ volume_key.spec 8 Aug 2009 03:34:48 -0000 1.3
@@ -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/releas
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 form
%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 at 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 at lists.fedoraproject.org> - 0.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
- Previous message (by thread): rpms/trac-tickettemplate-plugin/EL-5 README.license, NONE, 1.1 trac-tickettemplate-plugin.spec, NONE, 1.1 sources, 1.1, 1.2
- Next message (by thread): rpms/xorg-x11-drv-nouveau/F-11 rh508970.patch, NONE, 1.1 xorg-x11-drv-nouveau.spec, 1.53, 1.54
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list