Sympa 0.008 est disponible

[Christophe Wolfhugel <adresse@cachée>]

James Bond a eu un accident, dans le feu de l'action.

        ftp://ftp.pasteur.fr/pri/sympa-008.tar.gz

Ci-après le patch qui permet de passer de la 0.007 à la 0.008, mais je vous
conseille vraiment de ne pas l'appliquer (cela peut donner des résultats
bizarres).

C'est normalement cette version qui servira au cours du 26 novembre.

AVERTISSEMENT : le répertoire documentation est toujours à côté de la
plaque, ne tenez pas compte des documents qui s'y trouvent.

Je m'absente une semaine, mais si vous avez des corrections envoyez-les
j'essaierais de les intégrer le week-end prochain.

-- 
Christophe Wolfhugel  -+- SIS, Institut Pasteur, Paris
Boulot : adresse@cachée,  $HOME : adresse@cachée

diff -c sympa-007/nls/fr.msg sympa-008/nls/fr.msg
*** sympa-007/nls/fr.msg        Thu Nov  6 13:54:20 1997
--- sympa-008/nls/fr.msg        Sat Nov 15 11:55:21 1997
***************
*** 148,155 ****
  sur la liste.\n"
  34    "Votre adresse a été retirée de la liste %s\n\
  par %s\n"
  36    "Les informations concernant cet utilisateur ont été mises à jour.\n"
! 37    "L'utilisateur est maintenant abonné à la liste.\n";
  38    "L'utilisateur spécifié a été retiré de la liste\n"
  
  $delset 7
--- 148,156 ----
  sur la liste.\n"
  34    "Votre adresse a été retirée de la liste %s\n\
  par %s\n"
+ 35    "L'archive vous est envoyée dans un message séparé.\n"
  36    "Les informations concernant cet utilisateur ont été mises à jour.\n"
! 37    "L'utilisateur est maintenant abonné à la liste.\n"
  38    "L'utilisateur spécifié a été retiré de la liste\n"
  
  $delset 7
Common subdirectories: sympa-007/sample/RCS and sympa-008/sample/RCS
diff -c sympa-007/sample/sympa.conf sympa-008/sample/sympa.conf
*** sympa-007/sample/sympa.conf Mon Nov 10 14:04:12 1997
--- sympa-008/sample/sympa.conf Sat Nov 15 17:38:41 1997
***************
*** 35,40 ****
--- 35,45 ----
  ## domaines différents).
  avg           3
  
+ ## Nombre maximum de Sendmail tournant en parallèle sur le système Sympa.
+ ## La valeur proposée est assez faible et peut aisément être augmentée
+ ## à 100, 200 voire 300 pour des machines assez puissantes.
+ maxsmtp               10
+ 
  ## Commande d'accès pour l'envoi des messages (chemin absolu vers Sendmail 
8.7
  ## ou supérieur)
  sendmail      /usr/sbin/sendmail
diff -c sympa-007/src/Archive.pm sympa-008/src/Archive.pm
*** sympa-007/src/Archive.pm    Mon Sep 15 18:25:15 1997
--- sympa-008/src/Archive.pm    Sat Nov 15 17:39:41 1997
***************
*** 9,15 ****
  use strict;
  
  ## RCS identification.
! my $id = '@(#)$Id: Archive.pm,v 1.1 1997/09/15 16:25:08 sympa Exp $';
  
  ## Does the real job : stores the message given as an argument into
  ## the indicated directory.
--- 9,15 ----
  use strict;
  
  ## RCS identification.
! my $id = '@(#)$Id: Archive.pm,v 1.2 1997/11/15 16:39:35 sympa Exp $';
  
  ## Does the real job : stores the message given as an argument into
  ## the indicated directory.
***************
*** 61,67 ****
        @l = ($msg::no_archives_available);
        return @l;
     }
!    unless (opendir(DIR, "$name/archives")) {
        @l = ($msg::no_archives_available);
        return @l;
     }
--- 61,67 ----
        @l = ($msg::no_archives_available);
        return @l;
     }
!    unless (opendir(DIR, "$name")) {
        @l = ($msg::no_archives_available);
        return @l;
     }
diff -c sympa-007/src/Commands.pm sympa-008/src/Commands.pm
*** sympa-007/src/Commands.pm   Mon Nov 10 13:59:57 1997
--- sympa-008/src/Commands.pm   Sat Nov 15 17:39:54 1997
***************
*** 6,12 ****
  package Commands;
  
  ## RCS identification.
! my $id = '@(#)$Id: Commands.pm,v 1.2 1997/11/10 12:59:40 sympa Exp $';
  
  use Conf;
  use Language;
