head	1.5;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.2
	OPENPKG_E1_MP:1.2
	OPENPKG_E1_MP_2_STABLE:1.2.2.2
	OPENPKG_E1_FP:1.2.2.2
	OPENPKG_2_STABLE_MP:1.2
	OPENPKG_2_STABLE_20061018:1.2.2.2
	OPENPKG_2_STABLE:1.2.0.2;
locks; strict;
comment	@# @;


1.5
date	2009.04.18.07.59.25;	author rse;	state Exp;
branches;
next	1.4;
commitid	yNmyHHZWqcUmktKt;

1.4
date	2007.06.04.15.35.52;	author rse;	state Exp;
branches;
next	1.3;
commitid	cKb0K4A5bVh6QBks;

1.3
date	2007.02.06.16.38.51;	author rse;	state Exp;
branches;
next	1.2;
commitid	XGfYrzvfG1oSYr5s;

1.2
date	2006.06.05.08.00.10;	author rse;	state Exp;
branches
	1.2.2.1;
next	1.1;
commitid	LyKqgXszGQ0b1Nzr;

1.1
date	2006.03.01.14.09.59;	author rse;	state Exp;
branches;
next	;
commitid	xjk6yiS4lfMy8unr;

1.2.2.1
date	2006.06.05.08.00.10;	author rse;	state dead;
branches;
next	1.2.2.2;
commitid	iZxwRSmmWscPXUQr;

1.2.2.2
date	2006.10.16.14.56.59;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.5
log
@adjust dependency
@
text
@Index: Makefile.in
--- Makefile.in.orig	2008-03-03 14:06:56 +0100
+++ Makefile.in	2008-03-04 09:44:18 +0100
@@@@ -714,7 +714,7 @@@@
 	@@(cd soap && echo "making in soap/..." && \
 	$(MAKE) SH='${SH}' CC='${CC}' CFLAGS='${CFLAGS}' PERL='${PERL}' \
 	DIR='${DIR}' BINDIR='${BINDIR}' SBINDIR='${SBINDIR}' LIBDIR='${LIBDIR}' \
-	USER='${USER}' GROUP='${GROUP}' SCRIPTDIR='${SCRIPTDIR}' \
+	USER='${USER}' GROUP='${GROUP}' SCRIPTDIR='${SCRIPTDIR}' enable_secure='${enable_secure}' \
 	CGIDIR='${CGIDIR}' WWSBINDIR='${WWSBINDIR}' MAILERPROGDIR='${MAILERPROGDIR}' \
 	PIDDIR='${PIDDIR}' CONFIG='${CONFIG}' WWSCONFIG='${WWSCONFIG}' ETCBINDIR='${ETCBINDIR}' \
 	DESTDIR='${DESTDIR}' USER='${USER}' GROUP='${GROUP}' newinstall) || exit 1;
Index: soap/Makefile
--- soap/Makefile.orig	2007-12-05 16:37:14 +0100
+++ soap/Makefile	2008-03-04 09:45:41 +0100
@@@@ -60,9 +60,11 @@@@
 	chown $(USER) $(DESTDIR)$(CGIDIR)/$$i; \
 	chgrp $(GROUP) $(DESTDIR)$(CGIDIR)/$$i; \
 	done
+	@@if [ "$(enable_secure)" != "yes" ]; then \
 	@@echo "Setting SetUID bit on sympa_soap_server-wrapper.fcgi..."
 	chmod u+s $(DESTDIR)$(CGIDIR)/sympa_soap_server-wrapper.fcgi
 	chmod g+s $(DESTDIR)$(CGIDIR)/sympa_soap_server-wrapper.fcgi
+	fi
 	@@for i in $(lib_SUBST) ; do \
 	chown $(USER) $(DESTDIR)$(LIBDIR)/$$i; \
 	chgrp $(GROUP) $(DESTDIR)$(LIBDIR)/$$i; \
Index: soap/sympa_soap_server.fcgi
--- soap/sympa_soap_server.fcgi.orig	2007-12-13 16:42:04 +0100
+++ soap/sympa_soap_server.fcgi	2008-03-04 09:44:18 +0100
@@@@ -52,7 +52,7 @@@@
 ## Open log
 $wwsconf->{'log_facility'}||= $Conf{'syslog'};
 
-&Log::do_openlog($wwsconf->{'log_facility'}, $Conf{'log_socket_type'}, 'soap');
+&Log::do_openlog($wwsconf->{'log_facility'}, $Conf{'log_socket_type'}, 'soap', $Conf{'logfile'});
 &Log::do_log('info', 'SOAP server launched');
 
 unless ($List::use_db = &List::check_db_connect()) {
Index: src/Conf.pm
--- src/Conf.pm.orig	2008-02-13 14:15:20 +0100
+++ src/Conf.pm	2008-03-04 09:47:05 +0100
@@@@ -50,7 +50,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 ignore_x_no_archive_header_feature domain lang listmaster listmaster_email localedir log_socket_type log_level 
+		       global_remind home host ignore_x_no_archive_header_feature domain lang listmaster listmaster_email localedir log_socket_type log_level logfile
 		       logo_html_definition 
                        main_menu_custom_button_1_title main_menu_custom_button_1_url main_menu_custom_button_1_target 
                        main_menu_custom_button_2_title main_menu_custom_button_2_url main_menu_custom_button_2_target 
@@@@ -110,6 +110,7 @@@@
      'host'    => undef,
      'domain'  => undef,
      'email'   => 'sympa',
+     'logfile' => '--PIDDIR--/sympa.log',
      'pidfile' => '--PIDDIR--/sympa.pid',
      'pidfile_distribute' => '--PIDDIR--/sympa-distribute.pid',
      'pidfile_creation' => '--PIDDIR--/sympa-creation.pid',
Index: src/Language.pm
--- src/Language.pm.orig	2008-01-07 14:05:19 +0100
+++ src/Language.pm	2008-03-04 09:44:18 +0100
@@@@ -176,7 +176,7 @@@@
 	    }	
 	}
 	unless ($success) {
-	    &do_log('err','Failed to setlocale(%s) ; you either have a problem with the catalogue .mo files or you should extend available locales in  your /etc/locale.gen (or /etc/sysconfig/i18n) file', $locale);
+	    # &do_log('err','Failed to setlocale(%s) ; you either have a problem with the catalogue .mo files or you should extend available locales in  your /etc/locale.gen (or /etc/sysconfig/i18n) file', $locale);
 	    return undef;
 	}
     }
Index: src/Log.pm
--- src/Log.pm.orig	2007-12-19 16:22:54 +0100
+++ src/Log.pm	2008-03-04 09:49:54 +0100
@@@@ -26,7 +26,7 @@@@
 use strict "vars";
 
 require Exporter;
