Add missing patches

Package-Manager: portage-2.2_rc40-r1/cvs/Linux x86_64

4 files changed, 51 insertions, 9 deletions

diff --git a/sys-fs/dmraid/ChangeLog b/sys-fs/dmraid/ChangeLog
index 1e4fc393fe26..0f308b6e0042 100644
--- a/sys-fs/dmraid/ChangeLog
+++ b/sys-fs/dmraid/ChangeLog
@@ -1,11 +1,14 @@
 # ChangeLog for sys-fs/dmraid
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/ChangeLog,v 1.19 2009/09/09 21:02:11 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/ChangeLog,v 1.20 2009/09/10 16:42:57 tommy Exp $
 
-  08 Sep 2009; Ian Stakenvicius <ian@aerobiology.ca>
-  dmraid-1.0.0_rc14.ebuild, +dmraid-1.0.0_rc15-r1.ebuild,
+  10 Sep 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   +files/dmraid-1.0.0_rc15-devsk-isw.patch,
   +files/dmraid-1.0.0_rc15-undo-p-rename.patch:
+  Add missing patches
+
+  08 Sep 2009; Ian Stakenvicius <ian@aerobiology.ca>
+  dmraid-1.0.0_rc14.ebuild, +dmraid-1.0.0_rc15-r1.ebuild:
   Updated SRC_URI for rc14, bumped rc15 to -r1 (for ~ppc) to apply patches to
   fix bug #275566 and bug #275451
 
diff --git a/sys-fs/dmraid/Manifest b/sys-fs/dmraid/Manifest
index 3d311aca056d..a2b62b5f55fa 100644
--- a/sys-fs/dmraid/Manifest
+++ b/sys-fs/dmraid/Manifest
@@ -1,20 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX dmraid-1.0.0_rc15-devsk-isw.patch 723 RMD160 e5843d1f06eb78db37281a22571905dc8e9f3f19 SHA1 4a8029f5709c3b86ec317461721f3808075cbc52 SHA256 fa7f184b8f76812fbc379265a2e5563cf0242bdf381f8485e4ea781b7172fd43
+AUX dmraid-1.0.0_rc15-undo-p-rename.patch 531 RMD160 118b97bb99868033d37c8ce7bebb485f4600af2f SHA1 cbcc203e42894b936ce3adce0ff36eaf1ebe7edf SHA256 5eb8d6b268249fe3ef9e184376dfc04a2b8cffb4204c41d69480f3ae09caa670
 AUX dmraid-destdir-fix.patch 902 RMD160 8641454fcab27ff5f122e50cc1cdc4559e484692 SHA1 8dac0fd6d374cbdd490f101817677ac66dfc87ce SHA256 4a275211bd2036ceec2181e1ac1bc4d14d522cb254c81e596af6e1481db1d667
 DIST dmraid-1.0.0.rc14.tar.bz2 164234 RMD160 9cd238a981cfef9c5c1f2f1d6466b70c95ec9c7c SHA1 2b3284db46a995967d88993ae5ae36b57c513bc4 SHA256 a777354d6d69a9b58d84966cc7b37bc3f5c89539f885ad25fd874ed1c388fbec
 DIST dmraid-1.0.0.rc15.tar.bz2 190475 RMD160 045a58855a93082a7758cfedc6f9cd4cfd91668b SHA1 3fa1f184a497fd2cc6cefa4cb2892ffb1ede64bf SHA256 30847258b7f946ed908e79af4058bbf2c9a3791728b8231f7c490ca601566c05
 EBUILD dmraid-1.0.0_rc14.ebuild 2209 RMD160 06b4fd23216718242e2f9c20ce2e85b243f0bb43 SHA1 f1635d2629fcb946f251fc0f28a3a85d326d22f2 SHA256 557dc539b6a138f061a1a5e27aa0395c62a225e7ae4f2fa5944e182fc347eb5f
 EBUILD dmraid-1.0.0_rc15-r1.ebuild 2316 RMD160 2448f9352973cdb0f21dbb4b68da126a93e72488 SHA1 dc5eb4af5df7d1f52581b2a802e74527e0ca4165 SHA256 34e8cd1f921df769d3d845d200503ff58cd700647d5ead09f429c0185219622a
 EBUILD dmraid-1.0.0_rc15.ebuild 2223 RMD160 69c0ff36a37bf9f683dec8bcdfb74a458f4a2ed8 SHA1 203f1c99bdf68f86aff8a017084d75be71e94346 SHA256 c85c488dc8e0b7455651722e54fe00ec5382cee373af5f198146e75187d50fef
