OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   04-Jun-2007 17:35:53
  Branch: HEAD                             Handle: 2007060416355200

  Modified files:
    openpkg-src/sympa       sympa.patch sympa.spec

  Log:
    upgrading package: sympa 5.2.4 -> 5.3.1

  Summary:
    Revision    Changes     Path
    1.4         +76 -74     openpkg-src/sympa/sympa.patch
    1.11        +2  -2      openpkg-src/sympa/sympa.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/sympa/sympa.patch
  ============================================================================
  $ cvs diff -u -r1.3 -r1.4 sympa.patch
  --- openpkg-src/sympa/sympa.patch     6 Feb 2007 16:38:51 -0000       1.3
  +++ openpkg-src/sympa/sympa.patch     4 Jun 2007 15:35:52 -0000       1.4
  @@ -1,7 +1,7 @@
   Index: Makefile.in
  ---- Makefile.in.orig 2007-02-06 15:25:52 +0100
  -+++ Makefile.in      2007-02-06 17:34:22 +0100
  -@@ -703,7 +703,7 @@
  +--- Makefile.in.orig 2007-06-04 15:11:37 +0200
  ++++ Makefile.in      2007-06-04 17:28:10 +0200
  +@@ -706,7 +706,7 @@
        @(cd soap && echo "making in soap/..." && \
        $(MAKE) SH='${SH}' CC='${CC}' CFLAGS='${CFLAGS}' PERL='${PERL}' \
        DIR='${DIR}' BINDIR='${BINDIR}' SBINDIR='${SBINDIR}' LIBDIR='${LIBDIR}' 
\
  @@ -11,9 +11,9 @@
        PIDDIR='${PIDDIR}' CONFIG='${CONFIG}' WWSCONFIG='${WWSCONFIG}' 
ETCBINDIR='${ETCBINDIR}' \
        DESTDIR='${DESTDIR}' USER='${USER}' GROUP='${GROUP}' 
ICONSDIR='${ICONSDIR}' newinstall) || exit 1;
   Index: soap/Makefile
  ---- soap/Makefile.orig       2004-01-12 09:18:13 +0100
  -+++ soap/Makefile    2007-02-06 17:34:22 +0100
  -@@ -50,9 +50,11 @@
  +--- soap/Makefile.orig       2006-05-11 16:57:10 +0200
  ++++ soap/Makefile    2007-06-04 17:28:10 +0200
  +@@ -51,9 +51,11 @@
        chown $(USER) $(DESTDIR)$(CGIDIR)/$$i; \
        chgrp $(GROUP) $(DESTDIR)$(CGIDIR)/$$i; \
        done
  @@ -29,8 +29,8 @@
        chown $(USER) $(DESTDIR)$(LIBDIR)/$$i; \
        chgrp $(GROUP) $(DESTDIR)$(LIBDIR)/$$i; \
   Index: soap/sympa_soap_server.fcgi
  ---- soap/sympa_soap_server.fcgi.orig 2006-02-24 15:36:30 +0100
  -+++ soap/sympa_soap_server.fcgi      2007-02-06 17:34:22 +0100
  +--- soap/sympa_soap_server.fcgi.orig 2006-02-24 15:37:54 +0100
  ++++ soap/sympa_soap_server.fcgi      2007-06-04 17:28:10 +0200
   @@ -52,7 +52,7 @@
    ## Open log
    $wwsconf->{'log_facility'}||= $Conf{'syslog'};
  @@ -41,29 +41,29 @@
    
    unless ($List::use_db = &List::check_db_connect()) {
   Index: src/Conf.pm
  ---- src/Conf.pm.orig 2006-08-24 17:05:36 +0200
  -+++ src/Conf.pm      2007-02-06 17:34:22 +0100
  -@@ -43,7 +43,7 @@
  +--- src/Conf.pm.orig 2007-04-26 16:54:39 +0200
  ++++ src/Conf.pm      2007-06-04 17:29:33 +0200
  +@@ -48,7 +48,7 @@
  +                    cookie cookie_cas_expire create_list 
automatic_list_feature automatic_list_creation automatic_list_removal crl_dir 
crl_update_task db_host db_env db_name db_timeout
  +                    db_options db_passwd db_type db_user db_port 
db_additional_subscriber_fields db_additional_user_fields
                       default_shared_quota default_archive_quota 
default_list_priority distribution_mode edit_list email etc
  -                    global_remind home host domain lang listmaster 
listmaster_email localedir log_socket_type log_level 
  +-                   global_remind home host domain lang listmaster 
listmaster_email localedir log_socket_type log_level 
  ++                   global_remind home host domain lang listmaster 
listmaster_email localedir log_socket_type log_level logfile
                       logo_html_definition misaddressed_commands 
misaddressed_commands_regexp max_size maxsmtp nrcpt 
  --                   owner_priority pidfile pidfile_distribute
  -+                   owner_priority logfile pidfile pidfile_distribute
  -                    spool queue queuedistribute queueauth queuetask 
queuebounce queuedigest 
  -                    queuemod queuetopic queuesubscribe queueoutgoing tmpdir
  -                    loop_command_max loop_command_sampling_delay 
loop_command_decrease_factor loop_prevention_regex
  -@@ -89,6 +89,7 @@
  +                    owner_priority pidfile pidfile_distribute 
pidfile_creation
  +                    spool queue queuedistribute queueauth queuetask 
queuebounce queuedigest queueautomatic
  +@@ -102,6 +102,7 @@
         'host'    => undef,
         'domain'  => undef,
         'email'   => 'sympa',
   +     'logfile' => '--PIDDIR--/sympa.log',
         'pidfile' => '--PIDDIR--/sympa.pid',
         'pidfile_distribute' => '--PIDDIR--/sympa-distribute.pid',
  -      'localedir'  => '--LOCALEDIR--',
  +      'pidfile_creation' => '--PIDDIR--/sympa-creation.pid',
   Index: src/Language.pm
  ---- src/Language.pm.orig     2006-06-08 14:53:26 +0200
  -+++ src/Language.pm  2007-02-06 17:34:22 +0100
  -@@ -175,7 +175,7 @@
  +--- src/Language.pm.orig     2007-04-20 16:38:24 +0200
  ++++ src/Language.pm  2007-06-04 17:28:10 +0200
  +@@ -194,7 +194,7 @@
            }   
        }
        unless ($success) {
  @@ -73,24 +73,26 @@
        }
        }
   Index: src/Log.pm
  ---- src/Log.pm.orig  2006-03-24 18:00:31 +0100
  -+++ src/Log.pm       2007-02-06 17:34:22 +0100
  -@@ -24,12 +24,13 @@
  +--- src/Log.pm.orig  2007-03-30 14:58:59 +0200
  ++++ src/Log.pm       2007-06-04 17:31:18 +0200
  +@@ -24,7 +24,7 @@
    package Log;
    
    require Exporter;
   -use Sys::Syslog;
   +use IO::File;
    use Carp;
  - 
  + use POSIX qw/mktime/;
  + use Encode;
  +@@ -32,6 +32,7 @@
    @ISA = qw(Exporter);
    @EXPORT = qw(fatal_err do_log do_openlog $log_level);
    
   +my ($log_fh, $log_file);
  - my ($log_facility, $log_socket_type, $log_service);
  - local $log_level |= 0;
  + my ($log_facility, $log_socket_type, $log_service,$sth,@sth_stack,$rows_nb);
    
  -@@ -37,8 +38,6 @@
  + 
  +@@ -41,8 +42,6 @@
        my $m  = shift;
        my $errno  = $!;
        
  @@ -99,19 +101,19 @@
        $m =~ s/%m/$errno/g;
    
        my $full_msg = sprintf $m,@_;
  -@@ -72,9 +71,9 @@
  -     # do not log if log level if too high regarding the log requested by 
