add a patch to avoid the memory corruption in flightgear, when a joystick has more axes than are expected. Fixes bug #89336 by Scott Hathcock

(Portage version: 2.1_pre7-r3)

6 files changed, 58 insertions, 20 deletions

diff --git a/media-libs/plib/ChangeLog b/media-libs/plib/ChangeLog
index 6576d4e2fc1b..b6322c8c16ea 100644
--- a/media-libs/plib/ChangeLog
+++ b/media-libs/plib/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/plib
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/plib/ChangeLog,v 1.27 2006/03/10 21:46:58 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/plib/ChangeLog,v 1.28 2006/03/31 22:01:16 seemant Exp $
+
+*plib-1.8.4-r1 (31 Mar 2006)
+
+  31 Mar 2006; Seemant Kulleen <seemant@gentoo.org>
+  +files/plib-1.8.4-too-many-axes.patch, -plib-1.8.3.ebuild,
+  +plib-1.8.4-r1.ebuild:
+  add a patch to avoid the memory corruption in flightgear, when a joystick
+  has more axes than are expected. Fixes bug #89336 by Scott Hathcock
 
   10 Mar 2006; Mark Loeser <halcy0n@gentoo.org>
   +files/plib-1.8.4-gcc41.patch, plib-1.8.4.ebuild:
diff --git a/media-libs/plib/Manifest b/media-libs/plib/Manifest
index 0c95753b71cb..24c307ede836 100644
--- a/media-libs/plib/Manifest
+++ b/media-libs/plib/Manifest
@@ -1,18 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ed38744eeaefe0be01fef87b6ea8b722 ChangeLog 3600
 RMD160 c552a097dd3dd65da6601610956e4d5e425f4b4c ChangeLog 3600
 SHA256 86cbbccba739c87e78cdc4aece5b5b3b87ef224fa3da862a917f74a3494e23c7 ChangeLog 3600
 MD5 f5061365a80c4d8aececf56604d9b5c8 files/digest-plib-1.6.0 62
 RMD160 f9ed6df5738e4a0741761b687977e605f887f58c files/digest-plib-1.6.0 62
 SHA256 2b0fe08f347f7d1bcc533fcd1682e13a416f59188a998c2720fed6aa175646ce files/digest-plib-1.6.0 62
-MD5 bc913bb51ba51adf7d83ee2a5b784fac files/digest-plib-1.8.3 62
-RMD160 2f1c81bb799071da5bca8bf6d7085f791fd407aa files/digest-plib-1.8.3 62
-SHA256 f21c2d3a346ea05940a8942c38418f9c49d49ff71ad949269e1b3c97068fabd4 files/digest-plib-1.8.3 62
 MD5 b786078ffac425978e62d0f7ebdb6feb files/digest-plib-1.8.4 62
 RMD160 031cb65d978ebda06865790318aecd9f5e7f1157 files/digest-plib-1.8.4 62
 SHA256 20ae246f4c458d97fda91a2b44a01b47a1c31b5e3e86a04b660fc5adec6472c8 files/digest-plib-1.8.4 62
+MD5 ba00db1f29b68e4be2cfe4060a2c0f8b files/digest-plib-1.8.4-r1 232
+RMD160 b42249b6210282ada5451b69ac8de50935a7cc19 files/digest-plib-1.8.4-r1 232
+SHA256 337465fa246be7c2db7b951a3e60fc4a84804e8a3befddd83ae814a59908bae7 files/digest-plib-1.8.4-r1 232
 MD5 df018721fb95cb80084a51f865f58b43 files/plib-1.8.4-gcc41.patch 705
 RMD160 616bee0f6e8c3e47d158805ce1770beae0b4938c files/plib-1.8.4-gcc41.patch 705
 SHA256 036340c3271599af4386799ac4caf3d4be730fb483136c59f2cdb80b5d9bc953 files/plib-1.8.4-gcc41.patch 705
@@ -22,16 +19,9 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 db364c5aee519d415253d0c5b6acecb9 plib-1.6.0.ebuild 667
 RMD160 12deb4a89f2f2c18c26ee42bb7efdf1847e5c2de plib-1.6.0.ebuild 667
 SHA256 a2ca4d900f8dc087e48ae5c394a9b1c0550393cfe4838e3f0ae92d0556fc3e5c plib-1.6.0.ebuild 667
