Revision bump by Víctor Enríquez Miguel. Patches from mephinet & Michael Weber close bug #298459. Patch from Michael Weber closes bug #309751.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

7 files changed, 73 insertions, 138 deletions

diff --git a/sys-auth/thinkfinger/ChangeLog b/sys-auth/thinkfinger/ChangeLog
index 818198ca8c8e..643b7dc2825d 100644
--- a/sys-auth/thinkfinger/ChangeLog
+++ b/sys-auth/thinkfinger/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-auth/thinkfinger
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/thinkfinger/ChangeLog,v 1.7 2009/02/18 15:37:38 chainsaw Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/thinkfinger/ChangeLog,v 1.8 2010/04/11 15:33:02 chainsaw Exp $
+
+*thinkfinger-0.3-r2 (11 Apr 2010)
+
+  11 Apr 2010; <chainsaw@gentoo.org> +files/0.3-send-sync-event.patch,
+  -thinkfinger-0.2.2-r1.ebuild, -thinkfinger-0.3.ebuild,
+  files/60-thinkfinger.rules, -thinkfinger-0.3-r1.ebuild,
+  +thinkfinger-0.3-r2.ebuild:
+  Revision bump by Víctor Enríquez Miguel. Patches from mephinet & Michael
+  Weber close bug #298459. Patch from Michael Weber closes bug #309751.
 
 *thinkfinger-0.3-r1 (18 Feb 2009)
 
diff --git a/sys-auth/thinkfinger/Manifest b/sys-auth/thinkfinger/Manifest
index eecc01175c56..0b97b86ca235 100644
--- a/sys-auth/thinkfinger/Manifest
+++ b/sys-auth/thinkfinger/Manifest
@@ -3,19 +3,17 @@ Hash: SHA1
 
 AUX 0.3-carriagereturn.patch 409 RMD160 22542c76ba34dc2654077e54a68d06e1b9fa1b4d SHA1 09726c9d38e36c4e193e5a122dafe1bdfd1be9ad SHA256 75b6d7093d6182a1384ada721f92975450e1055cf0e6796f2649260042738b65
 AUX 0.3-direct_set_config_usb_hello.patch 941 RMD160 e848bc1ea9331fd7e8516dc40ef875b5921031e0 SHA1 fbaf31d72fa615c3cd159504a5eb31fdc60ffe05 SHA256 285fd6ae82334e5b9b19fc0ba1e8429b0c46cb7b880a0df251989c7862969c23
+AUX 0.3-send-sync-event.patch 1031 RMD160 ed414897a83d9ed08bd2efb0ed08e646ee09c6f4 SHA1 8b67abc16b92b5f73f079fc0e557d8de85e4e358 SHA256 ff9aab4179d44708bb77b3b8be4939c3559e724b90fef8c688c5c9d0e996f095
 AUX 0.3-tftoolgroup.patch 1708 RMD160 66278d05abb136b69e1c1d8c654fb052a1f2f20d SHA1 95b6f6c3507f61ec75afb65b4d1d8cc138dbc1bd SHA256 d48da4d150986c21bb1b9c2b0f43dce9814ef0e8a1044f29805ca393721e4bd3
-AUX 60-thinkfinger.rules 599 RMD160 ca1107b6854139d9ff8067a19d448bc8d0b8ab41 SHA1 e0ec3f8786a8d776174048e7df5a914eb88da1d3 SHA256 cb91294c30e9feafa69b3194ba16e65ab4648772c425f5bc69fdee459795c68f
-DIST thinkfinger-0.2.2.tar.gz 362593 RMD160 1cebb0df186753c8faf0cf550968c7425f38a0e8 SHA1 374ddef8bbf8fc3c5f590bc60a96c3700f2200f0 SHA256 d3acf4f2e06bee4db6cce655938e8d59136dc212957305afdbf7d470f3a931d2
+AUX 60-thinkfinger.rules 251 RMD160 855fc594c5ae54e971cd781eab3f4fa2c08812cd SHA1 0dea2d595a99e470e972c179685cd370406e0cae SHA256 e7d1c3f56b052b4bc50f1bf245bff5b32067f869c9c1859828dae2ae2ae612c9
 DIST thinkfinger-0.3.tar.gz 372053 RMD160 7a83e7234bc6687f581df3b68b92cc06bf5b24cb SHA1 6d032ec7ad1166505b6773dff3c762c77bc72626 SHA256 9741ae205aadc9f576be73c382596266300e709371e72574a86e339ebf978f4b
