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

[Thomas Bächler]

    Date: Sunday, May 13, 2012 @ 09:45:33
  Author: thomas
Revision: 158937

upgpkg: cryptsetup 1.4.2-1

- upstream update
- move cryptsetup to /usr
- fix typo in the mkinitcpio hook help

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

-----------------+
 PKGBUILD        |   15 ++++++++-------
 encrypt_hook    |   10 +++++-----
 encrypt_install |    2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-13 13:26:46 UTC (rev 158936)
+++ PKGBUILD	2012-05-13 13:45:33 UTC (rev 158937)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 pkgname=cryptsetup
-pkgver=1.4.1
-pkgrel=3
+pkgver=1.4.2
+pkgrel=1
 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt"
 arch=(i686 x86_64)
 license=('GPL')
@@ -15,13 +15,14 @@
         http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc
         encrypt_hook
         encrypt_install)
-sha256sums=('82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb'
-            '71c6506d4b6d0b22b9b6c2a68e604959e4c072af04680ed6acc0126c97bdbc88'
-            '811bbea1337106ad811731c746d73ee81039bad00aef52398e3a377ad0766757'
-            'ddbbdcb8eff93a3a7622ec633e90d5c0d68e3afbeaf942dc2309adab345047d4')
+sha256sums=('1fe80d7b19d24b3f65d2e446decfed859e2c4d17fdf7c19289d82dc7cd60dfe7'
+            '4e6dbece8d1baad861479aca70d0cf30887420da9b5eab45d65d064c656893ed'
+            'e4c00e2da274bf4cab3f72a0de779790a11a946d36b83144e74d3791e230b262'
+            'cba1dc38ff6cc4d3740d0badfb2b151bb03d19e8e9fa497569ac2fb6f4196e0e')
+
 build() {
   cd "${srcdir}"/$pkgname-${pkgver}
-  ./configure --prefix=/usr --disable-static --sbindir=/sbin
+  ./configure --prefix=/usr --disable-static
   make
 }
 

Modified: encrypt_hook
===================================================================
--- encrypt_hook	2012-05-13 13:26:46 UTC (rev 158936)
+++ encrypt_hook	2012-05-13 13:45:33 UTC (rev 158937)
@@ -1,7 +1,7 @@
 #!/usr/bin/ash
 
 run_hook() {
-    /sbin/modprobe -a -q dm-crypt >/dev/null 2>&1
+    modprobe -a -q dm-crypt >/dev/null 2>&1
     [ "${quiet}" = "y" ] && CSQUIET=">/dev/null"
 
     # Get keyfile if specified
@@ -59,12 +59,12 @@
     done
 
     if  poll_device "${cryptdev}" ${rootdelay}; then
-        if /sbin/cryptsetup isLuks ${cryptdev} >/dev/null 2>&1; then
+        if cryptsetup isLuks ${cryptdev} >/dev/null 2>&1; then
             [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated
             dopassphrase=1
             # If keyfile exists, try to use that
             if [ -f ${ckeyfile} ]; then
-                if eval /sbin/cryptsetup --key-file ${ckeyfile} luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; then
+                if eval cryptsetup --key-file ${ckeyfile} luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; then
                     dopassphrase=0
                 else
                     echo "Invalid keyfile. Reverting to passphrase."
@@ -76,7 +76,7 @@
                 echo "A password is required to access the ${cryptname} volume:"
 
                 #loop until we get a real password
-                while ! eval /sbin/cryptsetup luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; do
+                while ! eval cryptsetup luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; do
                     sleep 2;
                 done
             fi
@@ -96,7 +96,7 @@
                 err "Non-LUKS decryption not attempted..."
                 return 1
             fi
-            exe="/sbin/cryptsetup create $cryptname $cryptdev $cryptargs"
+            exe="cryptsetup create $cryptname $cryptdev $cryptargs"
             IFS=: read c_hash c_cipher c_keysize c_offset c_skip <<EOF
 $crypto
 EOF

Modified: encrypt_install
===================================================================
--- encrypt_install	2012-05-13 13:26:46 UTC (rev 158936)
+++ encrypt_install	2012-05-13 13:45:33 UTC (rev 158937)
@@ -22,7 +22,7 @@
 This hook allows for an encrypted root device. Users should specify the device
 to be unlocked using 'cryptdevice=device:dmname' on the kernel command line,
 where 'device' is the path to the raw device, and 'dmname' is the name given to
-the device after unlocking, and will be available as /dev/mapper/lvname.
+the device after unlocking, and will be available as /dev/mapper/dmname.
 
 For unlocking via keyfile, 'cryptkey=device:fstype:path' should be specified on
 the kernel cmdline, where 'device' represents the raw block device where the key