5 files changed, 34 insertions, 34 deletions
diff --git a/source/a/mdadm/mdadm-2.6.4.tar.bz2.sign b/source/a/mdadm/mdadm-2.6.4.tar.bz2.sign
deleted file mode 100644
index 36b61480..00000000
--- a/source/a/mdadm/mdadm-2.6.4.tar.bz2.sign
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-Comment: See http://www.kernel.org/signature.html for info
-
-iD8DBQBHGC8JyGugalF9Dw4RArGIAJ9W38h+Mb/c62Ia6kn+TiDfd8ZxJQCfXEY8
-FdGihwdJnxz8cK3+VC4rmZs=
-=+YBi
------END PGP SIGNATURE-----
diff --git a/source/a/mdadm/mdadm-2.6.9.tar.bz2.sign b/source/a/mdadm/mdadm-2.6.9.tar.bz2.sign
new file mode 100644
index 00000000..95c6050d
--- /dev/null
+++ b/source/a/mdadm/mdadm-2.6.9.tar.bz2.sign
@@ -0,0 +1,8 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+Comment: See http://www.kernel.org/signature.html for info
+
+iD8DBQBJtgO9yGugalF9Dw4RAjdkAJ9yrZow4cgdSuoqFbXROoDzH9EyTwCfSVY5
+Ew7L5NKxUJZbZVXseX82eT0=
+=X/Wg
+-----END PGP SIGNATURE-----
diff --git a/source/a/mdadm/mdadm.SlackBuild b/source/a/mdadm/mdadm.SlackBuild
index 45cc83b3..4e59b703 100755
--- a/source/a/mdadm/mdadm.SlackBuild
+++ b/source/a/mdadm/mdadm.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,10 +21,19 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=2.6.4
-ARCH=${ARCH:-x86_64}
+VERSION=2.6.9
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-mdadm
@@ -33,11 +42,11 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf mdadm-$VERSION
-tar xjvf $CWD/mdadm-$VERSION.tar.bz2
+tar xjvf $CWD/mdadm-$VERSION.tar.bz2 || exit 1
 cd mdadm-$VERSION
 
-# Build this static... it's small enough.
-zcat $CWD/mdadm.static.small.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
+# Build this static:
+zcat $CWD/mdadm.static.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
 
 chown -R root:root .
 find . \
diff --git a/source/a/mdadm/mdadm.static.diff b/source/a/mdadm/mdadm.static.diff
new file mode 100644
index 00000000..ae8a4642
--- /dev/null
+++ b/source/a/mdadm/mdadm.static.diff
@@ -0,0 +1,11 @@
+--- ./Makefile.orig	2009-03-10 01:01:17.000000000 -0500
++++ ./Makefile	2010-05-16 20:56:33.000000000 -0500
+@@ -55,7 +55,7 @@
+ CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS)
+ 
+ # If you want a static binary, you might uncomment these
+-# LDFLAGS = -static
++LDFLAGS = -static
+ # STRIP = -s
+ 
+ INSTALL = /usr/bin/install
diff --git a/source/a/mdadm/mdadm.static.small.diff b/source/a/mdadm/mdadm.static.small.diff
deleted file mode 100644
index 6be02fda..00000000
--- a/source/a/mdadm/mdadm.static.small.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./Makefile.orig	2006-06-15 19:21:52.000000000 -0500
-+++ ./Makefile	2006-06-25 00:28:24.000000000 -0500
-@@ -39,7 +39,7 @@
- 
- CC = $(CROSS_COMPILE)gcc
- CXFLAGS = -ggdb
--CWFLAGS = -Wall -Werror -Wstrict-prototypes
-+CWFLAGS = -Wall -Werror -Wstrict-prototypes -Os
- 
- ifdef DEBIAN
- CPPFLAGS= -DDEBIAN
-@@ -55,7 +55,7 @@
- CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS)
- 
- # If you want a static binary, you might uncomment these
--# LDFLAGS = -static
-+LDFLAGS = -static
- # STRIP = -s
- 
- INSTALL = /usr/bin/install