-use Sys::Syslog;
+use IO::File;
 use Carp;
 use POSIX qw/mktime/;
 use Encode;
@@@@ -34,6 +34,7 @@@@
 our @@ISA = qw(Exporter);
 our @@EXPORT = qw(fatal_err do_log do_openlog $log_level);
 
+my ($log_fh, $log_file);
 my ($log_facility, $log_socket_type, $log_service,$sth,@@sth_stack,$rows_nb);
 # When logs are not available, period of time to wait before sending another warning to listmaster.
 my $warning_timeout = 600;
@@@@ -47,8 +48,7 @@@@
     my $errno  = $!;
     
     eval {
-	syslog('err', $m, @@_);
-	syslog('err', "Exiting.");
+        1;
     };
     if($@@ && ($warning_date < time - $warning_timeout)) {
 	$warning_date = time + $warning_timeout;
@@@@ -108,9 +108,9 @@@@
 	$fac = 'notice';
     }
     eval {
-	unless (syslog($fac, $m, @@param)) {
+	unless (&do_write($fac, $level, $m, @@param)) {
 	    &do_connect();
-	    syslog($fac, $m, @@param);
+	    &do_write($fac, $level, $m, @@param);
 	}
     };
     if($@@ && ($warning_date < time - $warning_timeout)) {
@@@@ -128,12 +128,24 @@@@
     }    
 }
 
+sub do_write {
+    my ($fac, $level, $fmt, @@args) = @@_;
+    if (defined($log_fh)) {
+        my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time());
+        my $date = sprintf("%b %2d %02d:%02d:%02d", $mon+1, $mday, $hour, $min, $sec);
+        $log_fh->printf("%s %s[%d]: [%s.%s] $fmt\n", $date, $log_service, $$, $fac, $level, @@args);
+        return 1;
+    }
+    else {
+        return 0;
+    }
+}
 
 sub do_openlog {
-   my ($fac, $socket_type, $service) = @@_;
+   my ($fac, $socket_type, $service, $logfile) = @@_;
    $service ||= 'sympa';
 
-   ($log_facility, $log_socket_type, $log_service) = ($fac, $socket_type, $service);
+   ($log_facility, $log_socket_type, $log_service, $log_file) = ($fac, $socket_type, $service, $logfile);
 
 #   foreach my $k (keys %options) {
 #       printf "%s = %s\n", $k, $options{$k};
@@@@ -143,18 +155,8 @@@@
 }
 
 sub do_connect {
-    if ($log_socket_type =~ /^(unix|inet)$/i) {
-      Sys::Syslog::setlogsock(lc($log_socket_type));
-    }
-    # close log may be usefull : if parent processus did open log child process inherit the openlog with parameters from parent process 
-    closelog ; 
-    eval {openlog("$log_service\[$$\]", 'ndelay', $log_facility)};
-    if($@@ && ($warning_date < time - $warning_timeout)) {
-	$warning_date = time + $warning_timeout;
-	unless(&List::send_notify_to_listmaster('logs_failed', $Conf::Conf{'host'}, [$@@])) {
-	    print STDERR "No logs available, can't send warning message";
-	}
-    };
+    $log_fh->close() if defined($log_fh); 
+    $log_fh = new IO::File ">>$log_file";
 }
 
 # return the name of the used daemon
Index: src/alias_manager.pl
--- src/alias_manager.pl.orig	2007-12-13 11:54:45 +0100
+++ src/alias_manager.pl	2008-03-04 09:44:18 +0100
@@@@ -45,7 +45,7 @@@@
 my $tmp_alias_file = $Conf{'tmpdir'}.'/sympa_aliases.'.time;
 
 
-my $alias_wrapper = '--MAILERPROGDIR--/aliaswrapper';
+my $alias_wrapper = '--LIBEXECDIR--/aliaswrapper';
 my $lock_file = '--EXPL_DIR--/alias_manager.lock';
 my $default_domain;
 my $path_to_queue = '--MAILERPROGDIR--/queue';
Index: src/etc/script/mod2html.pl
--- src/etc/script/mod2html.pl.orig	2007-06-26 15:20:24 +0200
+++ src/etc/script/mod2html.pl	2008-03-04 09:44:18 +0100
@@@@ -12,7 +12,7 @@@@
 unless (Conf::load('--CONFIG--')) {
     die "Can't load Sympa configuration file";
 }
