Fri Jun 3 22:47:36 UTC 2011

5 files changed, 22 insertions, 12 deletions

diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD
index 0da5b0175..15d191ead 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)
 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 ()
diff --git a/core/lvm2/11-dm-initramfs.rules b/core/lvm2/11-dm-initramfs.rules
new file mode 100644
index 000000000..d2c167324
--- /dev/null
+++ b/core/lvm2/11-dm-initramfs.rules
@@ -0,0 +1,3 @@
+# needed with new udev/mkinitcpio and as implemented in dracut:
+# <http://git.kernel.org/?p=boot/dracut/dracut.git;a=commitdiff;h=12b9736228f2b34c15a9cb63be79cf7b6e865b54>
+SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist"
diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD
index e7129b765..39e3b4561 100644
--- a/core/lvm2/PKGBUILD
+++ b/core/lvm2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 123786 2011-05-13 00:53:49Z eric $
+# $Id: PKGBUILD 125735 2011-05-28 17:12:36Z thomas $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
@@ -6,7 +6,7 @@ pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
 pkgver=2.02.85
 _pkgverlvm=${pkgver}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://sourceware.org/lvm2/"
 license=('GPL2' 'LGPL2.1')
@@ -15,15 +15,18 @@ conflicts=('mkinitcpio<0.5.99')
 source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz
         lvm2_install
         lvm2_hook
-        Be-quiet-on-removing-cache-on-read-only-fs.diff)
+        Be-quiet-on-removing-cache-on-read-only-fs.diff
+        11-dm-initramfs.rules)
 md5sums=('91785ca438e5ce679dd3a386b183d552'
-         'e29bc80d636ed17b617d9b384a5f3aa0'
+         '9fbe01c6e3fca4634b4a38ecdc2f562f'
          'cf05f2c7281e24269ea9dcc6b4e106ba'
-         '6db89da27928d2415a8e26cd0a842712')
+         '6db89da27928d2415a8e26cd0a842712'
+         '69e40679cd8b3658bfc619e48baae125')
 sha1sums=('43ba2a3be84b2e897ae6b47b0b0be7e212216be7'
-          '662fc54ce291fd79bd09701e4c3e10854f325282'
+          '3f11db76189bcbc32d6b16a1b05ca3499e3e7b47'
           '1cd20e8fbad6fd7d5c0f54e831fbf58ae564b440'
-          '6d7dd04be291d7537235704c816a701fd5beacc0')
+          '6d7dd04be291d7537235704c816a701fd5beacc0'
+          'f6a554eea9557c3c236df2943bb6e7e723945c41')
 
 build() {
   cd "${srcdir}/LVM2.${_pkgverlvm}"
@@ -44,6 +47,8 @@ package_device-mapper() {
 
   cd "${srcdir}/LVM2.${_pkgverlvm}"
   make DESTDIR="${pkgdir}" install_device-mapper
+  # extra udev rule for device-mapper in initramfs
+  install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/lib/initcpio/udev/11-dm-initramfs.rules"
 }
 
 package_lvm2() {
diff --git a/core/lvm2/lvm2_install b/core/lvm2/lvm2_install
index 0c01ce69c..0df69f81b 100644
--- a/core/lvm2/lvm2_install
+++ b/core/lvm2/lvm2_install
@@ -14,6 +14,7 @@ install ()
     add_file "/lib/udev/rules.d/13-dm-disk.rules"
     add_file "/lib/udev/rules.d/95-dm-notify.rules"
     add_file "/lib/udev/rules.d/11-dm-lvm.rules"
+    add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules"
 }
 
 help ()