From 029c01a438937640ee53dddd6a21e485646830c1 Mon Sep 17 00:00:00 2001
From: abveritas <abveritas@chakra-project.org>
Date: Sun, 29 Jul 2012 22:28:03 +0000
Subject: [PATCH] one more cryptsetup rebuild, needed to go back to mkinitcpio
 hooks for 8.8, used too new hooks in .install

---
 cryptsetup/PKGBUILD        |  4 ++--
 cryptsetup/encrypt_install | 35 ++++++++++++++++-------------------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/cryptsetup/PKGBUILD b/cryptsetup/PKGBUILD
index 1701479b4..d8720dec3 100644
--- a/cryptsetup/PKGBUILD
+++ b/cryptsetup/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=cryptsetup
 pkgver=1.4.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -21,7 +21,7 @@ source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
 sha256sums=('1fe80d7b19d24b3f65d2e446decfed859e2c4d17fdf7c19289d82dc7cd60dfe7'
             '4e6dbece8d1baad861479aca70d0cf30887420da9b5eab45d65d064c656893ed'
             '811bbea1337106ad811731c746d73ee81039bad00aef52398e3a377ad0766757'
-            'aa02e35420e015b9c6a44d0fb4378aaaba3b87edf68cb6cf4b038a9a1467a498')
+            '868fbc7ed1ff49803be06d78ff35b5f9a35dcc5ee820fd8cabe0dfcf74061182')
 build() {
   cd "${srcdir}"/$pkgname-${pkgver}
   ./configure --prefix=/usr --disable-static
diff --git a/cryptsetup/encrypt_install b/cryptsetup/encrypt_install
index b8a602b21..de299507a 100644
--- a/cryptsetup/encrypt_install
+++ b/cryptsetup/encrypt_install
@@ -1,27 +1,24 @@
 #!/bin/bash
 
-build() {
-    local mod
-
-    add_module dm-crypt
-    if [[ $CRYPTO_MODULES ]]; then
-        for mod in $CRYPTO_MODULES; do
-            add_module "$mod"
-        done
+build()
+{
+    if [ -z "${CRYPTO_MODULES}" ]; then
+        MODULES=" dm-crypt $(all_modules "/crypto/") "
     else
-        add_all_modules '/crypto/'
+        MODULES=" dm-crypt ${CRYPTO_MODULES} "
     fi
 
-    add_binary "cryptsetup"
-    add_binary "dmsetup"
-    add_file "/usr/lib/udev/rules.d/10-dm.rules"
-    add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
-    add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
-    add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
-
-    add_runscript
-}
-
+        FILES=""
+        SCRIPT="encrypt"
+        [ -f "/sbin/cryptsetup" ] && add_binary "/sbin/cryptsetup" "/sbin/cryptsetup"
+        [ -f "/usr/sbin/cryptsetup" ] && add_binary "/usr/sbin/cryptsetup" "/sbin/cryptsetup"
+        add_binary "/sbin/dmsetup"
+        add_file "/usr/lib/udev/rules.d/10-dm.rules"
+        add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
+        add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
+        add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules"
+} 
+    
 help() {
     cat <<HELPEOF
 This hook allows for an encrypted root device. Users should specify the device