-&do_openlog($Conf{'syslog'}, $Conf{'log_socket_type'}, 'sympa');
+&do_openlog($Conf{'syslog'}, $Conf{'log_socket_type'}, 'sympa', $Conf{'logfile'});
 
 if ($Conf{'db_name'} and $Conf{'db_type'}) {
     unless (&Upgrade::probe_db()) {
Index: src/etc/script/testlogs.pl
--- src/etc/script/testlogs.pl.orig	2007-07-31 16:47:41 +0200
+++ src/etc/script/testlogs.pl	2008-03-04 09:44:18 +0100
@@@@ -19,7 +19,7 @@@@
 
 
 ## Open the syslog and say we're read out stuff.
-do_openlog($Conf{'syslog'}, $Conf{'log_socket_type'}, 'sympa');
+do_openlog($Conf{'syslog'}, $Conf{'log_socket_type'}, 'sympa', $Conf{'logfile'});
 
 # 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	2008-01-18 15:06:26 +0100
+++ src/sympa.pl	2008-03-04 09:44:18 +0100
@@@@ -173,7 +173,7 @@@@
 }
 
 ## Open the syslog and say we're read out stuff.
-do_openlog($Conf{'syslog'}, $Conf{'log_socket_type'}, 'sympa');
+do_openlog($Conf{'syslog'}, $Conf{'log_socket_type'}, 'sympa', $Conf{'logfile'});
 
 # setting log_level using conf unless it is set by calling option
 if ($main::options{'log_level'}) {
@@@@ -314,7 +314,7 @@@@
     $service .= '(distribute)' 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 $$ for $service purpose ");
     unless ($main::options{'batch'} ) {
Index: src/sympa_wizard.pl
--- src/sympa_wizard.pl.orig	2008-01-30 18:28:31 +0100
+++ src/sympa_wizard.pl	2008-03-04 09:44:18 +0100
@@@@ -65,6 +65,12 @@@@
 	       'query' => 'Directory for configuration files ; it also contains scenari/ and templates/ directories',
 	       'file' => 'sympa.conf'},
 
+	      {'name' => 'logfile',
+	       'default' => '--PIDDIR--/sympa.log',
+	       'query' => 'File to which Sympa logs.',
+	       'file' => 'sympa.conf',
+               'advice' =>'Sympa logs to this file instead of Syslog.'},
+
 	      {'name' => 'pidfile',
 	       'default' => '--PIDDIR--/sympa.pid',
 	       'query' => 'File containing Sympa PID while running.',
@@@@ -92,13 +98,13 @@@@
                'advice' =>''},
 
 	      {'name' => 'arc_path',
-	       'default' => '--DIR--/arc',
+	       'default' => '--DIR--/var/sympa/store/arc',
 	       'query' => 'Where to store HTML archives',
 	       'file' => 'wwsympa.conf','edit' => '1',
                'advice' =>'Better if not in a critical partition'},
 	      
 	      {'name' => 'bounce_path',
-	       'default' => '--DIR--/bounce',
+	       'default' => '--DIR--/var/sympa/store/bounce',
 	       'query' => 'Where to store bounces',
 	       'file' => 'wwsympa.conf',
                'advice' =>'Better if not in a critical partition'},
@@@@ -166,13 +172,13 @@@@
 	      {'title' => 'General definition'},
 	      
 	      {'name' => 'domain',
-	       'default' => '--HOST--',
+	       'default' => 'example.com',
 	       'query' => 'Main robot hostname',
 	       'file' => 'sympa.conf',
 	       'advice' =>''},
 	      
 	      {'name' => 'listmaster',
-	       'default' => 'your_email_address@@--HOST--',
+	       'default' => 'listmaster@@example.com',
 	       '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.'},
@@@@ -300,7 +306,7 @@@@
 	      {'title' => 'MTA related'},
 
 	      {'name' => 'sendmail',
-	       'default' => '/usr/sbin/sendmail',
+	       'default' => '--DIR--/sbin/sendmail',
 	       '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)"},
@@@@ -327,7 +333,7 @@@@
 	      {'title' => 'Pluggin'},
 
 	      {'name' => 'antivirus_path',
-	       'sample' => '/usr/local/uvscan/uvscan',
+	       'sample' => '--DIR--/bin/uvscan',
 	       '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'},
@@@@ -340,14 +346,14 @@@@
 	       'advice' =>''},
 
               {'name' => 'mhonarc',
-	       'default' => '/usr/bin/mhonarc',
+	       'default' => '--DIR--/bin/mhonarc',
 	       'query' => 'Path to MhOnarc mail2html pluggin',
 	       'file' => 'wwsympa.conf','edit' => '1',
 	       'advice' =>'This is required for HTML mail archiving'},
 
 	      {'title' => 'S/MIME pluggin'},
 	      {'name' => 'openssl',
-	       'sample' => '/usr/local/bin/openssl',
+	       'sample' => '--DIR--/bin/openssl',
 	       'query' => 'Path to OpenSSL',
 	       'file' => 'sympa.conf','edit' => '1',
 	       'advice' =>'Sympa knowns S/MIME if openssl is installed'},
@@@@ -368,7 +374,7 @@@@
 	       'file' => 'sympa.conf'},
 
 	      {'name' => 'key_passwd',
-	       'sample' => 'your_password',
+	       'sample' => 'sympa',
 	       'query' => 'Password used to crypt lists private keys',
 	       'file' => 'sympa.conf','edit' => '1',
 	       'advice' =>''},
@@@@ -405,7 +411,7 @@@@
 	       'advice' =>''},
 	      
 	      {'name' => 'db_passwd',
-	       'sample' => 'your_passwd',
+	       'sample' => 'sympa',
 	       '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 ?)'},
@@@@ -436,7 +442,7 @@@@
 	       'advice' =>'This module provide much faster web interface'},
 
 	      {'name' => 'wwsympa_url',
-	       'default' => 'http://--HOST--/sympa',
+	       'default' => 'http://www.example.com/sympa',
 	       'query' => "Sympa\'s main page URL",
 	       'file' => 'sympa.conf','edit' => '1',
 	       'advice' =>''},
Index: src/task_manager.pl
--- src/task_manager.pl.orig	2007-12-14 16:12:21 +0100
+++ src/task_manager.pl	2008-03-04 09:44:18 +0100
@@@@ -114,7 +114,7 @@@@
 &tools::write_pid($wwsconf->{'task_manager_pidfile'}, $$);
 
 $wwsconf->{'log_facility'}||= $Conf{'syslog'};
-do_openlog($wwsconf->{'log_facility'}, $Conf{'log_socket_type'}, 'task_manager');
+do_openlog($wwsconf->{'log_facility'}, $Conf{'log_socket_type'}, 'task_manager', $Conf{'logfile'});
 
 # 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	2007-12-11 16:49:30 +0100
+++ wwsympa/archived.pl	2008-03-04 09:44:18 +0100
@@@@ -132,7 +132,7 @@@@
 }
 
 $wwsconf->{'log_facility'}||= $Conf{'syslog'};
-do_openlog($wwsconf->{'log_facility'}, $Conf{'log_socket_type'}, 'archived');
+do_openlog($wwsconf->{'log_facility'}, $Conf{'log_socket_type'}, 'archived', $Conf{'logfile'});
 
 ## Set the UserID & GroupID for the process
 $( = $) = (getgrnam('--GROUP--'))[2];
Index: wwsympa/bounced.pl
--- wwsympa/bounced.pl.orig	2007-12-13 14:33:38 +0100
+++ wwsympa/bounced.pl	2008-03-04 09:44:18 +0100
@@@@ -147,7 +147,7 @@@@
 }
 
 $wwsconf->{'log_facility'}||= $Conf{'syslog'};
-do_openlog($wwsconf->{'log_facility'}, $Conf{'log_socket_type'}, 'bounced');
+do_openlog($wwsconf->{'log_facility'}, $Conf{'log_socket_type'}, 'bounced', $Conf{'logfile'});
 
 ## Set the UserID & GroupID for the process
 $( = $) = (getgrnam('--GROUP--'))[2];
Index: wwsympa/wwsympa.fcgi
--- wwsympa/wwsympa.fcgi.orig	2008-02-29 12:34:07 +0100
+++ wwsympa/wwsympa.fcgi	2008-03-04 09:44:18 +0100
@@@@ -617,7 +617,7 @@@@
 ## Open log
 $wwsconf->{'log_facility'}||= $Conf{'syslog'};
 
-&Log::do_openlog($wwsconf->{'log_facility'}, $Conf{'log_socket_type'}, 'wwsympa');
+&Log::do_openlog($wwsconf->{'log_facility'}, $Conf{'log_socket_type'}, 'wwsympa', $Conf{'logfile'});
 &do_log('info', 'WWSympa started');
 
 ## Set locale configuration	 
@


