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.

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

4 files changed, 59 insertions, 6 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/Manifest b/app-crypt/ekeyd/Manifest
index 7fc3d3162266..01128335d83c 100644
--- a/app-crypt/ekeyd/Manifest
+++ b/app-crypt/ekeyd/Manifest
@@ -1,7 +1,18 @@
+-----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.init 781 RMD160 9f7f426544b116224cbb523d27bee17d378acf2d SHA1 9017e3ddfa29b2b4319a61245f1cf8400f0f06c4 SHA256 441af4b871a17184196a5dbf5263b40291185646ed199c2495662f4da2ea9f86
 DIST ekeyd-1.1.1.tar.gz 92588 RMD160 ed93590eb8e0cafb540c0a2bd59cb3f79b5481b5 SHA1 b7848a3c3f4f9a878ab0c83de6e4faa55b4541e3 SHA256 cb2931c6a357ed98aa227b750e502ced64c992b01a79a0bc58d63e81b209f8d0
-EBUILD ekeyd-1.1.1.ebuild 4083 RMD160 dd89bb837e91384a6807efde3f129496a7d77ec1 SHA1 64afb44ada97cd4134944adec40da13b576c8349 SHA256 39413a5d8943535e9f1c1766ea8e22ef4e11dd3920d0601dad52c75d512b40ae
-MISC ChangeLog 3180 RMD160 e12c4e80215c89f0870fc3f5cd2c2d1c3eb1d52b SHA1 82dd2eabd6bee8dab4e80c7fd0b68ef4cce8298d SHA256 31af590cd73df971c66ea5edb97d0f0be4983f46a587d9efd6cc70a9f4cf45f7
+EBUILD ekeyd-1.1.1-r1.ebuild 4132 RMD160 340ee507510ac8d70ce11601e2e1e6f5e5e8b06e SHA1 eb74967f4c2c7a4b3a70de1e8f708190c4909fd4 SHA256 b501e893d1dc9475f16ac5b213552605d335bdabe631092be60e5c0d606a58b2
+MISC ChangeLog 3539 RMD160 8ab81f4757c6003510be75bc8e313dfcf90fe574 SHA1 cf3d01bda2a98db4bba99353e544e27cbbe77114 SHA256 86425706df64f6c59e5605fe5dac2dc52280c639c2826743510b01e9c7b3b986
 MISC metadata.xml 401 RMD160 988224226b2b1e56ca024b6866deb0291faf3ab7 SHA1 17ae474fa2c6964cc4feab7173ec86f1062b9197 SHA256 3e04add274d3b051cdc073d9b3b8272861caff36bec655e6c86cf2a4fabb66c4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkxdr9wACgkQAiZjviIA2XhxgQCfc5aVQryXyMJcJ9MBzzigzcPW
+oz0Ani2QSRAJ1flYyaEABckAGsHKTxtm
+=7O8X
+-----END PGP SIGNATURE-----
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
+