Revision bump, add a patch to use /dev for sockets and pid files, inspired by mdadm, so that it works even if the rule is started early when / is yet to be pivoted or mounted r/w.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 46 insertions, 4 deletions

diff --git a/app-crypt/ekeyd/ChangeLog b/app-crypt/ekeyd/ChangeLog
index f17c0df03588..63d5aa0a86ee 100644
--- a/app-crypt/ekeyd/ChangeLog
+++ b/app-crypt/ekeyd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-crypt/ekeyd
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ChangeLog,v 1.12 2009/11/24 10:32:47 robbat2 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ChangeLog,v 1.13 2010/08/07 19:11:05 flameeyes Exp $
+
+*ekeyd-1.1.1-r1 (07 Aug 2010)
+
+  07 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org> -ekeyd-1.1.1.ebuild,
+  +ekeyd-1.1.1-r1.ebuild, +files/ekeyd-1.1.1-earlyboot.patch:
+  Revision bump, add a patch to use /dev for sockets and pid files, inspired
+  by mdadm, so that it works even if the rule is started early when / is yet
+  to be pivoted or mounted r/w.
 
   24 Nov 2009; Robin H. Johnson <robbat2@gentoo.org> ekeyd-1.1.1.ebuild:
   Diego reports that while it compiles against libusb-compat, it does not
diff --git a/app-crypt/ekeyd/ekeyd-1.1.1.ebuild b/app-crypt/ekeyd/ekeyd-1.1.1-r1.ebuild
index 95e9b8502483..5f65a39d0c8c 100644
--- a/app-crypt/ekeyd/ekeyd-1.1.1.ebuild
+++ b/app-crypt/ekeyd/ekeyd-1.1.1-r1.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/app-crypt/ekeyd/ekeyd-1.1.1.ebuild,v 1.2 2009/11/24 10:32:47 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ekeyd-1.1.1-r1.ebuild,v 1.1 2010/08/07 19:11:05 flameeyes Exp $
 
 EAPI=2
 
@@ -43,6 +43,8 @@ src_prepare() {
 		-e '/gzip/d' \
 		daemon/Makefile || die
 
+	epatch "${FILESDIR}"/${P}-earlyboot.patch
+
 	# We moved the binaries around
 	sed -i -e 's:$BINPATH/ekey-ulusbd:/usr/libexec/ekey-ulusbd:' \
 		doc/ekeyd-udev || die
diff --git a/app-crypt/ekeyd/files/ekeyd-1.1.1-earlyboot.patch b/app-crypt/ekeyd/files/ekeyd-1.1.1-earlyboot.patch
new file mode 100644
index 000000000000..d415373e0769
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekeyd-1.1.1-earlyboot.patch
@@ -0,0 +1,32 @@
+Index: ekeyd-1.1.1/doc/ekeyd-udev
+===================================================================
+--- ekeyd-1.1.1.orig/doc/ekeyd-udev
++++ ekeyd-1.1.1/doc/ekeyd-udev
+@@ -6,19 +6,20 @@ if test "x$SUBSYSTEM" = "xtty"; then
+   $BINPATH/ekeydctl ${ACTION} /dev/entropykey/${ENTROPY_KEY_SERIAL}
+ else
+   if test "x$ACTION" = "xadd"; then
+-    mkdir -p /var/run/entropykeys
++    mkdir -p /dev/entropykey
++    mkdir -p /dev/.ekeyd-ulusb
+     if test "x${BUSNUM}" = "x" -o "x${DEVNUM}" = "x"; then
+       exit 0
+     fi
+-    if test -r "/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid"; then
+-      kill $(cat "/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid") || true
++    if test -r "/dev/.ekeyd-ulusb/${ENTROPY_KEY_SERIAL}.pid"; then
++      kill $(cat "/dev/.ekeyd-ulusb/${ENTROPY_KEY_SERIAL}.pid") || true
+     fi
+-    $BINPATH/ekey-ulusbd -b${BUSNUM} -d${DEVNUM} -P/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid -p/var/run/entropykeys/${ENTROPY_KEY_SERIAL} -D
++    /usr/libexec/ekey-ulusbd -b${BUSNUM} -d${DEVNUM} -P/dev/.ekeyd-ulusb/${ENTROPY_KEY_SERIAL}.pid -p/dev/entropykey/${ENTROPY_KEY_SERIAL} -D
+   fi
+-  $BINPATH/ekeydctl ${ACTION} /var/run/entropykeys/${ENTROPY_KEY_SERIAL}
++  $BINPATH/ekeydctl ${ACTION} /dev/entropykey/${ENTROPY_KEY_SERIAL}
+   if test "x$ACTION" = "xremove"; then
+-    rm "/var/run/ekey-ulusbd-${ENTROPYKEY_KEY_SERIAL}.pid"
+-    rm "/var/run/entropykeys/${ENTROPYKEY_KEY_SERIAL}"
++    rm "/dev/.ekeyd-ulusb/${ENTROPYKEY_KEY_SERIAL}.pid"
++    rm "/dev/entropykey/${ENTROPYKEY_KEY_SERIAL}"
+   fi
+ fi
+