mdadm/dmraid: bump version

Patch by: Charles Duffy <Charles_Duffy@messageone.com>

Both mdadm and dmraid packages refer to upstream versions which are no
longer available.

diff --git a/package/dmraid/dmraid.mk b/package/dmraid/dmraid.mk
index 500ee0d52977c21e117a5f0a3dc01034b87e3894..873403a919aa37f8a99cf1f6bb38db05bdf5e4d9 100644 (file)
--- a/package/dmraid/dmraid.mk
+++ b/package/dmraid/dmraid.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-DMRAID_VERSION=1.0.0.rc14
+DMRAID_VERSION=1.0.0.rc15
 DMRAID_SOURCE:=dmraid-$(DMRAID_VERSION).tar.bz2
 DMRAID_SITE:=http://people.redhat.com/~heinzm/sw/dmraid/src
 DMRAID_DIR:=$(BUILD_DIR)/dmraid/$(DMRAID_VERSION)

diff --git a/package/dmraid/dmraid.patch b/package/dmraid/dmraid.patch
index fabd7c9026f5af5ff47137ddaaaad98eb8640d9b..55bfcd5ae25404dbc9a7454c9569a94f1dbb286d 100644 (file)
--- a/package/dmraid/dmraid.patch
+++ b/package/dmraid/dmraid.patch
@@ -1,6 +1,6 @@
---- 1.0.0.rc10/lib/device/scan.c.orig  2006-04-20 18:20:24.000000000 -0600
-+++ 1.0.0.rc10/lib/device/scan.c       2006-04-20 18:21:00.000000000 -0600
-@@ -66,7 +66,7 @@
+--- 1.0.0.rc15/lib/device/scan.c.orig  2008-06-20 09:32:05.000000000 -0500
++++ 1.0.0.rc15/lib/device/scan.c       2008-12-01 17:15:25.000000000 -0600
+@@ -69,7 +69,7 @@
        static char *ret = NULL, *sysfs_mp;
  
        if (!(sysfs_mp = find_sysfs_mp(lc)))
@@ -9,10 +9,10 @@
  
        if ((ret = dbg_malloc(strlen(sysfs_mp) + strlen(path) + 1)))
                sprintf(ret, "%s%s", sysfs_mp, path);
-@@ -308,7 +308,7 @@
+@@ -315,7 +315,7 @@
        } else {
                sysfs = 0;
-               path = (char*) _PATH_DEV;
+               path = (char *) _PATH_DEV;
 -              log_print(lc, "carrying on with %s", path);
 +              log_notice(lc, "carrying on with %s", path);
        }

diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk
index 7af0e8f9f645a49fe9f06e4e36f6372ee901cd94..aa760663d8e4931c86fd49ad0b0c8fef832e74b3 100644 (file)
--- a/package/mdadm/mdadm.mk
+++ b/package/mdadm/mdadm.mk
@@ -3,9 +3,9 @@
 # mdadm
 #
 #############################################################
-MDADM_VERSION:=2.6.4
+MDADM_VERSION:=2.6.7.1
 MDADM_SOURCE:=mdadm_$(MDADM_VERSION).orig.tar.gz
-MDADM_PATCH:=mdadm_$(MDADM_VERSION)-2.diff.gz
+MDADM_PATCH:=mdadm_$(MDADM_VERSION)-1.diff.gz
 MDADM_CAT:=$(ZCAT)
 MDADM_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/m/mdadm
 MDADM_DIR:=$(BUILD_DIR)/mdadm-$(MDADM_VERSION)