diff --git a/mdadm/.md5sum b/mdadm/.md5sum index 2c2233ca6..5494e160e 100644 --- a/mdadm/.md5sum +++ b/mdadm/.md5sum @@ -1 +1,2 @@ -dd951296208068119132a684d835e18c mdadm-2.6.1.tar.gz +e42142677104e1984d726862488b4af4 mdadm-2.6.2.patch +e34d2590523d679895966c4111670450 mdadm-2.6.2.tar.gz diff --git a/mdadm/Pkgfile b/mdadm/Pkgfile index bc8f14631..ec3685de6 100644 --- a/mdadm/Pkgfile +++ b/mdadm/Pkgfile @@ -3,11 +3,13 @@ # Maintainer: Jürgen Daubert, juergen dot daubert at t-online dot de name=mdadm -version=2.6.1 +version=2.6.2 release=1 -source=(http://www.kernel.org/pub/linux/utils/raid/$name/$name-$version.tar.gz) +source=(http://www.kernel.org/pub/linux/utils/raid/$name/$name-$version.tar.gz + $name-$version.patch) build() { cd $name-$version + patch -p1 -i $SRC/$name-$version.patch make CXFLAGS="$CFLAGS" DESTDIR=$PKG MANDIR=/usr/man install } diff --git a/mdadm/mdadm-2.6.2.patch b/mdadm/mdadm-2.6.2.patch new file mode 100644 index 000000000..5217fe7e8 --- /dev/null +++ b/mdadm/mdadm-2.6.2.patch @@ -0,0 +1,28 @@ +Fix compile error in Detail.c + +'avail' is undefined if '--export', so make sure we don't try to use +it. + + +### Diffstat output + ./Detail.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff .prev/Detail.c ./Detail.c +--- .prev/Detail.c 2007-05-21 14:25:50.000000000 +1000 ++++ ./Detail.c 2007-05-22 08:57:59.000000000 +1000 +@@ -377,12 +377,12 @@ This is pretty boring + + if (brief > 1 && devices) printf("\n devices=%s", devices); + if (brief) printf("\n"); +-out: + if (test && + !enough(array.level, array.raid_disks, array.layout, + 1, avail, avail_disks)) + rv = 2; + ++out: + close(fd); + return rv; + } +