[arch-commits] CVS update of core/base/cryptsetup (3 files)

[Thomas Baechler]

    Date: Saturday, March 15, 2008 @ 11:30:26
  Author: thomas
    Path: /home/cvs-core/core/base/cryptsetup

Modified: PKGBUILD (1.12 -> 1.13) encrypt_install (1.2 -> 1.3)
 Removed: cryptsetup-1.0.5-run_udevsettle.patch (1.1)

upgpkg: cryptsetup 1.0.6-1


---------------------------------------+
 PKGBUILD                              |   19 ++++++++-----------
 cryptsetup-1.0.5-run_udevsettle.patch |   29 -----------------------------
 encrypt_install                       |    2 +-
 3 files changed, 9 insertions(+), 41 deletions(-)


Index: core/base/cryptsetup/PKGBUILD
diff -u core/base/cryptsetup/PKGBUILD:1.12 core/base/cryptsetup/PKGBUILD:1.13
--- core/base/cryptsetup/PKGBUILD:1.12	Sun Mar  2 23:01:23 2008
+++ core/base/cryptsetup/PKGBUILD	Sat Mar 15 11:30:25 2008
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.12 2008/03/02 22:01:23 thomas Exp $
+# $Id: PKGBUILD,v 1.13 2008/03/15 10:30:25 thomas Exp $
 # Maintainer: Judd Vinet <jvinet at zeroflux.org>
 pkgname=cryptsetup
-pkgver=1.0.5
-pkgrel=6
+pkgver=1.0.6
+pkgrel=1
 pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
 arch=(i686 x86_64)
 license=('GPL')
@@ -13,19 +13,16 @@
 source=(http://luks.endorphin.org/source/cryptsetup-$pkgver.tar.bz2
         encrypt_hook
 	encrypt_install
-	luksOpen-status.patch
-        cryptsetup-1.0.5-run_udevsettle.patch)
-md5sums=('0aa2f94c39123f1a0352983e5366179c'
+	luksOpen-status.patch)
+md5sums=('00d452eb7a76e39f5749545d48934a10'
          '40fee2419cd444cfb283c311f9555d2d'
-         'f87befa265771f24b01fef8d38957c58'
-         'd4be8d2059d5427c057be4de4e948887'
-         '0c0af7d348da6e85dc4bdbd8c0df9e13')
+         '24b76e9cb938bc3c8dcff396cbab28c7'
+         'd4be8d2059d5427c057be4de4e948887')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
   # suppress "Command successful" message on luksOpen
-  patch -Np1 -i $startdir/src/luksOpen-status.patch
-  patch -Np1 -i $startdir/src/cryptsetup-1.0.5-run_udevsettle.patch
+  patch -p1 -i $startdir/src/luksOpen-status.patch
   ./configure --prefix=/usr --disable-static
   make || return 1
   make DESTDIR=$startdir/pkg install
Index: core/base/cryptsetup/cryptsetup-1.0.5-run_udevsettle.patch
diff -u core/base/cryptsetup/cryptsetup-1.0.5-run_udevsettle.patch:1.1 core/base/cryptsetup/cryptsetup-1.0.5-run_udevsettle.patch:removed
--- core/base/cryptsetup/cryptsetup-1.0.5-run_udevsettle.patch:1.1	Thu Jun 21 18:33:12 2007
+++ core/base/cryptsetup/cryptsetup-1.0.5-run_udevsettle.patch	Sat Mar 15 11:30:26 2008
@@ -1,29 +0,0 @@
-Index: cryptsetup-1.0.5/lib/libdevmapper.c
-===================================================================
---- cryptsetup-1.0.5.orig/lib/libdevmapper.c
-+++ cryptsetup-1.0.5/lib/libdevmapper.c
-@@ -18,6 +18,13 @@
- 
- #define	CRYPT_TARGET	"crypt"
- 
-+#define UDEVSETTLE	"/sbin/udevsettle"
-+
-+static void run_udevsettle(void)
-+{
-+	system(UDEVSETTLE);
-+}
-+
- static void set_dm_error(int level, const char *file, int line,
-                          const char *f, ...)
- {
-@@ -184,6 +191,9 @@ static int dm_create_device(int reload, 
- 	if (dmi.read_only)
- 		options->flags |= CRYPT_FLAG_READONLY;
- 
-+	/* run udevsettle to avoid problems with busy dm devices */
-+	run_udevsettle();
-+
- 	r = 0;
- 	
- out:
-
Index: core/base/cryptsetup/encrypt_install
diff -u core/base/cryptsetup/encrypt_install:1.2 core/base/cryptsetup/encrypt_install:1.3
--- core/base/cryptsetup/encrypt_install:1.2	Sun Mar  2 23:01:23 2008
+++ core/base/cryptsetup/encrypt_install	Sat Mar 15 11:30:26 2008
@@ -3,7 +3,7 @@
 install ()
 {
     if [ -z "${CRYPTO_MODULES}" ]; then
-        MODULES=" dm-crypt $(all_modules "/crypto/" | grep -v "aes.ko" ) "
+        MODULES=" dm-crypt $(all_modules "/crypto/") "
     else
         MODULES=" dm-crypt ${CRYPTO_MODULES} "
     fi