Date: Friday, June 17, 2011 @ 03:48:12
Author: tpowa
Revision: 127622
upgpkg: mdadm 3.2.2-1
bump to version, fixed udev warnings
Added:
mdadm/trunk/disable-werror.patch
Modified:
mdadm/trunk/PKGBUILD
mdadm/trunk/mdadm_hook
mdadm/trunk/mdadm_install
Deleted:
mdadm/trunk/segfault-3.2.1.patch
----------------------+
PKGBUILD | 23 +++++++---------
disable-werror.patch | 11 +++++++
mdadm_hook | 4 --
mdadm_install | 2 -
segfault-3.2.1.patch | 68 -------------------------------------------------
5 files changed, 23 insertions(+), 85 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-06-17 07:24:32 UTC (rev 127621)
+++ PKGBUILD 2011-06-17 07:48:12 UTC (rev 127622)
@@ -2,8 +2,8 @@
# Maintainer: Tobias Powalowski <tp...@archlinux.org>
# Contributor: Judd Vinet <jvi...@zeroflux.org>
pkgname=mdadm
-pkgver=3.2.1
-pkgrel=3
+pkgver=3.2.2
+pkgrel=1
pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as
Software RAID"
arch=(i686 x86_64)
license=('GPL')
@@ -17,13 +17,19 @@
mdadm.conf
mdadm_install
mdadm_hook
- segfault-3.2.1.patch)
+ disable-werror.patch)
install=mdadm.install
replaces=('raidtools')
+md5sums=('12ee2fbf3beddb60601fb7a4c4905651'
+ '6df172c8f77b280018cf87eb3d313f29'
+ '00cbed931db4f15b6ce49e3e7d433966'
+ '53f58d4a8f6e23c452d67007186262e3'
+ '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 @@
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')
Added: disable-werror.patch
===================================================================
--- disable-werror.patch (rev 0)
+++ disable-werror.patch 2011-06-17 07:48:12 UTC (rev 127622)
@@ -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
Modified: mdadm_hook
===================================================================
--- mdadm_hook 2011-06-17 07:24:32 UTC (rev 127621)
+++ mdadm_hook 2011-06-17 07:48:12 UTC (rev 127622)
@@ -39,6 +39,4 @@
esac
done
fi
- # assemble everything
- [ -e $mdconfig ] && /sbin/mdassemble
-}
\ No newline at end of file
+}
Modified: mdadm_install
===================================================================
--- mdadm_install 2011-06-17 07:24:32 UTC (rev 127621)
+++ mdadm_install 2011-06-17 07:48:12 UTC (rev 127622)
@@ -11,7 +11,7 @@
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"
}
Deleted: segfault-3.2.1.patch
===================================================================
--- segfault-3.2.1.patch 2011-06-17 07:24:32 UTC (rev 127621)
+++ segfault-3.2.1.patch 2011-06-17 07:48:12 UTC (rev 127622)
@@ -1,68 +0,0 @@
-From 4019ad07013a5d8618b867f724d1c4a13c5cb05d Mon Sep 17 00:00:00 2001
-From: Jonathan Liu <net...@gmail.com>
-Date: Tue, 12 Apr 2011 18:28:01 +1000
-Subject: [PATCH] Monitor: avoid NULL dereference with 0.90 metadata
-
-0.90 array do not report the metadata type in /proc/mdstat, so
-we cannot assume that mse->metadata_version is non-NULL.
-
-So add an appropriate check.
-
-This adds an additional check missed by commit
-eb28e119b03fd5149886ed516fa4bb006ad3602e.
-
-Signed-off-by: NeilBrown <ne...@suse.de>
----
- Monitor.c | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/Monitor.c b/Monitor.c
-index a3ea724..55aebeb 100644
---- a/Monitor.c
-+++ b/Monitor.c
-@@ -577,7 +577,8 @@ static int check_array(struct state *st, struct mdstat_ent
*mdstat,
- info[i].major = info[i].minor = 0;
- }
-
-- if (strncmp(mse->metadata_version, "external:", 9) == 0 &&
-+ if (mse->metadata_version &&
-+ strncmp(mse->metadata_version, "external:", 9) == 0 &&
- is_subarray(mse->metadata_version+9))
- st->parent_dev =
- devname2devnum(mse->metadata_version+10);
---
-1.7.2.3
-
-From eb28e119b03fd5149886ed516fa4bb006ad3602e Mon Sep 17 00:00:00 2001
-From: NeilBrown <ne...@suse.de>
-Date: Tue, 5 Apr 2011 09:16:57 +1000
-Subject: [PATCH] Monitor: avoid NULL dereference with 0.90 metadata
-
-0.90 array do not report the metadata type in /proc/mdstat, so
-we cannot assume that mse->metadata_version is non-NULL.
-
-So add an appropriate check.
-
-Reported-by: Eugene <hde...@yahoo.com>
-Signed-off-by: NeilBrown <ne...@suse.de>
----
- Monitor.c | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/Monitor.c b/Monitor.c
-index 291e465..337785d 100644
---- a/Monitor.c
-+++ b/Monitor.c
-@@ -688,7 +688,8 @@ static int add_new_arrays(struct mdstat_ent *mdstat,
struct state **statelist,
- st->devnum = mse->devnum;
- st->percent = -2;
- st->expected_spares = -1;
-- if (strncmp(mse->metadata_version, "external:", 9) == 0
&&
-+ if (mse->metadata_version &&
-+ strncmp(mse->metadata_version, "external:", 9) == 0
&&
- is_subarray(mse->metadata_version+9))
- st->parent_dev =
-
devname2devnum(mse->metadata_version+10);
---
-1.7.2.3
-
