Version bump and fix by Matt Anderson for segv in jstest #132607.

Package-Manager: portage-2.1.1_pre4

6 files changed, 135 insertions, 9 deletions

diff --git a/games-util/joystick/ChangeLog b/games-util/joystick/ChangeLog
index 37682c9c6133..7c0811c635d6 100644
--- a/games-util/joystick/ChangeLog
+++ b/games-util/joystick/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-util/joystick
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/ChangeLog,v 1.3 2005/08/23 03:18:02 vapier Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/ChangeLog,v 1.4 2006/07/31 04:51:35 vapier Exp $
+
+*joystick-20060731 (31 Jul 2006)
+
+  31 Jul 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/joystick-jstest-segv.patch, +joystick-20060731.ebuild:
+  Version bump and fix by Matt Anderson for segv in jstest #132607.
 
   23 Aug 2005; Mike Frysinger <vapier@gentoo.org>
   +files/joystick-MCS-defines.patch, joystick-20050720.ebuild:
diff --git a/games-util/joystick/Manifest b/games-util/joystick/Manifest
index a67723be17d7..dd06cda32c05 100644
--- a/games-util/joystick/Manifest
+++ b/games-util/joystick/Manifest
@@ -1,15 +1,42 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX joystick-MCS-defines.patch 575 RMD160 1c3ee34bc75645dff552e0b22a8515e4b3bb3dbe SHA1 81d0fa629cc7c11e7336fc3b610c296418fbd777 SHA256 fc58bba55c2b158aa5615599c6433989df2d09204d1d2717728f50489fac0b61
+MD5 4fa67a6834ab2028a7d57b149b14769e files/joystick-MCS-defines.patch 575
+RMD160 1c3ee34bc75645dff552e0b22a8515e4b3bb3dbe files/joystick-MCS-defines.patch 575
+SHA256 fc58bba55c2b158aa5615599c6433989df2d09204d1d2717728f50489fac0b61 files/joystick-MCS-defines.patch 575
+AUX joystick-jstest-segv.patch 1561 RMD160 16585232d1edf36e492dea560a916e8a63e2567b SHA1 f59b280ad68880a336e6f86cedda6962a0a3c4ee SHA256 d0caec60e34eb2b60ae621ddaf3d5aeb6f0ca7efbcd10d0727c39a79153c873a
+MD5 97c17ba6fcc130d42003eb9c9995d786 files/joystick-jstest-segv.patch 1561
+RMD160 16585232d1edf36e492dea560a916e8a63e2567b files/joystick-jstest-segv.patch 1561
+SHA256 d0caec60e34eb2b60ae621ddaf3d5aeb6f0ca7efbcd10d0727c39a79153c873a files/joystick-jstest-segv.patch 1561
+DIST joystick-20050720.tar.bz2 27187 RMD160 930f2605801298bbe19d99a3030726796a4707c9 SHA1 467f5bad5fb528e7c382424ead9bbd01f508f75e SHA256 fac9d32d03e91615e47f23d279d1b0cc9f9fdfa12a897d0771a533d9be8ff36a
+DIST joystick-20060731.tar.bz2 27411 RMD160 fea5a38160bb578c7d0ab380b7d5f7ceba490ca4 SHA1 9846e9750058728b75f5db9b4496af4c72dfb016 SHA256 17aa3ca45f6bbd2004d0cede4a0f1c32b4cabb946628a85602d89c45d874006b
+EBUILD joystick-20050720.ebuild 762 RMD160 f87e72609665e4cf3851c7805f64b1a14169ab7c SHA1 ace54f78506078f55a21384bf46ddad186dab134 SHA256 f2a439f84ba9f7654fcbdfc8361932b42798445bc5b015f286b67e7430c07def
 MD5 81906644bf9cbed72bd3a4b7c0fb896e joystick-20050720.ebuild 762