-EBUILD thinkfinger-0.2.2-r1.ebuild 1468 RMD160 d1859fbd84b6408652598b2afcbcf32bc148455f SHA1 8d510e8ebe69e4d7df2bd88a79b41382570ef992 SHA256 5329ef6ea5a498c73c7aa339db526ad0fcc1e9d29f4c01aa665f87d7ce8ad252
-EBUILD thinkfinger-0.3-r1.ebuild 2107 RMD160 0dcc197f376495fce3dfaab84694a6adbd9964fa SHA1 1dee0e1714a058d4bfe8f2e86bde7badc283eeae SHA256 c25c993bdc08911acfd6d12b8224aa4802fd4b4decd49090d9dd4d2505a16205
-EBUILD thinkfinger-0.3.ebuild 1673 RMD160 aa40841b5eb49f071e681937937b09e6e09f8057 SHA1 6ca6a735d517972bfc26b7155be7520d460a08ff SHA256 041f8a76b2d8f62a0d2375528f0d9b28722a2e36e2fc23f8c2f4cd380c8dea3e
-MISC ChangeLog 2229 RMD160 97bc6882616587fe31b5ebb756a28be6aa7c7c0b SHA1 e09243734dd3ae4f4c8a936f4f7a76b322e1bb41 SHA256 5128d04979fe3000c4f5def7d9d47cb4181eb18dd37b3f527f63b9c8124ffbaf
+EBUILD thinkfinger-0.3-r2.ebuild 2164 RMD160 5663ea5f47f3e2d2e793304d7d28da9ffcbcc1c8 SHA1 c47350b67c6d0a7c44729e378b9dd5d8b7f9030d SHA256 9b08b64b4e95cce7ab01d12e4e743d9d43515533a4d0766ad514ac06053b6efb
+MISC ChangeLog 2630 RMD160 8689655dde754f7588bd7564b8b7dade5a5096a3 SHA1 3e3869ed9e9e81da76ccc20f127b0200c33b4a1b SHA256 ba20c6eaa3b216a8f74f4e582bc7a3b0445d55c04a5ba0c5f2009253de0c92b9
 MISC metadata.xml 497 RMD160 9df54748d112b4a38861c14fa9ad6a01d3c2341e SHA1 1e349cf13897948ace735d9a87e5bd685613a33f SHA256 13d0f548b65df70bb70d82e1e106b77f5cff96b1a91298815cdb9e01cc433ef2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkmcKxYACgkQp5vW4rUFj5qAiACfVOqYKqQyrtWizUK95g64jslP
