- Update to 6.0.5.

- Pass maintainership to submitter.

PR:		ports/148923
Submitted by:	Chris Rees <utisoft@gmail.com>

16 files changed, 175 insertions, 350 deletions

diff --git a/mail/sympa/files/patch-Makefile.in b/mail/sympa/files/patch-Makefile.in
deleted file mode 100644
index ac6008b65340..000000000000
--- a/mail/sympa/files/patch-Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile.in.orig	Mon Jun 21 14:33:16 2004
-+++ Makefile.in	Mon Feb 28 09:53:50 2005
-@@ -561,7 +561,7 @@
- 	( \
- 		cd doc/man8 ; \
- 		PERL=$(PERL); export PERL; \
--		UMASK=0600; export UMASK; \
-+		UMASK=0444; export UMASK; \
- 		DIR=$(DIR); export DIR; \
- 		INSTALLDIR=$(MANDIR)/man8; export INSTALLDIR; \
- 		DESTDIR=$(DESTDIR); export DESTDIR; \
-@@ -575,8 +575,6 @@
- 		PIDDIR=$(PIDDIR); export PIDDIR; \
- 		$(PERL) ../../subst.pl $$manfile \
- 	) ;\
--	chown $(USER) $(DESTDIR)$(MANDIR)/man8/$$manfile; \
--	chgrp $(GROUP) $(DESTDIR)$(MANDIR)/man8/$$manfile; \
- 	done
- 
- installscript:
-@@ -644,7 +642,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-check_perl_modules.pl b/mail/sympa/files/patch-check_perl_modules.pl
deleted file mode 100644
index eeb460c248e4..000000000000
--- a/mail/sympa/files/patch-check_perl_modules.pl
+++ /dev/null
@@ -1,19 +0,0 @@
---- check_perl_modules.pl	2003/11/28 18:16:39
-+++ check_perl_modules.pl	2004/05/04 21:05:38
-@@ -158,6 +158,8 @@
- sub install_module {
-     my ($module, $default) = @_;
- 
-+    return if $ENV{'PERL_EXTUTILS_AUTOINSTALL'} =~ /--skip|--default/;
-+
-     unless ($ENV{'FTP_PASSIVE'} eq 1) {
- 	$ENV{'FTP_PASSIVE'} = 1;
- 	print "Setting FTP Passive mode\n";
-@@ -178,7 +180,7 @@
-     print "Install module $module ? [$default]";
-     my $answer = <STDIN>; chomp $answer;
-     $answer ||= $default;
--    next unless ($answer =~ /^y$/i);
-+    return unless ($answer =~ /^y$/i);
-   CPAN::Shell->conf('inactivity_timeout', 4);
-     CPAN::Shell->install($module);
diff --git a/mail/sympa/files/patch-config.sub b/mail/sympa/files/patch-config.sub
deleted file mode 100644
index 8347d6dbd8b9..000000000000
--- a/mail/sympa/files/patch-config.sub
+++ /dev/null
@@ -1,11 +0,0 @@
---- config.sub.orig	Tue Sep 13 20:35:06 2005
-+++ config.sub	Tue Sep 13 20:32:55 2005
-@@ -224,7 +224,7 @@ case $basic_machine in
- 	      | f301-* | armv*-* | s390-* | sv1-* | t3e-* \
- 	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
- 	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
--	      | bs2000-*)
-+	      | bs2000-* | amd64-*)
- 		;;
- 	# Recognize the various machine names and aliases which stand
- 	# for a CPU type and a company and sometimes even an OS.
diff --git a/mail/sympa/files/patch-doc-sample-Makefile.am b/mail/sympa/files/patch-doc-sample-Makefile.am
new file mode 100644
index 000000000000..a1fdc986a1bb
--- /dev/null
+++ b/mail/sympa/files/patch-doc-sample-Makefile.am
@@ -0,0 +1,11 @@
+--- doc/sample/Makefile.am	2009-07-28 12:13:00.000000000 +0000
++++ doc/sample/Makefile.am-bkp	2010-07-29 07:04:25.000000000 +0000
+@@ -19,7 +19,7 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ 
+-sampledir = $(docdir)/sample
++sampledir = /usr/local/share/examples/sympa
+ nobase_sample_DATA = README \
+ 		     trusted_applications.conf robot.conf employees.ldap \
+ 		     test/config test/info test/message.footer test/web_tt2/welcome.tt2
diff --git a/mail/sympa/files/patch-doc-sample-Makefile.in b/mail/sympa/files/patch-doc-sample-Makefile.in
new file mode 100644
index 000000000000..72f6c277bdef
--- /dev/null
+++ b/mail/sympa/files/patch-doc-sample-Makefile.in
@@ -0,0 +1,90 @@
+--- doc/sample/Makefile.in	2010-07-06 14:12:30.000000000 +0000
++++ doc/sample/Makefile.in-bkp	2010-07-29 01:00:41.000000000 +0000
+@@ -71,7 +71,7 @@
+     *) f=$$p;; \
+   esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(sampledir)"
++am__installdirs = "$(sampledir)"
+ nobase_sampleDATA_INSTALL = $(install_sh_DATA)
+ DATA = $(nobase_sample_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -177,7 +177,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ webtemplatedir = @webtemplatedir@
+-sampledir = $(docdir)/sample
++sampledir = /usr/local/share/examples/sympa
+ nobase_sample_DATA = README \
+ 		     trusted_applications.conf robot.conf employees.ldap \
+ 		     test/config test/info test/message.footer test/web_tt2/welcome.tt2
+@@ -218,13 +218,13 @@
+ uninstall-info-am:
+ install-nobase_sampleDATA: $(nobase_sample_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(sampledir)" || $(mkdir_p) "$(DESTDIR)$(sampledir)"
++	test -z "$(sampledir)" || $(mkdir_p) "$(sampledir)"
+ 	@$(am__vpath_adj_setup) \
+ 	list='$(nobase_sample_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  $(am__vpath_adj) \
+-	  echo " $(nobase_sampleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sampledir)/$$f'"; \
+-	  $(nobase_sampleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sampledir)/$$f"; \
++	  echo " $(nobase_sampleDATA_INSTALL) '$$d$$p' '$(sampledir)/$$f'"; \
++	  $(nobase_sampleDATA_INSTALL) "$$d$$p" "$(sampledir)/$$f"; \
+ 	done
+ 
+ uninstall-nobase_sampleDATA:
+@@ -232,8 +232,8 @@
+ 	@$(am__vpath_adj_setup) \
+ 	list='$(nobase_sample_DATA)'; for p in $$list; do \
+ 	  $(am__vpath_adj) \
+-	  echo " rm -f '$(DESTDIR)$(sampledir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(sampledir)/$$f"; \
++	  echo " rm -f '$(sampledir)/$$f'"; \
++	  rm -f "$(sampledir)/$$f"; \
+ 	done
+ tags: TAGS
+ TAGS:
+@@ -243,7 +243,7 @@
+ 
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/test $(distdir)/test/web_tt2
++	$(mkdir_p) /$(sampledir)/test $(sampledir)/test/web_tt2
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -255,18 +255,18 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(sampledir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+ 	  if test -d $$d/$$file; then \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++	      cp -pR $(srcdir)/$$file $(sampledir)$$dir || exit 1; \
+ 	    fi; \
+-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
++	    cp -pR $$d/$$file $(sampledir)$$dir || exit 1; \
+ 	  else \
+-	    test -f $(distdir)/$$file \
+-	    || cp -p $$d/$$file $(distdir)/$$file \
++	    test -f $(sampledir)/$$file \
++	    || cp -p $$d/$$file $(sampledir)/$$file \
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+@@ -274,7 +274,7 @@
+ check: check-am
+ all-am: Makefile $(DATA)
+ installdirs:
+-	for dir in "$(DESTDIR)$(sampledir)"; do \
++	for dir in "$(sampledir)"; do \
+ 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ 	done
+ install: install-am
diff --git a/mail/sympa/files/patch-soap-sympa_soap_server.fcgi b/mail/sympa/files/patch-soap-sympa_soap_server.fcgi
deleted file mode 100644
index 54495c70b022..000000000000
--- a/mail/sympa/files/patch-soap-sympa_soap_server.fcgi
+++ /dev/null
@@ -1,11 +0,0 @@
---- soap/sympa_soap_server.fcgi	2003/11/28 18:16:39
-+++ soap/sympa_soap_server.fcgi	2004/05/04 21:05:38
-@@ -78,7 +78,7 @@
- my $server = SOAP::Transport::HTTP::FCGI::Sympa->new(); 
- 
- #$server->dispatch_with({'urn:Sympa' => 'sympasoap'});
--$server->dispatch_to('/home/sympa/bin','sympasoap');
-+$server->dispatch_to('--LIBDIR--','sympasoap');
- 
- $server->handle($birthday);
- 
diff --git a/mail/sympa/files/patch-src-bouncequeue.c b/mail/sympa/files/patch-src-bouncequeue.c
deleted file mode 100644
index 1dbbb67c397b..000000000000
--- a/mail/sympa/files/patch-src-bouncequeue.c
+++ /dev/null
@@ -1,35 +0,0 @@
-===================================================================
-RCS file: /var/www/SourceSup/cvs/sympa/sympa/src/bouncequeue.c,v
-retrieving revision 1.4
-retrieving revision 1.4.2.1
-diff -u -r1.4 -r1.4.2.1
---- src/bouncequeue.c	2003/10/07 12:04:47	1.4
-+++ src/bouncequeue.c	2005/01/27 08:54:02	1.4.2.1
-@@ -1,5 +1,5 @@
- /* boucequeue.c - This program does the non-delivery deports spooling
--  RCS Identication ; $Revision: 1.4 $ ; $Date: 2003/10/07 12:04:47 $ 
-+  RCS Identication ; $Revision: 1.4.2.1 $ ; $Date: 2005/01/27 08:54:02 $ 
- 
-   Sympa - SYsteme de Multi-Postage Automatique
-   Copyright (c) 1997, 1998, 1999, 2000, 2001 Comite Reseau des Universites
-@@ -30,6 +30,11 @@
- static char     buf[16384];
- static int      i, fd;
- 
-+/* For HP-UX */
-+#ifndef EX_CONFIG
-+# define EX_CONFIG 78
-+#endif
-+
- #ifndef CONFIG
- # define CONFIG		"/etc/sympa.conf"
- #endif
-@@ -97,7 +102,7 @@
-       exit(EX_NOPERM);
-    }
-    umask(027);
--   sprintf(qfile, "T.%s.%ld.%d", listname, time(NULL), getpid());
-+   snprintf(qfile, sizeof(qfile), "T.%s.%ld.%d", listname, time(NULL), getpid());
-    fd = open(qfile, O_CREAT|O_WRONLY, 0600);
-    if (fd == -1)
-       exit(EX_TEMPFAIL);
diff --git a/mail/sympa/files/patch-src-etc-script-Makefile b/mail/sympa/files/patch-src-etc-script-Makefile
deleted file mode 100644
index de885034b7df..000000000000
--- a/mail/sympa/files/patch-src-etc-script-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-orphan_killer.pl b/mail/sympa/files/patch-src-etc-script-orphan_killer.pl
deleted file mode 100644
index 5d119f1a5d44..000000000000
--- a/mail/sympa/files/patch-src-etc-script-orphan_killer.pl
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/etc/script/orphan_killer.pl	2003/11/28 18:16:39
-+++ src/etc/script/orphan_killer.pl	2004/05/04 21:05:38
-@@ -24,7 +24,7 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- 
--use lib '/home/sympa/bin';
-+use lib '--LIBDIR--';
- 
- use Conf;
- ## Change to your wwsympa.conf location
diff --git a/mail/sympa/files/patch-src-etc-script-sympa b/mail/sympa/files/patch-src-etc-script-sympa
deleted file mode 100644
index 0191f4fa831c..000000000000
--- a/mail/sympa/files/patch-src-etc-script-sympa
+++ /dev/null
@@ -1,85 +0,0 @@
---- src/etc/script/sympa	2003/11/28 18:16:39
-+++ src/etc/script/sympa	2004/05/04 21:05:38
-@@ -35,6 +35,8 @@
- sympaconf="--CONFIG--"
- wwsympaconf="--WWSCONFIG--"
- 
-+lockdir="--LOCKDIR--"
-+
- ##'echo -n' not supported with SH on Solaris
- if [ ${OSTYPE} = "SunOS" ]; then
-   echo_opt=""
-@@ -42,6 +44,10 @@
-   echo_opt="-n"
- fi
- 
-+if [ ${OSTYPE} = "FreeBSD" ]; then
-+  lockdir="/var/spool/lock"
-+fi
-+
- # End of parameters
- 
- # Current state of the module
-@@ -60,7 +66,7 @@
-        if [ -f --PIDDIR--/$1.pid ] ; then
-              pid=`head -1 --PIDDIR--/$1.pid`
-              if [ "$pid" != "" ] ; then
--                 running=`ps -A | grep "$pid"`
-+                 running=`ps -ax | grep perl | grep $pid`
-                  if [ "$running" != "" ]; then
-                      echo "$1 (pid $pid) is active..."
-                      return 0
-@@ -88,7 +94,7 @@
- #		startparam=""
- #	fi
-  
--	if [ ${OSTYPE} = "IRIX" -o ${OSTYPE} = "SunOS" ]; then
-+	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
-@@ -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" -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
-   start)
--	if [ ! -f --LOCKDIR--/sympa ]; then
-+	if [ ! -f "$lockdir/sympa" ]; then
- 		echo "Starting Sympa subsystem: "
- 		sympa_start sympa
- 		sympa_start archived
- 		sympa_start bounced
- 		sympa_start task_manager
--		touch --LOCKDIR--/sympa
-+		touch "$lockdir/sympa"
- 		echo
- 	else
- 
-@@ -201,13 +207,13 @@
- 	sympa_stop archived
- 	sympa_stop sympa
- 	sympa_stop task_manager
--	if [ -f --LOCKDIR--/sympa ]; then
--		rm -f --LOCKDIR--/sympa
-+	if [ -f "$lockdir/sympa" ]; then
-+		rm -f "$lockdir/sympa"
- 	fi
- 	;;
-   status)
- 	echo "Status of Sympa subsystem: "
--	if [ -f --LOCKDIR--/sympa ]; then
-+	if [ -f "$lockdir/sympa" ]; then
- 		echo "Status file for subsystem found."
- 	else
- 		echo "Status file for subsystem NOT found."
diff --git a/mail/sympa/files/patch-src-etc-script-sympa.in b/mail/sympa/files/patch-src-etc-script-sympa.in
new file mode 100644
index 000000000000..b17f70e78104
--- /dev/null
+++ b/mail/sympa/files/patch-src-etc-script-sympa.in
@@ -0,0 +1,74 @@
+--- src/etc/script/sympa.in.bak	2010-07-25 11:53:14.000000000 +0100
++++ src/etc/script/sympa.in	2010-07-25 11:58:18.000000000 +0100
+@@ -59,6 +59,8 @@
+ sympaconf="--CONFIG--"
+ wwsympaconf="--WWSCONFIG--"
+ 
++lockdir="--LOCKDIR--"
++
+ ##'echo -n' not supported with SH on Solaris
+ if [ ${OSTYPE} = "SunOS" ]; then
+   echo_opt=""
+@@ -66,6 +68,10 @@
+   echo_opt="-n"
+ fi
+ 
++if [ ${OSTYPE} = "FreeBSD" ]; then
++	lockdir="/var/spool/lock"
++fi
++
+ # End of parameters
+ 
+ # Current state of the module
+@@ -85,7 +91,7 @@
+        if [ -f --piddir--/$1.pid ] ; then
+              pid=`head -1 --piddir--/$1.pid`
+              if [ "$pid" != "" ] ; then
+-                 running=`ps -A | grep "$pid"`
++                 running=`ps -ax | grep perl | grep "$pid"`
+                  if [ "$running" != "" ]; then
+                      echo "$1 (pid $pid) is active..."
+                      return 0
+@@ -155,7 +161,7 @@
+ 	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 [ $1 = 'bulk' ]; then
+ 		    if [ ${use_functions} ]; then
+ 			kill -TERM $pid && success || failure
+@@ -197,14 +203,14 @@
+ # See how we were called.
+ case "$1" in
+   start)
+-	if [ ! -f --lockdir--/sympa ]; then
++	if [ ! -f $lockdir/sympa ]; then
+ 		echo "Starting Sympa subsystem: "
+ 		sympa_start sympa
+ 		sympa_start bulk
+ 		sympa_start archived
+ 		sympa_start bounced
+ 		sympa_start task_manager
+-		touch --lockdir--/sympa
++		touch $lockdir/sympa
+ 		echo
+ 	else
+ 
+@@ -226,13 +232,13 @@
+ 		sympa_stop sympa-creation
+ 	fi
+ 	sympa_stop task_manager
+-	if [ -f --lockdir--/sympa ]; then
+-		rm -f --lockdir--/sympa
++	if [ -f $lockdir/sympa ]; then
++		rm -f $lockdir/sympa
+ 	fi
+ 	;;
+   status)
+ 	echo "Status of Sympa subsystem: "
+-	if [ -f --lockdir--/sympa ]; then
++	if [ -f $lockdir/sympa ]; then
+ 		echo "Status file for subsystem found."
+ 	else
+ 		echo "Status file for subsystem NOT found."
diff --git a/mail/sympa/files/patch-src-queue.c b/mail/sympa/files/patch-src-queue.c
deleted file mode 100644
index 964998b17e9a..000000000000
--- a/mail/sympa/files/patch-src-queue.c
+++ /dev/null
@@ -1,42 +0,0 @@
-===================================================================
-RCS file: /var/www/SourceSup/cvs/sympa/sympa/src/queue.c,v
-retrieving revision 1.4
-retrieving revision 1.4.2.1
-diff -u -r1.4 -r1.4.2.1
---- src/queue.c	2003/10/07 12:04:47	1.4
-+++ src/queue.c	2005/01/27 08:54:02	1.4.2.1
-@@ -1,5 +1,5 @@
- /* queue.c - This program does the messages spooling
--   RCS Identication ; $Revision: 1.4 $ ; $Date: 2003/10/07 12:04:47 $ 
-+   RCS Identication ; $Revision: 1.4.2.1 $ ; $Date: 2005/01/27 08:54:02 $ 
- 
-    Sympa - SYsteme de Multi-Postage Automatique
-    Copyright (c) 1997, 1998, 1999, 2000, 2001 Comite Reseau des Universites
-@@ -26,12 +26,17 @@
- #include <string.h>
- #include <stdlib.h>
- 
--static char rcsid[] = "(@)$Id: queue.c,v 1.4 2003/10/07 12:04:47 salaun Exp $";
-+static char rcsid[] = "(@)$Id: queue.c,v 1.4.2.1 2005/01/27 08:54:02 sympa-authors Exp $";
- 
- static char     qfile[128];
- static char     buf[16384];
- static int      i, fd;
- 
-+/* For HP-UX */
-+#ifndef EX_CONFIG
-+# define EX_CONFIG 78
-+#endif
-+
- #ifndef CONFIG
- # define CONFIG		"/etc/sympa.conf"
- #endif
-@@ -116,7 +121,7 @@
-      exit(EX_NOPERM);
-    }
-    umask(027);
--   sprintf(qfile, "T.%s.%ld.%d", listname, time(NULL), getpid());
-+   snprintf(qfile, sizeof(qfile), "T.%s.%ld.%d", listname, time(NULL), getpid());
-    fd = open(qfile, O_CREAT|O_WRONLY, 0600);
-    if (fd == -1){
-      char* buffer=(char*)malloc(strlen(argv[0])+strlen(queuedir)+80);
diff --git a/mail/sympa/files/patch-src-sympa_wizard.pl b/mail/sympa/files/patch-src-sympa_wizard.pl
deleted file mode 100644
index 0e10cae3bc16..000000000000
--- a/mail/sympa/files/patch-src-sympa_wizard.pl
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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
deleted file mode 100644
index 6a0c27ce63d6..000000000000
--- a/mail/sympa/files/patch-wwsympa-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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
deleted file mode 100644
index 718cc8334aca..000000000000
--- a/mail/sympa/files/patch-wwsympa-wwsympa-wrapper.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 3d31d371998e..000000000000
--- a/mail/sympa/files/patch-wwsympa-wwsympa.fcgi
+++ /dev/null
@@ -1,42 +0,0 @@
---- 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->{'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->{'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;/;
-@@ -3629,7 +3629,7 @@
- 	     unless  ($#sender_hdr == -1) {
- 		 my $rejected_sender = $sender_hdr[0]->address;
- 		 my %context;
--		 $context{'subject'} = &MIME::Words::decode_mimewords($msg->head->get('subject'));
-+		 $context{'subject'} = &tools::decode_mimewords($msg->head->get('subject'));
- 		 $context{'rejected_by'} = $param->{'user'}{'email'};
- 		 $list->send_file('reject', $rejected_sender, $robot, \%context);
- 	     }
-@@ -4381,7 +4381,7 @@
- 
-      ## Decode subject header fields
-      foreach my $m (@{$param->{'res'}}) {
--	 $m->{'subj'} = &MIME::Words::decode_mimewords($m->{'subj'});
-+	 $m->{'subj'} = &tools::decode_mimewords($m->{'subj'});
-      }
- 
-      return 1;
-@@ -9135,7 +9135,7 @@
-      ($param->{'local_to'},$param->{'domain_to'}) = split ('@',$param->{'to'});
- 
-      $param->{'mailto'}= &mailto($list,$param->{'to'});
--     $param->{'subject'}= &MIME::Words::encode_mimewords($in{'subject'});
-+     $param->{'subject'}= $in{'subject'}; # &tools::encode_mimewords($in{'subject'});
-      $param->{'in_reply_to'}= $in{'in_reply_to'};
-      $param->{'message_id'} = &tools::get_message_id($robot);
-      return 1;