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: 05-Jun-2006 10:00:15
Branch: HEAD Handle: 2006060509001001
Modified files:
openpkg-src/sympa sympa.patch sympa.spec
Log:
upgrading package: sympa 5.1.2 -> 5.2.1
Summary:
Revision Changes Path
1.2 +80 -50 openpkg-src/sympa/sympa.patch
1.2 +4 -3 openpkg-src/sympa/sympa.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sympa/sympa.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 sympa.patch
--- openpkg-src/sympa/sympa.patch 1 Mar 2006 14:09:59 -0000 1.1
+++ openpkg-src/sympa/sympa.patch 5 Jun 2006 08:00:10 -0000 1.2
@@ -1,6 +1,45 @@
+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 2005-05-30 10:10:02.000000000 +0000
-+++ soap/sympa_soap_server.fcgi 2005-11-20 13:13:59.992979738 +0000
+--- 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'};
@@ -9,10 +48,10 @@
+&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::probe_db()) {
+ unless ($List::use_db = &List::check_db_connect()) {
Index: src/Conf.pm
---- src/Conf.pm.orig 2005-10-20 09:51:13.000000000 +0000
-+++ src/Conf.pm 2005-11-20 13:13:59.994159654 +0000
+--- 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
@@ -20,9 +59,9 @@
- owner_priority pidfile pidfile_distribute
+ owner_priority logfile pidfile pidfile_distribute
spool queue queuedistribute queueauth queuetask
queuebounce queuedigest
- queueexpire queuemod queuesubscribe queueoutgoing tmpdir
- loop_command_max loop_command_sampling_delay
loop_command_decrease_factor
-@@ -87,6 +87,7 @@
+ 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',
@@ -31,18 +70,9 @@
'pidfile_distribute' => '--PIDDIR--/sympa-distribute.pid',
'localedir' => '--LOCALEDIR--',
Index: src/Language.pm
---- 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 @@
+--- 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) {
@@ -52,8 +82,8 @@
}
}
Index: src/Log.pm
---- src/Log.pm.orig 2005-01-26 14:09:33.000000000 +0000
-+++ src/Log.pm 2005-11-20 13:13:59.995301071 +0000
+--- 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;
@@ -78,7 +108,7 @@
$m =~ s/%m/$errno/g;
my $full_msg = sprintf $m,@_;
-@@ -69,9 +68,9 @@
+@@ -72,9 +71,9 @@
# do not log if log level if too high regarding the log requested by
user
return if ($level > $log_level);
@@ -89,8 +119,8 @@
+ &do_write($fac, $level, $m, @_);
}
if ($main::options{'foreground'}) {
- if (!$main::options{'batch'}
-@@ -82,12 +81,24 @@
+ if ($main::options{'log_to_stderr'} ||
+@@ -85,12 +84,24 @@
}
}
@@ -117,7 +147,7 @@
# foreach my $k (keys %options) {
# printf "%s = %s\n", $k, $options{$k};
-@@ -97,12 +108,8 @@
+@@ -100,12 +111,8 @@
}
sub do_connect {
@@ -133,8 +163,8 @@
1;
Index: src/alias_manager.pl
---- 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
+--- 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;
@@ -145,8 +175,8 @@
my $default_domain;
my $path_to_queue = '--MAILERPROGDIR--/queue';
Index: src/etc/script/mod2html.pl
---- 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
+--- 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";
@@ -157,8 +187,8 @@
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 07:49:34.000000000 +0000
-+++ src/etc/script/testlogs.pl 2005-11-20 13:13:59.996049654 +0000
+--- 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 @@
@@ -169,9 +199,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 2005-07-28 09:39:28.000000000 +0000
-+++ src/sympa.pl 2005-11-20 13:13:59.997390238 +0000
-@@ -167,7 +167,7 @@
+--- 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.
@@ -180,7 +210,7 @@
# setting log_level using conf unless it is set by calling option
if ($main::options{'log_level'}) {
-@@ -253,7 +253,7 @@
+@@ -256,7 +256,7 @@
my $service = 'sympa';
$service .= '(message)' if ($main::daemon_usage eq 'message');
$service .= '(command)' if ($main::daemon_usage eq 'command');
@@ -190,8 +220,8 @@
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 2005-08-10 12:30:20.000000000 +0000
-+++ src/sympa_wizard.pl 2005-11-20 13:13:59.998440988 +0000
+--- 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'},
@@ -300,9 +330,9 @@
'file' => 'sympa.conf','edit' => '1',
'advice' =>''},
Index: src/task_manager.pl
---- 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 @@
+--- 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'};
@@ -312,9 +342,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 2005-10-20 10:23:44.000000000 +0000
-+++ wwsympa/archived.pl 2005-11-20 13:14:00.000065988 +0000
-@@ -111,7 +111,7 @@
+--- 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'};
@@ -324,9 +354,9 @@
## Set the UserID & GroupID for the process
$( = $) = (getgrnam('--GROUP--'))[2];
Index: wwsympa/bounced.pl
---- 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 @@
+--- 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'};
@@ -336,9 +366,9 @@
## Set the UserID & GroupID for the process
$( = $) = (getgrnam('--GROUP--'))[2];
Index: wwsympa/wwsympa.fcgi
---- 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 @@
+--- 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'};
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sympa/sympa.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 sympa.spec
--- openpkg-src/sympa/sympa.spec 1 Mar 2006 14:09:59 -0000 1.1
+++ openpkg-src/sympa/sympa.spec 5 Jun 2006 08:00:11 -0000 1.2
@@ -32,8 +32,8 @@
Class: EVAL
Group: Mail
License: GPL
-Version: 5.1.2
-Release: 20060301
+Version: 5.2.1
+Release: 20060605
# list of sources
Source0: http://www.sympa.org/distribution/sympa-%{version}.tar.gz
@@ -130,7 +130,8 @@
--with-sendmail_aliases=%{l_prefix}/var/sympa/mta/aliases \
--with-virtual_aliases=%{l_prefix}/var/sympa/mta/virtual \
--with-newaliases=`%{l_shtool} path -p
%{l_prefix}/bin:%{l_prefix}/sbin newaliases` \
- --with-postmap=%{l_prefix}/sbin/postmap
+ --with-postmap=%{l_prefix}/sbin/postmap \
+ --enable-secure
# build program
%{l_make} %{l_mflags}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
