diff options
| author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-06-05 20:20:25 -0500 |
|---|---|---|
| committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-06-05 20:20:25 -0500 |
| commit | 33c22f43a52aae722ce4d9cbe47f8d2fff31f395 (patch) | |
| tree | 71f9661d9a843cca28225852f8784e48a2b96cb2 /core/cryptsetup | |
| parent | c87732e5659b56943ef4f120d7c71dcaabc3f849 (diff) | |
| parent | 3695b5d62c2aef6e82abc95d775a2ebd89bce081 (diff) | |
Merge branch 'master' of vparabola:~/abslibre-pre-mips64el
Conflicts:
multilib-testing/lib32-mesa/PKGBUILD
multilib/lib32-glew/PKGBUILD
testing/iproute2/PKGBUILD
Diffstat (limited to 'core/cryptsetup')
| -rw-r--r-- | core/cryptsetup/PKGBUILD | 10 | ||||
| -rw-r--r-- | core/cryptsetup/encrypt_install | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD index 9dc49b129..66812b834 100644 --- a/core/cryptsetup/PKGBUILD +++ b/core/cryptsetup/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 123894 2011-05-14 09:00:27Z thomas $ +# $Id: PKGBUILD 125738 2011-05-28 17:14:11Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=cryptsetup -pkgver=1.3.0 +pkgver=1.3.1 pkgrel=1 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' 'libgcrypt' 'popt') +depends=('device-mapper>=2.02.85-2' 'libgcrypt' 'popt') conflicts=('mkinitcpio<0.5.99') options=('!libtool' '!emptydirs') source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 encrypt_hook encrypt_install) -sha256sums=('c675059a25061851dcaf9732a2118d75585097c8fbb3985026526988e8d76394' +sha256sums=('7ceb18a0c91fa1546077b41b93463dd2ec9d7f83e6fd93757fb84cc608206a6a' '64601eae6fbf3e3afceccec5877557aa208a82497c33cc94ad0a686b4022b5dc' - '8e4920bb4b5ce96508aa0c42b9b07326b70daf630519f1aa1d8082bca709c12a') + '07918fc349b3a7c4a73e8ad1cc3d97a2a79ebc7655090ab9ebb00b1e092c85aa') build() { cd $srcdir/$pkgname-${pkgver} diff --git a/core/cryptsetup/encrypt_install b/core/cryptsetup/encrypt_install index 9446e6864..25a2ae45c 100644 --- a/core/cryptsetup/encrypt_install +++ b/core/cryptsetup/encrypt_install @@ -16,6 +16,7 @@ install () add_file "/lib/udev/rules.d/10-dm.rules" add_file "/lib/udev/rules.d/13-dm-disk.rules" add_file "/lib/udev/rules.d/95-dm-notify.rules" + add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules" } help () |