Fix a segmentation fault while running in xorg 1.12 (Debian bug #675407).

Package-Manager: portage-2.2.0_alpha118/cvs/Linux x86_64

5 files changed, 72 insertions, 20 deletions

diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 6e228b13abf2..76d65f3ce01c 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 09nvidia 61 SHA256 14702d6726cc9f0ad832a3cc90059999eb956f9e3a35397cb63cfa6347b33e39 SHA512 14c47fa164bde3422b64224e3e46e0a6097599de6193b6d36eb162271d41130f0498f6aee09f5cb60fe43727bf74051f9127afa1b4af42efc28d40af2e4fa86f WHIRLPOOL 34bc9975d132da84506a61a119a5d8d8b5be35af5c1511b5e3228fa3d9f0f3b7f84821c0ab09252054d1471ac7901522309d440c82342d6dfdd2beb73f680460
 AUX 195.30-unified-arch.patch 1525 SHA256 b6224e213820c698315a8645204d992b779f31e8c45c025e740bc189dc1f9bae SHA512 64994be7e26e1f8b5dcff386b9573df92861611a724ba0415b83c09326be261722fd8f13d5bb19bd11924fcd10da34913044ff363c384d307367de8b81c9c8f6 WHIRLPOOL 461c56f82a7a05c031f43b38dcfe282ed205239ced006beccdecaa47a796618e94b665667a9a2e857c80d69425aef0767d7e637b745f1a3f63fe590fdfd471df
 AUX 256.35-unified-arch.patch 1380 SHA256 5e84bb51e0f9b3ceba270d53ad2a739dc534861df9acd6ab6852670f5a1357d7 SHA512 ddc4cf0275aa842bd98fd78f04837da4d98c3acce08e90d2ca81cfe3619f614cc6bb3a8e569268df226f982823b55e9cd6df292ef7027da191e407240092920e WHIRLPOOL 58203e13f9a3f650eec55ca6fd488fde8ecd055e0521ba0ba45804aef148fc978e59a2e84a1639f2c5f3eafe6d695773ce1e080e59ea03aee4bc2d02758e225a
@@ -33,9 +36,20 @@ DIST NVIDIA-Linux-x86_64-295.59.run 58529480 SHA256 4b1d96389abd2b804ad470c51891
 DIST NVIDIA-Linux-x86_64-302.17.run 58653717 SHA256 5cf9059ebb70ade99e5621c0a605ed5bbb6c274f7c52a7ef40342ceb41b381fc SHA512 2e945eab66328e0fd71bb5c428ada87fc210748e71605f1304d0b37abe92ee247834a22ce0a58e14bb799ee99e704dcf5daa17c036a6648445c30a90d30a25b3 WHIRLPOOL 49c141ad09ae74a8caef2e25d0b6b750a02f6b121b8951ef53ca43e6863f7bba243b380f9c8180b5d0f5fda6b009a32252e3972cd61c7f7626a5841e65541c82
 DIST NVIDIA-Linux-x86_64-96.43.20-pkg2.run 14572507 SHA256 562107a262e250b836966e29851628f6162ee2857d53252221c780d9b201de18 SHA512 ca89961463bc705b1aa0e5fcbb284317e60e455d444035ba8f6a44cb3884f3a4b4c98ed5a37465d6f70a0eb6578a7d865b25f15a6b6f48bdbcb5aaca6e541623 WHIRLPOOL 873e32237ee1441625c1335e1d325649f139306a49bc87fc25afe81ec37671984a2f0bb904b2d7b435d5ceb52572740bb910fac32853627ce5583655178674dc
 EBUILD nvidia-drivers-173.14.34.ebuild 16996 SHA256 7e066de284bd75d22d7b391edff27010ee2ad6bd69a5226e13414b3c1fe714b3 SHA512 fef83eebb72d3b5929f290c850acc0e066428360b3b52691e77ef0163153d4dc4cd2ecf475c3dcb3048ae30fd0895fc35882193a8adbb558a15bafee799b2f6c WHIRLPOOL 601c791ceead494e3edfa7c76bf887739e658f9a84b5d2c23ba237471a98c2c6fdc24f58c3176982852e0d143f8d46bc746367543c9c4e717b39317eaedbd75f
-EBUILD nvidia-drivers-173.14.35.ebuild 16994 SHA256 a7a6d1c513227b72da84d2f34feb77429c2e65d5e900ad21c8ecced8bd840984 SHA512 2efe6168565f0fe29968940d3f88787fce9a2dc55c816837483d4f2b500a6bc38c55afa394efe94cef4dec3c409c6fd7031791162330a3868061d276096fdacc WHIRLPOOL 0f9bbe14b4e0ab95710ecbc397aeacda1ecf29dc5e912308dfd7353216acc886a48ba30fdc8dfbae37951329baa36d8a1617893429bc75f7584dc18439bb6616
+EBUILD nvidia-drivers-173.14.35.ebuild 16993 SHA256 1415dab3c365979a115737b101e288d760a072d8637e45f8e20836b9c52b8068 SHA512 480fd1c2c5a37026eb8c4ab76e5dedfd9929b621bd553fada9e75a55d9083b52048a4a564b64588e2f1e1c2f86b379ff13c6d2a47933853159b44e6f409e1360 WHIRLPOOL 863a7aa04e19685c712d5080615a76f38f6fca5043f83c485cc81cec5971283957dfc13af030779f684d54699bcd6ae06b72b4d202dfde35e3b31d015c969261
 EBUILD nvidia-drivers-295.59.ebuild 18560 SHA256 15bc1d8d002c2648d269013ff54f98a5197d11792ab631d937b55919f12d8fda SHA512 eb9a3fe624e1c80dcfd3217c3dc29ed521e1bdd1e535e9be373913773ccc936455522f58dfab7c21dcfb8d642b952d40325d2cb6139cd5bfa42f03e8c121f578 WHIRLPOOL 8908272a4efa82d2a3ebfaa202bb120a1fd7baeb4675c1d6e3f7549b6ba8dc24b450a110c27a1631fbe9d499dd326228be82fa729ed31eba035358aefa02ad34
 EBUILD nvidia-drivers-302.17.ebuild 18562 SHA256 ffba4fca6c97d3d2fd4e2e42bab80798da1eb109b08a2958ed1a1bc866e617e0 SHA512 303ba6ab7008c33447382e5d2a62d511b129026514fd6717721e2e41b5165fe3964ec7ce2cdda28a64298cfb65e26bc5a78ffcb9cf94a3eea85ac7f9ee58507f WHIRLPOOL d44bf86dae5a2f6849ecef89481e84f64798d469d586de9103d333d058400163c18f7ff12f18ba9b85897198f806e6409ed6496ec80d713b7e2d88d23e148ac1
 EBUILD nvidia-drivers-96.43.20.ebuild 15606 SHA256 7343d4e7ec6b4354efabe420ba6413e5e369fe6897eee51cbb3ae49b39d31b13 SHA512 cdaee736cd2e92efca59b5da3fb609cd35c2dc4d4c9f5eccd1bfebd88579125786d0d2626def1ca4b6e07e1f014f622cfa49e52889c76d0d24b42793bc1e76ad WHIRLPOOL 5d3290e54166f8e1b7e763f58aed4ba40391f2ca166ff75c467aad02eda3ee947cddfa18b356ffaebf0faac66a3df2d190d2e5f5dd3499a6eeb156bee1864f7d
-MISC ChangeLog 76501 SHA256 0bcf95142591a3a56d389c19921574fad8cbbdf493fba2b525f7fea5f3995d52 SHA512 a3bff669f216a89f5fc44e90d92ebdfcf3703c2bf46b4de2aa2a8cd3d932c551b537812830c0f3ec5fd7092a1cf33e0b46a500d0f871fad8ea48f578f7c22798 WHIRLPOOL 7ede5d0d55f07844504133d84389b0d49bfd67337b9f481baf8165fe81fc291a952f8ecc061042d810dda7f542baa24604315275c7b795174b267cc121791ea6
+MISC ChangeLog 76614 SHA256 e6748eaa316fe1cb185bc299db056ad7ff822e036099d8176c3f62575532a033 SHA512 cd6756165cf82ec43cdc557b9136357f66b272a445154162316abe816734f10fcbd780fe32c71902ebff86b89858ef321174e21086d85f610161dcaf7cc6b333 WHIRLPOOL a8f19764a61bca9595d5844417680bc575896f07720f77dcfe695eecef423e86e8d172e29d05681692119fa1f4bae8c4459138340f24b863f46c157c8e145b28
 MISC metadata.xml 805 SHA256 86490388b274c1b62b659755b80bd96f82625ed8a35c0a0d83992eee3734e4b1 SHA512 2de923556f92b1d2e319fb46905bf0c8dce0a6c7bdb4aaa1ad9a7587e4689666a6b03e5f68536e1ad4b0695fd403daa05c2b99c2f207bccf25611eb8bb9e1252 WHIRLPOOL 6e2c189d0b6fef5f19b5b4251901e2e3210869f77d8df279b524617fe258300b350f98116c5a0b28a32ea77a81b4341f701eb49bf90d85c3598339ee72bb77c2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCgAGBQJQBZQEAAoJEPUd7O0j6ekAshMIALcGMZdG8po3lWhz20fDM1fT
+05zlfDAMskBzKT2lTUBgw8VT+7vG4Vu2oET8rDljEJbdqy9s1z1VD6/sbg83sbDd
+TwmGJjHnI6ReRL+q0vGiuvfnUSX9GK/rUD0COuxt49NHyYO1dXh0vlMIyF7hUn2N
+lS8ixYjnxVuFiM0cl2A1W5uBr++YQKVYfSyyRz1Etr6SsTL9wIIoXMBUGmZiIK83
+UoyXGj7mGPYOFTLECnBoJ4pSEj/AEk2i0N/CvgCKoeVb9B8Cr4eGFHp75UHFr5Gx
+JHazWnqEJOO29+QEkL/eQ1rHnLorL/yF2jIfrjRdPJEECHBLWVo3KqG2dCX/Aw4=
+=llIe
+-----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-openchrome/ChangeLog b/x11-drivers/xf86-video-openchrome/ChangeLog
index 99991845a104..8dfa0dcd726a 100644
--- a/x11-drivers/xf86-video-openchrome/ChangeLog
+++ b/x11-drivers/xf86-video-openchrome/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-video-openchrome
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-openchrome/ChangeLog,v 1.61 2012/06/24 11:16:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-openchrome/ChangeLog,v 1.62 2012/07/17 16:32:06 jer Exp $
+
+  17 Jul 2012; Jeroen Roovers <jer@gentoo.org>
+  xf86-video-openchrome-0.2.906.ebuild,
+  +files/xf86-video-openchrome-0.2.906-xorg-1.12.patch:
+  Fix a segmentation fault while running in xorg 1.12 (Debian bug #675407).
 
   24 Jun 2012; Agostino Sarubbo <ago@gentoo.org>
   xf86-video-openchrome-0.2.906.ebuild:
diff --git a/x11-drivers/xf86-video-openchrome/Manifest b/x11-drivers/xf86-video-openchrome/Manifest
index 9cfa6a53c209..f6993a7a2d88 100644
--- a/x11-drivers/xf86-video-openchrome/Manifest
+++ b/x11-drivers/xf86-video-openchrome/Manifest
@@ -1,20 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST xf86-video-openchrome-0.2.905.tar.bz2 508469 RMD160 cd8b60b3ba48af8f831a1a2496b5ceabc2c74148 SHA1 bbd64f258e69b29498e5f68d5a28e5253d252dd1 SHA256 0c8f15fb798680a429089a58d5211f9064797e3720010d599acc010d04a88bd2
-DIST xf86-video-openchrome-0.2.906.tar.bz2 514154 RMD160 0a826707b45f3fd17576a82f1f8f589b2d9768c1 SHA1 1c49bf722326442393288db490ff48d437e337f9 SHA256 e7558edc144a08371493432014a7b88ee26ec35d00ef96f2ea24bd7872b0ff41
-EBUILD xf86-video-openchrome-0.2.905.ebuild 1343 RMD160 d8a7d353c110415d1ef4e38eed91fbc9fa826df2 SHA1 8173993fc78b3d0036e5b10f4ff1a0a1f0213c65 SHA256 a322c2d00ec169a7aa0f152964c19ec9612c8ba1aba549980e626398171d7576
-EBUILD xf86-video-openchrome-0.2.906.ebuild 1336 RMD160 4c5cba373aa0cf92989cf542afddaf35dda00563 SHA1 2f0a199340c13a079528c6f9a261ebe9045a72ff SHA256 e9b9fcb0a149527c08eb2ef46503e44535048eb3c29f3e68c41e1f4d234bef1d
-MISC ChangeLog 10528 RMD160 4c23c53a53a88406b9f97039b9c5276115d79895 SHA1 6a4822ba0124b5f7fc146e32f605ae83e09192ea SHA256 523fd47707f3ab4ff4e3bbc45f049785d78b218a8be07740542cea958d24ac30
-MISC metadata.xml 315 RMD160 9fc61675d6a4140a8da6b8c7018ba06b761f7e20 SHA1 391456b7e6e8caeecde821fecb1f5d94fda9c717 SHA256 d8fa3d7ffb55c1f06f7041b80ce125721c371afc0762ebb197db44821b2b08e8
+AUX xf86-video-openchrome-0.2.906-xorg-1.12.patch 782 SHA256 bb02a78914184a66aec6ee62a08516503e590e3719675b0ba79ab778ea24aa47 SHA512 3e7855a1202c8c990db791337ef5c2f14bf15f77186cc73a7601f50aad2ee8fee2308a46ffdfad26664de689d065d5fd6a6b09cdcb67a5a3623ff4acfc021a60 WHIRLPOOL 867c4ba8bcbe1506a3186d0de872b88abed2739e965656c88978de4489ada73b9c52ca1ac14b5aa74763a7d1bd93b3508bae8acde7ff215cfb19ab740c3b0b3d
+DIST xf86-video-openchrome-0.2.905.tar.bz2 508469 SHA256 0c8f15fb798680a429089a58d5211f9064797e3720010d599acc010d04a88bd2 SHA512 8bbfb6b83321381b6843e78e63d1eae1b33028dc84be61bf69b2bf986601e19b268be69f7ef0df7309e23f0a65e014ebf024a021b796910183beb1762ee0ddd6 WHIRLPOOL c682499b8afc101aff7354fd93ef72ec6d52b3b611245309a763ff49fb51b3110e7f56f8661d869913da3c57fb1295109fe0633e1ca1c432d5c6e2d150f8792d
+DIST xf86-video-openchrome-0.2.906.tar.bz2 514154 SHA256 e7558edc144a08371493432014a7b88ee26ec35d00ef96f2ea24bd7872b0ff41 SHA512 c4d1a91fc06f16d813543a2d984df7cb141d8d0452c63a48371ac59bf227e30cfa6093081df98ce8c7c1c811198d0da928ab5522856fc7ea1646b5ac264dd6f4 WHIRLPOOL 4cf28b75c44b9a63c6dc8c0df040f4508468d1b99bee8c030ab51afb43c28966eadbcadee879698f208acd66c0c5ea307da1bf5bbd3163eed26a9ca42e508a5a
+EBUILD xf86-video-openchrome-0.2.905.ebuild 1343 SHA256 a322c2d00ec169a7aa0f152964c19ec9612c8ba1aba549980e626398171d7576 SHA512 6c8440334d99b785e74d6c1d58fe0ac7d53ce8a19e4bc22a317973e3b004eb7dc9ba4fc19fa01e428ddf8d6b6e15629f0f33a92a0ef17be3beb169732c2d706a WHIRLPOOL f025b57f6f3883ebead53b57245982a4b14665c1ab899750b3280efda267c1ea91c8a9159ad28a8f9f2170a1615d8037516ea29d52d269767feef62afe874d69
+EBUILD xf86-video-openchrome-0.2.906.ebuild 1405 SHA256 49f755167ffef9cf37cf94f7101ad93074d48dab85c01d0dc353b654dbe86b41 SHA512 9ff94d62c3ccf5d80295a196819f6053cb589655341e42e9065df63a2640016cbf10b3bd11550b1a71ff4ef282a81e5e900b0371717cca59d709f7de5ae77a5a WHIRLPOOL 153d4f9b0de34e66c271b5a34d09849750fec804bbd8d44b6467b7604b986ca7d8274aebd7dc63c62d961742e051d04ad4e05d31716f23878d9ed7cb11eadb9a
+MISC ChangeLog 10748 SHA256 f714d7cb5133ea7d226c01e26ad26c25735fb8d5d8723503de4ae9383547d725 SHA512 0cac0c542cf83deec59c79ef9f2c89aba626fc4bf2774eec5a67a3a15fd8d2a451fed4c7c99002a2bd7410153868128ca80fe92955bde5733d75632e49f7790b WHIRLPOOL 6d42d92d7936dabdf57114c86b31d0db8f174728ad860bb722dedc903f824e653e77df3124a210e33df93605d4df768a268b30a5bbf6aa897b08092b2d4501ca
+MISC metadata.xml 315 SHA256 d8fa3d7ffb55c1f06f7041b80ce125721c371afc0762ebb197db44821b2b08e8 SHA512 c00a8104c842076ee61a655103fa6ebe61a7e901617d020987bac6db6d8fddb61d71c89d898feddc6c3b0ab7b33ffee925ac46d9202d2ab54986c27e260d8b79 WHIRLPOOL 5ef939e7182e73177dbf6ee8efaf037fb20584231a63b9f97e074d84eb650bc05b5bf45e34e40b689d53f34b59dab4aa118f2ddf112ac739909b5b8fde9a4c1e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJP5vcrAAoJEOTDgjZ80txdDL0IAKTU6W9IBLcbsq1De+jcD9dW
-1H9Y777UoCuMF6CyhDwCIwE+aQ2PURnD/93oHKzfR9b8o/yh6LKKQ5oTMmBn5UFe
-WU3UbPHk/4Hy/o4lkitMv766/+OUbWVIEntkleMZtdwR8O49a32BlcVbB0o6yKv6
-rzyVgnREjjjEJO8uU2XwHjyTzqg2qcRQfTuZCxI+NIp/2i2oiJSsWw0SAd4+jghk
-jFBClhM01X+kfiZwWE92vyWhexZ8AOS3X/+xvstsk+kyBBfHOzVJ1odSbIhvrgLQ
-WHWUNoq9FRocinjAf/oGOLuS1EgHah6rUnMDmzevajTLmLgXv9RfFCqD7j/N4MU=
-=f35j
+iEYEAREIAAYFAlAFk4sACgkQVWmRsqeSphOCxACdGjYZ3NBGA8JZk8Zrnj0T6X5d
+qKcAnir6u6z2YWxAkL5TY/VT0CWIl4ZZ
+=LYSf
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-openchrome/files/xf86-video-openchrome-0.2.906-xorg-1.12.patch b/x11-drivers/xf86-video-openchrome/files/xf86-video-openchrome-0.2.906-xorg-1.12.patch
new file mode 100644
index 000000000000..1c39353fb231
--- /dev/null
+++ b/x11-drivers/xf86-video-openchrome/files/xf86-video-openchrome-0.2.906-xorg-1.12.patch
@@ -0,0 +1,32 @@
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=675407
+
+
+Deal with X 1.12 by calling vgaHWSetStdFuncs().
+
+Thanks to Leon Winter for testing the initial patch and proposing a
+working one.
+
+Signed-off-by: Cyril Brulebois <kibi@debian.org>
+--- a/src/via_driver.c
++++ b/src/via_driver.c
+@@ -997,6 +997,11 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
+ #endif
+     }
+ 
++    hwp = VGAHWPTR(pScrn);
++
++    /* Needed with X 1.12 */
++    vgaHWSetStdFuncs(hwp);
++
+     if (pVia->Chipset == VIA_CLE266)
+         ViaDoubleCheckCLE266Revision(pScrn);
+ 
+@@ -1012,8 +1017,6 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
+     struct pci_device *vgaDevice = viaPciDeviceVga();
+ #endif
+ 
+-    hwp = VGAHWPTR(pScrn);
+-
+     switch (pVia->Chipset) {
+         case VIA_CLE266:
+ #ifdef XSERVER_LIBPCIACCESS
diff --git a/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.906.ebuild b/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.906.ebuild
index 937559f45853..723e0f29e451 100644
--- a/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.906.ebuild
+++ b/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.906.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.906.ebuild,v 1.3 2012/06/24 11:16:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.906.ebuild,v 1.4 2012/07/17 16:32:06 jer Exp $
 
 EAPI=4
 XORG_DRI="dri"
-inherit xorg-2
+inherit eutils xorg-2
 
 DESCRIPTION="X.Org driver for VIA/S3G cards"
 HOMEPAGE="http://www.openchrome.org"
@@ -26,6 +26,10 @@ DEPEND="
 
 DOCS=( ChangeLog NEWS README )
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-xorg-1.12.patch
+}
+
 pkg_setup() {
 	xorg-2_pkg_setup
 	XORG_CONFIGURE_OPTIONS=(