--- 6,12 ----
  package Commands;
  
  ## RCS identification.
! my $id = '@(#)$Id: Commands.pm,v 1.3 1997/11/15 16:39:47 sympa Exp $';
  
  use Conf;
  use Language;
***************
*** 132,137 ****
--- 132,138 ----
        return;
     }
     $list->archive_send($sender, $file);
+    print Msg(6, 35, "The archive is being mailed separately.\n");
     do_log('info', Msg(7, 4, 'GET %s %s from %s'), $which, $file, $sender);
  }
  
diff -c sympa-007/src/Conf.pm sympa-008/src/Conf.pm
*** sympa-007/src/Conf.pm       Mon Sep 15 18:27:12 1997
--- sympa-008/src/Conf.pm       Sat Nov 15 17:40:49 1997
***************
*** 12,22 ****
  @EXPORT = qw(%Conf);
  
  ## RCS identification.
! my $id = '@(#)$Id: Conf.pm,v 1.1 1997/09/15 16:27:07 sympa Exp $';
  
  my @valid_options = qw(
     home queue lists help umask syslog nrcpt avg
!    sendmail host email pidfile msgcat
  );
  
  my %valid_options = ();
--- 12,22 ----
  @EXPORT = qw(%Conf);
  
  ## RCS identification.
! my $id = '@(#)$Id: Conf.pm,v 1.2 1997/11/15 16:40:43 sympa Exp $';
  
  my @valid_options = qw(
     home queue lists help umask syslog nrcpt avg
!    maxsmtp sendmail host email pidfile msgcat
  );
  
  my %valid_options = ();
diff -c sympa-007/src/List.pm sympa-008/src/List.pm
*** sympa-007/src/List.pm       Mon Nov 10 14:00:16 1997
--- sympa-008/src/List.pm       Mon Nov 10 15:55:06 1997
***************
*** 163,169 ****
  use Conf;
  
  ## RCS identification.
! my $id = '@(#)$Id: List.pm,v 1.2 1997/11/10 13:00:04 sympa Exp $';
  
  ## Generic variables : name of the file having the subscribers, the
  ## control information and the welcome message.
--- 163,169 ----
  use Conf;
  
  ## RCS identification.
! my $id = '@(#)$Id: List.pm,v 1.3 1997/11/10 14:55:03 sympa Exp $';
  
  ## Generic variables : name of the file having the subscribers, the
  ## control information and the welcome message.
***************
*** 459,464 ****
--- 459,465 ----
     return undef unless ($self && $who);;
     $function =~ y/A-Z/a-z/;
     $who =~ y/A-Z/a-z/;
+    chomp($who);
     my $admin = $self->{'admin'};
     return undef unless ($admin && $admin->{$function});
  
Common subdirectories: sympa-007/src/RCS and sympa-008/src/RCS
diff -c sympa-007/src/RELEASE_NOTES sympa-008/src/RELEASE_NOTES
*** sympa-007/src/RELEASE_NOTES Mon Nov 10 14:02:20 1997
--- sympa-008/src/RELEASE_NOTES Sat Nov 15 17:41:42 1997
***************
*** 1,3 ****
--- 1,7 ----
+ 0.008 15 novembre 1997
+ 
+       Corrigé quelques bugs et rajout de l'option maxsmtp dans sympa.conf.
+ 
  0.007   10 novembre 1997
  
        La modération était en avance sur son temps : on revient à la 
(mauvaise)
diff -c sympa-007/src/Version.pm sympa-008/src/Version.pm
*** sympa-007/src/Version.pm    Mon Nov 10 14:56:35 1997
--- sympa-008/src/Version.pm    Sat Nov 15 17:42:01 1997
***************
*** 5,11 ****
  package Version;
  
  ## RCS identification.
! my $id = '@(#)$Id: Version.pm,v 1.4 1997/11/10 13:56:31 sympa Exp $';
  
  require Exporter;
  use Carp;
--- 5,11 ----
  package Version;
  
  ## RCS identification.
! my $id = '@(#)$Id: Version.pm,v 1.5 1997/11/15 16:41:58 sympa Exp $';
  
  require Exporter;
  use Carp;
***************
*** 13,18 ****
  @ISA = qw(Exporter);
  @EXPORT = qw($Version);
  
! $Version = '0.007';
  
  1;
--- 13,18 ----
  @ISA = qw(Exporter);
  @EXPORT = qw($Version);
  
! $Version = '0.008';
  
  1;
