Revision bump: fix udev rules for keys with slashes in serial numbers (bug #349503, huge thanks to Daniel Weigert for the help and the patience); install udev rules to /lib/udev/rules.d (or lib64); fix rules for non-symlinked lib64; use the same name for both rule files.

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

4 files changed, 65 insertions, 12 deletions

diff --git a/app-crypt/ekeyd/ChangeLog b/app-crypt/ekeyd/ChangeLog
index 4807dd1bb1e5..892cecd112db 100644
--- a/app-crypt/ekeyd/ChangeLog
+++ b/app-crypt/ekeyd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-crypt/ekeyd
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ChangeLog,v 1.18 2010/11/06 01:34:36 rafaelmartins Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ChangeLog,v 1.19 2011/03/27 21:56:08 flameeyes Exp $
+
+*ekeyd-1.1.3-r2 (27 Mar 2011)
+
+  27 Mar 2011; Diego E. Pettenò <flameeyes@gentoo.org> -ekeyd-1.1.3-r1.ebuild,
+  +ekeyd-1.1.3-r2.ebuild, +files/ekeyd-1.1.3-slashes.patch:
+  Revision bump: fix udev rules for keys with slashes in serial numbers (bug
+  #349503, huge thanks to Daniel Weigert for the help and the patience);
+  install udev rules to /lib/udev/rules.d (or lib64); fix rules for
+  non-symlinked lib64; use the same name for both rule files.
 
   06 Nov 2010; Rafael G. Martins <rafaelmartins@gentoo.org>
   ekeyd-1.1.3-r1.ebuild:
diff --git a/app-crypt/ekeyd/Manifest b/app-crypt/ekeyd/Manifest
index ee810f1c54fb..e8279ea4b1d4 100644
--- a/app-crypt/ekeyd/Manifest
+++ b/app-crypt/ekeyd/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ekey-ulusbd.conf 579 RMD160 0fb73018df4b96197fb1bd245f98e078b9e84501 SHA1 c7b287b34080c6cc941e217e21768f290803ca98 SHA256 7077c2634fe54d1c1a6af9f48d4e76b53b8c8f2b110c44ec50a4998f7e797fa9
 AUX ekey-ulusbd.init 1044 RMD160 8d367b69b2ab785603329039005e3e04d0a5858e SHA1 acece8401daf5d0d9c73e4efd3262f2fd2887391 SHA256 454def35bf7bb2e8e1927a33415f51832f45714e5db411c1d0374331e07e802c
 AUX ekeyd-1.1.1-earlyboot.patch 1526 RMD160 66512d44326f6b4ccb3971dd83a5888dc8175a47 SHA1 9ac7a0ab0ff4f800d373f16173a0a40d282a6030 SHA256 00d346ba22afcefafbed9ee1a53c38460db732839a2ed9b5a32ac5bb250987c3
 AUX ekeyd-1.1.3-libusb_compat.patch 658 RMD160 356e27996ac6efbda56002d2dabaae9fce234e95 SHA1 e035db0258b7162a1ed7a69a343628a92c4a78a8 SHA256 5b82fe0d834ccfe674fdee2582a9097e4f0bea5b766e0c287808c7f4b3bc77e2
+AUX ekeyd-1.1.3-slashes.patch 1820 RMD160 4ed9ac60240fae3d9cd1c5f06f372fa7808a704b SHA1 fc12e503bb70ca88d7e7a6a6ad423a95a114d6a1 SHA256 170dd74ef68b470e7a7082a7f5ec6356563daff7167e89413710940ae3a5952b
 AUX ekeyd.init 781 RMD160 9f7f426544b116224cbb523d27bee17d378acf2d SHA1 9017e3ddfa29b2b4319a61245f1cf8400f0f06c4 SHA256 441af4b871a17184196a5dbf5263b40291185646ed199c2495662f4da2ea9f86
 DIST ekeyd-1.1.3.tar.gz 95173 RMD160 0af970891d8da67b5b0737fbac9d626a38ccb41a SHA1 a0119105d3804b76df0dd6a5e18e80db3193ece8 SHA256 07c20450e7ab139b723945e3aa0748f55209c0da097253b25074149c847044e4
-EBUILD ekeyd-1.1.3-r1.ebuild 4540 RMD160 67b0d7dba836847d71a365dea81a65f3ecf178a5 SHA1 0f7988c6afe6b082079ac495d9390b8068fe92a9 SHA256 841630e8be8e52f525e3729e97b8d58780f1543546fdb5e095ea3983e0277d44
-MISC ChangeLog 4483 RMD160 298405a9cb96710326e9b63b74c40dacfd24ec85 SHA1 8fe52513614642b59cea46846edf35010caa3e4d SHA256 9637bffbcd492bb92cf3f1322d021be6380fa4fe14aadd1509706f75f5e8bb4a
+EBUILD ekeyd-1.1.3-r2.ebuild 4762 RMD160 46a412d45eaafa47fb834ec0eb7e108ca08a25b7 SHA1 c38f09b2d413d1c625c22aa73445ae3eaef3cd23 SHA256 f8f0f8f8d9a21e98b1c177217dc0cb794f4187b1c05793d9bed64b056327968c
+MISC ChangeLog 4931 RMD160 19f5bb9ec890d3401cfacf47e82a9811b4ff8c1c SHA1 1fbb0de4ed0950b007acb6b7a51e6ff8e8b45a62 SHA256 7b9825b1b8e0d713c1e20ea3c545706d81afbcb975a5089bd1b86a4551f51d24
 MISC metadata.xml 619 RMD160 a2b1c4bc5ba935096e78992db51ee7d129e21b30 SHA1 2d82a2c0c31be9a52b57ce055de3fb3bbde28544 SHA256 f7a7ec084ae9aec5e7b5bfc14fc853bdb56f427b8577eb494576079ae5205aa9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2PsnMACgkQAiZjviIA2Xi4KgCgo9/m0RaYrUZOpdOYIzFdzS8q
+cmwAoInOB38fxY+bp/fg84hlGZ118W5a
+=IOdW
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/ekeyd/ekeyd-1.1.3-r1.ebuild b/app-crypt/ekeyd/ekeyd-1.1.3-r2.ebuild
index 9d85cb5039e8..4b1c411a3d4f 100644
--- a/app-crypt/ekeyd/ekeyd-1.1.3-r1.ebuild
+++ b/app-crypt/ekeyd/ekeyd-1.1.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ekeyd-1.1.3-r1.ebuild,v 1.3 2010/11/06 01:34:36 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ekeyd-1.1.3-r2.ebuild,v 1.1 2011/03/27 21:56:08 flameeyes Exp $
 
 EAPI=2
 
@@ -45,6 +45,14 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${PN}-1.1.1-earlyboot.patch
 	epatch "${FILESDIR}"/${P}-libusb_compat.patch
+	epatch "${FILESDIR}"/${P}-slashes.patch
+
+	# Stupid multilib hack; remove it once Gentoo has sane paths for
+	# udev directories.
+	if [[ $(get_libdir) != lib ]]; then
+		sed -i -e "s:/lib/udev/:/$(get_libdir)/udev/:" \
+			doc/*.rules || die
+	fi
 
 	# We moved the binaries around
 	sed -i -e 's:$BINPATH/ekey-ulusbd:/usr/libexec/ekey-ulusbd:' \
@@ -109,12 +117,11 @@ src_install() {
 	dodoc daemon/README* AUTHORS WARNING ChangeLog || die
 
 	if use kernel_linux; then
-		insinto /etc/udev/rules.d
-		if use usb; then
-			newins doc/60-UDEKEY01-UDS.rules 70-ekey-ulusbd.rules || die
-		else
-			newins doc/60-UDEKEY01.rules 70-${PN}.rules || die
-		fi
+		local rules=doc/60-UDEKEY01.rules
+		use usb && rules=doc/60-UDEKEY01-UDS.rules
+
+		insinto /$(get_libdir)/udev/rules.d
+		newins ${rules} 70-${PN}.rules || die
 
 		exeinto /$(get_libdir)/udev
 		doexe doc/ekeyd-udev || die
diff --git a/app-crypt/ekeyd/files/ekeyd-1.1.3-slashes.patch b/app-crypt/ekeyd/files/ekeyd-1.1.3-slashes.patch
new file mode 100644
index 000000000000..fc709108bc74
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekeyd-1.1.3-slashes.patch
@@ -0,0 +1,26 @@
+Index: ekeyd-1.1.3/doc/60-UDEKEY01.rules
+===================================================================
+--- ekeyd-1.1.3.orig/doc/60-UDEKEY01.rules
++++ ekeyd-1.1.3/doc/60-UDEKEY01.rules
+@@ -2,7 +2,7 @@
+ 
+ # Detect an Entropy Key being inserted
+ ACTION=="add|change", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="usb_id --export %p"
+-ACTION=="add|change", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT}"
++ACTION=="add|change", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/sh -c '/bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT} | /bin/sed -e s:/:_:g'"
+ 
+ # Add the /dev/entropykey/FOO symbolic link
+ ACTION=="add|change", ENV{ENTROPY_KEY_SERIAL}!="", SYMLINK+="entropykey/$env{ENTROPY_KEY_SERIAL}"
+Index: ekeyd-1.1.3/doc/60-UDEKEY01-UDS.rules
+===================================================================
+--- ekeyd-1.1.3.orig/doc/60-UDEKEY01-UDS.rules
++++ ekeyd-1.1.3/doc/60-UDEKEY01-UDS.rules
+@@ -3,7 +3,7 @@
+ 
+ # Detect an Entropy Key being inserted
+ # ACTION=="add", SUBSYSTEM=="usb", DEVTYPE=="usb_device", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="usb_id --export %p"
+-ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/echo ENTROPY_KEY_SERIAL=$attr{serial}"
++ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/sh -c '/bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT} | /bin/sed -e s:/:_:g'"
+ 
+ # And tell the ekeyd about the new device.
+ ACTION=="add|change", ENV{ENTROPY_KEY_SERIAL}!="", RUN+="/lib/udev/ekeyd-udev"