Mon Jul 11 23:12:58 UTC 2011

13 files changed, 52 insertions, 46 deletions

diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD
index 15d191ead..a2a11ec9e 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)
 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"
diff --git a/core/dmraid/PKGBUILD b/core/dmraid/PKGBUILD
index 118b43474..5af91a2ec 100644
--- a/core/dmraid/PKGBUILD
+++ b/core/dmraid/PKGBUILD
@@ -1,12 +1,13 @@
-# $Id: PKGBUILD 116764 2011-03-25 20:30:44Z tpowa $
+# $Id: PKGBUILD 129977 2011-06-30 18:03:08Z thomas $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 #Contributor: Urs Wolfer <uwolfer @ fwo.ch>
 
 pkgname=dmraid
 pkgver=1.0.0.rc16.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Device mapper RAID interface"
 url="http://people.redhat.com/~heinzm/sw/dmraid/"
+conflicts=('mkinitcpio<0.7')
 depends=('device-mapper>=2.0.54')
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -16,8 +17,8 @@ source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2
         dmraid_hook)
 install=dmraid.install
 md5sums=('819338fcef98e8e25819f0516722beeb'
-         'd01908b414e1686c0f3233ff37de78a5'
-         '0a748b6e78b156f2f9dda45fc629651f')
+         'bf6c61a11dbbb40d5152835075c9f438'
+         '2a1ef82fb32f065ee560dceef736475e')
 
 build() {
   cd "$srcdir"/$pkgname/1.0.0.rc16-3/$pkgname
diff --git a/core/dmraid/dmraid_hook b/core/dmraid/dmraid_hook
index d4e758c34..6219a718a 100644
--- a/core/dmraid/dmraid_hook
+++ b/core/dmraid/dmraid_hook
@@ -5,7 +5,8 @@ run_hook ()
     /sbin/modprobe -q dm-mirror >/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
         msg ":: Activating dmraid arrays..."
 	# prevent any event monitoring calls with -I
diff --git a/core/dmraid/dmraid_install b/core/dmraid/dmraid_install
index a20960aed..eeb9e0893 100644
--- a/core/dmraid/dmraid_install
+++ b/core/dmraid/dmraid_install
@@ -1,12 +1,11 @@
 # vim: set ft=sh:
 
-install ()
+build()
 {
     MODULES=" dm-mod dm-mirror "
     BINARIES="/sbin/dmraid /sbin/dmsetup"
     FILES=""
     SCRIPT="dmraid"
-    add_dir "/dev/mapper"
     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"
diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD
index 39e3b4561..0e13adba9 100644
--- a/core/lvm2/PKGBUILD
+++ b/core/lvm2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 125735 2011-05-28 17:12:36Z thomas $
+# $Id: PKGBUILD 129975 2011-06-30 17:54:05Z thomas $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
@@ -6,25 +6,24 @@ pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
 pkgver=2.02.85
 _pkgverlvm=${pkgver}
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://sourceware.org/lvm2/"
 license=('GPL2' 'LGPL2.1')
 groups=('base')
-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
         11-dm-initramfs.rules)
 md5sums=('91785ca438e5ce679dd3a386b183d552'
-         '9fbe01c6e3fca4634b4a38ecdc2f562f'
-         'cf05f2c7281e24269ea9dcc6b4e106ba'
+         'dcb82506d732cc7b10159a89b579dba8'
+         '8d613b84a175cd85f752a75198e40e15'
          '6db89da27928d2415a8e26cd0a842712'
          '69e40679cd8b3658bfc619e48baae125')
 sha1sums=('43ba2a3be84b2e897ae6b47b0b0be7e212216be7'
-          '3f11db76189bcbc32d6b16a1b05ca3499e3e7b47'
-          '1cd20e8fbad6fd7d5c0f54e831fbf58ae564b440'
+          '7f108b2f2056eb050fc898bf5190ecf9145aed8a'
+          'a0e0513c2efb183006e57e595d93ce18be297928'
           '6d7dd04be291d7537235704c816a701fd5beacc0'
           'f6a554eea9557c3c236df2943bb6e7e723945c41')
 
@@ -54,7 +53,7 @@ package_device-mapper() {
 package_lvm2() {
   pkgdesc="Logical Volume Manager 2 utilities"
   depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline')
-  conflicts=('lvm' 'mkinitcpio<0.5.99')
+  conflicts=('lvm' 'mkinitcpio<0.7')
   backup=('etc/lvm/lvm.conf')
   options=('!makeflags')
 
diff --git a/core/lvm2/lvm2_hook b/core/lvm2/lvm2_hook
index 86d2ea582..874b91d06 100644
--- a/core/lvm2/lvm2_hook
+++ b/core/lvm2/lvm2_hook
@@ -4,7 +4,8 @@ run_hook ()
     /sbin/modprobe -q dm-mod >/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
 
         # If the lvmwait= parameter has been specified on the command line
diff --git a/core/lvm2/lvm2_install b/core/lvm2/lvm2_install
index 0df69f81b..94175b523 100644
--- a/core/lvm2/lvm2_install
+++ b/core/lvm2/lvm2_install
@@ -1,13 +1,12 @@
 # vim: set ft=sh:
 
-install ()
+build()
 {
     MODULES=" dm-mod dm-snapshot dm-mirror"
     BINARIES=""
     FILES=""
     SCRIPT="lvm2"
 
-    add_dir "/dev/mapper"
     add_binary "/sbin/lvm"
     add_binary "/sbin/dmsetup"
     add_file "/lib/udev/rules.d/10-dm.rules"
diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD
index 0455dce6e..0f9d96fc8 100644
--- a/core/mdadm/PKGBUILD
+++ b/core/mdadm/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 120375 2011-04-23 07:42:14Z tpowa $
+# $Id: PKGBUILD 129978 2011-06-30 18:05:23Z thomas $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 pkgname=mdadm
-pkgver=3.2.1
-pkgrel=3
+pkgver=3.2.2
+pkgrel=2
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.cse.unsw.edu.au/~neilb/source/mdadm/"
 groups=('base')
-conflicts=('mkinitcpio<0.5.99')
+conflicts=('mkinitcpio<0.7')
 depends=('glibc')
 backup=('etc/mdadm.conf')
 source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
@@ -17,13 +17,19 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
         mdadm.conf 
         mdadm_install
         mdadm_hook
-        segfault-3.2.1.patch)
+        disable-werror.patch)
 install=mdadm.install
 replaces=('raidtools')
+md5sums=('12ee2fbf3beddb60601fb7a4c4905651'
+         '6df172c8f77b280018cf87eb3d313f29'
+         '00cbed931db4f15b6ce49e3e7d433966'
+         '4bb000166fb13e82ceaa2422fdfaac7e'
+         '36f7cc564ed3267888d90208e0eb7adc'
+         '4ad87b74a4bc9a34621280abe0e0c3e4')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i ../segfault-3.2.1.patch
+  patch -Np0 -i ../disable-werror.patch
   make CXFLAGS="$CFLAGS"
 }
 
@@ -36,13 +42,4 @@ package() {
   install -D -m644 ../mdadm_hook $pkgdir/lib/initcpio/hooks/mdadm
   # symlink for backward compatibility
   ln -sf /lib/initcpio/hooks/mdadm  $pkgdir/lib/initcpio/hooks/raid
-  # build static mdassemble for Arch's initramfs
-  make MDASSEMBLE_AUTO=1 mdassemble
-  install -D -m755 mdassemble $pkgdir/sbin/mdassemble
 }
-md5sums=('d1e2549202bd79d9e99f1498d1109530'
-         '6df172c8f77b280018cf87eb3d313f29'
-         '00cbed931db4f15b6ce49e3e7d433966'
-         '865c3d39e5f5dae58388160b563981f1'
-         '1a3eb63832cecd6550f5b0a21d58cfdb'
-         '2fd25605bd1836a33c689ac442cb73ed')
diff --git a/core/mdadm/disable-werror.patch b/core/mdadm/disable-werror.patch
new file mode 100644
index 000000000..50a33f19d
--- /dev/null
+++ b/core/mdadm/disable-werror.patch
@@ -0,0 +1,11 @@
+--- Makefile.old	2011-06-17 09:38:03.269238332 +0200
++++ Makefile	2011-06-17 09:38:14.122398837 +0200
+@@ -42,7 +42,7 @@
+ 
+ CC = $(CROSS_COMPILE)gcc
+ CXFLAGS = -ggdb
+-CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter
++CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter
+ ifdef WARN_UNUSED
+ CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O
+ endif
diff --git a/core/mdadm/mdadm_hook b/core/mdadm/mdadm_hook
index 57799d3b8..1d217a5a8 100755
--- a/core/mdadm/mdadm_hook
+++ b/core/mdadm/mdadm_hook
@@ -39,6 +39,4 @@ run_hook ()
             esac 
         done
     fi
-    # assemble everything
-    [ -e $mdconfig ] && /sbin/mdassemble
-}
\ No newline at end of file
+}
diff --git a/core/mdadm/mdadm_install b/core/mdadm/mdadm_install
index b7a57ea4e..f351cb292 100644
--- a/core/mdadm/mdadm_install
+++ b/core/mdadm/mdadm_install
@@ -1,6 +1,6 @@
 # vim: set ft=sh:
 
-install ()
+build()
 {
     MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") "
     BINARIES=""
@@ -11,7 +11,7 @@ install ()
         echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays."
         add_file "/etc/mdadm.conf"
     fi
-    add_binary "/sbin/mdassemble"
+    add_binary "/sbin/mdadm"
     add_file "/lib/udev/rules.d/64-md-raid.rules"
 }