[arch-commits] Commit in cryptsetup/trunk (3 files)

[Thomas Bächler]

    Date: Friday, July 24, 2009 @ 21:02:38
  Author: thomas
Revision: 47665

upgpkg: cryptsetup 1.0.7-1

Modified:
  cryptsetup/trunk/PKGBUILD
Deleted:
  cryptsetup/trunk/cryptsetup-1.0.5-run_udevsettle.patch
  cryptsetup/trunk/fix-udevsettle-call.patch

---------------------------------------+
 PKGBUILD                              |   28 ++++++++++++----------------
 cryptsetup-1.0.5-run_udevsettle.patch |   29 -----------------------------
 fix-udevsettle-call.patch             |   12 ------------
 3 files changed, 12 insertions(+), 57 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-25 00:18:13 UTC (rev 47664)
+++ PKGBUILD	2009-07-25 01:02:38 UTC (rev 47665)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Judd Vinet <jvinet at zeroflux.org>
 pkgname=cryptsetup
-pkgver=1.0.6
-pkgrel=3
+pkgver=1.0.7
+pkgrel=1
 pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
 arch=(i686 x86_64)
 license=('GPL')
@@ -14,30 +14,26 @@
 source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
         encrypt_hook
 	encrypt_install
-	luksOpen-status.patch
-	fix-udevsettle-call.patch)
-md5sums=('00d452eb7a76e39f5749545d48934a10'
+	luksOpen-status.patch)
+md5sums=('5eea2a77391a8a1a651b31cbaef59e22'
          '6bdb1b83539453d403335aed1a579a5c'
          '24b76e9cb938bc3c8dcff396cbab28c7'
-         'd4be8d2059d5427c057be4de4e948887'
-         '9c62a0fdc8e579ff3a8dc11c884a4c3c')
+         'd4be8d2059d5427c057be4de4e948887')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-${pkgver}
   # suppress "Command successful" message on luksOpen
-  patch -p1 -i $startdir/src/luksOpen-status.patch || return 1
-  patch -p1 -i $startdir/src/fix-udevsettle-call.patch || return 1
+  patch -p1 -i $srcdir/luksOpen-status.patch || return 1
   ./configure --prefix=/usr --disable-static
   make || return 1
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR=$pkgdir install
   # include a static cryptsetup binary for initrd setups
   make clean
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-${pkgver}
   ./configure --prefix=/usr --enable-static
   make || return 1
-  # include a static cryptsetup binary for initrd setups
-  install -D -m755 src/cryptsetup $startdir/pkg/sbin/cryptsetup.static || return 1
+  install -D -m755 src/cryptsetup $pkgdir/sbin/cryptsetup.static || return 1
   # install hook
-  install -D -m644 $startdir/src/encrypt_hook $startdir/pkg/lib/initcpio/hooks/encrypt
-  install -D -m644 $startdir/src/encrypt_install $startdir/pkg/lib/initcpio/install/encrypt
+  install -D -m644 $srcdir/encrypt_hook $pkgdir/lib/initcpio/hooks/encrypt || return 1
+  install -D -m644 $srcdir/encrypt_install $pkgdir/lib/initcpio/install/encrypt || return 1
 }

Deleted: cryptsetup-1.0.5-run_udevsettle.patch
===================================================================
--- cryptsetup-1.0.5-run_udevsettle.patch	2009-07-25 00:18:13 UTC (rev 47664)
+++ cryptsetup-1.0.5-run_udevsettle.patch	2009-07-25 01:02:38 UTC (rev 47665)
@@ -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:
-

Deleted: fix-udevsettle-call.patch
===================================================================
--- fix-udevsettle-call.patch	2009-07-25 00:18:13 UTC (rev 47664)
+++ fix-udevsettle-call.patch	2009-07-25 01:02:38 UTC (rev 47665)
@@ -1,12 +0,0 @@
-diff -Nur cryptsetup-1.0.6.orig/lib/libdevmapper.c cryptsetup-1.0.6/lib/libdevmapper.c
---- cryptsetup-1.0.6.orig/lib/libdevmapper.c	2007-10-25 09:11:19.000000000 +0200
-+++ cryptsetup-1.0.6/lib/libdevmapper.c	2008-09-12 18:27:44.000000000 +0200
-@@ -18,7 +18,7 @@
- 
- #define	CRYPT_TARGET	"crypt"
- 
--#define UDEVSETTLE	"/sbin/udevsettle"
-+#define UDEVSETTLE	"/sbin/udevadm settle"
- 
- static void run_udevsettle(void)
- {