+RMD160 f87e72609665e4cf3851c7805f64b1a14169ab7c joystick-20050720.ebuild 762
+SHA256 f2a439f84ba9f7654fcbdfc8361932b42798445bc5b015f286b67e7430c07def joystick-20050720.ebuild 762
+EBUILD joystick-20060731.ebuild 811 RMD160 593de05aefaafdd36a65378445958f7de862243a SHA1 4e9767e41711780f6f79b97ee6f90136bfff1a6a SHA256 6843aee20381aeb05be7094a9a6c96e92c2d39253d9f4fbfc7d36a639f66df48
+MD5 b8ed5f8eb709039683687685e34f1d36 joystick-20060731.ebuild 811
+RMD160 593de05aefaafdd36a65378445958f7de862243a joystick-20060731.ebuild 811
+SHA256 6843aee20381aeb05be7094a9a6c96e92c2d39253d9f4fbfc7d36a639f66df48 joystick-20060731.ebuild 811
+MISC ChangeLog 837 RMD160 37e29b7d1741c907af7d855fced9a60e91608a03 SHA1 16fc7ebe17be9f527d254546e86b0df4382dfbf6 SHA256 38fece33cefd880b4b132be59490cff963c37b7ab9aedcc1d05f24b6feba7887
+MD5 3a1fe200ae296374977ccd0e6376c2b0 ChangeLog 837
+RMD160 37e29b7d1741c907af7d855fced9a60e91608a03 ChangeLog 837
+SHA256 38fece33cefd880b4b132be59490cff963c37b7ab9aedcc1d05f24b6feba7887 ChangeLog 837
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 726ec0f4239c175e4e5068a8aeced3e4 ChangeLog 620
-MD5 329c2c6c17d30f706c38fb2d53108816 files/digest-joystick-20050720 69
-MD5 4fa67a6834ab2028a7d57b149b14769e files/joystick-MCS-defines.patch 575
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 3c285d629d49e56380d4730130afdf1c files/digest-joystick-20050720 253
+RMD160 1fb9b4ce55d7a31af3d0d9ef8795c119e46db065 files/digest-joystick-20050720 253
+SHA256 acb1d84431ba2a0970f69a39619f791322ca29d515818edbf32745d8d1df17cb files/digest-joystick-20050720 253
+MD5 e6708e3e655604c46d79810c5d9b7eed files/digest-joystick-20060731 253
+RMD160 52eb83d3aa5acf2a4dc0e4361cb5dad4923867f9 files/digest-joystick-20060731 253
+SHA256 cc1ae31946b1e28fdcb7857463687766f08354787824856daabc698bbc5def8e files/digest-joystick-20060731 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFDCpWbgIKl8Uu19MoRAiEyAJ0YO1urzmq3e9y4O58CaFxUujQSKACePKEZ
-ee7gD/5f2o/xKWGGutyBIXU=
-=AmM7
+iD8DBQFEzYxgamhnQswr0vIRAsIuAJ4uKrcQzF2bVUDHyZI4L+V083uLhACgksMW
+rSt2EWJXJfLmoefuua+WsN8=
+=xRkq
 -----END PGP SIGNATURE-----
diff --git a/games-util/joystick/files/digest-joystick-20050720 b/games-util/joystick/files/digest-joystick-20050720
index 3f52e4ff707d..68958dd4e057 100644
--- a/games-util/joystick/files/digest-joystick-20050720
+++ b/games-util/joystick/files/digest-joystick-20050720
@@ -1 +1,3 @@
 MD5 51ff9dbe781be634e7470a9505754f4b joystick-20050720.tar.bz2 27187
