main/xen: fix pod2man choking

(cherry picked from commit c664d6766c3aef2a323bf49feb1bb2f542f60800)
author: William Pitcock <nenolod@dereferenced.org> 2013-06-01 16:28:03 -0500
committer: Natanael Copa <ncopa@alpinelinux.org> 2013-06-04 09:56:55 +0000
commit: 70a7c317209820b96639a9f99f7d2395c56944ae (patch)
tree: 9b2e9ddb12a15675aef5a33a983fb42dc81cc9c9
parent: f54fbdb7bdf1dcd1581204c5355552bc5c9e49c9 (diff)
download: alpine_aports-70a7c317209820b96639a9f99f7d2395c56944ae.tar.bz2
alpine_aports-70a7c317209820b96639a9f99f7d2395c56944ae.tar.xz
alpine_aports-70a7c317209820b96639a9f99f7d2395c56944ae.zip
2 files changed, 16 insertions, 0 deletions
diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD
index e608b3d129..7bfcc6bc3e 100644
--- a/main/xen/APKBUILD
+++ b/main/xen/APKBUILD
@@ -26,6 +26,8 @@ source="http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.g
        xsa48-4.2.patch
        xsa56.patch
+        fix-pod2man-choking.patch
        xenstored.initd
        xenstored.confd
        xenconsoled.initd
@@ -148,6 +150,7 @@ ed7d0399c6ca6aeee479da5d8f807fe0  xsa41b.patch
 2f3dd7bdc59d104370066d6582725575  xsa41c.patch
 b3e3a57d189a4f86c9766eaf3b5207f4  xsa48-4.2.patch
 e70b9128ffc2175cea314a533a7d8457  xsa56.patch
+eabbf2ea11a8c95e911f6138dbbf7220  fix-pod2man-choking.patch
 95d8af17bf844d41a015ff32aae51ba1  xenstored.initd
 b017ccdd5e1c27bbf1513e3569d4ff07  xenstored.confd
 ed262f15fb880badb53575539468646c  xenconsoled.initd
@@ -169,6 +172,7 @@ a0c225d716d343fe041b63e3940900c5b3573ed3bcfc5b7c2d52ea2861c3fc28  docs-Fix-gener
 683dd96a0a8899f794070c8c09643dfeeb39f92da531955cba961b45f6075914  xsa41c.patch
 dc23077028584e71a08dd0dc9e81552c76744a5ce9d39df5958a95ae9cf3107b  xsa48-4.2.patch
 a691c5f5332a42c0d38ddb4dc037eb902f01ba31033b64c47d02909a8de0257d  xsa56.patch
+656eca6937502602f0ea5fb805ed332e196d8d3d9d466ea1e18d9214ecb89456  fix-pod2man-choking.patch
 81d335946c81311c86e2f2112b773a568a5a530c0db9802b2fe559e71bb8b381  xenstored.initd
 ea9171e71ab3d33061979bcf3bb737156192aa4b0be4d1234438ced75b6fdef3  xenstored.confd
 93bea2eb90ea1b4628854c8141dd351bbd1fbc5959b12795447ea933ad025f01  xenconsoled.initd
@@ -190,6 +194,7 @@ bda9105793f2327e1317991762120d0668af0e964076b18c9fdbfd509984b2e88d85df95702c46b2
 36b60478660ff7748328f5ab9adff13286eee1a1bad06e42fdf7e6aafe105103988525725aacd660cf5b2a184a9e2d6b3818655203c1fa07e07dcebdf23f35d9  xsa41c.patch
 31dd8c62d41cc0a01a79d9b24a5b793f5e2058230808d9c5364c6ff3477ab02f3258f1bbd761d97dc1b97ee120b41524b999eaac77f33b606496fc324b5fa2e4  xsa48-4.2.patch
 26a1c2cc92ddd4c1ab6712b0e41a0135d0e76a7fe3a14b651fb0235e352e5a24077414371acccb93058b7ce4d882b667386811170ba74570c53165837bcd983d  xsa56.patch
+cae84fb00604285f4f7e3489c17c01248bbc640f310dbcdf2fd734e660f0f3c2c363e47f775fd28fe832bf6ab80c8760d37f2f0a42c84b6107630db2d50def6c  fix-pod2man-choking.patch
 792b062e8a16a2efd3cb4662d379d1500527f2a7ca9228d7831c2bd34f3b9141df949153ea05463a7758c3e3dd9a4182492ad5505fa38e298ecf8c99db77b4ee  xenstored.initd
 100cf4112f401f45c1e4e885a5074698c484b40521262f6268fad286498e95f4c51e746f0e94eb43a590bb8e813a397bb53801ccacebec9541020799d8d70514  xenstored.confd
 12f981b2459c65d66e67ec0b32d0d19b95a029bc54c2a79138cfe488d3524a22e51860f755abfe25ddcdaf1b27f2ded59b6e350b9d5f8791193d00e2d3673137  xenconsoled.initd
