From 4a732c9d4dd00793be3da653a87b5e0b45eded3c Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 28 Mar 2011 14:57:09 +0000
Subject: main/mdadm: upgrade to 3.2.1

---
 main/mdadm/APKBUILD           |  7 ++-----
 main/mdadm/mdadm-uclibc.patch | 27 ---------------------------
 2 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 main/mdadm/mdadm-uclibc.patch

diff --git a/main/mdadm/APKBUILD b/main/mdadm/APKBUILD
index d75703089..15b72cd13 100644
--- a/main/mdadm/APKBUILD
+++ b/main/mdadm/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter at gmail>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mdadm
-pkgver=3.1.5
+pkgver=3.2.1
 pkgrel=0
 pkgdesc="a tool for managing Linux Software RAID arrays"
 url="http://neil.brown.name/blog/mdadm"
@@ -14,13 +14,11 @@ source="http://www.kernel.org/pub/linux/utils/raid/${pkgname}/${pkgname}-${pkgve
 	${pkgname}.initd
 	${pkgname}.confd
 	mdadm-raid.initd
-	mdadm-uclibc.patch
 	uclibc-bswap.patch
 	"
 
 prepare() {
 	cd "$srcdir/$pkgname-$pkgver"
-	patch -p1 -i "$srcdir"/mdadm-uclibc.patch || return 1
 	patch -p1 -i "$srcdir"/uclibc-bswap.patch || return 1
 }
 
@@ -39,9 +37,8 @@ package() {
 	install -m644 -D mdadm.conf-example "$pkgdir"/etc/mdadm.conf
 }
 
-md5sums="f3cb0cc93bd0b428aeb3a197b5abb574  mdadm-3.1.5.tar.gz
+md5sums="e18400b5346937a10b021cf728cd7e17  mdadm-3.2.1.tar.gz
 ce57e798431f7ab89f9b07a7daaa4852  mdadm.initd
 16d2b8eb2e17184357db503470fdd8eb  mdadm.confd
 af5bb6e1479bf1d27cf50521af82dae1  mdadm-raid.initd
-bca76ff25366bd1b70654b0cf4814236  mdadm-uclibc.patch
 e6dde992d7da016f25161d6637474d26  uclibc-bswap.patch"
diff --git a/main/mdadm/mdadm-uclibc.patch b/main/mdadm/mdadm-uclibc.patch
deleted file mode 100644
index a7b01a08d..000000000
--- a/main/mdadm/mdadm-uclibc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/platform-intel.c b/platform-intel.c
-index 30f7914..1e62e87 100644
---- a/platform-intel.c
-+++ b/platform-intel.c
-@@ -91,7 +91,9 @@ struct sys_dev *find_driver_devices(const char *bus, const char *driver)
- 		/* generate canonical path name for the device */
- 		sprintf(path, "/sys/bus/%s/drivers/%s/%s",
- 			bus, driver, de->d_name);
--		list->path = canonicalize_file_name(path);
-+		list->path = malloc(PATH_MAX);
-+		if (list->path)
-+			realpath(path, list->path);
- 		list->next = NULL;
- 	}
- 	closedir(driver_dir);
-@@ -207,9 +209,9 @@ const struct imsm_orom *find_imsm_orom(void)
- char *devt_to_devpath(dev_t dev)
- {
- 	char device[46];
--
-+	char *tmp = malloc(PATH_MAX);
- 	sprintf(device, "/sys/dev/block/%d:%d/device", major(dev), minor(dev));
--	return canonicalize_file_name(device);
-+	return tmp ? realpath(device, tmp) : NULL;
- }
- 
- static char *diskfd_to_devpath(int fd)
-- 
cgit v1.2.3