+RMD160 930f2605801298bbe19d99a3030726796a4707c9 joystick-20050720.tar.bz2 27187
+SHA256 fac9d32d03e91615e47f23d279d1b0cc9f9fdfa12a897d0771a533d9be8ff36a joystick-20050720.tar.bz2 27187
diff --git a/games-util/joystick/files/digest-joystick-20060731 b/games-util/joystick/files/digest-joystick-20060731
new file mode 100644
index 000000000000..a0fb481f1192
--- /dev/null
+++ b/games-util/joystick/files/digest-joystick-20060731
@@ -0,0 +1,3 @@
+MD5 388fff42d5f65f4bfd1548ea125ca798 joystick-20060731.tar.bz2 27411
+RMD160 fea5a38160bb578c7d0ab380b7d5f7ceba490ca4 joystick-20060731.tar.bz2 27411
+SHA256 17aa3ca45f6bbd2004d0cede4a0f1c32b4cabb946628a85602d89c45d874006b joystick-20060731.tar.bz2 27411
diff --git a/games-util/joystick/files/joystick-jstest-segv.patch b/games-util/joystick/files/joystick-jstest-segv.patch
new file mode 100644
index 000000000000..fa1e4cdd6cbd
--- /dev/null
+++ b/games-util/joystick/files/joystick-jstest-segv.patch
@@ -0,0 +1,52 @@
+fix segfault when JSIOCGAXMAP/JSIOCGBTNMAP dont work
+
+http://bugs.gentoo.org/132607
+
+patch by Matt Anderson
+
+--- utils/jstest.c
++++ utils/jstest.c
+@@ -76,6 +76,7 @@ int main (int argc, char **argv)
+ 	char name[NAME_LENGTH] = "Unknown";
+ 	uint16_t btnmap[KEY_MAX - BTN_MISC + 1];
+ 	uint8_t axmap[ABS_MAX + 1];
++	int btnmap_ok, axismap_ok;
+ 
+ 	if (argc < 2 || argc > 3 || !strcmp("--help", argv[1])) {
+ 		puts("");
+@@ -99,21 +100,29 @@ int main (int argc, char **argv)
+ 	ioctl(fd, JSIOCGAXES, &axes);
+ 	ioctl(fd, JSIOCGBUTTONS, &buttons);
+ 	ioctl(fd, JSIOCGNAME(NAME_LENGTH), name);
+-	ioctl(fd, JSIOCGAXMAP, axmap);
+-	ioctl(fd, JSIOCGBTNMAP, btnmap);
++	axismap_ok = ioctl(fd, JSIOCGAXMAP, axmap);
++	btnmap_ok = ioctl(fd, JSIOCGBTNMAP, btnmap);
+ 
+ 
+ 	printf("Driver version is %d.%d.%d.\n",
+ 		version >> 16, (version >> 8) & 0xff, version & 0xff);
+ 
+ 	printf("Joystick (%s) has %d axes (", name, axes);
+-	for (i = 0; i < axes; i++)
+-		printf("%s%s", i > 0 ? ", " : "", axis_names[axmap[i]]);
++	if (!axismap_ok) {
++		for (i = 0; i < axes; i++)
++			printf("%s%s", i > 0 ? ", " : "", axis_names[axmap[i]]);
++	} else {
++		printf(" axismap never defined ");
++	}
+ 	puts(")");
+ 
+ 	printf("and %d buttons (", buttons);
+-	for (i = 0; i < buttons; i++)
+-		printf("%s%s", i > 0 ? ", " : "", button_names[btnmap[i] - BTN_MISC]);
++	if (!btnmap_ok) {
++		for (i = 0; i < buttons; i++)
++			printf("%s%s", i > 0 ? ", " : "", button_names[btnmap[i] - BTN_MISC]);
++	} else {
++		printf(" buttonmap never defined ");
++	}
+ 	puts(").");
+ 
+ 	printf("Testing ... (interrupt to exit)\n");
diff --git a/games-util/joystick/joystick-20060731.ebuild b/games-util/joystick/joystick-20060731.ebuild
new file mode 100644
index 000000000000..e690b0b69b92
--- /dev/null
+++ b/games-util/joystick/joystick-20060731.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/joystick-20060731.ebuild,v 1.1 2006/07/31 04:51:35 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="joystick testing utilities"
+HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~vojtech/input/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="sdl"
+
+DEPEND="sdl? ( media-libs/libsdl )"
+
+S=${WORKDIR}/utils
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/joystick-MCS-defines.patch
+	epatch "${FILESDIR}"/joystick-jstest-segv.patch
+}
+
+src_compile() {
+	local SDL
+	use sdl && SDL=1 || SDL=0
+	emake SDL=${SDL} || die
+}
+
+src_install() {
+	dobin $(find . -type f -a -perm +1) || die "dobin"
+	dodoc README
+}