[arch-commits] Commit in cryptsetup/trunk (PKGBUILD encrypt_hook)

[Thomas Bächler]

    Date: Saturday, February 9, 2013 @ 17:06:29
  Author: thomas
Revision: 177818

upgpkg: cryptsetup 1.6.0-1

Modified:
  cryptsetup/trunk/PKGBUILD
  cryptsetup/trunk/encrypt_hook

--------------+
 PKGBUILD     |    8 ++++----
 encrypt_hook |    6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-09 15:02:46 UTC (rev 177817)
+++ PKGBUILD	2013-02-09 16:06:29 UTC (rev 177818)
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 pkgname=cryptsetup
-pkgver=1.5.1
+pkgver=1.6.0
 pkgrel=1
 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt"
 arch=(i686 x86_64)
@@ -14,9 +14,9 @@
         http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc
         encrypt_hook
         encrypt_install)
-md5sums=('87cc018c0c65f36043f38ceb8ffd4d81'
-         '5f711687f453f4d5a38596f60df5247a'
-         'c970831d733ca42e20415005967e7843'
+md5sums=('99002ac59a65ea371e7a98200943cb80'
+         'd933e3e59998e491f674b42fd66d6183'
+         'c279d86d6dc18322c054d2272ebb9e90'
          '21c45f9cab3e0b5165f68358884fbd0f')
 
 build() {

Modified: encrypt_hook
===================================================================
--- encrypt_hook	2013-02-09 15:02:46 UTC (rev 177817)
+++ encrypt_hook	2013-02-09 16:06:29 UTC (rev 177818)
@@ -66,7 +66,7 @@
             dopassphrase=1
             # If keyfile exists, try to use that
             if [ -f ${ckeyfile} ]; then
-                if eval cryptsetup --key-file ${ckeyfile} luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; then
+                if eval cryptsetup --key-file ${ckeyfile} open --type luks ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; then
                     dopassphrase=0
                 else
                     echo "Invalid keyfile. Reverting to passphrase."
@@ -78,7 +78,7 @@
                 echo "A password is required to access the ${cryptname} volume:"
 
                 #loop until we get a real password
-                while ! eval cryptsetup luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; do
+                while ! eval cryptsetup open --type luks ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; do
                     sleep 2;
                 done
             fi
@@ -98,7 +98,7 @@
                 err "Non-LUKS decryption not attempted..."
                 return 1
             fi
-            exe="cryptsetup create $cryptname $resolved $cryptargs"
+            exe="cryptsetup open --type plain $resolved $cryptname $cryptargs"
             IFS=: read c_hash c_cipher c_keysize c_offset c_skip <<EOF
 $crypto
 EOF