[arch-commits] CVS update of core/base/cryptsetup (PKGBUILD encrypt_install)

[Thomas Baechler]

    Date: Sunday, March 2, 2008 @ 23:01:23
  Author: thomas
    Path: /home/cvs-core/core/base/cryptsetup

Modified: PKGBUILD (1.11 -> 1.12) encrypt_install (1.1 -> 1.2)

upgpkg: cryptsetup 1.0.5-6
    Add optional CRYPTO_MODULES parameter


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


Index: core/base/cryptsetup/PKGBUILD
diff -u core/base/cryptsetup/PKGBUILD:1.11 core/base/cryptsetup/PKGBUILD:1.12
--- core/base/cryptsetup/PKGBUILD:1.11	Fri Nov 16 00:53:13 2007
+++ core/base/cryptsetup/PKGBUILD	Sun Mar  2 23:01:23 2008
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.11 2007/11/15 23:53:13 daniel Exp $
+# $Id: PKGBUILD,v 1.12 2008/03/02 22:01:23 thomas Exp $
 # Maintainer: Judd Vinet <jvinet at zeroflux.org>
 pkgname=cryptsetup
 pkgver=1.0.5
-pkgrel=5
+pkgrel=6
 pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
 arch=(i686 x86_64)
 license=('GPL')
@@ -17,7 +17,7 @@
         cryptsetup-1.0.5-run_udevsettle.patch)
 md5sums=('0aa2f94c39123f1a0352983e5366179c'
          '40fee2419cd444cfb283c311f9555d2d'
-         '70fe6feacc8e7c735ba8baa95f9f61a1'
+         'f87befa265771f24b01fef8d38957c58'
          'd4be8d2059d5427c057be4de4e948887'
          '0c0af7d348da6e85dc4bdbd8c0df9e13')
 
@@ -39,7 +39,4 @@
   # 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
-  
-  # fix permissions
-  find $startdir/pkg -type d -exec chmod 755 {} \;
 }
Index: core/base/cryptsetup/encrypt_install
diff -u core/base/cryptsetup/encrypt_install:1.1 core/base/cryptsetup/encrypt_install:1.2
--- core/base/cryptsetup/encrypt_install:1.1	Wed Sep 27 18:16:09 2006
+++ core/base/cryptsetup/encrypt_install	Sun Mar  2 23:01:23 2008
@@ -2,7 +2,11 @@
 
 install ()
 {
-    MODULES=" dm-crypt $(all_modules "/crypto/" | grep -v "aes.ko" ) "
+    if [ -z "${CRYPTO_MODULES}" ]; then
+        MODULES=" dm-crypt $(all_modules "/crypto/" | grep -v "aes.ko" ) "
+    else
+        MODULES=" dm-crypt ${CRYPTO_MODULES} "
+    fi
     BINARIES=""
     add_dir "/dev/mapper"
     add_file "/sbin/cryptsetup.static" "/bin/cryptsetup"