-MD5 ea22495868a2ff1a662361db0244592a plib-1.8.3.ebuild 740
-RMD160 42628729b82b86f206531a161a2960352a9b6d93 plib-1.8.3.ebuild 740
-SHA256 acec181279b939955a928d2675594c0fcd1e409c3cd17ae55b54bc978f806f1c plib-1.8.3.ebuild 740
+MD5 c59b0f93f5c630ccb826aac6ceee23f6 plib-1.8.4-r1.ebuild 962
+RMD160 823b4ab995e4a6145c7ec1f0932138f0ef315fd4 plib-1.8.4-r1.ebuild 962
+SHA256 c6128562615f9f45126d51f3ef98939cc2ac3de1e7854bb0e074b7204968b60f plib-1.8.4-r1.ebuild 962
 MD5 c59b0f93f5c630ccb826aac6ceee23f6 plib-1.8.4.ebuild 962
 RMD160 823b4ab995e4a6145c7ec1f0932138f0ef315fd4 plib-1.8.4.ebuild 962
 SHA256 c6128562615f9f45126d51f3ef98939cc2ac3de1e7854bb0e074b7204968b60f plib-1.8.4.ebuild 962
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEEfPcCRZPokWLroQRApS4AJwKmtWFtRvcRrvZajQAobaYq5vQDgCgkAB8
-34FyRwC9nZ55JTUVGZxBRtQ=
-=h5fx
------END PGP SIGNATURE-----
diff --git a/media-libs/plib/files/digest-plib-1.8.3 b/media-libs/plib/files/digest-plib-1.8.3
deleted file mode 100644
index d65b18235f15..000000000000
--- a/media-libs/plib/files/digest-plib-1.8.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 de10b19dfcee5da7115ee2a69656f34c plib-1.8.3.tar.gz 742380
diff --git a/media-libs/plib/files/digest-plib-1.8.4-r1 b/media-libs/plib/files/digest-plib-1.8.4-r1
new file mode 100644
index 000000000000..e85c944839c9
--- /dev/null
+++ b/media-libs/plib/files/digest-plib-1.8.4-r1
@@ -0,0 +1,3 @@
+MD5 5e3f289a9d1c5de0b1cfdec76bf139e6 plib-1.8.4.tar.gz 793758
+RMD160 a0b6f2fdd4035cb2a6b83616726563d779efb87f plib-1.8.4.tar.gz 793758
+SHA256 79e71d02fc2d7c984a4341239ed1d89ced743db2d6d4f83c30c422edaa6020e1 plib-1.8.4.tar.gz 793758
diff --git a/media-libs/plib/files/plib-1.8.4-too-many-axes.patch b/media-libs/plib/files/plib-1.8.4-too-many-axes.patch
new file mode 100644
index 000000000000..92f9f17753cf
--- /dev/null
+++ b/media-libs/plib/files/plib-1.8.4-too-many-axes.patch
@@ -0,0 +1,25 @@
+--- src/js/jsLinux.cxx.orig	2006-03-31 16:22:21.000000000 -0500
++++ src/js/jsLinux.cxx	2006-03-31 16:23:46.000000000 -0500
+@@ -75,12 +75,13 @@
+   ioctl ( os->fd, JSIOCGNAME ( sizeof(name) ), name ) ;
+   fcntl ( os->fd, F_SETFL      , O_NONBLOCK   ) ;
+ 
++  int all_axes = num_axes;
+   if ( num_axes > _JS_MAX_AXES )
+     num_axes = _JS_MAX_AXES ;
+ 
+   // Remove any deadband value already done in the kernel.
+   // Since we have our own deadband management this is save to do so.
+-  struct js_corr corr [ _JS_MAX_AXES ] ;
++  struct js_corr* corr = new js_corr[ all_axes ] ;
+   ioctl ( os->fd, JSIOCGCORR, corr );
+   for ( int i = 0; i < num_axes ; ++i ) {
+     if ( corr[ i ] . type == JS_CORR_BROKEN ) {
+@@ -90,6 +91,7 @@
+     }
+   }
+   ioctl ( os->fd, JSIOCSCORR, corr );
++  delete [] corr;
+ 
+   for ( int i = 0 ; i < _JS_MAX_AXES ; i++ )
+   {
diff --git a/media-libs/plib/plib-1.8.3.ebuild b/media-libs/plib/plib-1.8.4-r1.ebuild
index 82d9159f6ab9..fa9923a82e6c 100644
--- a/media-libs/plib/plib-1.8.3.ebuild
+++ b/media-libs/plib/plib-1.8.4-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/plib/plib-1.8.3.ebuild,v 1.8 2006/01/25 05:26:24 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/plib/plib-1.8.4-r1.ebuild,v 1.1 2006/03/31 22:01:16 seemant Exp $
+
+inherit flag-o-matic eutils
 
 DESCRIPTION="multimedia library used by many games"
 HOMEPAGE="http://plib.sourceforge.net/"
@@ -8,7 +10,7 @@ SRC_URI="http://plib.sourceforge.net/dist/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND="virtual/glut
@@ -20,6 +22,17 @@ DEPEND="${RDEPEND}
 			x11-libs/libXt )
 		virtual/x11 )"
 
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	epatch "${FILESDIR}"/${P}-gcc41.patch
+	epatch "${FILESDIR}"/${P}-too-many-axes.patch
+
+	# Since plib only provides static libraries, force
+	# building as PIC or plib is useless to amd64/etc...
+	append-flags -fPIC
+}
+
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog KNOWN_BUGS NOTICE README* TODO*