diff -c sympa-007/src/smtp.pm sympa-008/src/smtp.pm
*** sympa-007/src/smtp.pm       Mon Sep 15 18:29:03 1997
--- sympa-008/src/smtp.pm       Sat Nov 15 17:43:05 1997
***************
*** 15,24 ****
  use strict;
  
  ## RCS identification.
! my $id = '@(#)$Id: smtp.pm,v 1.1 1997/09/15 16:29:00 sympa Exp $';
  
  my $opensmtp = 0;
my $max_smtp = 30;              ## No more than 10 simultaneous SMTP sessions
  my $fh = 'fh0000000000';      ## File handle for the stream.
  
  my $max_arg = POSIX::sysconf(POSIX::_SC_ARG_MAX);
--- 15,23 ----
  use strict;
  
  ## RCS identification.
! my $id = '@(#)$Id: smtp.pm,v 1.2 1997/11/15 16:42:58 sympa Exp $';
  
  my $opensmtp = 0;
  my $fh = 'fh0000000000';      ## File handle for the stream.
  
  my $max_arg = POSIX::sysconf(POSIX::_SC_ARG_MAX);
***************
*** 61,67 ****
     ## Check how many open smtp's we have, if too many wait for a few
     ## to terminate and then do our job.
     print STDERR "Open = $opensmtp\n" if ($main::opt_d);
!    while ($opensmtp > $max_smtp) {
        print STDERR "Too many open SMTP, Open = $opensmtp\n" if 
($main::opt_d);
        last if (($pid = wait) == -1);  ## No more childs, don't block.
         if (!defined($pid{$pid})) {
--- 60,66 ----
     ## Check how many open smtp's we have, if too many wait for a few
     ## to terminate and then do our job.
     print STDERR "Open = $opensmtp\n" if ($main::opt_d);
!    while ($opensmtp > $Conf{'maxsmtp'}) {
        print STDERR "Too many open SMTP, Open = $opensmtp\n" if 
($main::opt_d);
        last if (($pid = wait) == -1);  ## No more childs, don't block.
         if (!defined($pid{$pid})) {
***************
*** 101,107 ****
     }
     close(IN);
     $opensmtp++;
!    select(undef, undef,undef, 0.3) if ($opensmtp < $max_smtp);
     return("smtp::$fh"); ## Symbol for the write descriptor.
  }
  
--- 100,106 ----
     }
     close(IN);
     $opensmtp++;
!    select(undef, undef,undef, 0.3) if ($opensmtp < $Conf{'maxsmtp'});
     return("smtp::$fh"); ## Symbol for the write descriptor.
  }
  
diff -c sympa-007/src/sympa.pl sympa-008/src/sympa.pl
*** sympa-007/src/sympa.pl      Mon Nov 10 14:01:32 1997
--- sympa-008/src/sympa.pl      Sat Nov 15 17:43:47 1997
***************
*** 3,9 ****
  ## Sympa - Programme principal
  
  ## RCS identification.
! my $id = '@(#)$Id: sympa.pl,v 1.12 1997/11/10 13:01:25 sympa Exp $';
  
  ## Load the modules and whatever we need.
  use lib '--DIR--';
--- 3,9 ----
  ## Sympa - Programme principal
  
  ## RCS identification.
! my $id = '@(#)$Id: sympa.pl,v 1.14 1997/11/15 16:43:33 sympa Exp $';
  
  ## Load the modules and whatever we need.
  use lib '--DIR--';
***************
*** 32,39 ****
     print Msg(1, 1, "Configuration file has errors.\n");
     exit(1);
  }
  

  ## Open the syslog and say we're read out stuff.
  do_openlog($Conf{'syslog'});
  do_log('debug', Msg(1, 6, 'Configuration file read'));
--- 32,39 ----
     print Msg(1, 1, "Configuration file has errors.\n");
     exit(1);
  }
+ Language::SetLang('default.cat') unless ($opt_l);
  
  ## Open the syslog and say we're read out stuff.
  do_openlog($Conf{'syslog'});
  do_log('debug', Msg(1, 6, 'Configuration file read'));
***************
*** 50,55 ****
--- 50,70 ----
     ## No return.
  }
  
