Changeset 589

Timestamp:

Oct 26, 2025, 12:25:51 PM (9 hours ago)

Author:

katerina

Message:

Fix for ticket #477 (obsolete gpg option --secret-keyring).

File:

• trunk/scripts/samhainadmin-gpg.pl.in (modified) (4 diffs)

trunk/scripts/samhainadmin-gpg.pl.in

@@ -156 +156 @@
     print "    Set the passphrase for gpg. By default, gpg will ask.\n\n";
 
-    print "  -s gnupg_homedir --secretkeyring gnupg_homedir\n";
-    print "    Select an alternate gpg homedirectory to locate the secret keyring.\n";
-    print "    Will use '$ENV{'HOME'}/.gnupg/' by default.\n\n";
-
     print "  -k keyid      --keyid keyid\n";
     print "   Select the keyid to use for signing.\n\n";
@@ -528 +524 @@
         local $SIG{PIPE} = 'IGNORE';
         my $command = "$gpg --homedir $ENV{'HOME'}/.gnupg --passphrase-fd 0 -a ${KEYTAG} ${TARGETKEYID} --clearsign -o $fileout --not-dash-escaped ";
-        $command .= "--secret-keyring $secretkeyring " if (defined($opts{'s'}));
         $command .= "$file1";
         open (FH, "|$command")  or die "can't fork: $!";
@@ -535 +530 @@
     } else {
         my $command = "$gpg --homedir $ENV{'HOME'}/.gnupg                   -a ${KEYTAG} ${TARGETKEYID} --clearsign -o $fileout --not-dash-escaped ";
-        $command .= "--secret-keyring $secretkeyring " if (defined($opts{'s'}));
         $command .= "$file1";
         system("$command") == 0 
@@ -572 +566 @@
             'd|datafile=s',
             'p|passphrase=s',
-            's|secretkeyring=s',
             'k|keyid=s',
             'create-cfgfile',  # -m F