[Haver-commits] r249 - trunk/dev-tools/haver-push

[haver]

Author: bdonlan
Date: 2004-06-26 22:42:20 -0400 (Sat, 26 Jun 2004)
New Revision: 249

Modified:
   trunk/dev-tools/haver-push/push.conf.sample
   trunk/dev-tools/haver-push/push.pl
   trunk/dev-tools/haver-push/receive.conf.sample
   trunk/dev-tools/haver-push/receive.pl
Log:
* Remove $gpgopts
* Add $homedir, to specify gpg homedir


Modified: trunk/dev-tools/haver-push/push.conf.sample
===================================================================
--- trunk/dev-tools/haver-push/push.conf.sample 2004-06-27 01:44:57 UTC (rev 
248)
+++ trunk/dev-tools/haver-push/push.conf.sample 2004-06-27 02:42:20 UTC (rev 
249)
@@ -1,7 +1,7 @@
 $repopath      = "/home/user/source";
 $destaddr      = '[EMAIL PROTECTED]';
 $fromaddr      = '[EMAIL PROTECTED]';
-$gpgopts               = '';
+#$homedir              = '/foo';
 $gpgkey                = 'DB0F8263';
 $gpgpass               = 'foo';
 $statefile     = '/home/user/state';

Modified: trunk/dev-tools/haver-push/push.pl
===================================================================
--- trunk/dev-tools/haver-push/push.pl  2004-06-27 01:44:57 UTC (rev 248)
+++ trunk/dev-tools/haver-push/push.pl  2004-06-27 02:42:20 UTC (rev 249)
@@ -38,7 +38,7 @@
 our $repopath;
 our $destaddr;
 our $fromaddr;
-our $gpgopts;
+our $homedir;
 our $gpgkey;
 our $gpgpass;
 our $statefile;
@@ -103,9 +103,12 @@
 }
 
 my $mg = Mail::GPG->new(
+       gnupg_hash_init         => {
+                               ($homedir ? (homedir => $homedir) : ()),
+                               },
        default_key_id          => $gpgkey,
        default_passphrase      => $gpgpass,
-);
+) or die "Can't init Mail::GPG: $!";
 
 $message = $mg->mime_sign(
        entity => $message,

Modified: trunk/dev-tools/haver-push/receive.conf.sample
===================================================================
--- trunk/dev-tools/haver-push/receive.conf.sample      2004-06-27 01:44:57 UTC 
(rev 248)
+++ trunk/dev-tools/haver-push/receive.conf.sample      2004-06-27 02:42:20 UTC 
(rev 249)
@@ -1,3 +1,4 @@
 $storedir      = "/home/user/pushstore";
 $repopath      = "/home/user/target";
 $gpgkey                = '01234567';
+#$homedir      = '/foo';

Modified: trunk/dev-tools/haver-push/receive.pl
===================================================================
--- trunk/dev-tools/haver-push/receive.pl       2004-06-27 01:44:57 UTC (rev 
248)
+++ trunk/dev-tools/haver-push/receive.pl       2004-06-27 02:42:20 UTC (rev 
249)
@@ -32,6 +32,7 @@
 our $storedir;
 our $repopath;
 our $gpgkey;
+our $homedir;
 
 do "receive.conf" or die "Loading config file receive.conf: $?";
 
@@ -49,7 +50,12 @@
 
 my $entity = $parser->parse(\*STDIN);
 
-my $mg = new Mail::GPG;
+my $mg = new Mail::GPG(
+        gnupg_hash_init         => {
+                                ($homedir ? (homedir => $homedir) : ()),
+                               },
+       ) or die "Can't init Mail::GPG: $!";
+
 my $result = $mg->verify(entity => $entity);
 
 if (!$result->get_is_signed()) {