Add explosion avoidance to the driver, upstream patch found by Kamil Kamiński <kamil@mrblur.net>. Closes bug #237074.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc5-00131-g5f17cfc-dirty x86_64

4 files changed, 103 insertions, 2 deletions

diff --git a/x11-drivers/xf86-input-synaptics/ChangeLog b/x11-drivers/xf86-input-synaptics/ChangeLog
index 67c813908583..36cb4ffea54f 100644
--- a/x11-drivers/xf86-input-synaptics/ChangeLog
+++ b/x11-drivers/xf86-input-synaptics/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-input-synaptics
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.8 2008/09/08 11:47:07 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.9 2008/09/10 13:08:46 chainsaw Exp $
+
+*xf86-input-synaptics-0.15.1-r1 (10 Sep 2008)
+
+  10 Sep 2008; <chainsaw@gentoo.org> +files/synaptics-fix-explosion.patch,
+  +xf86-input-synaptics-0.15.1-r1.ebuild:
+  Add explosion avoidance to the driver, upstream patch found by Kamil
+  Kamiński <kamil@mrblur.net>. Closes bug #237074.
 
   08 Sep 2008; Joseph Jezak <josejx@gentoo.org>
   xf86-input-synaptics-0.15.1.ebuild:
diff --git a/x11-drivers/xf86-input-synaptics/Manifest b/x11-drivers/xf86-input-synaptics/Manifest
index 7efca5fd41cf..0511b7a2e7c1 100644
--- a/x11-drivers/xf86-input-synaptics/Manifest
+++ b/x11-drivers/xf86-input-synaptics/Manifest
@@ -1,11 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 11-x11-synaptics.fdi 593 RMD160 5b2d387e22b2dfd340e6e5e508f5b07bd916f5fc SHA1 f8985d0324efceb86ca18418df16222b773bf798 SHA256 f904632ce695305ec6384a615c1ebb317ed40249a34c57149a06f9da0f775fdc
 AUX rc.conf 342 RMD160 65e507598001c497dec7b05ab5bb8e06ff1aac7a SHA1 cc76b983b33f8eb5c3624ba78db206781eab81bb SHA256 3334b80cd39226fafd948e16114ab094fffe9455625f608c80f8287a006d0716
 AUX rc.init 452 RMD160 202287feac6c79276fac32987cb1d75158bacfee SHA1 db38171e0c8e1d777ae8af2ce81e43950137892f SHA256 0d735340a0adb2e5e6c902253d4ef68fd80c3001b0ed31ea70d2a2690d738a1a
+AUX synaptics-fix-explosion.patch 657 RMD160 44c4b8230aeafab0264ab4ec1a2def4131b881eb SHA1 d452e5cc55fa047c36c5ad4c1a8e0e3cbdffd4bc SHA256 59587c82f10279b032d29c12ba07bd251b60fa463a2f0d082606dbe9b52c6c63
 AUX synaptics-fix-xinerama.patch 752 RMD160 5017471df5c4f47382938ccff9bbd66033c06a6f SHA1 14b53a0c4090739ddc4cff9e9ad94cb9e2499c87 SHA256 7bdec4ef00a520d52e00b8a1d0b6d61e89fde910e28baa306b8be23dd7aadd64
 AUX synaptics-xorg-version.patch 581 RMD160 eab8463f1fe5e78d6da033fcecdbd5714fce1287 SHA1 fd4e7e691b30f5571bc8905780dd16db1790f689 SHA256 39445b88a5ec8e82da69c3b93003af26e14c964fbf63710ae56e1204dc8e29e2
 DIST xf86-input-synaptics-0.15.0.tar.bz2 280770 RMD160 54648e5f3bdbcab1857ddb469f83aacba3f7af9d SHA1 41eaa1c77af11166ff5ec4abc013076f545bc676 SHA256 e7d481c375a11df55eb8f12390c329c2bfda3258c689cec11cfec27cb5895c8b
 DIST xf86-input-synaptics-0.15.1.tar.bz2 287827 RMD160 561971ec7cb144fdd3e246ac902b092d3171aa46 SHA1 74a986265570e0a25eb1e9a880a04653d48d7bd1 SHA256 9053f4bede4fbb5a27bf013445dd2a8389b039bc7fab208688db1afbc89aa47a
 EBUILD xf86-input-synaptics-0.15.0-r1.ebuild 2034 RMD160 878cf0877bf0229880a6d33b096f2352920e3d4f SHA1 af3a211c486db334670793869ab4c8bc884634ee SHA256 b5c2267aa2876a3a3c8e9f2a3869c13a443a0df8ebed2bf4cb36e1fe152a06ad
+EBUILD xf86-input-synaptics-0.15.1-r1.ebuild 2049 RMD160 1c0e2527a8eedd5a8682e7466b191f05502b232c SHA1 bf04620877188cff6ef1788ed66ab549658c7792 SHA256 9d64498100837e2580a514a0a1b503f8d1484098a9df68e37d8c4c120cc15909
 EBUILD xf86-input-synaptics-0.15.1.ebuild 1917 RMD160 f2c3d29a206f14e82fc473d936aa53240660871c SHA1 0132dedf13a89d02f8e60b2e24b886116f066faf SHA256 2f2a3ebe31390002eeea14ab22830e09c6136bac21b61383fe8a7b00fd07c888
