From af62905d06499302d92f165768168d76f9138f64 Mon Sep 17 00:00:00 2001 From: Marcin Deranek Date: Mon, 9 Mar 2020 09:36:09 +0100 Subject: Remove obsolete/outdated version --- net-mail/sympa/files/sympa-5.4.Makefile.am.patch | 63 ----------------- .../files/sympa-5.4.gentoo_default_config.patch | 47 ------------- net-mail/sympa/files/sympa-5.4.initd | 49 ------------- net-mail/sympa/files/sympa-5.4.locale.patch | 19 ----- net-mail/sympa/files/sympa-5.4.moderation.patch | 82 ---------------------- net-mail/sympa/files/sympa-6.0.fix.defaults.patch | 11 --- net-mail/sympa/files/sympa-6.0.initd | 53 -------------- net-mail/sympa/files/sympa-6.1.initd | 57 --------------- net-mail/sympa/files/sympa-6.1.perl-5.22.patch | 11 --- 9 files changed, 392 deletions(-) delete mode 100644 net-mail/sympa/files/sympa-5.4.Makefile.am.patch delete mode 100644 net-mail/sympa/files/sympa-5.4.gentoo_default_config.patch delete mode 100644 net-mail/sympa/files/sympa-5.4.initd delete mode 100644 net-mail/sympa/files/sympa-5.4.locale.patch delete mode 100644 net-mail/sympa/files/sympa-5.4.moderation.patch delete mode 100644 net-mail/sympa/files/sympa-6.0.fix.defaults.patch delete mode 100644 net-mail/sympa/files/sympa-6.0.initd delete mode 100644 net-mail/sympa/files/sympa-6.1.initd delete mode 100644 net-mail/sympa/files/sympa-6.1.perl-5.22.patch (limited to 'net-mail/sympa/files') diff --git a/net-mail/sympa/files/sympa-5.4.Makefile.am.patch b/net-mail/sympa/files/sympa-5.4.Makefile.am.patch deleted file mode 100644 index 228bc43..0000000 --- a/net-mail/sympa/files/sympa-5.4.Makefile.am.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- Makefile.am.orig 2007-09-19 20:12:15.520640736 +0200 -+++ Makefile.am 2007-09-19 20:12:49.344926922 +0200 -@@ -134,7 +134,7 @@ - - SH = @SH@ - CC = @CC@ --CFLAGS = -g -+CFLAGS = @CFLAGS@ - - # Aix4.2 (and some others unix), use gnu make ! - #MAKE = @MAKE@ -@@ -164,7 +163,7 @@ - LOG_SOCKET_TYPE = unix - #endif - --all: warning checkperl checkcpan sources wrapper soap_wrapper man locale -+all: sources wrapper soap_wrapper man locale - - rpm: build_rh_rpm build_mdk_rpm - -@@ -259,7 +258,7 @@ - $(MAKE) PERL='${PERL}' clean) || exit 1; \ - done; - --install: importantchanges installdir installsrc installwws installwebtt2 installmailtt2 installlocale installman installscript installsample installconfig installdoc installsoap nextstep -+install: installdir installsrc installwws installwebtt2 installmailtt2 installlocale installman installscript installsample installconfig installdoc installsoap nextstep - - nextstep: - @echo "" -@@ -339,7 +339,7 @@ - installwws: - @(cd wwsympa && echo "making in wwsympa..." && \ - $(MAKE) SH='${SH}' CC='${CC}' CFLAGS='${CFLAGS}' PERL='${PERL}' \ -- DIR='${DIR}' BINDIR='${BINDIR}' SBINDIR='${SBINDIR}' LIBDIR='${LIBDIR}' \ -+ DIR='${DIR}' BINDIR='${BINDIR}' SBINDIR='${SBINDIR}' LIBDIR='${LIBDIR}' SPOOLDIR='${SPOOLDIR}' \ - USER='${USER}' GROUP='${GROUP}' SUDO='${SUDO}' enable_secure='${enable_secure}' \ - CGIDIR='${CGIDIR}' WWSBINDIR='${WWSBINDIR}' MAILERPROGDIR='${MAILERPROGDIR}' \ - PIDDIR='${PIDDIR}' CONFIG='${CONFIG}' WWSCONFIG='${WWSCONFIG}' ETCBINDIR='${ETCBINDIR}' \ -@@ -406,7 +406,7 @@ - - installdir: - @echo "Creating required directories" -- @for dir in $(DIR) $(EXPL_DIR) $(CONFDIR) $(SAMPLEDIR) $(ETCDIR) $(BINDIR) $(LOCALEDIR) $(DOCDIR) $(DIR)/static_content $(DIR)/static_content/icons ; do \ -+ @for dir in $(DIR) $(EXPL_DIR) $(CONFDIR) $(SAMPLEDIR) $(ETCDIR) $(BINDIR) $(LOCALEDIR) $(DOCDIR) $(SPOOLDIR)/static_content $(SPOOLDIR)/static_content/icons ; do \ - if [ ! -d $(DESTDIR)$$dir ] ; then \ - echo "Creating $(DESTDIR)$$dir"; \ - mkdir -p $(DESTDIR)$$dir; \ -@@ -473,14 +472,7 @@ - INITCONF='1'; \ - fi \ - fi \ -- done; \ -- if [ "$$INITCONF" ] ; then \ -- echo "###############################################"; \ -- echo "It seems to be your first installation of Sympa"; \ -- echo "The following wizard will help you create your $(CONFDIR)/sympa.conf and $(CONFDIR)/wwsympa.conf :"; \ -- DESTDIR=$(DESTDIR); export DESTDIR; \ -- $(PERL) -I $(DESTDIR)$(LIBDIR) $(DESTDIR)$(SBINDIR)/sympa_wizard.pl; \ -- fi -+ done; - - build_rh_rpm: clean - @echo "Building RedHat RPM in $(RPMTOPDIR) ..." diff --git a/net-mail/sympa/files/sympa-5.4.gentoo_default_config.patch b/net-mail/sympa/files/sympa-5.4.gentoo_default_config.patch deleted file mode 100644 index abce32f..0000000 --- a/net-mail/sympa/files/sympa-5.4.gentoo_default_config.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- src/sympa_wizard.pl.orig 2007-03-04 11:41:19.000000000 +0100 -+++ src/sympa_wizard.pl 2007-09-16 19:24:00.377085123 +0200 -@@ -92,13 +92,13 @@ - 'advice' =>''}, - - {'name' => 'arc_path', -- 'default' => '--DIR--/arc', -+ 'default' => '--SPOOLDIR--/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' => '--SPOOLDIR--/bounce', - 'query' => 'Where to store bounces', - 'file' => 'wwsympa.conf', - 'advice' =>'Better if not in a critical partition'}, -@@ -122,13 +122,13 @@ - 'advice' =>''}, - - {'name' => 'queuebounce', -- 'default' => '--SPOOLDIR--/bounce', -+ 'default' => '--SPOOLDIR--/qbounce', - 'query' => 'Bounce incoming spool', - 'file' => 'sympa.conf', - 'advice' =>''}, - - {'name' => 'static_content_path', -- 'default' => '--DIR--/static_content', -+ 'default' => '--SPOOLDIR--/static_content', - 'query' => 'The directory where Sympa stores static contents (CSS, members pictures, documentation) directly delivered by Apache', - 'file' => 'sympa.conf', - 'advice' =>''}, ---- wwsympa/Makefile.orig 2008-01-30 18:10:56.000000000 +0100 -+++ wwsympa/Makefile 2008-04-02 09:26:53.222445659 +0200 -@@ -100,8 +100,8 @@ - - installicons: - @echo "Installing icons..." -- @echo $(DESTDIR)$(DIR)/static_content/icons -- cp icons/*.png $(DESTDIR)$(DIR)/static_content/icons -+ @echo $(DESTDIR)$(SPOOLDIR)/static_content/icons -+ cp icons/*.png $(DESTDIR)$(SPOOLDIR)/static_content/icons - - installwrapper: - @echo "Installing wwsympa-wrapper binary..." diff --git a/net-mail/sympa/files/sympa-5.4.initd b/net-mail/sympa/files/sympa-5.4.initd deleted file mode 100644 index 86ada21..0000000 --- a/net-mail/sympa/files/sympa-5.4.initd +++ /dev/null @@ -1,49 +0,0 @@ -#!/sbin/openrc-run - -opts="depend start stop" -sympaconf="/etc/sympa/sympa.conf" -wwsympaconf="/etc/sympa/wwsympa.conf" -sympadir="/usr" -depend() { - use logger mysql postgres ldap - before apache apache2 lighttpd -} - -sympa_start() { - ebegin "Starting Sympa module $1.pl: " - local MY_PID="/var/run/sympa/$1.pid" - start-stop-daemon --start --quiet --pidfile ${MY_PID} --exec $sympadir/sbin/$1.pl - eend $? -} - -sympa_stop() { - ebegin "Stopping Sympa module $1.pl: " - local MY_PID="/var/run/sympa/$1.pid" - start-stop-daemon --stop --quiet --pidfile ${MY_PID} - eend $? -} - -start() { - #Check config files - if [ ! -f $sympaconf ]; then - eerror "Missing Sympa config!" - return 1 - fi - if [ ! -f $wwsympaconf ]; then - eerror "Missing WWSympa config!" - return 1 - fi - echo "Starting Sympa subsystems: " - sympa_start sympa - sympa_start bounced - sympa_start archived - sympa_start task_manager -} - -stop(){ - echo "Stopping Sympa subsystems: " - sympa_stop bounced - sympa_stop archived - sympa_stop sympa - sympa_stop task_manager -} diff --git a/net-mail/sympa/files/sympa-5.4.locale.patch b/net-mail/sympa/files/sympa-5.4.locale.patch deleted file mode 100644 index d47ef07..0000000 --- a/net-mail/sympa/files/sympa-5.4.locale.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- src/sympa.pl.orig 2008-04-25 11:14:22.778440706 +0200 -+++ src/sympa.pl 2008-04-25 11:15:04.042853056 +0200 -@@ -203,6 +203,7 @@ - ## Set locale configuration - $main::options{'lang'} =~ s/\.cat$//; ## Compatibility with version < 2.3.3 - $Language::default_lang = $main::options{'lang'} || $Conf{'lang'}; -+&Language::SetLang($Language::default_lang); - - ## Main program - if (!chdir($Conf{'home'})) { -@@ -827,8 +828,6 @@ - ## them, sleeps a while and continues the good job. - while (!$signal) { - -- &Language::SetLang($Language::default_lang); -- - &List::init_list_cache(); - - if (!opendir(DIR, $spool)) { diff --git a/net-mail/sympa/files/sympa-5.4.moderation.patch b/net-mail/sympa/files/sympa-5.4.moderation.patch deleted file mode 100644 index 8af00ea..0000000 --- a/net-mail/sympa/files/sympa-5.4.moderation.patch +++ /dev/null @@ -1,82 +0,0 @@ ---- src/Commands.pm.orig 2008-05-02 10:31:47.000000000 +0200 -+++ src/Commands.pm 2008-10-08 21:45:39.270266973 +0200 -@@ -2027,11 +2027,12 @@ - my $modqueue = &Conf::get_robot_conf($robot,'queuemod') ; - - my $name = $list->{'name'}; -- my $file; -+ my $file, $dir; - - ## For compatibility concerns - foreach my $list_id ($list->get_list_id(),$list->{'name'}) { - $file = $modqueue.'/'.$list_id.'_'.$key; -+ $dir = $modqueue.'/.'.$list_id.'_'.$key; - last if (-f $file); - } - -@@ -2040,6 +2041,7 @@ - ## For compatibility concerns - foreach my $list_id ($list->get_list_id(),$list->{'name'}) { - $file = $modqueue.'/'.$list_id.'_'.$key.'.distribute'; -+ $dir = $modqueue.'/.'.$list_id.'_'.$key; - last if (-f $file); - } - } -@@ -2102,6 +2104,7 @@ - &do_log('info', 'Message for %s from %s moved in spool %s for distribution message-id=%s', $name, $sender, $Conf{'queuedistribute'},$hdr->get('Message-Id')); - } - unlink($file); -+ &tools::remove_dir($dir); - - return 1; - } -@@ -2318,11 +2321,12 @@ - &Language::SetLang($list->{'admin'}{'lang'}); - - my $name = "$list->{'name'}"; -- my $file; -+ my $file, $dir; - - ## For compatibility concerns - foreach my $list_id ($list->get_list_id(),$list->{'name'}) { - $file = $modqueue.'/'.$list_id.'_'.$key; -+ $dir = $modqueue.'/.'.$list_id.'_'.$key; - last if (-f $file); - } - -@@ -2386,6 +2390,7 @@ - close(IN); - &do_log('info', 'REJECT %s %s from %s accepted (%d seconds)', $name, $sender, $key, time-$time_command); - unlink($file); -+ &tools::remove_dir($dir); - - return 1; - } ---- wwsympa/wwsympa.fcgi.orig 2008-04-11 11:42:53.000000000 +0200 -+++ wwsympa/wwsympa.fcgi 2008-10-08 23:11:45.242256683 +0200 -@@ -6144,7 +6144,7 @@ - $in{'id'} =~ s/\0/,/g; - - &wwslog('info', 'do_reject(%s)', $in{'id'}); -- my ($msg, $file); -+ my ($msg, $file, $dir); - - unless ($param->{'list'}) { - &report::reject_report_web('user','missing_arg',{'argument' => 'list'},$param->{'action'}); -@@ -6188,6 +6188,7 @@ - ## For compatibility concerns - foreach my $list_id ($list->get_list_id(),$list->{'name'}) { - $file = $Conf{'queuemod'}.'/'.$list_id.'_'.$id; -+ $dir = $Conf{'queuemod'}.'/.'.$list_id.'_'.$id; - last if (-f $file); - } - -@@ -6234,7 +6235,7 @@ - } - close(IN); - -- unless (unlink($file)) { -+ unless (unlink($file) && &tools::remove_dir($dir)) { - &report::reject_report_web('intern','erase_file',{'file' => $file},$param->{'action'},$list,$param->{'user'}{'email'},$robot); - &wwslog('err','do_reject: failed to erase %s', $file); - &web_db_log({'parameters' => $in{'id'}, diff --git a/net-mail/sympa/files/sympa-6.0.fix.defaults.patch b/net-mail/sympa/files/sympa-6.0.fix.defaults.patch deleted file mode 100644 index 55ea608..0000000 --- a/net-mail/sympa/files/sympa-6.0.fix.defaults.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/lib/confdef.pm.orig 2009-07-27 19:58:23.043761210 +0200 -+++ src/lib/confdef.pm 2009-07-27 20:05:05.871259383 +0200 -@@ -133,7 +133,7 @@ - }, - { - name => 'queuebounce', -- default => Sympa::Constants::SPOOLDIR . '/bounce', -+ default => Sympa::Constants::SPOOLDIR . '/qbounce', - query => 'Bounce incoming spool', - file => 'sympa.conf', - }, diff --git a/net-mail/sympa/files/sympa-6.0.initd b/net-mail/sympa/files/sympa-6.0.initd deleted file mode 100644 index 691ce10..0000000 --- a/net-mail/sympa/files/sympa-6.0.initd +++ /dev/null @@ -1,53 +0,0 @@ -#!/sbin/openrc-run - -opts="depend start stop" -sympaconf="/etc/sympa/sympa.conf" -wwsympaconf="/etc/sympa/wwsympa.conf" -sympadir="/usr" -depend() { - use logger mysql postgres ldap - before apache apache2 lighttpd -} - -sympa_start() { - ebegin "Starting Sympa module $1.pl: " - start-stop-daemon --start --quiet --pidfile /var/run/sympa/$1.pid --exec ${sympadir}/sbin/$1.pl - eend $? -} - -sympa_stop() { - if [ -f "/var/run/sympa/$1.pid" ]; then - ebegin "Stopping Sympa module $1.pl: " - start-stop-daemon --stop --quiet --pidfile /var/run/sympa/$1.pid - eend $? - fi -} - -start() { - #Check config files - if [ ! -f ${sympaconf} ]; then - eerror "Missing Sympa config!" - return 1 - fi - if [ ! -f ${wwsympaconf} ]; then - eerror "Missing WWSympa config!" - return 1 - fi - echo "Starting Sympa subsystems: " - sympa_start sympa - sympa_start bulk - sympa_start archived - sympa_start bounced - sympa_start task_manager -} - -stop(){ - echo "Stopping Sympa subsystems: " - sympa_stop bounced - sympa_stop archived - sympa_stop bulk - sympa_stop sympa - sympa_stop task_manager - sympa_stop sympa-distribute - sympa_stop sympa-creation -} diff --git a/net-mail/sympa/files/sympa-6.1.initd b/net-mail/sympa/files/sympa-6.1.initd deleted file mode 100644 index b54fc17..0000000 --- a/net-mail/sympa/files/sympa-6.1.initd +++ /dev/null @@ -1,57 +0,0 @@ -#!/sbin/openrc-run - -sympaconf="/etc/sympa/sympa.conf" -wwsympaconf="/etc/sympa/wwsympa.conf" -data_structure="/etc/sympa/data_structure.version" -sympadir="/usr" -rundir="/var/run/sympa" - -depend() { - use logger mysql postgres ldap - before apache apache2 lighttpd -} - -sympa_start() { - ebegin "Starting Sympa module $1.pl: " - start-stop-daemon --start --quiet --pidfile "${rundir}"/$1.pid --exec ${sympadir}/sbin/$1.pl - eend $? -} - -sympa_stop() { - if [ -f "${rundir}"/$1.pid ]; then - ebegin "Stopping Sympa module $1.pl: " - start-stop-daemon --stop --retry 30 --quiet --pidfile "${rundir}"/$1.pid - eend $? - fi -} - -start() { - if [ ! -f "${data_structure}" ]; then - eerror "Please run 'sympa.pl --upgrade' first" - return 1 - fi - # Check config files - if [ ! -f "${sympaconf}" ]; then - eerror "Missing Sympa config (${sympaconf})" - return 2 - fi - if [ ! -f "${wwsympaconf}" ]; then - eerror "Missing WWSympa config (${wwsympaconf})" - return 3 - fi - echo "Starting Sympa subsystems: " - sympa_start sympa - sympa_start bulk - sympa_start archived - sympa_start bounced - sympa_start task_manager -} - -stop(){ - echo "Stopping Sympa subsystems: " - sympa_stop task_manager - sympa_stop bounced - sympa_stop archived - sympa_stop bulk - sympa_stop sympa -} diff --git a/net-mail/sympa/files/sympa-6.1.perl-5.22.patch b/net-mail/sympa/files/sympa-6.1.perl-5.22.patch deleted file mode 100644 index d36dd5b..0000000 --- a/net-mail/sympa/files/sympa-6.1.perl-5.22.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- wwsympa/SympaSession.pm.old 2016-12-04 10:49:21.983433301 +0100 -+++ wwsympa/SympaSession.pm 2016-12-04 10:49:46.718916357 +0100 -@@ -123,7 +123,7 @@ - } - - ## Load existing session. -- if ($cookie and $cookie =~ /^\d{,16}$/) { -+ if ($cookie and $cookie =~ /^\d{1,16}$/) { - ## Compatibility: session by older releases of Sympa. - $id_session = $cookie; - $is_old_session = 1; -- cgit v1.2.3