7 files changed, 96 insertions, 19 deletions

diff --git a/mail/sympa/files/patch-Makefile.in b/mail/sympa/files/patch-Makefile.in
new file mode 100644
index 000000000000..bae9e3a71b53
--- /dev/null
+++ b/mail/sympa/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in	Sat Oct 23 16:49:11 2004
++++ Makefile.in	Sat Oct 23 16:49:22 2004
+@@ -644,7 +644,7 @@
+ 	fi \
+ 	fi \
+ 	done; \
+-	if [ "$$INITCONF" ] ; then \
++	#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 :"; \
diff --git a/mail/sympa/files/patch-src-etc-script-Makefile b/mail/sympa/files/patch-src-etc-script-Makefile
new file mode 100644
index 000000000000..de885034b7df
--- /dev/null
+++ b/mail/sympa/files/patch-src-etc-script-Makefile
@@ -0,0 +1,11 @@
+--- src/etc/script/Makefile.orig	Sat Oct 23 16:44:11 2004
++++ src/etc/script/Makefile	Sat Oct 23 16:44:13 2004
+@@ -23,7 +23,7 @@
+ 
+ SUBSTSRC	=	load_subscribers.pl arc2webarc.pl testldap.pl p12topem.pl init_comment.pl crypt_passwd.pl testlogs.pl mod2html.pl
+ 
+-INITSRC		=	sympa
++INITSRC		=	sympa.sh
+ 
+ #SCRIPTDIR	=	../../../script
+ SCRIPTDIR	=	$(SBINDIR)
diff --git a/mail/sympa/files/patch-src-etc-script-sympa b/mail/sympa/files/patch-src-etc-script-sympa
index 03737312d103..0191f4fa831c 100644
--- a/mail/sympa/files/patch-src-etc-script-sympa
+++ b/mail/sympa/files/patch-src-etc-script-sympa
@@ -29,26 +29,27 @@
                   if [ "$running" != "" ]; then
                       echo "$1 (pid $pid) is active..."
                       return 0
-@@ -88,8 +94,8 @@
+@@ -88,7 +94,7 @@
  #		startparam=""
  #	fi
   
 -	if [ ${OSTYPE} = "IRIX" -o ${OSTYPE} = "SunOS" ]; then
--		$sympadir/$1.pl $startparam && echo "success" || echo "failure"
-+	if [ ${OSTYPE} = "IRIX" -o ${OSTYPE} = "FreeBSD" ]; then
-+		su -m sympa -c "$sympadir/$1.pl $startparam" && echo "success" || echo "failure"
++	if [ ${OSTYPE} = "IRIX" -o ${OSTYPE} = "SunOS" -o ${OSTYPE} = "FreeBSD" ]; then
+ 		$sympadir/$1.pl $startparam && echo "success" || echo "failure"
  	else
  		$sympadir/$1.pl $startparam && success || failure
- 	fi
-@@ -144,7 +150,7 @@
+@@ -144,9 +150,9 @@
  	if [ -f --PIDDIR--/$1.pid ]; then
  		echo $echo_opt "Stopping module $1.pl: "
  		pid=`head -1 --PIDDIR--/$1.pid`
 -		running=`ps -A | grep "$pid"`
 +		running=`ps -ax | grep perl | grep "$pid"`
  		if [ "$running" != "" ]; then
- 		    if [ ${OSTYPE} = "IRIX" ]; then
+-		    if [ ${OSTYPE} = "IRIX" ]; then
++		    if [ ${OSTYPE} = "IRIX" -o ${OSTYPE} = "FreeBSD" ]; then
  			kill -TERM $pid && echo "success" || echo "failure"
+ 		    elif [ ${OSTYPE} = "SunOS" ]; then
+ 			echo "Stopping module $1.pl: terminated"
 @@ -180,13 +186,13 @@
  # See how we were called.
  case "$1" in