+ ## Put ourselves in background if we're not in debug mode. That method
+ ## works on many systems, although, it seems that Unix conceptors have
+ ## decided that there won't be a single and easy way to detach a process
+ ## from its controlling tty.
+ unless ($opt_d) {
+    open(STDERR, ">> /dev/null");
+    open(STDOUT, ">> /dev/null");
+    if (open(TTY, "/dev/tty")) {
+       ioctl(TTY, $TIOCNOTTY, 0);
+       close(TTY);
+    }
+    setpgrp(0, 0);
+    exit(0) if (fork != 0);
+ }
+ 
  ## Create and write the pidfile
  unless (open(LOCK, "+>> $Conf{'pidfile'}")) {
     fatal_err(Msg(3, 2, "Could not open %s, exiting"), $Conf{'pidfile'});
***************
*** 74,94 ****
  ## Most initializations have now been done.
  do_log('notice', Msg(3, 5, 'Sympa Started'));
  
## Put ourselves in background if we're not in debug mode. That method
## works on many systems, although, it seems that Unix conceptors have
## decided that there won't be a single and easy way to detach a process
## from its controlling tty.
unless ($opt_d) {
   open(STDERR, ">> /dev/null");
   open(STDOUT, ">> /dev/null");
   if (open(TTY, "/dev/tty")) {
      ioctl(TTY, $TIOCNOTTY, 0);
      close(TTY);
   }
   setpgrp(0, 0);
   exit(0) if (fork != 0);
}

  ## Catch SIGTERM, in order to exit cleanly, whenever possible.
  $SIG{'TERM'} = 'sigterm';
  
--- 89,94 ----
***************
*** 273,279 ****
        $Conf{'request'} = "$Conf{'email'}-request\@$host";
     }
     $host = $hostname unless ($host);
!    do_log('debug', Msg(4, 5, "Processing message for %s"), $listname) if 
($opt_d);
  
     ## Now check if the sender is an authorized address.
     my $hdr = $msg->head;
--- 273,279 ----
        $Conf{'request'} = "$Conf{'email'}-request\@$host";
     }
     $host = $hostname unless ($host);
!    do_log('debug', Msg(4, 5, "Processing message for %s"), 'Sympa') if 
($opt_d);
  
     ## Now check if the sender is an authorized address.
     my $hdr = $msg->head;
diff -c sympa-007/src/tools.pl sympa-008/src/tools.pl
*** sympa-007/src/tools.pl      Mon Sep 15 18:29:44 1997
--- sympa-008/src/tools.pl      Sat Nov 15 17:43:26 1997
***************
*** 12,18 ****
  use Log;
  
  ## RCS identification.
! my $id = '@(#)$Id: tools.pl,v 1.7 1997/09/15 16:29:41 sympa Exp $';
  
  ## Sorts the list of adresses by domain name
  ## Input : users hash
--- 12,18 ----
  use Log;
  
  ## RCS identification.
! my $id = '@(#)$Id: tools.pl,v 1.8 1997/11/15 16:43:13 sympa Exp $';
  
  ## Sorts the list of adresses by domain name
  ## Input : users hash
***************
*** 72,78 ****
     if ($subject) {
        foreach $avoid (@avoid_hdr) {
           if ($subject =~ /^\s*($avoid)(\s+|$)/im) {
!             &rejectMessage($sender);
              return 1;
           }
        }
--- 72,78 ----
     if ($subject) {
        foreach $avoid (@avoid_hdr) {
           if ($subject =~ /^\s*($avoid)(\s+|$)/im) {
!             &rejectMessage($msg, $sender);
              return 1;
           }
        }
***************
*** 80,86 ****
     foreach $i (@{$msg->body}) {
        foreach $avoid (@avoid_msg) {
           if ($i =~ /^\s*($avoid)(\s+|$)/im) {  ## Suspicious line
!             &rejectMessage($sender);
              return 1;
           }
        }
--- 80,86 ----
     foreach $i (@{$msg->body}) {
        foreach $avoid (@avoid_msg) {
           if ($i =~ /^\s*($avoid)(\s+|$)/im) {  ## Suspicious line
!             &rejectMessage($msg, $sender);
              return 1;
           }
        }
***************
*** 89,95 ****
  }
  
  sub rejectMessage {
!    my $sender = shift;
  
     *REJ = smtp::smtpto(\$Conf{'request'}, \$sender);
     print REJ "To: $sender\n";
--- 89,95 ----
  }
  
  sub rejectMessage {
!    my($msg, $sender) = @_;
  
     *REJ = smtp::smtpto(\$Conf{'request'}, \$sender);
     print REJ "To: $sender\n";
***************
*** 109,115 ****
  
  ------ Beginning of the suspect message --------
  "), $Conf{'sympa'}, $Conf{'request'};
!    print REJ @{$data};
     print REJ Msg(5, 4, "------- Fin message suspect ---------\n");
     close(REJ);
  }
--- 109,115 ----
  
  ------ Beginning of the suspect message --------
  "), $Conf{'sympa'}, $Conf{'request'};
!    $msg->print(\*REJ);
     print REJ Msg(5, 4, "------- Fin message suspect ---------\n");
     close(REJ);
  }