diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-12 10:57:14 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-12 10:57:14 -0300 |
| commit | 66873986693bc3c8812d12f3919f1977b9a30674 (patch) | |
| tree | 14a385b80dfa23890d9d864dd89fafb61dd38ff2 /core/cryptsetup | |
| parent | fa448c3d0b12a414235560d2cbd14eb74aace7bd (diff) | |
| parent | e03f4b9bc9da3327de94bc58aa92ecb836c1580d (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/puzzles/PKGBUILD
core/lvm2/PKGBUILD
core/mdadm/PKGBUILD
libre/kernel26-libre/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'core/cryptsetup')
| -rw-r--r-- | core/cryptsetup/PKGBUILD | 10 | ||||
| -rw-r--r-- | core/cryptsetup/encrypt_hook | 3 | ||||
| -rw-r--r-- | core/cryptsetup/encrypt_install | 3 |
3 files changed, 8 insertions, 8 deletions
diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD index 66812b834..cee08955b 100644 --- a/core/cryptsetup/PKGBUILD +++ b/core/cryptsetup/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 125738 2011-05-28 17:14:11Z thomas $ +# $Id: PKGBUILD 129976 2011-06-30 17:57:50Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=cryptsetup pkgver=1.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" arch=(i686 x86_64 'mips64el') license=('GPL') url="http://code.google.com/p/cryptsetup/" groups=('base') depends=('device-mapper>=2.02.85-2' 'libgcrypt' 'popt') -conflicts=('mkinitcpio<0.5.99') +conflicts=('mkinitcpio<0.7') options=('!libtool' '!emptydirs') source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 encrypt_hook encrypt_install) sha256sums=('7ceb18a0c91fa1546077b41b93463dd2ec9d7f83e6fd93757fb84cc608206a6a' - '64601eae6fbf3e3afceccec5877557aa208a82497c33cc94ad0a686b4022b5dc' - '07918fc349b3a7c4a73e8ad1cc3d97a2a79ebc7655090ab9ebb00b1e092c85aa') + 'b8269d358363eb8d67d1ffa1469068e454a89154636283bcc3edc6486b7fff4e' + 'd4380195351b70abf8fcb3cd19461879c55a7a07e4915d1f0365b295b112a573') build() { cd $srcdir/$pkgname-${pkgver} diff --git a/core/cryptsetup/encrypt_hook b/core/cryptsetup/encrypt_hook index e84bc6ed7..54aaa2236 100644 --- a/core/cryptsetup/encrypt_hook +++ b/core/cryptsetup/encrypt_hook @@ -6,7 +6,8 @@ run_hook () /sbin/modprobe -a -q dm-crypt >/dev/null 2>&1 if [ -e "/sys/class/misc/device-mapper" ]; then if [ ! -e "/dev/mapper/control" ]; then - /bin/mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') + mkdir /dev/mapper + mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') fi [ "${quiet}" = "y" ] && CSQUIET=">/dev/null" diff --git a/core/cryptsetup/encrypt_install b/core/cryptsetup/encrypt_install index 25a2ae45c..13174ec06 100644 --- a/core/cryptsetup/encrypt_install +++ b/core/cryptsetup/encrypt_install @@ -1,6 +1,6 @@ # vim: set ft=sh: -install () +build() { if [ -z "${CRYPTO_MODULES}" ]; then MODULES=" dm-crypt $(all_modules "/crypto/") " @@ -9,7 +9,6 @@ install () fi FILES="" SCRIPT="encrypt" - add_dir "/dev/mapper" [ -f "/sbin/cryptsetup" ] && add_binary "/sbin/cryptsetup" "/sbin/cryptsetup" [ -f "/usr/sbin/cryptsetup" ] && add_binary "/usr/sbin/cryptsetup" "/sbin/cryptsetup" add_binary "/sbin/dmsetup" |