[csw-devel] SF.net SVN: opencsw:[438] catalog_signatures

[bdwalton at users.sourceforge.net]

Revision: 438
          http://opencsw.svn.sourceforge.net/opencsw/?rev=438&view=rev
Author:   bdwalton
Date:     2011-07-21 03:12:47 +0000 (Thu, 21 Jul 2011)

Log Message:
-----------
drop the pinentry timeout wrapper

Signed-off-by: Ben Walton <bwalton at opencsw.org>

Modified Paths:
--------------
    catalog_signatures/etc/gpg/gpg-agent.conf

Removed Paths:
-------------
    catalog_signatures/bin/pinentry_timeout

Deleted: catalog_signatures/bin/pinentry_timeout
===================================================================
--- catalog_signatures/bin/pinentry_timeout	2011-07-21 03:12:20 UTC (rev 437)
+++ catalog_signatures/bin/pinentry_timeout	2011-07-21 03:12:47 UTC (rev 438)
@@ -1,30 +0,0 @@
-#!/opt/csw/bin/bash
-
-#Time to wait for pinentry before killing it
-export ALARMTIME=30
-
-PARENTPID=$$
-
-exit_timeout() {
-    echo "Timed out.  Killing pinentry."
-    kill -9 $CHILDPID >/dev/null 2>&1
-    reset
-    exit 1
-}
-
-/opt/csw/bin/pinentry-curses &
-CHILDPID=$!
-
-#Prepare to catch SIGALRM, call exit_timeout
-trap exit_timeout SIGALRM
-
-#Sleep in a subprocess, then signal parent with ALRM
-(sleep $ALARMTIME; kill -ALRM $PARENTPID) &
-
-ALARMPID=$!
-
-#Wait for child processes to complete normally
-wait $CHILDPID
-
-#Tidy up the Alarm subprocess
-kill $ALARMPID

Modified: catalog_signatures/etc/gpg/gpg-agent.conf
===================================================================
--- catalog_signatures/etc/gpg/gpg-agent.conf	2011-07-21 03:12:20 UTC (rev 437)
+++ catalog_signatures/etc/gpg/gpg-agent.conf	2011-07-21 03:12:47 UTC (rev 438)
@@ -1 +0,0 @@
-pinentry-program /home/bwalton/catalog_signature/bin/pinentry_timeout


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.