user 
  -     return if ($level > $log_level);
  +@@ -98,9 +97,9 @@
  +     $m = $call[3].'() ' . $m if ($call[3]);
  +     }
    
  --    unless (syslog($fac, $m, @_)) {
  -+    unless (&do_write($fac, $level, $m, @_)) {
  +-    unless (syslog($fac, $m, @param)) {
  ++    unless (&do_write($fac, $level, $m, @param)) {
        &do_connect();
  --        syslog($fac, $m, @_);
  -+    &do_write($fac, $level, $m, @_);
  +-        syslog($fac, $m, @param);
  ++    &do_write($fac, $level, $m, @param);
        }
  + 
        if ($main::options{'foreground'}) {
  -     if ($main::options{'log_to_stderr'} || 
  -@@ -85,12 +84,24 @@
  +@@ -112,12 +111,24 @@
        }    
    }
    
  @@ -138,7 +140,7 @@
    
    #   foreach my $k (keys %options) {
    #       printf "%s = %s\n", $k, $options{$k};
  -@@ -100,12 +111,8 @@
  +@@ -127,12 +138,8 @@
    }
    
    sub do_connect {
  @@ -152,10 +154,10 @@
   +    $log_fh = new IO::File ">>$log_file";
    }
    
  - 1;
  + # return the name of the used daemon
   Index: src/alias_manager.pl
   --- src/alias_manager.pl.orig        2006-01-04 14:16:30 +0100
  -+++ src/alias_manager.pl     2007-02-06 17:34:22 +0100
  ++++ src/alias_manager.pl     2007-06-04 17:28:10 +0200
   @@ -43,7 +43,7 @@
    my $tmp_alias_file = $Conf{'tmpdir'}.'/sympa_aliases.'.time;
    
  @@ -166,8 +168,8 @@
    my $default_domain;
    my $path_to_queue = '--MAILERPROGDIR--/queue';
   Index: src/etc/script/mod2html.pl
  ---- src/etc/script/mod2html.pl.orig  2005-08-12 17:46:18 +0200
  -+++ src/etc/script/mod2html.pl       2007-02-06 17:34:22 +0100
  +--- src/etc/script/mod2html.pl.orig  2006-09-29 17:49:10 +0200
  ++++ src/etc/script/mod2html.pl       2007-06-04 17:28:10 +0200
   @@ -12,7 +12,7 @@
    unless (Conf::load('--CONFIG--')) {
        die "Can't load Sympa configuration file";
  @@ -176,10 +178,10 @@
   +&do_openlog($Conf{'syslog'}, $Conf{'log_socket_type'}, 'sympa', 
$Conf{'logfile'});
    
    if ($Conf{'db_name'} and $Conf{'db_type'}) {
  -     unless ($List::use_db = &List::probe_db()) {
  +     unless ($List::use_db = &Upgrade::probe_db()) {
   Index: src/etc/script/testlogs.pl
   --- src/etc/script/testlogs.pl.orig  2003-03-12 08:49:34 +0100
  -+++ src/etc/script/testlogs.pl       2007-02-06 17:34:22 +0100
  ++++ src/etc/script/testlogs.pl       2007-06-04 17:28:10 +0200
   @@ -19,7 +19,7 @@
    
    
  @@ -190,9 +192,9 @@
    # setting log_level using conf unless it is set by calling option
    if ($main::options{'log_level'}) {
   Index: src/sympa.pl
  ---- src/sympa.pl.orig        2006-10-09 14:33:36 +0200
  -+++ src/sympa.pl     2007-02-06 17:34:22 +0100
  -@@ -164,7 +164,7 @@
  +--- src/sympa.pl.orig        2007-03-30 14:45:20 +0200
  ++++ src/sympa.pl     2007-06-04 17:32:20 +0200
  +@@ -176,7 +176,7 @@
    }
    
    ## Open the syslog and say we're read out stuff.
  @@ -201,18 +203,18 @@
    
    # setting log_level using conf unless it is set by calling option
    if ($main::options{'log_level'}) {
  -@@ -257,7 +257,7 @@
  -     my $service = 'sympa';
  -     $service .= '(message)' if ($main::daemon_usage eq 'message');
  -     $service .= '(command)' if ($main::daemon_usage eq 'command');
  +@@ -317,7 +317,7 @@
  +     $service .= '(message)' if ($main::daemon_usage == DAEMON_MESSAGE);
  +     $service .= '(command)' if ($main::daemon_usage == DAEMON_COMMAND);
  +     $service .= '(creation)' if ($main::daemon_usage == DAEMON_CREATION);
   -    do_openlog($Conf{'syslog'}, $Conf{'log_socket_type'}, $service);
   +    do_openlog($Conf{'syslog'}, $Conf{'log_socket_type'}, $service, 
$Conf{'logfile'});
    
  -     do_log('debug', "Running server $$ with main::daemon_usage = 
$main::daemon_usage ");
  +     do_log('debug', "Running server $$ for $service purpose ");
        unless ($main::options{'batch'} ) {
   Index: src/sympa_wizard.pl
  ---- src/sympa_wizard.pl.orig 2006-10-16 16:24:39 +0200
  -+++ src/sympa_wizard.pl      2007-02-06 17:34:22 +0100
  +--- src/sympa_wizard.pl.orig 2007-03-04 11:41:19 +0100
  ++++ src/sympa_wizard.pl      2007-06-04 17:28:10 +0200
   @@ -65,6 +65,12 @@
               'query' => 'Directory for configuration files ; it also contains 
scenari/ and templates/ directories',
               'file' => 'sympa.conf'},
  @@ -242,7 +244,7 @@
               'query' => 'Where to store bounces',
               'file' => 'wwsympa.conf',
                   'advice' =>'Better if not in a critical partition'},
  -@@ -154,13 +160,13 @@
  +@@ -166,13 +172,13 @@
              {'title' => 'General definition'},
              
              {'name' => 'domain',
  @@ -258,7 +260,7 @@
               'query' => 'Listmasters email list comma separated',
               'file' => 'sympa.conf','edit' => '1',
               'advice' =>'Sympa will associate listmaster privileges to these 
email addresses (mail and web interfaces). Some error reports may also be sent 
to these addresses.'},
  -@@ -276,7 +282,7 @@
  +@@ -300,7 +306,7 @@
              {'title' => 'MTA related'},
    
              {'name' => 'sendmail',
  @@ -267,7 +269,7 @@
               'query' => 'Path to the MTA (sendmail, postfix, exim or qmail)',
               'file' => 'sympa.conf','edit' => '1',
               'advice' => "should point to a sendmail-compatible binary (eg: a 
binary named \'sendmail\' is distributed with Postfix)"},
  -@@ -303,7 +309,7 @@
  +@@ -327,7 +333,7 @@
              {'title' => 'Pluggin'},
    
              {'name' => 'antivirus_path',
  @@ -276,7 +278,7 @@
               'query' => 'Path to the antivirus scanner engine',
               'file' => 'sympa.conf','edit' => '1',
               'advice' =>'supported antivirus : McAfee/uvscan, Fsecure/fsav, 
Sophos, AVP and Trend Micro/VirusWall'},
  -@@ -316,14 +322,14 @@
  +@@ -340,14 +346,14 @@
               'advice' =>''},
    
                  {'name' => 'mhonarc',
  @@ -293,7 +295,7 @@
               'query' => 'Path to OpenSSL',
               'file' => 'sympa.conf','edit' => '1',
               'advice' =>'Sympa knowns S/MIME if openssl is installed'},
  -@@ -344,7 +350,7 @@
  +@@ -368,7 +374,7 @@
               'file' => 'sympa.conf'},
    
              {'name' => 'key_passwd',
  @@ -302,7 +304,7 @@
               'query' => 'Password used to crypt lists private keys',
               'file' => 'sympa.conf','edit' => '1',
               'advice' =>''},
  -@@ -381,7 +387,7 @@
  +@@ -405,7 +411,7 @@
               'advice' =>''},
              
              {'name' => 'db_passwd',
  @@ -311,7 +313,7 @@
               'query' => 'Database password (associated to the db_user)',
               'file' => 'sympa.conf','edit' => '1',
               'advice' =>'What ever you use a password or not, you must 
protect the SQL server (is it a not a public internet service ?)'},
  -@@ -412,7 +418,7 @@
  +@@ -436,7 +442,7 @@
               'advice' =>'This module provide much faster web interface'},
    
              {'name' => 'wwsympa_url',
  @@ -321,9 +323,9 @@
               'file' => 'sympa.conf','edit' => '1',
               'advice' =>''},
   Index: src/task_manager.pl
  ---- src/task_manager.pl.orig 2006-04-19 15:21:17 +0200
  -+++ src/task_manager.pl      2007-02-06 17:34:22 +0100
  -@@ -119,7 +119,7 @@
  +--- src/task_manager.pl.orig 2007-04-27 18:11:16 +0200
  ++++ src/task_manager.pl      2007-06-04 17:28:10 +0200
  +@@ -114,7 +114,7 @@
    $log_level = $main::options{'log_level'} || $Conf{'log_level'};
    
    $wwsconf->{'log_facility'}||= $Conf{'syslog'};
  @@ -333,9 +335,9 @@
    # setting log_level using conf unless it is set by calling option
    if ($main::options{'log_level'}) {
   Index: wwsympa/archived.pl
  ---- wwsympa/archived.pl.orig 2006-08-29 13:25:36 +0200
  -+++ wwsympa/archived.pl      2007-02-06 17:34:22 +0100
  -@@ -114,7 +114,7 @@
  +--- wwsympa/archived.pl.orig 2007-04-18 17:51:58 +0200
  ++++ wwsympa/archived.pl      2007-06-04 17:28:10 +0200
  +@@ -130,7 +130,7 @@
    $log_level = $main::options{'log_level'} || $Conf{'log_level'};
    
    $wwsconf->{'log_facility'}||= $Conf{'syslog'};
  @@ -345,9 +347,9 @@
    ## Set the UserID & GroupID for the process
    $( = $) = (getgrnam('--GROUP--'))[2];
   Index: wwsympa/bounced.pl
  ---- wwsympa/bounced.pl.orig  2006-04-19 15:21:17 +0200
  -+++ wwsympa/bounced.pl       2007-02-06 17:34:23 +0100
  -@@ -142,7 +142,7 @@
  +--- wwsympa/bounced.pl.orig  2007-03-30 14:12:28 +0200
  ++++ wwsympa/bounced.pl       2007-06-04 17:28:10 +0200
  +@@ -146,7 +146,7 @@
    $log_level = $main::options{'log_level'} || $Conf{'log_level'};
    
    $wwsconf->{'log_facility'}||= $Conf{'syslog'};
  @@ -357,9 +359,9 @@
    ## Set the UserID & GroupID for the process
    $( = $) = (getgrnam('--GROUP--'))[2];
   Index: wwsympa/wwsympa.fcgi
  ---- wwsympa/wwsympa.fcgi.orig        2007-01-23 18:01:05 +0100
  -+++ wwsympa/wwsympa.fcgi     2007-02-06 17:34:23 +0100
  -@@ -540,7 +540,7 @@
  +--- wwsympa/wwsympa.fcgi.orig        2007-05-09 15:20:09 +0200
  ++++ wwsympa/wwsympa.fcgi     2007-06-04 17:28:10 +0200
  +@@ -584,7 +584,7 @@
    ## Open log
    $wwsconf->{'log_facility'}||= $Conf{'syslog'};
    
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/sympa/sympa.spec
  ============================================================================
  $ cvs diff -u -r1.10 -r1.11 sympa.spec
  --- openpkg-src/sympa/sympa.spec      18 Apr 2007 21:46:25 -0000      1.10
  +++ openpkg-src/sympa/sympa.spec      4 Jun 2007 15:35:52 -0000       1.11
  @@ -32,8 +32,8 @@
   Class:        EVAL
   Group:        Mail
   License:      GPL
  -Version:      5.2.4
  -Release:      20070418
  +Version:      5.3.1
  +Release:      20070604
   
   #   list of sources
   Source0:      http://www.sympa.org/distribution/sympa-%{version}.tar.gz
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to