Changeset 481 for trunk/scripts

Timestamp:

Jul 18, 2015, 5:06:52 PM (9 years ago)

Author:

katerina

Message:

Enhancements and fixes for tickets #374, #375, #376, #377, #378, and #379.

Location:

trunk/scripts

Files:

• README (modified) (1 diff)
• redhat_i386.client.spec.in (modified) (2 diffs)
• samhain.ebuild.in (modified) (1 diff)
• samhain.spec.in (modified) (2 diffs)
• samhainadmin.pl.in (modified) (3 diffs)
• samhainrc_update.sh (deleted)

trunk/scripts/README

@@ -38 +38 @@
    Run 'yuleadmin.pl -h' for usage instructions.
 
-samhainrc_update.sh
--------------------
-
-   If you are using the --with-kcheck option on Linux, after a kernel
-   update you need to change some option (addresses of kernel functions)
-   in the samhainrc configuration file. The correct new addresses must
-   be looked up in the System.map file
-
-   This script will do this automatically. Run 'samhainrc_update.sh -h'
-   for usage instructions. You may need to change the location of the
-   samhainrc file by editing the line 'cfgfile="/etc/samhainrc"'
-   at the beginning of the script.
- 
 check_samhain.pl
 ----------------

trunk/scripts/redhat_i386.client.spec.in

@@ -123 +123 @@
 fi
 
-%postun
-if [ "$1" = 0 ]; then
-        # remove any kernel modules that might have been installed
-        RVER=`uname -r`
-        rm -f /lib/modules/$RVER/samhain*
-fi
 
 
@@ -136 +130 @@
 %dir /var/log
 #%doc docs/BUGS COPYING docs/Changelog docs/TODO
-#%doc LICENSE docs/HOWTO* docs/MANUAL-2_3.* docs/README*
+#%doc LICENSE docs/HOWTO* docs/MANUAL-2_4.* docs/README*
 /etc
 /usr/local/sbin/samhain

trunk/scripts/samhain.ebuild.in

@@ -69 +69 @@
         dodoc docs/BUGS COPYING docs/Changelog LICENSE docs/README \
               docs/README.UPGRADE docs/sh_mounts.txt docs/sh_userfiles.txt \
-              docs/MANUAL-2_3.ps docs/MANUAL-2_3.html.tar
+              docs/MANUAL-2_4.ps docs/MANUAL-2_4.html.tar
 
         dohtml docs/HOWTO-client+server.html docs/HOWTO-samhain+GnuPG.html \

trunk/scripts/samhain.spec.in

@@ -109 +109 @@
 fi
 
-%postun
-if [ "$1" = 0 ]; then
-        # remove any kernel modules that might have been installed
-        RVER=`uname -r`
-        rm -f /lib/modules/$RVER/samhain*
-fi
-
 
 %files
@@ -122 +115 @@
 %dir %{_localstatedir}/log
 %doc docs/BUGS COPYING docs/Changelog docs/TODO
-%doc LICENSE docs/HOWTO* docs/MANUAL-2_3.* docs/README*
+%doc LICENSE docs/HOWTO* docs/MANUAL-2_4.* docs/README*
 %{_localstatedir}/lib/%{name}
 %{_sbindir}/%{name}

trunk/scripts/samhainadmin.pl.in

@@ -156 +156 @@
     print "    Set the passphrase for gpg. By default, gpg will ask.\n\n";
 
-    print "  -s secretkeyring --secretkeyring secretkeyring\n";
-    print "    Select an alternate secret keyring for gpg.\n";
-    print "    Will use '$ENV{'HOME'}/.gnupg/secring.gpg' by default.\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";
 
     print "  -l            --list\n";
@@ -570 +573 @@
             'p|passphrase=s',
             's|secretkeyring=s',
+            'k|keyid=s',
             'create-cfgfile',  # -m F
             'print-cfgfile',   # -m f
@@ -584 +588 @@
 }
 
+if (defined($opts{'k'})) {
+    $TARGETKEYID = $opts{'k'};
+    $KEYTAG = "--default-key";
+}
 if (defined($opts{'c'})) {
     $cfgfile = $opts{'c'};