-MISC ChangeLog 4112 RMD160 62745fa6123c8ebbd59614da558feb2efa1d846f SHA1 ae9fa6774037680a39864046864ad3337bda0125 SHA256 2707ed5d0a89c3bc89d58f392f184f288c61cb2178976643b70e7727c6cb6469
+MISC ChangeLog 4194 RMD160 f4fb3dfaa2ae66c4b46daf25ca70fefbc24f2cfe SHA1 2188131b5b9acf8abf3a991882177410f9980fb5 SHA256 d4d27d62b4fb67eaa230f0e0cea590510211ec75fcea6c98c4b2addf33ff0239
 MISC metadata.xml 479 RMD160 f8f87fe9d61a0765e733ceb9a8fbf64baafe75f6 SHA1 3cef4c529760bece235360f92c2492b147210a09 SHA256 1896db02215d0604a855bcb58d442124ccecf6df5d8528166398d55793bf7d6f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iJwEAQECAAYFAkqoF94ACgkQG7kqcTWJkGexdQQAuPzptqbYU1AIzOcTQ7YMKU0q
-voUzapQ3LRv6eZc4DWWXS1/OqzPHvdzupC+cZitQxoNv3m0SKDxZIorvWsxdVMY9
-vQ/U66epEatTB6qI29LkIz5up32bMakbYY3IrA0/s7OVhImLNFJ6EAqBsjllwSpD
-e329tXrs6Jb5ndWNWZY=
-=dEJQ
+iJwEAQECAAYFAkqpLJwACgkQG7kqcTWJkGd52gP/SowyupI5zsdwC0GjJv0R10ra
+zSneFPav5pBEcK3V4xQeEU4e5MNn+Uk4ZU69fTzDolfjVjuUSU84qrSZeJI1FNRb
+SqzjD03uOZdVSuDqGR2y1qSc+eOlzYBQBblYgRkXomIi0dEy9gzyqL05zG7TEoxg
+/i/lh60EXMaISupfOLI=
+=yHT3
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/dmraid/files/dmraid-1.0.0_rc15-devsk-isw.patch b/sys-fs/dmraid/files/dmraid-1.0.0_rc15-devsk-isw.patch
new file mode 100644
index 000000000000..1ce8834ebadd
--- /dev/null
+++ b/sys-fs/dmraid/files/dmraid-1.0.0_rc15-devsk-isw.patch
@@ -0,0 +1,24 @@
+--- ./lib/device/scsi.c.org	2009-06-25 15:22:26.605895909 -0700
++++ ./lib/device/scsi.c	2009-06-25 15:56:39.784749181 -0700
+@@ -110,7 +110,9 @@
+ 		}
+ 
+ 		ret = ret &&
+-		     (di->serial = dbg_strdup((char *) &response[p->start + 1]));
++		     (di->serial = dbg_strdup(remove_white_space
++                                        (lc, (char *)&response[p->start + 1],
++                                         MAX_RESPONSE_LEN)));
+ 	}
+ 
+ 	dbg_free(response);
+--- ./lib/metadata/metadata.c.org	2009-06-25 17:32:19.856309659 -0700
++++ ./lib/metadata/metadata.c	2009-06-25 17:32:35.502920755 -0700
+@@ -839,7 +839,7 @@
+ 		 */
+ 		if (T_GROUP(rs)) {
+ 			_discover_partitions(lc, &rs->sets);
+-			return;
++			continue;
+ 		}
+ 
+ 		/*
diff --git a/sys-fs/dmraid/files/dmraid-1.0.0_rc15-undo-p-rename.patch b/sys-fs/dmraid/files/dmraid-1.0.0_rc15-undo-p-rename.patch
new file mode 100644
index 000000000000..6636b0563086
--- /dev/null
+++ b/sys-fs/dmraid/files/dmraid-1.0.0_rc15-undo-p-rename.patch
@@ -0,0 +1,13 @@
+Author: Giuseppe Iuculano <giuseppe@iuculano.it>
+Description: Removed "p" from device name. A proper upgrade script is needed before using it.
+--- a/1.0.0.rc15/lib/format/partition/dos.c
++++ b/1.0.0.rc15/lib/format/partition/dos.c
+@@ -31,7 +31,7 @@ _name(struct lib_context *lc, struct rai
+ {
+ 	const char *base = get_basename(lc, rd->di->path);
+ 
+-	return type ? snprintf(str, len, "%s%s%u", base, OPT_STR_PARTCHAR(lc),
++	return type ? snprintf(str, len, "%s%u", base,
+ 			       partition) : snprintf(str, len, "%s", base);
+ }
+