1.4
log
@upgrading package: sympa 5.2.4 -> 5.3.1
@
text
@d2 3
a4 3
--- Makefile.in.orig	2007-06-04 15:11:37 +0200
+++ Makefile.in	2007-06-04 17:28:10 +0200
@@@@ -706,7 +706,7 @@@@
d12 1
a12 1
 	DESTDIR='${DESTDIR}' USER='${USER}' GROUP='${GROUP}' ICONSDIR='${ICONSDIR}' newinstall) || exit 1;
d14 3
a16 3
--- soap/Makefile.orig	2006-05-11 16:57:10 +0200
+++ soap/Makefile	2007-06-04 17:28:10 +0200
@@@@ -51,9 +51,11 @@@@
a19 3
-	@@echo "Setting SetUID bit on sympa_soap_server.fcgi..."
-	chmod u+s $(DESTDIR)$(CGIDIR)/sympa_soap_server.fcgi
-	chmod g+s $(DESTDIR)$(CGIDIR)/sympa_soap_server.fcgi
d21 3
a23 3
+	    echo "Setting SetUID bit on sympa_soap_server.fcgi..."; \
+	    chmod u+s $(DESTDIR)$(CGIDIR)/sympa_soap_server.fcgi; \
+	    chmod g+s $(DESTDIR)$(CGIDIR)/sympa_soap_server.fcgi; \
d29 2
a30 2
--- 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
d41 3
a43 3
--- 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 @@@@
d47 6
a52 6
-		       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 pidfile_creation
 		       spool queue queuedistribute queueauth queuetask queuebounce queuedigest queueautomatic
@@@@ -102,6 +102,7 @@@@
d61 3
a63 3
--- 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 @@@@
d73 4
a76 4
--- 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;
d84 3
a86 3
@@@@ -32,6 +32,7 @@@@
 @@ISA = qw(Exporter);
 @@EXPORT = qw(fatal_err do_log do_openlog $log_level);
d90 3
a92 4
 
 
@@@@ -41,8 +42,6 @@@@
     my $m  = shift;
d95 9
a103 7
-    syslog('err', $m, @@_);
-    syslog('err', "Exiting.");
     $m =~ s/%m/$errno/g;
 
     my $full_msg = sprintf $m,@@_;
@@@@ -98,9 +97,9 @@@@
 	$m = $call[3].'() ' . $m if ($call[3]);
d105 4
a108 4
 