-fgoAoJsDmY+pt/Aoa/ipbG3ZY6rS1EQH
-=bW+Y
+iEYEARECAAYFAkvB68AACgkQp5vW4rUFj5orWQCfeDZAKHXwFxgmOkgq3xCdZRc7
+M78Anjr7kKmbBX9K5rl7Fo+hw3OD++Hs
+=840l
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/thinkfinger/files/0.3-send-sync-event.patch b/sys-auth/thinkfinger/files/0.3-send-sync-event.patch
new file mode 100644
index 000000000000..39e0edb27ba1
--- /dev/null
+++ b/sys-auth/thinkfinger/files/0.3-send-sync-event.patch
@@ -0,0 +1,50 @@
+--- pam/pam_thinkfinger-uinput.c	2009-12-27 18:42:26.000000000 +0100
++++ pam/pam_thinkfinger-uinput.c	2009-12-27 18:41:55.000000000 +0100
+@@ -34,27 +34,40 @@
+ int uinput_cr (int *fd)
+ {
+ 	int retval = 0, ev_size = 0;
+-	struct input_event ev = {
++	struct input_event key_ev = {
+ 		.type = EV_KEY,
+ 		.code = KEY_ENTER,
+ 		.time = {0, }
+ 	};
+ 
+-	ev_size = sizeof (ev);
++	ev_size = sizeof (key_ev);
+ 
+ 	/* key press */
+-	ev.value = 1;
+-	if (write (*fd, &ev, ev_size) != ev_size) {
++	key_ev.value = 1;
++	if (write (*fd, &key_ev, ev_size) != ev_size) {
+ 		retval = errno;
+ 		goto out;
+ 	}
+ 	/* key release */
+-	ev.value = 0;
+-	if (write (*fd, &ev, ev_size) != ev_size) {
++	key_ev.value = 0;
++	if (write (*fd, &key_ev, ev_size) != ev_size) {
+ 		retval = errno;
+ 		goto out;
+ 	}
+-
++	
++	/* syn event */
++	struct input_event syn_ev = {
++	  .time = {0, },
++	  .type = EV_SYN,
++	  .code = SYN_REPORT,
++	  .value = 0
++	};
++	
++	if (write (*fd, &syn_ev, ev_size) != ev_size) {
++		retval = errno;
++		goto out;
++	}
++    
+ out:
+ 	return retval;
+ }
diff --git a/sys-auth/thinkfinger/files/60-thinkfinger.rules b/sys-auth/thinkfinger/files/60-thinkfinger.rules
index 21e1ac9461e3..1ccc394d49ff 100644
--- a/sys-auth/thinkfinger/files/60-thinkfinger.rules
+++ b/sys-auth/thinkfinger/files/60-thinkfinger.rules
@@ -1,17 +1,5 @@
-#
-# udev rules file for the thinkfinger fingerprint scanner
-# 
-# gives access to the fingerprint reader to those in the "fingerprint" group
-#
-# Taken from:
-#  http://www.thinkwiki.org/wiki/How_to_enable_the_fingerprint_reader_with_ThinkFinger
-# which was taken and modified from:
-#  http://article.gmane.org/gmane.linux.drivers.thinkfinger/329
-#
-
 # SGS Thomson Microelectronics Fingerprint Reader
-SYSFS{idVendor}=="0483", SYSFS{idProduct}=="2016", SYMLINK+="input/thinkfinger-%k", MODE="0660", GROUP="fingerprint"
+ATTRS{idVendor}=="0483", ATTRS{idProduct}=="2016", SYMLINK+="input/thinkfinger-%k", MODE="0660", GROUP="fingerprint"
 
 # the also-needed uinput device
 KERNEL=="uinput", MODE="0660", GROUP="fingerprint"
-
diff --git a/sys-auth/thinkfinger/thinkfinger-0.2.2-r1.ebuild b/sys-auth/thinkfinger/thinkfinger-0.2.2-r1.ebuild
deleted file mode 100644
index 8fb81356eda4..000000000000
--- a/sys-auth/thinkfinger/thinkfinger-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/thinkfinger/thinkfinger-0.2.2-r1.ebuild,v 1.3 2007/02/27 14:58:09 peper Exp $
-
-inherit pam
-
-DESCRIPTION="Support for the UPEK/SGS Thomson Microelectronics fingerprint reader, often seen in Thinkpads"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://thinkfinger.sourceforge.net/"
-
-RDEPEND=">=dev-libs/libusb-0.1.12
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	>=dev-util/pkgconfig-0.9.0"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pam"
-
-src_compile() {
-	econf \
-		$(use_enable pam) \
-		"--with-securedir=$(getpam_mod_dir)" \
-		|| die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	keepdir /etc/pam_thinkfinger
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	elog "Use tf-tool --acquire to take a finger print"
-	elog "tf-tool will write the finger print file to /tmp/test.bir"
-	elog ""
-	if useq pam ; then
-		elog "To add a fingerprint to PAM, use tf-tool --add-user USERNAME"
-		elog ""
-		elog "Add the following to /etc/pam.d/system-auth after pam_env.so"
-		elog "auth     sufficient     pam_thinkfinger.so"
-		elog ""
-		elog "Your system-auth should look similar to:"
-		elog "auth     required     pam_env.so"
-		elog "auth     sufficient   pam_thinkfinger.so"
-		elog "auth     sufficient   pam_unix.so try_first_pass likeauth nullok"
-	fi
-}
diff --git a/sys-auth/thinkfinger/thinkfinger-0.3-r1.ebuild b/sys-auth/thinkfinger/thinkfinger-0.3-r2.ebuild
index 80b5d14066d3..bf4e30e66186 100644
--- a/sys-auth/thinkfinger/thinkfinger-0.3-r1.ebuild
+++ b/sys-auth/thinkfinger/thinkfinger-0.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/thinkfinger/thinkfinger-0.3-r1.ebuild,v 1.1 2009/02/18 15:37:38 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/thinkfinger/thinkfinger-0.3-r2.ebuild,v 1.1 2010/04/11 15:33:02 chainsaw Exp $
 
 inherit pam linux-info eutils
 
@@ -24,6 +24,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/${PV}-direct_set_config_usb_hello.patch" || die
 	epatch "${FILESDIR}/${PV}-carriagereturn.patch" || die
+	epatch "${FILESDIR}/${PV}-send-sync-event.patch" || die
 	epatch "${FILESDIR}/${PV}-tftoolgroup.patch" || die
 }
 
diff --git a/sys-auth/thinkfinger/thinkfinger-0.3.ebuild b/sys-auth/thinkfinger/thinkfinger-0.3.ebuild
deleted file mode 100644
index bcb7ccc42a53..000000000000
--- a/sys-auth/thinkfinger/thinkfinger-0.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/thinkfinger/thinkfinger-0.3.ebuild,v 1.2 2007/09/08 18:21:42 vapier Exp $
-
-inherit pam linux-info
-
-DESCRIPTION="Support for the UPEK/SGS Thomson Microelectronics fingerprint reader, often seen in Thinkpads"
-HOMEPAGE="http://thinkfinger.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug pam"
-
-RDEPEND=">=dev-libs/libusb-0.1.12
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	>=dev-util/pkgconfig-0.9.0"
-
-pkg_setup() {
-	if use pam ; then
-		CONFIG_CHECK="~INPUT_UINPUT"
-		ERROR_CFG="Your kernel needs uinput for the pam module to work"
-		check_extra_config
-	fi
-}
-
-src_compile() {
-	econf \
-		$(use_enable pam) \
-		$(use_enable debug usb-debug) \
-		"--with-securedir=$(getpam_mod_dir)" \
-		|| die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	keepdir /etc/pam_thinkfinger
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	elog "Use tf-tool --acquire to take a finger print"
-	elog "tf-tool will write the finger print file to /tmp/test.bir"
-	elog ""
-	if use pam ; then
-		elog "To add a fingerprint to PAM, use tf-tool --add-user USERNAME"
-		elog ""
-		elog "Add the following to /etc/pam.d/system-auth after pam_env.so"
-		elog "auth     sufficient     pam_thinkfinger.so"
-		elog ""
-		elog "Your system-auth should look similar to:"
-		elog "auth     required     pam_env.so"
-		elog "auth     sufficient   pam_thinkfinger.so"
-		elog "auth     sufficient   pam_unix.so try_first_pass likeauth nullok"
-	fi
-}