diff --git a/main/xen/fix-pod2man-choking.patch b/main/xen/fix-pod2man-choking.patch
new file mode 100644
index 0000000000..ca28483c20
--- /dev/null
+++ b/main/xen/fix-pod2man-choking.patch
@@ -0,0 +1,11 @@
+--- xen-4.2.2.orig/tools/qemu-xen/qemu-doc.texi
+++ xen-4.2.2/tools/qemu-xen/qemu-doc.texi
+@@ -225,7 +225,7 @@
+ QEMU uses YM3812 emulation by Tatsuyuki Satoh.
+ 
+ QEMU uses GUS emulation (GUSEMU32 @url{http://www.deinmeister.de/gusemu/})
+-by Tibor "TS" Schütz.
+by Tibor "TS" Schultz.
+ 
+ Note that, by default, GUS shares IRQ(7) with parallel ports and so
+ qemu must be told to not have parallel ports to have working GUS
author	William Pitcock <nenolod@dereferenced.org>	2013-06-01 16:28:03 -0500
committer	Natanael Copa <ncopa@alpinelinux.org>	2013-06-04 09:56:55 +0000
commit	70a7c317209820b96639a9f99f7d2395c56944ae (patch)
tree	9b2e9ddb12a15675aef5a33a983fb42dc81cc9c9
parent	f54fbdb7bdf1dcd1581204c5355552bc5c9e49c9 (diff)
download	alpine_aports-70a7c317209820b96639a9f99f7d2395c56944ae.tar.bz2 alpine_aports-70a7c317209820b96639a9f99f7d2395c56944ae.tar.xz alpine_aports-70a7c317209820b96639a9f99f7d2395c56944ae.zip

diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD index e608b3d129..7bfcc6bc3e 100644 --- a/main/xen/APKBUILD +++ b/main/xen/APKBUILD
@@ -26,6 +26,8 @@ source="http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.g
26	xsa48-4.2.patch	26	xsa48-4.2.patch
27	xsa56.patch	27	xsa56.patch
28		28
		29	fix-pod2man-choking.patch
		30
29	xenstored.initd	31	xenstored.initd
30	xenstored.confd	32	xenstored.confd
31	xenconsoled.initd	33	xenconsoled.initd
@@ -148,6 +150,7 @@ ed7d0399c6ca6aeee479da5d8f807fe0 xsa41b.patch
148	2f3dd7bdc59d104370066d6582725575 xsa41c.patch	150	2f3dd7bdc59d104370066d6582725575 xsa41c.patch
149	b3e3a57d189a4f86c9766eaf3b5207f4 xsa48-4.2.patch	151	b3e3a57d189a4f86c9766eaf3b5207f4 xsa48-4.2.patch
150	e70b9128ffc2175cea314a533a7d8457 xsa56.patch	152	e70b9128ffc2175cea314a533a7d8457 xsa56.patch
		153	eabbf2ea11a8c95e911f6138dbbf7220 fix-pod2man-choking.patch
151	95d8af17bf844d41a015ff32aae51ba1 xenstored.initd	154	95d8af17bf844d41a015ff32aae51ba1 xenstored.initd
152	b017ccdd5e1c27bbf1513e3569d4ff07 xenstored.confd	155	b017ccdd5e1c27bbf1513e3569d4ff07 xenstored.confd
153	ed262f15fb880badb53575539468646c xenconsoled.initd	156	ed262f15fb880badb53575539468646c xenconsoled.initd
@@ -169,6 +172,7 @@ a0c225d716d343fe041b63e3940900c5b3573ed3bcfc5b7c2d52ea2861c3fc28 docs-Fix-gener
169	683dd96a0a8899f794070c8c09643dfeeb39f92da531955cba961b45f6075914 xsa41c.patch	172	683dd96a0a8899f794070c8c09643dfeeb39f92da531955cba961b45f6075914 xsa41c.patch
170	dc23077028584e71a08dd0dc9e81552c76744a5ce9d39df5958a95ae9cf3107b xsa48-4.2.patch	173	dc23077028584e71a08dd0dc9e81552c76744a5ce9d39df5958a95ae9cf3107b xsa48-4.2.patch
171	a691c5f5332a42c0d38ddb4dc037eb902f01ba31033b64c47d02909a8de0257d xsa56.patch	174	a691c5f5332a42c0d38ddb4dc037eb902f01ba31033b64c47d02909a8de0257d xsa56.patch
		175	656eca6937502602f0ea5fb805ed332e196d8d3d9d466ea1e18d9214ecb89456 fix-pod2man-choking.patch
172	81d335946c81311c86e2f2112b773a568a5a530c0db9802b2fe559e71bb8b381 xenstored.initd	176	81d335946c81311c86e2f2112b773a568a5a530c0db9802b2fe559e71bb8b381 xenstored.initd
173	ea9171e71ab3d33061979bcf3bb737156192aa4b0be4d1234438ced75b6fdef3 xenstored.confd	177	ea9171e71ab3d33061979bcf3bb737156192aa4b0be4d1234438ced75b6fdef3 xenstored.confd
174	93bea2eb90ea1b4628854c8141dd351bbd1fbc5959b12795447ea933ad025f01 xenconsoled.initd	178	93bea2eb90ea1b4628854c8141dd351bbd1fbc5959b12795447ea933ad025f01 xenconsoled.initd
@@ -190,6 +194,7 @@ bda9105793f2327e1317991762120d0668af0e964076b18c9fdbfd509984b2e88d85df95702c46b2
190	36b60478660ff7748328f5ab9adff13286eee1a1bad06e42fdf7e6aafe105103988525725aacd660cf5b2a184a9e2d6b3818655203c1fa07e07dcebdf23f35d9 xsa41c.patch	194	36b60478660ff7748328f5ab9adff13286eee1a1bad06e42fdf7e6aafe105103988525725aacd660cf5b2a184a9e2d6b3818655203c1fa07e07dcebdf23f35d9 xsa41c.patch
191	31dd8c62d41cc0a01a79d9b24a5b793f5e2058230808d9c5364c6ff3477ab02f3258f1bbd761d97dc1b97ee120b41524b999eaac77f33b606496fc324b5fa2e4 xsa48-4.2.patch	195	31dd8c62d41cc0a01a79d9b24a5b793f5e2058230808d9c5364c6ff3477ab02f3258f1bbd761d97dc1b97ee120b41524b999eaac77f33b606496fc324b5fa2e4 xsa48-4.2.patch
192	26a1c2cc92ddd4c1ab6712b0e41a0135d0e76a7fe3a14b651fb0235e352e5a24077414371acccb93058b7ce4d882b667386811170ba74570c53165837bcd983d xsa56.patch	196	26a1c2cc92ddd4c1ab6712b0e41a0135d0e76a7fe3a14b651fb0235e352e5a24077414371acccb93058b7ce4d882b667386811170ba74570c53165837bcd983d xsa56.patch
		197	cae84fb00604285f4f7e3489c17c01248bbc640f310dbcdf2fd734e660f0f3c2c363e47f775fd28fe832bf6ab80c8760d37f2f0a42c84b6107630db2d50def6c fix-pod2man-choking.patch
193	792b062e8a16a2efd3cb4662d379d1500527f2a7ca9228d7831c2bd34f3b9141df949153ea05463a7758c3e3dd9a4182492ad5505fa38e298ecf8c99db77b4ee xenstored.initd	198	792b062e8a16a2efd3cb4662d379d1500527f2a7ca9228d7831c2bd34f3b9141df949153ea05463a7758c3e3dd9a4182492ad5505fa38e298ecf8c99db77b4ee xenstored.initd
194	100cf4112f401f45c1e4e885a5074698c484b40521262f6268fad286498e95f4c51e746f0e94eb43a590bb8e813a397bb53801ccacebec9541020799d8d70514 xenstored.confd	199	100cf4112f401f45c1e4e885a5074698c484b40521262f6268fad286498e95f4c51e746f0e94eb43a590bb8e813a397bb53801ccacebec9541020799d8d70514 xenstored.confd
195	12f981b2459c65d66e67ec0b32d0d19b95a029bc54c2a79138cfe488d3524a22e51860f755abfe25ddcdaf1b27f2ded59b6e350b9d5f8791193d00e2d3673137 xenconsoled.initd	200	12f981b2459c65d66e67ec0b32d0d19b95a029bc54c2a79138cfe488d3524a22e51860f755abfe25ddcdaf1b27f2ded59b6e350b9d5f8791193d00e2d3673137 xenconsoled.initd


diff --git a/main/xen/fix-pod2man-choking.patch b/main/xen/fix-pod2man-choking.patch new file mode 100644 index 0000000000..ca28483c20 --- /dev/null +++ b/main/xen/fix-pod2man-choking.patch
@@ -0,0 +1,11 @@
		1	--- xen-4.2.2.orig/tools/qemu-xen/qemu-doc.texi
		2	+++ xen-4.2.2/tools/qemu-xen/qemu-doc.texi
		3	@@ -225,7 +225,7 @@
		4	QEMU uses YM3812 emulation by Tatsuyuki Satoh.
		5
		6	QEMU uses GUS emulation (GUSEMU32 @url{http://www.deinmeister.de/gusemu/})
		7	-by Tibor "TS" Schütz.
		8	+by Tibor "TS" Schultz.
		9
		10	Note that, by default, GUS shares IRQ(7) with parallel ports and so
		11	qemu must be told to not have parallel ports to have working GUS