-    unless (syslog($fac, $m, @@param)) {
+    unless (&do_write($fac, $level, $m, @@param)) {
 	&do_connect();
d110 5
a114 5
+	&do_write($fac, $level, $m, @@param);
     }
 
     if ($main::options{'foreground'}) {
@@@@ -112,12 +111,24 @@@@
d141 1
a141 1
@@@@ -127,12 +138,8 @@@@
d150 7
a156 1
-    openlog("$log_service\[$$\]", 'ndelay', $log_facility);
d163 3
a165 3
--- src/alias_manager.pl.orig	2006-01-04 14:16:30 +0100
+++ src/alias_manager.pl	2007-06-04 17:28:10 +0200
@@@@ -43,7 +43,7 @@@@
d175 2
a176 2
--- 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
d185 1
a185 1
     unless ($List::use_db = &Upgrade::probe_db()) {
d187 2
a188 2
--- src/etc/script/testlogs.pl.orig	2003-03-12 08:49:34 +0100
+++ src/etc/script/testlogs.pl	2007-06-04 17:28:10 +0200
d199 3
a201 3
--- 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 @@@@
d210 2
a211 2
@@@@ -317,7 +317,7 @@@@
     $service .= '(message)' if ($main::daemon_usage == DAEMON_MESSAGE);
d220 2
a221 2
--- src/sympa_wizard.pl.orig	2007-03-04 11:41:19 +0100
+++ src/sympa_wizard.pl	2007-06-04 17:28:10 +0200
d330 2
a331 2
--- src/task_manager.pl.orig	2007-04-27 18:11:16 +0200
+++ src/task_manager.pl	2007-06-04 17:28:10 +0200
d333 1
a333 1
 $log_level = $main::options{'log_level'} || $Conf{'log_level'};
d342 4
a345 4
--- 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'};
d354 4
a357 4
--- 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'};
d366 3
a368 3
--- 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 @@@@
@


1.3
log
@upgrading package: sympa 5.2.3 -> 5.2.4
@
text
@d2 3
a4 3
--- Makefile.in.orig	2007-02-06 15:25:52 +0100
+++ Makefile.in	2007-02-06 17:34:22 +0100
@@@@ -703,7 +703,7 @@@@
d14 3
a16 3
--- soap/Makefile.orig	2004-01-12 09:18:13 +0100
+++ soap/Makefile	2007-02-06 17:34:22 +0100
@@@@ -50,9 +50,11 @@@@
d32 2
a33 2
--- 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
d44 5
a48 3
--- 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 @@@@
d50 2
a51 1
 		       global_remind home host domain lang listmaster listmaster_email localedir log_socket_type log_level 
d53 3
a55 6
-		       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 @@@@
d62 1
a62 1
      'localedir'  => '--LOCALEDIR--',
d64 3
a66 3
--- 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 @@@@
d76 3
a78 3
--- 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 @@@@
d85 3
a87 1
 
d92 1
a92 2
 my ($log_facility, $log_socket_type, $log_service);
 local $log_level |= 0;
d94 2
a95 1
@@@@ -37,8 +38,6 @@@@
d104 3
a106 3
@@@@ -72,9 +71,9 @@@@
     # do not log if log level if too high regarding the log requested by user 
     return if ($level > $log_level);
d108 2
a109 2
-    unless (syslog($fac, $m, @@_)) {
+    unless (&do_write($fac, $level, $m, @@_)) {
d111 2
a112 2
-	    syslog($fac, $m, @@_);
+	&do_write($fac, $level, $m, @@_);
d114 1
d116 1
a116 2
 	if ($main::options{'log_to_stderr'} || 
@@@@ -85,12 +84,24 @@@@
d143 1
a143 1
@@@@ -100,12 +111,8 @@@@
d157 1
a157 1
 1;
d160 1
a160 1
+++ src/alias_manager.pl	2007-02-06 17:34:22 +0100
d171 2
a172 2
--- 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
d181 1
a181 1
     unless ($List::use_db = &List::probe_db()) {
d184 1
a184 1
+++ src/etc/script/testlogs.pl	2007-02-06 17:34:22 +0100
d195 3
a197 3
--- 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 @@@@
d206 4
a209 4
@@@@ -257,7 +257,7 @@@@
     my $service = 'sympa';
     $service .= '(message)' if ($main::daemon_usage eq 'message');
     $service .= '(command)' if ($main::daemon_usage eq 'command');
d213 1
a213 1
     do_log('debug', "Running server $$ with main::daemon_usage = $main::daemon_usage ");
d216 2
a217 2
--- src/sympa_wizard.pl.orig	2006-10-16 16:24:39 +0200
+++ src/sympa_wizard.pl	2007-02-06 17:34:22 +0100
d247 1
a247 1
@@@@ -154,13 +160,13 @@@@
d263 1
a263 1
@@@@ -276,7 +282,7 @@@@
d272 1
a272 1
@@@@ -303,7 +309,7 @@@@
d281 1
a281 1
@@@@ -316,14 +322,14 @@@@
d298 1
a298 1
@@@@ -344,7 +350,7 @@@@
d307 1
a307 1
@@@@ -381,7 +387,7 @@@@
d316 1
a316 1
@@@@ -412,7 +418,7 @@@@
d326 3
a328 3
--- 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 @@@@
d338 3
a340 3
--- 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 @@@@
d350 3
a352 3
--- 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 @@@@
d362 3
a364 3
--- 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 @@@@
@


1.2
log
@upgrading package: sympa 5.1.2 -> 5.2.1
@
text
@d2 2
a3 2
--- Makefile.in.orig	2006-06-01 17:07:06 +0200
+++ Makefile.in	2006-06-05 09:51:25 +0200
a12 9
Index: mail_tt2/Makefile
--- mail_tt2/Makefile.orig	2005-08-11 14:27:15 +0200
+++ mail_tt2/Makefile	2006-06-05 09:51:47 +0200
@@@@ -66,4 +66,4 @@@@
 	$(PERL) ../set_symlinks.pl mail_tt2 $(DESTDIR)$(ETCBINDIR)/mail_tt2
 	find $(DESTDIR)$(ETCBINDIR) -type d -exec chmod 755 {} \;
 	find $(DESTDIR)$(ETCBINDIR) -type f -exec chmod 444 {} \;
-	rm -f $(DESTDIR)$(ETCBINDIR)/web_tt2/authorization_reject.tt2 ; ln -s $(DESTDIR)$(ETCBINDIR)/mail_tt2/authorization_reject.tt2 $(DESTDIR)$(ETCBINDIR)/web_tt2
+	rm -f $(DESTDIR)$(ETCBINDIR)/web_tt2/authorization_reject.tt2 ; ln $(DESTDIR)$(ETCBINDIR)/mail_tt2/authorization_reject.tt2 $(DESTDIR)$(ETCBINDIR)/web_tt2
d15 1
a15 1
+++ soap/Makefile	2006-06-05 09:51:25 +0200
d33 1
a33 1
+++ soap/sympa_soap_server.fcgi	2006-06-05 09:51:25 +0200
d44 3
a46 3
--- src/Conf.pm.orig	2006-04-04 14:55:51 +0200
+++ src/Conf.pm	2006-06-05 09:51:25 +0200
@@@@ -42,7 +42,7 @@@@
d55 1
a55 1
@@@@ -88,6 +88,7 @@@@
d64 3
a66 3
--- src/Language.pm.orig	2006-04-10 17:54:26 +0200
+++ src/Language.pm	2006-06-05 09:51:25 +0200
@@@@ -169,7 +169,7 @@@@
d77 1
a77 1
+++ src/Log.pm	2006-06-05 09:51:25 +0200
d158 1
a158 1
+++ src/alias_manager.pl	2006-06-05 09:51:25 +0200
d170 1
a170 1
+++ src/etc/script/mod2html.pl	2006-06-05 09:51:25 +0200
d182 1
a182 1
+++ src/etc/script/testlogs.pl	2006-06-05 09:51:25 +0200
d193 2
a194 2
--- src/sympa.pl.orig	2006-03-30 14:50:18 +0200
+++ src/sympa.pl	2006-06-05 09:51:25 +0200
d204 1
a204 1
@@@@ -256,7 +256,7 @@@@
d214 2
a215 2
--- src/sympa_wizard.pl.orig	2006-03-15 10:18:47 +0100
+++ src/sympa_wizard.pl	2006-06-05 09:51:25 +0200
d261 1
a261 1
@@@@ -268,7 +274,7 @@@@
d270 1
a270 1
@@@@ -295,7 +301,7 @@@@
d279 1
a279 1
@@@@ -308,14 +314,14 @@@@
d296 1
a296 1
@@@@ -336,7 +342,7 @@@@
d305 1
a305 1
@@@@ -373,7 +379,7 @@@@
d314 1
a314 1
@@@@ -404,7 +410,7 @@@@
d325 1
a325 1
+++ src/task_manager.pl	2006-06-05 09:51:25 +0200
d336 2
a337 2
--- wwsympa/archived.pl.orig	2006-04-19 15:21:17 +0200
+++ wwsympa/archived.pl	2006-06-05 09:51:25 +0200
d349 1
a349 1
+++ wwsympa/bounced.pl	2006-06-05 09:51:25 +0200
d360 3
a362 3
--- wwsympa/wwsympa.fcgi.orig	2006-06-01 15:15:56 +0200
+++ wwsympa/wwsympa.fcgi	2006-06-05 09:51:25 +0200
@@@@ -530,7 +530,7 @@@@
@


1.2.2.1
log
@file sympa.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:56:59 +0000
@
text
@d1 379
@


1.2.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 379
Index: Makefile.in
--- Makefile.in.orig	2006-06-01 17:07:06 +0200
+++ Makefile.in	2006-06-05 09:51:25 +0200
@@@@ -703,7 +703,7 @@@@
 	@@(cd soap && echo "making in soap/..." && \
 	$(MAKE) SH='${SH}' CC='${CC}' CFLAGS='${CFLAGS}' PERL='${PERL}' \
 	DIR='${DIR}' BINDIR='${BINDIR}' SBINDIR='${SBINDIR}' LIBDIR='${LIBDIR}' \
-	USER='${USER}' GROUP='${GROUP}' SCRIPTDIR='${SCRIPTDIR}' \
+	USER='${USER}' GROUP='${GROUP}' SCRIPTDIR='${SCRIPTDIR}' enable_secure='${enable_secure}' \
 	CGIDIR='${CGIDIR}' WWSBINDIR='${WWSBINDIR}' MAILERPROGDIR='${MAILERPROGDIR}' \
 	PIDDIR='${PIDDIR}' CONFIG='${CONFIG}' WWSCONFIG='${WWSCONFIG}' ETCBINDIR='${ETCBINDIR}' \
 	DESTDIR='${DESTDIR}' USER='${USER}' GROUP='${GROUP}' ICONSDIR='${ICONSDIR}' newinstall) || exit 1;
Index: mail_tt2/Makefile
--- mail_tt2/Makefile.orig	2005-08-11 14:27:15 +0200
+++ mail_tt2/Makefile	2006-06-05 09:51:47 +0200
@@@@ -66,4 +66,4 @@@@
 	$(PERL) ../set_symlinks.pl mail_tt2 $(DESTDIR)$(ETCBINDIR)/mail_tt2
 	find $(DESTDIR)$(ETCBINDIR) -type d -exec chmod 755 {} \;
 	find $(DESTDIR)$(ETCBINDIR) -type f -exec chmod 444 {} \;
-	rm -f $(DESTDIR)$(ETCBINDIR)/web_tt2/authorization_reject.tt2 ; ln -s $(DESTDIR)$(ETCBINDIR)/mail_tt2/authorization_reject.tt2 $(DESTDIR)$(ETCBINDIR)/web_tt2
+	rm -f $(DESTDIR)$(ETCBINDIR)/web_tt2/authorization_reject.tt2 ; ln $(DESTDIR)$(ETCBINDIR)/mail_tt2/authorization_reject.tt2 $(DESTDIR)$(ETCBINDIR)/web_tt2
Index: soap/Makefile
--- soap/Makefile.orig	2004-01-12 09:18:13 +0100
+++ soap/Makefile	2006-06-05 09:51:25 +0200
@@@@ -50,9 +50,11 @@@@
 	chown $(USER) $(DESTDIR)$(CGIDIR)/$$i; \
 	chgrp $(GROUP) $(DESTDIR)$(CGIDIR)/$$i; \
 	done
-	@@echo "Setting SetUID bit on sympa_soap_server.fcgi..."
-	chmod u+s $(DESTDIR)$(CGIDIR)/sympa_soap_server.fcgi
-	chmod g+s $(DESTDIR)$(CGIDIR)/sympa_soap_server.fcgi
+	@@if [ "$(enable_secure)" != "yes" ]; then \
+	    echo "Setting SetUID bit on sympa_soap_server.fcgi..."; \
+	    chmod u+s $(DESTDIR)$(CGIDIR)/sympa_soap_server.fcgi; \
+	    chmod g+s $(DESTDIR)$(CGIDIR)/sympa_soap_server.fcgi; \
+	fi
 	@@for i in $(lib_SUBST) ; do \
 	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	2006-06-05 09:51:25 +0200
@@@@ -52,7 +52,7 @@@@
 ## Open log
 $wwsconf->{'log_facility'}||= $Conf{'syslog'};
 
-&Log::do_openlog($wwsconf->{'log_facility'}, $Conf{'log_socket_type'}, 'soap');
+&Log::do_openlog($wwsconf->{'log_facility'}, $Conf{'log_socket_type'}, 'soap', $Conf{'logfile'});
 &Log::do_log('info', 'SOAP server launched');
 
 unless ($List::use_db = &List::check_db_connect()) {
Index: src/Conf.pm
--- src/Conf.pm.orig	2006-04-04 14:55:51 +0200
+++ src/Conf.pm	2006-06-05 09:51:25 +0200
@@@@ -42,7 +42,7 @@@@
 		       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 
 		       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
@@@@ -88,6 +88,7 @@@@
      'host'    => undef,
      'domain'  => undef,
      'email'   => 'sympa',
+     'logfile' => '--PIDDIR--/sympa.log',
      'pidfile' => '--PIDDIR--/sympa.pid',
      'pidfile_distribute' => '--PIDDIR--/sympa-distribute.pid',
      'localedir'  => '--LOCALEDIR--',
Index: src/Language.pm
--- src/Language.pm.orig	2006-04-10 17:54:26 +0200
+++ src/Language.pm	2006-06-05 09:51:25 +0200
@@@@ -169,7 +169,7 @@@@
 	    }	
 	}
 	unless ($success) {
-	    &do_log('err','Failed to setlocale(%s) ; you either have a problem with the catalogue .mo files or you should extend available locales in  your /etc/locale.gen (or /etc/sysconfig/i18n) file', $locale);
+	    # &do_log('err','Failed to setlocale(%s) ; you either have a problem with the catalogue .mo files or you should extend available locales in  your /etc/locale.gen (or /etc/sysconfig/i18n) file', $locale);
 	    return undef;
 	}
     }
Index: src/Log.pm
--- src/Log.pm.orig	2006-03-24 18:00:31 +0100
+++ src/Log.pm	2006-06-05 09:51:25 +0200
@@@@ -24,12 +24,13 @@@@
 package Log;
 
 require Exporter;
-use Sys::Syslog;
+use IO::File;
 use Carp;
 
 @@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;
 
@@@@ -37,8 +38,6 @@@@
     my $m  = shift;
     my $errno  = $!;
     
-    syslog('err', $m, @@_);
-    syslog('err', "Exiting.");
     $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);
 
-    unless (syslog($fac, $m, @@_)) {
+    unless (&do_write($fac, $level, $m, @@_)) {
 	&do_connect();
-	    syslog($fac, $m, @@_);
+	&do_write($fac, $level, $m, @@_);
     }
     if ($main::options{'foreground'}) {
 	if ($main::options{'log_to_stderr'} || 
@@@@ -85,12 +84,24 @@@@
     }    
 }
 
+sub do_write {
+    my ($fac, $level, $fmt, @@args) = @@_;
+    if (defined($log_fh)) {
+        my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time());
+        my $date = sprintf("%b %2d %02d:%02d:%02d", $mon+1, $mday, $hour, $min, $sec);
+        $log_fh->printf("%s %s[%d]: [%s.%s] $fmt\n", $date, $log_service, $$, $fac, $level, @@args);
+        return 1;
+    }
+    else {
+        return 0;
+    }
+}
 
 sub do_openlog {
-   my ($fac, $socket_type, $service) = @@_;
+   my ($fac, $socket_type, $service, $logfile) = @@_;
    $service ||= 'sympa';
 
-   ($log_facility, $log_socket_type, $log_service) = ($fac, $socket_type, $service);
+   ($log_facility, $log_socket_type, $log_service, $log_file) = ($fac, $socket_type, $service, $logfile);
 
 #   foreach my $k (keys %options) {
 #       printf "%s = %s\n", $k, $options{$k};
@@@@ -100,12 +111,8 @@@@
 }
 
 sub do_connect {
-    if ($log_socket_type =~ /^(unix|inet)$/i) {
-      Sys::Syslog::setlogsock(lc($log_socket_type));
-    }
-    # close log may be usefull : if parent processus did open log child process inherit the openlog with parameters from parent process 
-    closelog ; 
-    openlog("$log_service\[$$\]", 'ndelay', $log_facility);
+    $log_fh->close() if defined($log_fh); 
+    $log_fh = new IO::File ">>$log_file";
 }
 
 1;
Index: src/alias_manager.pl
--- src/alias_manager.pl.orig	2006-01-04 14:16:30 +0100
+++ src/alias_manager.pl	2006-06-05 09:51:25 +0200
@@@@ -43,7 +43,7 @@@@
 my $tmp_alias_file = $Conf{'tmpdir'}.'/sympa_aliases.'.time;
 
 
-my $alias_wrapper = '--MAILERPROGDIR--/aliaswrapper';
+my $alias_wrapper = '--LIBEXECDIR--/aliaswrapper';
 my $lock_file = '--EXPL_DIR--/alias_manager.lock';
 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	2006-06-05 09:51:25 +0200
@@@@ -12,7 +12,7 @@@@
 unless (Conf::load('--CONFIG--')) {
     die "Can't load Sympa configuration file";
 }
-&do_openlog($Conf{'syslog'}, $Conf{'log_socket_type'}, 'sympa');
+&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()) {
Index: src/etc/script/testlogs.pl
--- src/etc/script/testlogs.pl.orig	2003-03-12 08:49:34 +0100
+++ src/etc/script/testlogs.pl	2006-06-05 09:51:25 +0200
@@@@ -19,7 +19,7 @@@@
 
 
 ## Open the syslog and say we're read out stuff.
-do_openlog($Conf{'syslog'}, $Conf{'log_socket_type'}, 'sympa');
+do_openlog($Conf{'syslog'}, $Conf{'log_socket_type'}, 'sympa', $Conf{'logfile'});
 
 # 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-03-30 14:50:18 +0200
+++ src/sympa.pl	2006-06-05 09:51:25 +0200
@@@@ -164,7 +164,7 @@@@
 }
 
 ## Open the syslog and say we're read out stuff.
-do_openlog($Conf{'syslog'}, $Conf{'log_socket_type'}, 'sympa');
+do_openlog($Conf{'syslog'}, $Conf{'log_socket_type'}, 'sympa', $Conf{'logfile'});
 
 # setting log_level using conf unless it is set by calling option
 if ($main::options{'log_level'}) {
@@@@ -256,7 +256,7 @@@@
     my $service = 'sympa';
     $service .= '(message)' if ($main::daemon_usage eq 'message');
     $service .= '(command)' if ($main::daemon_usage eq 'command');
-    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 ");
     unless ($main::options{'batch'} ) {
Index: src/sympa_wizard.pl
--- src/sympa_wizard.pl.orig	2006-03-15 10:18:47 +0100
+++ src/sympa_wizard.pl	2006-06-05 09:51:25 +0200
@@@@ -65,6 +65,12 @@@@
 	       'query' => 'Directory for configuration files ; it also contains scenari/ and templates/ directories',
 	       'file' => 'sympa.conf'},
 
+	      {'name' => 'logfile',
+	       'default' => '--PIDDIR--/sympa.log',
+	       'query' => 'File to which Sympa logs.',
+	       'file' => 'sympa.conf',
+               'advice' =>'Sympa logs to this file instead of Syslog.'},
+
 	      {'name' => 'pidfile',
 	       'default' => '--PIDDIR--/sympa.pid',
 	       'query' => 'File containing Sympa PID while running.',
@@@@ -92,13 +98,13 @@@@
                'advice' =>''},
 
 	      {'name' => 'arc_path',
-	       'default' => '--DIR--/arc',
+	       'default' => '--DIR--/var/sympa/store/arc',
 	       'query' => 'Where to store HTML archives',
 	       'file' => 'wwsympa.conf','edit' => '1',
                'advice' =>'Better if not in a critical partition'},
 	      
 	      {'name' => 'bounce_path',
-	       'default' => '--DIR--/bounce',
+	       'default' => '--DIR--/var/sympa/store/bounce',
 	       'query' => 'Where to store bounces',
 	       'file' => 'wwsympa.conf',
                'advice' =>'Better if not in a critical partition'},
@@@@ -154,13 +160,13 @@@@
 	      {'title' => 'General definition'},
 	      
 	      {'name' => 'domain',
-	       'default' => '--HOST--',
+	       'default' => 'example.com',
 	       'query' => 'Main robot hostname',
 	       'file' => 'sympa.conf',
 	       'advice' =>''},
 	      
 	      {'name' => 'listmaster',
-	       'default' => 'your_email_address@@--HOST--',
+	       'default' => 'listmaster@@example.com',
 	       '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.'},
@@@@ -268,7 +274,7 @@@@
 	      {'title' => 'MTA related'},
 
 	      {'name' => 'sendmail',
-	       'default' => '/usr/sbin/sendmail',
+	       'default' => '--DIR--/sbin/sendmail',
 	       '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)"},
@@@@ -295,7 +301,7 @@@@
 	      {'title' => 'Pluggin'},
 
 	      {'name' => 'antivirus_path',
-	       'sample' => '/usr/local/uvscan/uvscan',
+	       'sample' => '--DIR--/bin/uvscan',
 	       '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'},
@@@@ -308,14 +314,14 @@@@
 	       'advice' =>''},
 
               {'name' => 'mhonarc',
-	       'default' => '/usr/bin/mhonarc',
+	       'default' => '--DIR--/bin/mhonarc',
 	       'query' => 'Path to MhOnarc mail2html pluggin',
 	       'file' => 'wwsympa.conf','edit' => '1',
 	       'advice' =>'This is required for HTML mail archiving'},
 
 	      {'title' => 'S/MIME pluggin'},
 	      {'name' => 'openssl',
-	       'sample' => '/usr/local/bin/openssl',
+	       'sample' => '--DIR--/bin/openssl',
 	       'query' => 'Path to OpenSSL',
 	       'file' => 'sympa.conf','edit' => '1',
 	       'advice' =>'Sympa knowns S/MIME if openssl is installed'},
@@@@ -336,7 +342,7 @@@@
 	       'file' => 'sympa.conf'},
 
 	      {'name' => 'key_passwd',
-	       'sample' => 'your_password',
+	       'sample' => 'sympa',
 	       'query' => 'Password used to crypt lists private keys',
 	       'file' => 'sympa.conf','edit' => '1',
 	       'advice' =>''},
@@@@ -373,7 +379,7 @@@@
 	       'advice' =>''},
 	      
 	      {'name' => 'db_passwd',
-	       'sample' => 'your_passwd',
+	       'sample' => 'sympa',
 	       '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 ?)'},
@@@@ -404,7 +410,7 @@@@
 	       'advice' =>'This module provide much faster web interface'},
 
 	      {'name' => 'wwsympa_url',
-	       'default' => 'http://--HOST--/sympa',
+	       'default' => 'http://www.example.com/sympa',
 	       'query' => "Sympa\'s main page URL",
 	       '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	2006-06-05 09:51:25 +0200
@@@@ -119,7 +119,7 @@@@
 $log_level = $main::options{'log_level'} || $Conf{'log_level'};
 
 $wwsconf->{'log_facility'}||= $Conf{'syslog'};
-do_openlog($wwsconf->{'log_facility'}, $Conf{'log_socket_type'}, 'task_manager');
+do_openlog($wwsconf->{'log_facility'}, $Conf{'log_socket_type'}, 'task_manager', $Conf{'logfile'});
 
 # 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-04-19 15:21:17 +0200
+++ wwsympa/archived.pl	2006-06-05 09:51:25 +0200
@@@@ -114,7 +114,7 @@@@
 $log_level = $main::options{'log_level'} || $Conf{'log_level'};
 
 $wwsconf->{'log_facility'}||= $Conf{'syslog'};
-do_openlog($wwsconf->{'log_facility'}, $Conf{'log_socket_type'}, 'archived');
+do_openlog($wwsconf->{'log_facility'}, $Conf{'log_socket_type'}, 'archived', $Conf{'logfile'});
 
 ## 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	2006-06-05 09:51:25 +0200
@@@@ -142,7 +142,7 @@@@
 $log_level = $main::options{'log_level'} || $Conf{'log_level'};
 
 $wwsconf->{'log_facility'}||= $Conf{'syslog'};
-do_openlog($wwsconf->{'log_facility'}, $Conf{'log_socket_type'}, 'bounced');
+do_openlog($wwsconf->{'log_facility'}, $Conf{'log_socket_type'}, 'bounced', $Conf{'logfile'});
 
 ## Set the UserID & GroupID for the process
 $( = $) = (getgrnam('--GROUP--'))[2];
Index: wwsympa/wwsympa.fcgi
--- wwsympa/wwsympa.fcgi.orig	2006-06-01 15:15:56 +0200
+++ wwsympa/wwsympa.fcgi	2006-06-05 09:51:25 +0200
@@@@ -530,7 +530,7 @@@@
 ## Open log
 $wwsconf->{'log_facility'}||= $Conf{'syslog'};
 
-&Log::do_openlog($wwsconf->{'log_facility'}, $Conf{'log_socket_type'}, 'wwsympa');
+&Log::do_openlog($wwsconf->{'log_facility'}, $Conf{'log_socket_type'}, 'wwsympa', $Conf{'logfile'});
 &do_log('info', 'WWSympa started');
 
 ## Set locale configuration	 
@


1.1
log
@New Package: Sympa (Mailing List Manager)

Sponsored by:   Fraunhofer Gesellschaft (FhG)
                Institut für Informations- und Datenverarbeitung (IITB)
                http://www.iitb.fraunhofer.de/
@
text
@d1 39
d41 2
a42 2
--- soap/sympa_soap_server.fcgi.orig	2005-05-30 10:10:02.000000000 +0000
+++ soap/sympa_soap_server.fcgi	2005-11-20 13:13:59.992979738 +0000
d51 1
a51 1
 unless ($List::use_db = &List::probe_db()) {
d53 2
a54 2
--- src/Conf.pm.orig	2005-10-20 09:51:13.000000000 +0000
+++ src/Conf.pm	2005-11-20 13:13:59.994159654 +0000
d62 3
a64 3
 		       queueexpire queuemod queuesubscribe queueoutgoing tmpdir
 		       loop_command_max loop_command_sampling_delay loop_command_decrease_factor
@@@@ -87,6 +87,7 @@@@
d73 3
a75 12
--- src/Language.pm.orig	2005-10-20 09:51:13.000000000 +0000
+++ src/Language.pm	2005-11-20 13:13:59.994680321 +0000
@@@@ -128,7 +128,7 @@@@
     }
    
     &Locale::Messages::textdomain("sympa");
-    &Locale::Messages::bindtextdomain('sympa','--DIR--/locale');
+    &Locale::Messages::bindtextdomain('sympa','--LOCALEDIR--');
     &Locale::Messages::bind_textdomain_codeset('sympa',$recode) if $recode;
     #bind_textdomain_codeset sympa => 'iso-8859-1';
 
@@@@ -148,7 +148,7 @@@@
d85 2
a86 2
--- src/Log.pm.orig	2005-01-26 14:09:33.000000000 +0000
+++ src/Log.pm	2005-11-20 13:13:59.995301071 +0000
d111 1
a111 1
@@@@ -69,9 +68,9 @@@@
d122 2
a123 2
 	if (!$main::options{'batch'} 
@@@@ -82,12 +81,24 @@@@
d150 1
a150 1
@@@@ -97,12 +108,8 @@@@
d166 2
a167 2
--- src/alias_manager.pl.orig	2005-08-09 09:02:35.000000000 +0000
+++ src/alias_manager.pl	2005-11-20 13:15:57.888680709 +0000
d178 2
a179 2
--- src/etc/script/mod2html.pl.orig	2004-06-23 13:19:32.000000000 +0000
+++ src/etc/script/mod2html.pl	2005-11-20 13:13:59.995673904 +0000
d190 2
a191 2
--- src/etc/script/testlogs.pl.orig	2003-03-12 07:49:34.000000000 +0000
+++ src/etc/script/testlogs.pl	2005-11-20 13:13:59.996049654 +0000
d202 3
a204 3
--- src/sympa.pl.orig	2005-07-28 09:39:28.000000000 +0000
+++ src/sympa.pl	2005-11-20 13:13:59.997390238 +0000
@@@@ -167,7 +167,7 @@@@
d213 1
a213 1
@@@@ -253,7 +253,7 @@@@
d223 2
a224 2
--- src/sympa_wizard.pl.orig	2005-08-10 12:30:20.000000000 +0000
+++ src/sympa_wizard.pl	2005-11-20 13:13:59.998440988 +0000
d333 3
a335 3
--- src/task_manager.pl.orig	2005-10-28 14:39:33.000000000 +0000
+++ src/task_manager.pl	2005-11-20 13:13:59.999518238 +0000
@@@@ -113,7 +113,7 @@@@
d345 3
a347 3
--- wwsympa/archived.pl.orig	2005-10-20 10:23:44.000000000 +0000
+++ wwsympa/archived.pl	2005-11-20 13:14:00.000065988 +0000
@@@@ -111,7 +111,7 @@@@
d357 3
a359 3
--- wwsympa/bounced.pl.orig	2004-12-10 14:42:58.000000000 +0000
+++ wwsympa/bounced.pl	2005-11-20 13:14:00.000535988 +0000
@@@@ -138,7 +138,7 @@@@
d369 3
a371 3
--- wwsympa/wwsympa.fcgi.orig	2005-10-28 14:12:54.000000000 +0000
+++ wwsympa/wwsympa.fcgi	2005-11-20 13:14:00.009050821 +0000
@@@@ -514,7 +514,7 @@@@
@