-MISC ChangeLog 2178 RMD160 4fe6d1a37cd0994f5b227d13e9bc6a0c96ca94ed SHA1 5892c1cb7546201b11d4943b351383d51016228c SHA256 74e8ab06e76976d4a4accb0474bbec368938b0d1244751699fe48bfca31f4728
+MISC ChangeLog 2468 RMD160 b7f0f3432ef9438300c72e1f5068df2230aed0b3 SHA1 c7fc04d78b62026080f779a3ef5a73f0aa0c41a5 SHA256 dc6507eac5289be20b743b7435634f9f01d60b647d7dd72b6e182f8dfbe8baa7
 MISC metadata.xml 254 RMD160 c1c6e70dd9088c05d91c8188791534dae7ffa665 SHA1 2dcdc428213d896d7b0d00f46edfa49799a0f0a8 SHA256 326a5b3b205fe4d2e8822e5a595c500d19bf3d6c527ab1305a24ef476bd1c08b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjHxucACgkQp5vW4rUFj5pyDgCePm7GJly+jFD+Owcje24iVFP4
+2AcAoK3xpKo0zVkA0DGEDvYOnJNhm0te
+=3LX5
+-----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-input-synaptics/files/synaptics-fix-explosion.patch b/x11-drivers/xf86-input-synaptics/files/synaptics-fix-explosion.patch
new file mode 100644
index 000000000000..90d8729d3d51
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/files/synaptics-fix-explosion.patch
@@ -0,0 +1,13 @@
+diff -uNr xf86-input-synaptics-0.15.1.ORIG/src/synaptics.c xf86-input-synaptics-0.15.1/src/synaptics.c
+--- xf86-input-synaptics-0.15.1.ORIG/src/synaptics.c	2008-09-10 13:54:55.000000000 +0100
++++ xf86-input-synaptics-0.15.1/src/synaptics.c	2008-09-10 13:56:19.000000000 +0100
+@@ -176,7 +176,8 @@
+     device = xf86FindOptionValue(local->options, "Device");
+     if (!device) {
+ 	device = xf86FindOptionValue(local->options, "Path");
+-	xf86ReplaceStrOption(local->options, "Device", device);
++	if (device)
++  	    xf86ReplaceStrOption(local->options, "Device", device);
+     }
+     if (device && strstr(device, "/dev/input/event")) {
+ #ifdef BUILD_EVENTCOMM
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.1-r1.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.1-r1.ebuild
new file mode 100644
index 000000000000..940f19801951
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.1-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.1-r1.ebuild,v 1.1 2008/09/10 13:08:46 chainsaw Exp $
+
+inherit toolchain-funcs eutils linux-info x-modular
+
+DESCRIPTION="Driver for Synaptics touchpads"
+HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+LICENSE="MIT"
+IUSE="hal"
+RDEPEND="x11-libs/libXext
+	 hal? ( sys-apps/hal )"
+DEPEND="${RDEPEND}
+	!x11-drivers/synaptics
+	x11-base/xorg-server
+	x11-proto/inputproto
+	>=sys-apps/sed-4"
+
+evdev-input_check() {
+	# Check kernel config for required event interface support (either
+	# built-in or as a module. Bug #134309.
+
+	ebegin "Checking kernel config for event device support"
+	linux_chkconfig_present INPUT_EVDEV
+	eend $?
+
+	if [[ $? -ne 0 ]] ; then
+		ewarn "Synaptics driver requires event interface support."
+		ewarn "Please enable the event interface in your kernel config."
+		ewarn "The option can be found at:"
+		ewarn
+		ewarn "  Device Drivers"
+		ewarn "    Input device support"
+		ewarn "      -*- Generic input layer"
+		ewarn "        <*> Event interface"
+		ewarn
+		ewarn "Then rebuild the kernel or install the module."
+		epause 5
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	evdev-input_check
+}
+
+src_unpack() {
+	x-modular_unpack_source
+	# Fix to handle multiple screens through Xinerama properly. Bug #206614.
+	epatch "${FILESDIR}"/synaptics-fix-xinerama.patch
+	# Fix to not explode if no device and/or path are specified. Bug #237074.
+	epatch "${FILESDIR}"/synaptics-fix-explosion.patch
+}
+
+src_install() {
+	DOCS="INSTALL NEWS TODO README"
+	x-modular_src_install
+
+	# Stupid new daemon, didn't work for me because of shm issues
+	newinitd "${FILESDIR}"/rc.init syndaemon
+	newconfd "${FILESDIR}"/rc.conf syndaemon
+
+	if use hal ; then
+		# Have HAL assign this driver to supported touchpads.
+		insinto /usr/share/hal/fdi/policy/10osvendor
+		doins "${FILESDIR}"/11-x11-synaptics.fdi
+	fi
+}