diff --git a/cryptsetup-1.0.5-udevadm.patch b/cryptsetup-1.0.5-udevadm.patch new file mode 100644 index 0000000..12c55c1 --- /dev/null +++ b/cryptsetup-1.0.5-udevadm.patch @@ -0,0 +1,13 @@ +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 new file mode 100644 index 0000000..245684b --- /dev/null +++ b/cryptsetup-1.0.5_SVNr46.tar.bz2 @@ -0,0 +1,3 @@ +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 deleted file mode 100644 index a96c573..0000000 --- a/cryptsetup-1.0.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:829af59ab5bb47e4ff384a927458b4ffbb86380825de5f9ac751a89df599ed99 -size 417339 diff --git a/cryptsetup-mktar b/cryptsetup-mktar index 4ef003f..ac7086c 100644 --- a/cryptsetup-mktar +++ b/cryptsetup-mktar @@ -1,7 +1,7 @@ #!/bin/sh -# repo is at http://cryptsetup.googlecode.com/svn/trunk +# repo is at http://luks.endorphin.org/svn/cryptsetup set -e -x -SVN_VERSION="1.0.7_SVNr`svnversion .`" +SVN_VERSION="1.0.5_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 938b97e..397fdac 100644 --- a/cryptsetup.changes +++ b/cryptsetup.changes @@ -1,38 +1,3 @@ -------------------------------------------------------------------- -Thu Aug 27 06:59:55 UTC 2009 - lnussel@suse.de - -- new cryptsetup version 1.0.7 - * Allow removal of last slot in luksRemoveKey and luksKillSlot. - * Reject unsupported --offset and --skip options for luksFormat and update man page. - * Various man page fixes. - * Set UUID in device-mapper for LUKS devices. - * Retain readahead of underlying device. - * Display device name when asking for password. - * Check device size when loading LUKS header. Remove misleading error message later. - * Add error hint if dm-crypt mapping failed. - * Use better error messages if device doesn't exist or is already used by other mapping. - * Fix make distcheck. - * Check if all slots are full during luksAddKey. - * Fix segfault in set_error. - * Code cleanups, remove precompiled pot files, remove unnecessary files from po directory - * Fix uninitialized return value variable in setup.c. - * Code cleanups. (thanks to Ivan Stankovic) - * Fix wrong output for remaining key at key deletion. - * Allow deletion of key slot while other keys have the same key information. - * Add missing AM_PROG_CC_C_O to configure.in - * Remove duplicate sentence in man page. - * Wipe start of device (possible fs signature) before LUKS-formatting. - * Do not process configure.in in hidden directories. - * Return more descriptive error in case of IO or header format error. - * Use remapping to error target instead of calling udevsettle for temporary crypt device. - * Check device mapper communication and warn user if device-mapper support missing in kernel. - * Fix signal handler to properly close device. - * write_lseek_blockwise: declare innerCount outside the if block. - * add -Wall to the default CFLAGS. fix some signedness issues. - * Error handling improvement. - * Add non-exclusive override to interface definition. - * Refactor key slot selection into keyslot_from_option. - ------------------------------------------------------------------- Wed Aug 19 14:08:40 CEST 2009 - lnussel@suse.de diff --git a/cryptsetup.spec b/cryptsetup.spec index f74eb57..a0dda0d 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.7 -Release: 1 +Version: 1.0.5_SVNr46 +Release: 67 Summary: Set Up dm-crypt Based Encrypted Block Devices Source: cryptsetup-%{version}.tar.bz2 Source1: hashalot-%haver.tar.bz2 @@ -38,6 +38,7 @@ 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 @@ -114,6 +115,7 @@ Authors: %prep %setup -q -b 1 -b 2 +%patch1 -p1 pushd ../hashalot-%haver %patch10 -p1 %patch11 -p1