diff --git a/mail/sympa/files/patch-src-sympa_wizard.pl b/mail/sympa/files/patch-src-sympa_wizard.pl
new file mode 100644
index 000000000000..0e10cae3bc16
--- /dev/null
+++ b/mail/sympa/files/patch-src-sympa_wizard.pl
@@ -0,0 +1,19 @@
+--- src/sympa_wizard.pl	Sat Oct 23 19:50:48 2004
++++ src/sympa_wizard.pl	Sat Oct 23 19:53:21 2004
+@@ -308,14 +308,14 @@
+ 	       'advice' =>''},
+ 
+               {'name' => 'mhonarc',
+-	       'default' => '/usr/bin/mhonarc',
++	       'default' => '/usr/local/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' => '/usr/bin/openssl',
+ 	       'query' => 'Path to OpenSSL',
+ 	       'file' => 'sympa.conf','edit' => '1',
+ 	       'advice' =>'Sympa knowns S/MIME if openssl is installed'},
diff --git a/mail/sympa/files/patch-wwsympa-Makefile b/mail/sympa/files/patch-wwsympa-Makefile
new file mode 100644
index 000000000000..6a0c27ce63d6
--- /dev/null
+++ b/mail/sympa/files/patch-wwsympa-Makefile
@@ -0,0 +1,24 @@
+--- wwsympa/Makefile	Sat Oct 23 20:37:35 2004
++++ wwsympa/Makefile	Sat Oct 23 20:39:51 2004
+@@ -21,7 +21,7 @@
+ 
+ sbin_SUBST	=	bounced.pl archived.pl
+ 
+-cgi_SUBST	=	wwsympa.fcgi
++cgi_SUBST	=	wwsympa.fcgi wwsympa-wrapper
+ 
+ lib_SUBST	=	wwslib.pm cookielib.pm bounce-lib.pl Marc.pm Auth.pm
+ 
+@@ -50,9 +50,9 @@
+ 	chown $(USER) $(DESTDIR)$(CGIDIR)/$$i; \
+ 	chgrp $(GROUP) $(DESTDIR)$(CGIDIR)/$$i; \
+ 	done
+-	@echo "Setting SetUID bit on wwsympa.fcgi..."
+-	chmod u+s $(DESTDIR)$(CGIDIR)/wwsympa.fcgi
+-	chmod g+s $(DESTDIR)$(CGIDIR)/wwsympa.fcgi
++	@echo "Setting SetUID bit on wwsympa-wrapper..."
++	chmod u+s $(DESTDIR)$(CGIDIR)/wwsympa-wrapper
++	chmod g+s $(DESTDIR)$(CGIDIR)/wwsympa-wrapper
+ 	chmod 755 $(DESTDIR)$(ETCBINDIR)/wws_templates
+ 	chmod 755 $(DESTDIR)$(ICONSDIR)
+ 	chmod 755 $(DESTDIR)$(LIBDIR)/Marc
diff --git a/mail/sympa/files/patch-wwsympa-wwsympa-wrapper.c b/mail/sympa/files/patch-wwsympa-wwsympa-wrapper.c
new file mode 100644
index 000000000000..718cc8334aca
--- /dev/null
+++ b/mail/sympa/files/patch-wwsympa-wwsympa-wrapper.c
@@ -0,0 +1,11 @@
+--- wwsympa/wwsympa-wrapper.c	Sat Oct 23 20:42:47 2004
++++ wwsympa/wwsympa-wrapper.c	Sat Oct 23 20:42:30 2004
+@@ -0,0 +1,8 @@
++#include <unistd.h>
++
++#define WWSYMPA "/usr/local/sympa/bin/wwsympa.fcgi"
++
++int main(int argn, char **argv, char **envp) {
++    argv[0] = WWSYMPA;
++    execve(WWSYMPA,argv,envp);
++}
diff --git a/mail/sympa/files/patch-wwsympa-wwsympa.fcgi b/mail/sympa/files/patch-wwsympa-wwsympa.fcgi
index 402cd50160cd..3d31d371998e 100644
--- a/mail/sympa/files/patch-wwsympa-wwsympa.fcgi
+++ b/mail/sympa/files/patch-wwsympa-wwsympa.fcgi
@@ -1,19 +1,19 @@
---- wwsympa/wwsympa.fcgi	2003/11/28 18:16:39
-+++ wwsympa/wwsympa.fcgi	2003/12/28 18:16:39
-@@ -3523,10 +3523,10 @@
- 	 close MSG;
+--- wwsympa/wwsympa.fcgi	Mon Jun 21 15:04:16 2004
++++ wwsympa/wwsympa.fcgi	Sat Oct 23 16:15:08 2004
+@@ -3557,10 +3557,10 @@
+ 
  
  	 $param->{'spool'}{$id}{'size'} = int( (-s "$Conf{'queuemod'}/$msg") / 1024 + 0.5);
--	 $param->{'spool'}{$id}{'subject'} =  &MIME::Words::decode_mimewords($mail->head->get('Subject'));
-+	 $param->{'spool'}{$id}{'subject'} =  &tools::decode_mimewords($mail->head->get('Subject'));
+-	 $param->{'spool'}{$id}{'subject'} =  &MIME::Words::decode_mimewords($mail->{'msg'}->head->get('Subject'));
++	 $param->{'spool'}{$id}{'subject'} =  &tools::decode_mimewords($mail->{'msg'}->head->get('Subject'));
  	 $param->{'spool'}{$id}{'subject'} ||= 'no_subject';
- 	 $param->{'spool'}{$id}{'date'} = $mail->head->get('Date');
--	 $param->{'spool'}{$id}{'from'} = &MIME::Words::decode_mimewords($mail->head->get('From'));
-+	 $param->{'spool'}{$id}{'from'} = &tools::decode_mimewords($mail->head->get('From'));
+ 	 $param->{'spool'}{$id}{'date'} = $mail->{'msg'}->head->get('Date');
+-	 $param->{'spool'}{$id}{'from'} = &MIME::Words::decode_mimewords($mail->{'msg'}->head->get('From'));
++	 $param->{'spool'}{$id}{'from'} = &tools::decode_mimewords($mail->{'msg'}->head->get('From'));
  	 foreach my $field ('subject','date','from') {
  	     $param->{'spool'}{$id}{$field} =~ s/</&lt;/;
  	     $param->{'spool'}{$id}{$field} =~ s/>/&gt;/;
-@@ -3595,7 +3595,7 @@
+@@ -3629,7 +3629,7 @@
  	     unless  ($#sender_hdr == -1) {
  		 my $rejected_sender = $sender_hdr[0]->address;
  		 my %context;
@@ -22,7 +22,7 @@
  		 $context{'rejected_by'} = $param->{'user'}{'email'};
  		 $list->send_file('reject', $rejected_sender, $robot, \%context);
  	     }
-@@ -4352,7 +4352,7 @@
+@@ -4381,7 +4381,7 @@
  
       ## Decode subject header fields
       foreach my $m (@{$param->{'res'}}) {
@@ -31,7 +31,7 @@
       }
  
       return 1;
-@@ -9020,7 +9020,7 @@
+@@ -9135,7 +9135,7 @@
       ($param->{'local_to'},$param->{'domain_to'}) = split ('@',$param->{'to'});
  
       $param->{'mailto'}= &mailto($list,$param->{'to'});