diff options
Diffstat (limited to 'abs/core-testing/mdadm')
-rw-r--r-- | abs/core-testing/mdadm/PKGBUILD | 15 | ||||
-rw-r--r-- | abs/core-testing/mdadm/mdadm-2.2-segfault.patch | 12 |
2 files changed, 8 insertions, 19 deletions
diff --git a/abs/core-testing/mdadm/PKGBUILD b/abs/core-testing/mdadm/PKGBUILD index 13c5c98..0af45bf 100644 --- a/abs/core-testing/mdadm/PKGBUILD +++ b/abs/core-testing/mdadm/PKGBUILD @@ -1,8 +1,8 @@ # $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ # Maintainer: Judd Vinet <jvinet@zeroflux.org> pkgname=mdadm -pkgver=2.6.4 -pkgrel=10 +pkgver=3.0 +pkgrel=12 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID" arch=(i686 x86_64) license=('GPL') @@ -10,14 +10,15 @@ url="http://www.cse.unsw.edu.au/~neilb/source/mdadm/" groups=('base') depends=('glibc') backup=('etc/mdadm.conf') -source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 \ +conflicts=('udev<135-4') +source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/$pkgname-$pkgver.tar.bz2 \ mdadm mdadm.conf raid-partitions_install raid-partitions_hook) replaces=('raidtools') -md5sums=('b616697aecc870d5d580bd6e010472a3' +md5sums=('bcd27a1359b18e25e61593221d098f6a' '6df172c8f77b280018cf87eb3d313f29' - '0ce4c0f9770bf582a71228053566359d' - '9de7e423ec9c6766b5f5d39915929003' - '09d72c714b40b6fa1e8eab04c1dabd42') + '0ce4c0f9770bf582a71228053566359d' + '9de7e423ec9c6766b5f5d39915929003' + '09d72c714b40b6fa1e8eab04c1dabd42') build() { cd $startdir/src/$pkgname-$pkgver diff --git a/abs/core-testing/mdadm/mdadm-2.2-segfault.patch b/abs/core-testing/mdadm/mdadm-2.2-segfault.patch deleted file mode 100644 index d956a20..0000000 --- a/abs/core-testing/mdadm/mdadm-2.2-segfault.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur mdadm-2.2-orig/Assemble.c mdadm-2.2/Assemble.c ---- mdadm-2.2-orig/Assemble.c 2005-12-04 21:56:20.000000000 -0800 -+++ mdadm-2.2/Assemble.c 2006-02-06 10:56:37.000000000 -0800 -@@ -219,7 +219,7 @@ - } - if (dfd >= 0) close(dfd); - -- if (ident->uuid_set && (!update && strcmp(update, "uuid")!= 0) && -+ if (ident->uuid_set && (!update || strcmp(update, "uuid")!= 0) && - (!super || same_uuid(info.uuid, ident->uuid, tst->ss->swapuuid)==0)) { - if ((inargv && verbose >= 0) || verbose > 0) - fprintf(stderr, Name ": %s has wrong uuid.\n", |