OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 18-Apr-2009 09:59:25
Branch: HEAD Handle: 2009041808592500
Modified files:
openpkg-src/sympa sympa.patch sympa.spec
Log:
adjust dependency
Summary:
Revision Changes Path
1.5 +89 -85 openpkg-src/sympa/sympa.patch
1.17 +4 -4 openpkg-src/sympa/sympa.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sympa/sympa.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 sympa.patch
--- openpkg-src/sympa/sympa.patch 4 Jun 2007 15:35:52 -0000 1.4
+++ openpkg-src/sympa/sympa.patch 18 Apr 2009 07:59:25 -0000 1.5
@@ -1,7 +1,7 @@
Index: Makefile.in
---- Makefile.in.orig 2007-06-04 15:11:37 +0200
-+++ Makefile.in 2007-06-04 17:28:10 +0200
-@@ -706,7 +706,7 @@
+--- 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}'
\
@@ -9,28 +9,25 @@
+ 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;
+ DESTDIR='${DESTDIR}' USER='${USER}' GROUP='${GROUP}' newinstall) ||
exit 1;
Index: soap/Makefile
---- soap/Makefile.orig 2006-05-11 16:57:10 +0200
-+++ soap/Makefile 2007-06-04 17:28:10 +0200
-@@ -51,9 +51,11 @@
+--- 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
-- @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; \
+ @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 2006-02-24 15:37:54 +0100
-+++ soap/sympa_soap_server.fcgi 2007-06-04 17:28:10 +0200
+--- 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'};
@@ -41,18 +38,18 @@
unless ($List::use_db = &List::check_db_connect()) {
Index: src/Conf.pm
---- 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 @@
+--- 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 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 @@
+- 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',
@@ -61,9 +58,9 @@
'pidfile_distribute' => '--PIDDIR--/sympa-distribute.pid',
'pidfile_creation' => '--PIDDIR--/sympa-creation.pid',
Index: src/Language.pm
---- 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 @@
+--- 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) {
@@ -73,10 +70,10 @@
}
}
Index: src/Log.pm
---- 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;
+--- 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;
@@ -84,36 +81,37 @@
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);
+@@ -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);
-
-
-@@ -41,8 +42,6 @@
- my $m = shift;
+ # 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 = $!;
-- 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]);
+ 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';
}
-
-- unless (syslog($fac, $m, @param)) {
-+ unless (&do_write($fac, $level, $m, @param)) {
- &do_connect();
+ 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 ($main::options{'foreground'}) {
-@@ -112,12 +111,24 @@
++ &do_write($fac, $level, $m, @param);
+ }
+ };
+ if($@ && ($warning_date < time - $warning_timeout)) {
+@@ -128,12 +128,24 @@
}
}
@@ -140,7 +138,7 @@
# foreach my $k (keys %options) {
# printf "%s = %s\n", $k, $options{$k};
-@@ -127,12 +138,8 @@
+@@ -143,18 +155,8 @@
}
sub do_connect {
@@ -149,16 +147,22 @@
- }
- # 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);
+- 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 2006-01-04 14:16:30 +0100
-+++ src/alias_manager.pl 2007-06-04 17:28:10 +0200
-@@ -43,7 +43,7 @@
+--- 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;
@@ -168,8 +172,8 @@
my $default_domain;
my $path_to_queue = '--MAILERPROGDIR--/queue';
Index: src/etc/script/mod2html.pl
---- 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
+--- 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";
@@ -178,10 +182,10 @@
+&do_openlog($Conf{'syslog'}, $Conf{'log_socket_type'}, 'sympa',
$Conf{'logfile'});
if ($Conf{'db_name'} and $Conf{'db_type'}) {
- unless ($List::use_db = &Upgrade::probe_db()) {
+ unless (&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-06-04 17:28:10 +0200
+--- 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 @@
@@ -192,9 +196,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 2007-03-30 14:45:20 +0200
-+++ src/sympa.pl 2007-06-04 17:32:20 +0200
-@@ -176,7 +176,7 @@
+--- 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.
@@ -203,8 +207,8 @@
# setting log_level using conf unless it is set by calling option
if ($main::options{'log_level'}) {
-@@ -317,7 +317,7 @@
- $service .= '(message)' if ($main::daemon_usage == DAEMON_MESSAGE);
+@@ -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);
@@ -213,8 +217,8 @@
do_log('debug', "Running server $$ for $service purpose ");
unless ($main::options{'batch'} ) {
Index: src/sympa_wizard.pl
---- src/sympa_wizard.pl.orig 2007-03-04 11:41:19 +0100
-+++ src/sympa_wizard.pl 2007-06-04 17:28:10 +0200
+--- 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'},
@@ -323,10 +327,10 @@
'file' => 'sympa.conf','edit' => '1',
'advice' =>''},
Index: src/task_manager.pl
---- src/task_manager.pl.orig 2007-04-27 18:11:16 +0200
-+++ src/task_manager.pl 2007-06-04 17:28:10 +0200
+--- 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 @@
- $log_level = $main::options{'log_level'} || $Conf{'log_level'};
+ &tools::write_pid($wwsconf->{'task_manager_pidfile'}, $$);
$wwsconf->{'log_facility'}||= $Conf{'syslog'};
-do_openlog($wwsconf->{'log_facility'}, $Conf{'log_socket_type'},
'task_manager');
@@ -335,10 +339,10 @@
# 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-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'};
+--- 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');
@@ -347,10 +351,10 @@
## Set the UserID & GroupID for the process
$( = $) = (getgrnam('--GROUP--'))[2];
Index: wwsympa/bounced.pl
---- 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'};
+--- 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');
@@ -359,9 +363,9 @@
## Set the UserID & GroupID for the process
$( = $) = (getgrnam('--GROUP--'))[2];
Index: wwsympa/wwsympa.fcgi
---- 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 @@
+--- 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'};
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sympa/sympa.spec
============================================================================
$ cvs diff -u -r1.16 -r1.17 sympa.spec
--- openpkg-src/sympa/sympa.spec 1 Jan 2008 15:05:37 -0000 1.16
+++ openpkg-src/sympa/sympa.spec 18 Apr 2009 07:59:25 -0000 1.17
@@ -31,8 +31,8 @@
Class: EVAL
Group: Mail
License: GPL
-Version: 5.3.4
-Release: 20080101
+Version: 5.4.1
+Release: 20090418
# list of sources
Source0: http://www.sympa.org/distribution/sympa-%{version}.tar.gz
@@ -53,8 +53,8 @@
PreReq: perl-crypto, perl-mail, perl-util, perl-www, perl-comp
BuildPreReq: perl-locale, perl-parse, perl-sys, perl-ldap
PreReq: perl-locale, perl-parse, perl-sys, perl-ldap
-BuildPreReq: perl-db, perl-dbi, perl-dbi::with_dbd_mysql = yes
-PreReq: perl-db, perl-dbi, perl-dbi::with_dbd_mysql = yes
+BuildPreReq: perl-db, perl-dbi, perl-dbi::with_mysql = yes
+PreReq: perl-db, perl-dbi, perl-dbi::with_mysql = yes
BuildPreReq: perl-xml, perl-xml::with_libxml = yes
PreReq: perl-xml, perl-xml::with_libxml = yes
PreReq: apache, apache-fastcgi = yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
