summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2012-07-09 04:08:51 +0000
committerDoug Goldstein <cardoe@gentoo.org>2012-07-09 04:08:51 +0000
commitae53418a231d60ec794084bee5073ed02b64c549 (patch)
tree376ee83fc06d641d95be958f4cc92b3d4e5b62b2 /app-emulation
parentversion bump (bug #424599) (diff)
downloadhistorical-ae53418a231d60ec794084bee5073ed02b64c549.tar.gz
historical-ae53418a231d60ec794084bee5073ed02b64c549.tar.bz2
historical-ae53418a231d60ec794084bee5073ed02b64c549.zip
Fix a bad patch. bug #425300
Package-Manager: portage-2.1.10.65/cvs/Linux x86_64
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/libvirt/ChangeLog7
-rw-r--r--app-emulation/libvirt/Manifest4
-rw-r--r--app-emulation/libvirt/files/libvirt-0.9.13-qemu-add-rbd-to-whitelist-of-migration-safe-formats.patch14
3 files changed, 8 insertions, 17 deletions
diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index b2e692cee6b1..dc3e964fb80f 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-emulation/libvirt
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.196 2012/07/08 04:23:26 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.197 2012/07/09 04:08:50 cardoe Exp $
+
+ 08 Jul 2012; Doug Goldstein <cardoe@gentoo.org>
+ files/libvirt-0.9.13-qemu-add-rbd-to-whitelist-of-migration-safe-formats.patc
+ h:
+ Fix a bad patch. bug #425300
07 Jul 2012; Doug Goldstein <cardoe@gentoo.org> libvirt-0.9.13.ebuild,
+files/libvirt-0.9.13-qemu-add-rbd-to-whitelist-of-migration-safe-formats.pat
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 97e95864a317..76cef169c9a3 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,4 +1,4 @@
-AUX libvirt-0.9.13-qemu-add-rbd-to-whitelist-of-migration-safe-formats.patch 2399 SHA256 70530b03f5b41292feed0a67f5ee7c2574b0564873c77c2804ea6ad71c222358 SHA512 c5f6f40669d4a78c0957fcf4c3566faf32d8caab212456a9979c500d427620c23f59dda98a9d426ae6a0b30656ea3ef4b4696ee15747d82e8b1170849f39cee4 WHIRLPOOL a0b8e244e84127844361142f0adc0fee9f9e87378b4bf7108622ae6bd0b882a7631bacfc961160690120c0de3ac2353ea9aac981049b62ba6cb745f04ce40071
+AUX libvirt-0.9.13-qemu-add-rbd-to-whitelist-of-migration-safe-formats.patch 1910 SHA256 0f5e1b8cbf843f4aae305ece7b9a73de12b52bce608488e48c839ad9ec8c850a SHA512 353f32d25442430d0aab9c611cd60ca3a75ffc2c5ca3898e5a21546fda572224e73f5d01a98b1b7f669319ecc01fa811e1cc11fe06bd18530c497836f0da968e WHIRLPOOL a1302e326fba7f0bc12f4ab3629a7f16be1961d5dc715c8c7976563a1d34bdc77939f8c0bc98c7e38c5527d78452bb59fa95fa8d3e986947ad3eaf00ba43377b
AUX libvirtd.confd-r2 1749 SHA256 93040599a7cb878b54b8b963ef4963e9450bc25e982e390cef3e5b7e8039757c SHA512 c4c3150d35d3542b323991b32e2a09237a357d93753e641ae088b9697649fe58e878ed572c79c98e77e3d23f07e0e710ca812e8d4294e653bf6d5f183b666633 WHIRLPOOL a49eb7141052c18a5b1b35c48f9016d46946f8dcb9ed8a42e35a25c61ca6b919cfb4021374e685777fc01815bf45f6f90c6206d12ccdb4ca773a3e9e0e29d400
AUX libvirtd.confd-r3 1757 SHA256 60f341dcf33ca8d55b6394ba6cf8e22f5133393e47f827b88cef1243c255f15c SHA512 f65484ab52a5c4d0f7f1e6e7be9c379617d773b18e81ac875d628a0d9a2b5ae68d256dc1e29ca756d5216d52728bdc80da1afdd89977e6670da3a6dbd3aecc78 WHIRLPOOL 34e98b2cd72466a1152e41ea7b34533337e4aec3cf347cd75e766143b576462110bdb2ee691268ceaea0cfe6aba2a5b6bcdedc662ae6a66cc14e0099523c8e20
AUX libvirtd.init-r5 3572 SHA256 6c04449123ebb5d5736e53a81325f66a0db52cc19c7a6c80ba5f599a3687569f SHA512 bd11dfbd4ccf884b3b6f501bb3b2799f0d001b60eb9ec16167ac757066cf34ef5f22409fc97354596fb7d2a6701e023faf4a43f767df34a1070365731780b2b2 WHIRLPOOL 670e0918536745a6dd6de00bd9bef7b4d540be386d855fdd064ceb471a4f1e17d3dbac963f63f3c8f51985df7e60562775d01a14c86ebd3a8f96cc943cea7fd0
@@ -18,5 +18,5 @@ EBUILD libvirt-0.9.12.ebuild 10224 SHA256 bdc672b8cb37d4cc51a19588d399852f171708
EBUILD libvirt-0.9.13.ebuild 10580 SHA256 847189e0aaae7d2972b4aa9c982c24eb540a2ffa2623eabb417607047e1493a5 SHA512 3df8844105e615f5b892a14f5b5810845f029b12ed21653414937eceee0e1190d02b51b2622442e3b25645cb7afd612b1d2e4acc5a93fdfab032fd7b33b33f4b WHIRLPOOL 86f8e6c38ccde58e4945c95caaa5afd049f87facadf16f8c0b29f44cf5a95e27edbe8607c706db2dfeb4fd596f9169ac1ee4564c47da1d2d28900886f0f78c2e
EBUILD libvirt-0.9.8.ebuild 8137 SHA256 2892e8b77eab033b317847974b67212bede163a77449b2be5097abd9ae9dfd44 SHA512 de4716161495c5b142598daf6994b4ffc8faf169976f222aa809c3b953f97f4a8e8bb66fcf510a9c11c45b4037e4df48efc48e8dd60089aab2fec276abd66251 WHIRLPOOL 557497a58cb87c3b2a5031a428197c2cdfafc7161369a5716c58c88cac24320b781540334fbe938288626486bfac68c11607e6143c9cfe530bed7487337364e0
EBUILD libvirt-9999.ebuild 10349 SHA256 62ae9e1daff84437904c87954dd7c5d2dc34a8119e9dffd770fa1515bc757f99 SHA512 06c1e295c455c800e89c6a58a097925cb0912a8e83b0dbdf81351289d3585e23921eb5466ee10511fa13478e7cb1eeb0286521b6d1b7288c48509fa1e0b35228 WHIRLPOOL d94e0f4b7ddd7b1bbbd39f17852e8a9af45cce3b53639e4732bdb3fc193655025cd842d3b613327f26a6da76af5046648744ebaf7ac8f610a4d424c342639e43
-MISC ChangeLog 38949 SHA256 c13f2c6769a0e995bb9912594f3793454cb00343287541091ecdf5f8f40bb3cd SHA512 c2f8ceee42670549e7d4443226da121488d9d0dfc61420f096576d299c67d65145c84fe6e8b8cf85c5cae19f221a43e4226e337273a9f1704a70b909eaa20622 WHIRLPOOL 041ccd3c7923ca88b8f6b9dcdcc5dd55eae9a0b8db03973f6a972fbe78043fc4c5d2c19acc22bb4a1ce80cd07794b6dd1c7daec82e3b70cecafc6854b2759dea
+MISC ChangeLog 39116 SHA256 0c0302584924a25909a758ebd9ef9e4027aad61b39ac3804dcef58657428ad0b SHA512 cc43737cbd4a255b6f2886d1bfb4695b4329718d5a2fa9aad93065b32e8c2710826b56283b5403939331090ce3c2b4f5fb220b6e1bbf77eab0557312a2a16acc WHIRLPOOL b933f5b576b1ca48206c3727867653cf9b63be2a9f92ebd2dd5c19061b6880faded0b5b1859beddda1a39d53018bc92abab1fc792ea8f05af70e7be4f5005f74
MISC metadata.xml 3420 SHA256 0916b94209d91c7a809069e61f788a9f6115ce9081758a90330f29a3249c9be5 SHA512 8acd907b424ef3500112d5834fba026146636948675381a3a07c1837968f2ebb146b0afa2a9d56225d9af008ade51d46022ba1c03d5e02de0e6e7f3678be4091 WHIRLPOOL c0e4dea1775586184c261a406556eed83f3f26782bfb770e055df8531b0643c62e0f8a6ac3f1243c8cdd1e931f17020d72704178a33e8b5eb4f23f24cf4f7354
diff --git a/app-emulation/libvirt/files/libvirt-0.9.13-qemu-add-rbd-to-whitelist-of-migration-safe-formats.patch b/app-emulation/libvirt/files/libvirt-0.9.13-qemu-add-rbd-to-whitelist-of-migration-safe-formats.patch
index 982d49fa2b61..f848fd795f0f 100644
--- a/app-emulation/libvirt/files/libvirt-0.9.13-qemu-add-rbd-to-whitelist-of-migration-safe-formats.patch
+++ b/app-emulation/libvirt/files/libvirt-0.9.13-qemu-add-rbd-to-whitelist-of-migration-safe-formats.patch
@@ -19,20 +19,6 @@ Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
src/qemu/qemu_migration.c | 3 +++
3 files changed, 6 insertions(+), 2 deletions(-)
-diff --git a/.mailmap b/.mailmap
-index 65e2c10..a6744ac 100644
---- a/.mailmap
-+++ b/.mailmap
-@@ -28,7 +28,8 @@
- <supriyak@linux.vnet.ibm.com> <supriyak@in.ibm.com>
- <neil@aldur.co.uk> <neil@brightbox.co.uk>
- <stefanb@us.ibm.com> <stefanb@linux.vnet.ibm.com>
--<josh.durgin@dreamhost.com> <joshd@hq.newdream.net>
-+<josh.durgin@inktank.com> <joshd@hq.newdream.net>
-+<josh.durgin@inktank.com> <josh.durgin@dreamhost.com>
-
- # Name consolidation:
- # Preferred author spelling <preferred email>
diff --git a/AUTHORS b/AUTHORS
index 375db24..0e179a9 100644
--- a/AUTHORS