update port: security/swatch

[goblin]

Port: security/swatch

there are some bugs i've found while using this port
(i only use it while reading 'tail -n 1 -f /var/log/all.log'
and sending emails to me if need)

1.
my $tail_program_args = '-n 1 -f';

because of log rotating '-f' flag should be changed to '-F'
and may be not '-n 1' but '-n 0'

2.
it uses "open TAIL, '/usr/bin/tail ... | '".. so...
when i try to reconfigure it (change swatch.conf and kill -HUP)
after call to exit(0) swatch hangs in wait() state till /usr/bin/tail
works, and it works forever (nobody kills it)

if use real fork/exec mechanism, than it is possible to kill
/usr/bin/tail process when need, so exit(0) works fine then

3.
sending mail like "open MAIL, '| /usr/bin/sendmail ...'"
piped open calls wait() to catch SIGCHLD when child process is finished
if $SIG{CHLD} == 'IGNORE', then it hangs forever...

so just add
 local $SIG{CHLD} = 'default';
and works fine


here is my patch for swatch-3.0.8_1, which fixes it (works fine, and plz apply it,
cause i forget sometimes that original version does not works fine
when installing new machine %))

---------------------------------------------------
--- swatch.orig Mon Mar 22 08:49:59 2004
+++ swatch      Mon Mar 22 11:20:10 2004
@@ -355,7 +355,7 @@
 my $BUILD_DATE = "4 April 2003";

 my $tail_cmd_name = ''; # We'll try to find it in the PATH later
-my $tail_program_args = '-n 1 -f';
+my $tail_program_args = '-n 0 -F';

 ####### use_and_variables end #######
 ####### print_version begin #######
@@ -648,6 +648,7 @@
 my \$MAILER = "$mail_cmd";
 my \$WRITE  = "$write_cmd";
 \$/ = "$opt_input_record_separator";
+my \$tail_pid = 0;     # used to kill TAILed process

 use IO::Handle;
 STDOUT->autoflush(1);;
@@ -664,6 +665,7 @@

   $code .= q|
   close_pipe_if_open();
+  kill('TERM', $tail_pid) if $tail_pid; # or exit(0) will hang in wait() state till tail works
   exit(0);
 }

@@ -932,6 +934,9 @@

   (my $to_line = $args{'ADDRESSES'}) =~ s/:/,/g;

+  # piped open calls wait() to catch SIGCHLD when child process is finished
+  # if $SIG{CHLD} == 'IGNORE', then it hangs forever...
+  local $SIG{CHLD} = 'default';
   open(MAIL, "| $MAILER")
     or warn "$0: cannot open pipe to $MAILER: $!\n" && return;

@@ -1190,9 +1195,23 @@
       }
        $code = qq/
 my \$filename = '$filename';
-if (not open(TAIL, \"$tail_cmd_name $tail_program_args \$filename|\")) {
-    die "$0: cannot read run \\"$tail_cmd_name $tail_program_args \$filename\\": \$!\\n";
-}
+
+# use this block instead of below commented
+pipe TAIL, FDW;
+\$tail_pid = fork;
+if(!\$tail_pid) {
+       close STDOUT;
+       open STDOUT, \">\&FDW\";
+       close TAIL;
+       exec \"$tail_cmd_name $tail_program_args \$filename\"
+               or die \"$0: cannot exec \\"$tail_cmd_name $tail_program_args \$filename\\": \$!\\n\";
+       POSIX::_exit(0);
+}
+close FDW;
+
+#if (not open(TAIL, \"$tail_cmd_name $tail_program_args \$filename|\")) {
+#    die "$0: cannot read run \\"$tail_cmd_name $tail_program_args \$filename\\": \$!\\n";
+#}

 LOOP: while (<TAIL>) {
 /;
--------------------------------------------------

mailto: goblin at nnt.ru