Upgrade to sympa version 5.4.2. Changes since version 5.2.4:

Fix CVE-2008-1648 (denial of service)
Several new translations (some of them disabled, because of missing locale
  support on NetBSD-3).
Introduction of HTTP session in order to replace a lot of cookies, for better
  usability and security. This also allows some new features, from
  listing active session in admin page to crawler detection.
per list custom user attributes (defined by the list owner)
per list custom list parameters for use in authorization scenarios and
  mail templates
LDAP alias manager can now be LDAPS
XSS protection
Session hijacking protection
The performances  mainly regarding the web interface  have been
  significantly improved.

new SOAP features allow remote list creation, ADD and DEL of list members
Automatic list creation when a message is sent for the list.
each operations that changes the status of messages/subscriptions/list config
  is now logged in a structured DB entry.
Generalization of UTF-8

and more ...  See http://www.sympa.org/ for complete list.

12 files changed, 231 insertions, 145 deletions

diff --git a/mail/sympa/MESSAGE b/mail/sympa/MESSAGE
index 1320ada4bac..de4a01269ce 100644
--- a/mail/sympa/MESSAGE
+++ b/mail/sympa/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2004/09/26 20:13:34 seb Exp $
+$NetBSD: MESSAGE,v 1.3 2008/04/27 17:06:40 bouyer Exp $
 
 Run ${SYMPA_BIN}/sympa_wizard.pl -c sympa.conf
 and ${SYMPA_BIN}/sympa_wizard.pl -c wwsympa.conf
@@ -10,6 +10,6 @@ for interactive configuration.
 
 If you are upgrading from a previous version please consult
 ${PREFIX}/share/doc/sympa/NEWS
-for incompatible changes.
+for incompatible changes, and run '${SYMPA_BIN}/sympa.pl --upgrade'
 
 ===========================================================================
diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index 2821151235c..79d2c3c275e 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2008/03/17 11:23:30 obache Exp $
+# $NetBSD: Makefile,v 1.32 2008/04/27 17:06:40 bouyer Exp $
 #
 
-DISTNAME=	sympa-5.2.4
-PKGREVISION=	2
+DISTNAME=	sympa-5.4.2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sympa.org/distribution/ \
 		http://www.sympa.org/distribution/old
@@ -32,14 +31,17 @@ DEPENDS+=	p5-libwww>=1.09:../../www/p5-libwww
 DEPENDS+=	p5-Locale-libintl>=1.16:../../misc/p5-Locale-libintl
 DEPENDS+=	p5-XML-LibXML>=1.61:../../textproc/p5-XML-LibXML
 DEPENDS+=	p5-Regexp-Common>=2.120:../../textproc/p5-Regexp-Common
+DEPENDS+=	p5-HTML-StripScripts-Parser>=1.02:../../www/p5-HTML-StripScripts-Parser
+DEPENDS+=	p5-MIME-EncWords>=1.010.101:../../mail/p5-MIME-EncWords
 DEPENDS.SunOS+=	p5-DB_File>=1.75:../../databases/p5-DB_File
 
 OPSYSVARS+=	DEPENDS
 
+USE_TOOLS+=		gmake
+
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-confdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--with-cgidir=${SYMPA_BIN:Q}
-CONFIGURE_ARGS+=	--with-iconsdir=${SYMPA_PREFIX}/httpd/icons
 CONFIGURE_ARGS+=	--with-bindir=${SYMPA_BIN:Q}
 CONFIGURE_ARGS+=	--with-sbindir=${SYMPA_BIN:Q}
 CONFIGURE_ARGS+=	--with-libexecdir=${SYMPA_BIN:Q}
@@ -51,7 +53,7 @@ CONFIGURE_ARGS+=	--with-lockdir=${SYMPA_VARBASE}/lock
 CONFIGURE_ARGS+=	--with-piddir=${SYMPA_VARBASE}/run
 CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR}/sympa
 CONFIGURE_ARGS+=	--with-nlsdir=${SYMPA_PREFIX}/nls
-CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/html/sympa
+CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/sympa
 CONFIGURE_ARGS+=	--with-scriptdir=${SYMPA_BIN:Q}
 CONFIGURE_ARGS+=	--with-sampledir=${PREFIX}/share/examples/sympa
 CONFIGURE_ARGS+=	--with-spooldir=${SYMPA_SPOOL:Q}
diff --git a/mail/sympa/PLIST b/mail/sympa/PLIST
index 4efe2554160..f08c17c8db7 100644
--- a/mail/sympa/PLIST
+++ b/mail/sympa/PLIST
@@ -1,116 +1,92 @@
-@comment $NetBSD: PLIST,v 1.4 2007/03/28 20:51:09 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/04/27 17:06:40 bouyer Exp $
 man/man8/alias_manager.8
 man/man8/archived.8
 man/man8/bounced.8
 man/man8/sympa.8
-share/doc/html/sympa/contents.png
-share/doc/html/sympa/crossref.png
-share/doc/html/sympa/img1.old
-share/doc/html/sympa/img1.png
-share/doc/html/sympa/img2.old
-share/doc/html/sympa/img2.png
-share/doc/html/sympa/index.html
-share/doc/html/sympa/index.png
-share/doc/html/sympa/next.png
-share/doc/html/sympa/next_g.png
-share/doc/html/sympa/node1.html
-share/doc/html/sympa/node10.html
-share/doc/html/sympa/node11.html
-share/doc/html/sympa/node12.html
-share/doc/html/sympa/node13.html
-share/doc/html/sympa/node14.html
-share/doc/html/sympa/node15.html
-share/doc/html/sympa/node16.html
-share/doc/html/sympa/node17.html
-share/doc/html/sympa/node18.html
-share/doc/html/sympa/node19.html
-share/doc/html/sympa/node2.html
-share/doc/html/sympa/node20.html
-share/doc/html/sympa/node21.html
-share/doc/html/sympa/node22.html
-share/doc/html/sympa/node23.html
-share/doc/html/sympa/node24.html
-share/doc/html/sympa/node25.html
-share/doc/html/sympa/node26.html
-share/doc/html/sympa/node27.html
-share/doc/html/sympa/node28.html
-share/doc/html/sympa/node29.html
-share/doc/html/sympa/node3.html
-share/doc/html/sympa/node30.html
-share/doc/html/sympa/node31.html
-share/doc/html/sympa/node4.html
-share/doc/html/sympa/node5.html
-share/doc/html/sympa/node6.html
-share/doc/html/sympa/node7.html
-share/doc/html/sympa/node8.html
-share/doc/html/sympa/node9.html
-share/doc/html/sympa/prev.png
-share/doc/html/sympa/prev_g.png
-share/doc/html/sympa/sympa.css
-share/doc/html/sympa/sympa.html
-share/doc/html/sympa/sympa.pdf
-share/doc/html/sympa/sympa.ps
-share/doc/html/sympa/sympa.tex
-share/doc/html/sympa/up.png
-share/doc/html/sympa/up_g.png
 share/doc/sympa/NEWS
+share/doc/sympa/sympa.pdf
 share/examples/sympa/README
-share/examples/sympa/config.digest
-share/examples/sympa/config.include
-share/examples/sympa/config.moderation
-share/examples/sympa/config.privateorpublickey
-share/examples/sympa/config.public
-share/examples/sympa/sympa.conf
-share/examples/sympa/wwsympa.conf
+share/examples/sympa/employees.ldap
+share/examples/sympa/robot.conf
 share/examples/sympa/sample-list/config
 share/examples/sympa/sample-list/info
 share/examples/sympa/sample-list/message.footer
 share/examples/sympa/sample-list/welcome.tpl
+share/examples/sympa/trusted_applications.conf
 share/examples/rc.d/archived
 share/examples/rc.d/bounced
 share/examples/rc.d/sympa
 share/examples/rc.d/task_manager
+share/locale/ar/LC_MESSAGES/sympa.mo
+share/locale/ar/LC_MESSAGES/web_help.mo
 share/locale/cs/LC_MESSAGES/sympa.mo
+share/locale/cs/LC_MESSAGES/web_help.mo
 share/locale/de/LC_MESSAGES/sympa.mo
+share/locale/de/LC_MESSAGES/web_help.mo
 share/locale/el/LC_MESSAGES/sympa.mo
+share/locale/el/LC_MESSAGES/web_help.mo
 share/locale/en_US/LC_MESSAGES/sympa.mo
+share/locale/en_US/LC_MESSAGES/web_help.mo
 share/locale/es/LC_MESSAGES/sympa.mo
+share/locale/es/LC_MESSAGES/web_help.mo
 share/locale/et/LC_MESSAGES/sympa.mo
+share/locale/et/LC_MESSAGES/web_help.mo
 share/locale/fi/LC_MESSAGES/sympa.mo
+share/locale/fi/LC_MESSAGES/web_help.mo
 share/locale/fr/LC_MESSAGES/sympa.mo
+share/locale/fr/LC_MESSAGES/web_help.mo
 share/locale/hu/LC_MESSAGES/sympa.mo
+share/locale/hu/LC_MESSAGES/web_help.mo
+share/locale/id/LC_MESSAGES/sympa.mo
+share/locale/id/LC_MESSAGES/web_help.mo
 share/locale/it/LC_MESSAGES/sympa.mo
+share/locale/it/LC_MESSAGES/web_help.mo
 share/locale/ja/LC_MESSAGES/sympa.mo
+share/locale/ja/LC_MESSAGES/web_help.mo
 share/locale/nb_NO/LC_MESSAGES/sympa.mo
+share/locale/nb_NO/LC_MESSAGES/web_help.mo
 share/locale/nl/LC_MESSAGES/sympa.mo
+share/locale/nl/LC_MESSAGES/web_help.mo
 share/locale/oc/LC_MESSAGES/sympa.mo
+share/locale/oc/LC_MESSAGES/web_help.mo
 share/locale/pl/LC_MESSAGES/sympa.mo
-share/locale/pt/LC_MESSAGES/sympa.mo
+share/locale/pl/LC_MESSAGES/web_help.mo
 share/locale/pt_BR/LC_MESSAGES/sympa.mo
+share/locale/pt_BR/LC_MESSAGES/web_help.mo
 share/locale/ro/LC_MESSAGES/sympa.mo
+share/locale/ro/LC_MESSAGES/web_help.mo
 share/locale/sv/LC_MESSAGES/sympa.mo
+share/locale/sv/LC_MESSAGES/web_help.mo
 share/locale/tr/LC_MESSAGES/sympa.mo
+share/locale/tr/LC_MESSAGES/web_help.mo
 share/locale/zh_CN/LC_MESSAGES/sympa.mo
-share/locale/zh_TW/LC_MESSAGES/sympa.mo
+share/locale/zh_CN/LC_MESSAGES/web_help.mo
 sympa/bin/Archive.pm
 sympa/bin/Auth.pm
 sympa/bin/CAS.pm
 sympa/bin/Commands.pm
 sympa/bin/Conf.pm
 sympa/bin/Config_XML.pm
+sympa/bin/Datasource.pm
 sympa/bin/Family.pm
 sympa/bin/Fetch.pm
+sympa/bin/LDAPSource.pm
 sympa/bin/Language.pm
 sympa/bin/Ldap.pm
 sympa/bin/List.pm
+sympa/bin/Lock.pm
 sympa/bin/Log.pm
 sympa/bin/Marc.pm
 sympa/bin/Marc/Search.pm
 sympa/bin/Message.pm
 sympa/bin/PlainDigest.pm
+sympa/bin/SQLSource.pm
+sympa/bin/Scenario.pm
 sympa/bin/SharedDocument.pm
+sympa/bin/SympaSession.pm
 sympa/bin/SympaTransport.pm
 sympa/bin/Task.pm
+sympa/bin/Upgrade.pm
 sympa/bin/Version.pm
 sympa/bin/admin.pm
 sympa/bin/alias_manager.pl
@@ -153,13 +129,14 @@ sympa/bin/etc/global_task_models/expire_bounce.daily.task
 sympa/bin/etc/global_task_models/process_bouncers.weekly.task
 sympa/bin/etc/global_task_models/purge_orphan_bounces.monthly.task
 sympa/bin/etc/global_task_models/purge_user_table.monthly.task
+sympa/bin/etc/global_task_models/purge_session_table.daily.task
+sympa/bin/etc/global_task_models/purge_logs_table.daily.task
 sympa/bin/etc/list_aliases.tt2
 sympa/bin/etc/list_task_models/expire.yearly.task
 sympa/bin/etc/list_task_models/remind.2month.task
 sympa/bin/etc/list_task_models/remind.monthly.task
 sympa/bin/etc/list_task_models/remind.yearly.task
 sympa/bin/etc/list_task_models/sync_include.ttl.task
-sympa/bin/etc/mail_tt2/archive.tt2
 sympa/bin/etc/mail_tt2/authorization_reject.tt2
 sympa/bin/etc/mail_tt2/bye.tt2
 sympa/bin/etc/mail_tt2/certif_warning.tt2
@@ -217,6 +194,9 @@ sympa/bin/etc/scenari/add.closed
 sympa/bin/etc/scenari/add.default
 sympa/bin/etc/scenari/add.owner
 sympa/bin/etc/scenari/add.owner_notify
+sympa/bin/etc/scenari/automatic_list_creation.public
+sympa/bin/etc/scenari/automatic_list_creation.listmaster
+sympa/bin/etc/crawlers_detection.conf
 sympa/bin/etc/scenari/create_list.intranet
 sympa/bin/etc/scenari/create_list.listmaster
 sympa/bin/etc/scenari/create_list.public_listmaster
@@ -245,6 +225,7 @@ sympa/bin/etc/scenari/invite.default
 sympa/bin/etc/scenari/invite.owner
 sympa/bin/etc/scenari/invite.private
 sympa/bin/etc/scenari/invite.public
+sympa/bin/etc/ldap_alias_manager.conf
 sympa/bin/etc/scenari/remind.default
 sympa/bin/etc/scenari/remind.listmaster
 sympa/bin/etc/scenari/remind.owner
@@ -318,6 +299,7 @@ sympa/bin/etc/web_tt2/arc_protect.tt2
 sympa/bin/etc/web_tt2/arcsearch.tt2
 sympa/bin/etc/web_tt2/arcsearch_form.tt2
 sympa/bin/etc/web_tt2/authorization_reject.tt2
+sympa/bin/etc/web_tt2/blacklist.tt2
 sympa/bin/etc/web_tt2/button_footer.tt2
 sympa/bin/etc/web_tt2/button_header.tt2
 sympa/bin/etc/web_tt2/change_email.tt2
@@ -335,6 +317,8 @@ sympa/bin/etc/web_tt2/d_properties.tt2
 sympa/bin/etc/web_tt2/d_read.tt2
 sympa/bin/etc/web_tt2/d_upload.tt2
 sympa/bin/etc/web_tt2/dump_scenario.tt2
+sympa/bin/etc/web_tt2/dumpvars.tt2
+sympa/bin/etc/web_tt2/edit_attributes.tt2
 sympa/bin/etc/web_tt2/edit_list_request.tt2
 sympa/bin/etc/web_tt2/edit_template.tt2
 sympa/bin/etc/web_tt2/editfile.tt2
@@ -347,8 +331,17 @@ sympa/bin/etc/web_tt2/get_latest_lists.tt2
 sympa/bin/etc/web_tt2/get_pending_lists.tt2
 sympa/bin/etc/web_tt2/help.tt2
 sympa/bin/etc/web_tt2/help_admin.tt2
+sympa/bin/etc/web_tt2/help_arc.tt2
 sympa/bin/etc/web_tt2/help_editfile.tt2
 sympa/bin/etc/web_tt2/help_editlist.tt2
+sympa/bin/etc/web_tt2/help_faqadmin.tt2
+sympa/bin/etc/web_tt2/help_faquser.tt2
+sympa/bin/etc/web_tt2/help_introduction.tt2
+sympa/bin/etc/web_tt2/help_listconfig.tt2
+sympa/bin/etc/web_tt2/help_mail_commands.tt2
+sympa/bin/etc/web_tt2/help_sendmsg.tt2
+sympa/bin/etc/web_tt2/help_shared.tt2
+sympa/bin/etc/web_tt2/help_user.tt2
 sympa/bin/etc/web_tt2/help_user_options.tt2
 sympa/bin/etc/web_tt2/home.tt2
 sympa/bin/etc/web_tt2/info.tt2
@@ -373,6 +366,7 @@ sympa/bin/etc/web_tt2/maintenance.tt2
 sympa/bin/etc/web_tt2/menu.tt2
 sympa/bin/etc/web_tt2/modindex.tt2
 sympa/bin/etc/web_tt2/notice.tt2
+sympa/bin/etc/web_tt2/picture_upload.tt2
 sympa/bin/etc/web_tt2/pref.tt2
 sympa/bin/etc/web_tt2/remindpasswd.tt2
 sympa/bin/etc/web_tt2/remove_arc.tt2
@@ -391,6 +385,7 @@ sympa/bin/etc/web_tt2/serveradmin.tt2
 sympa/bin/etc/web_tt2/set_pending_list_request.tt2
 sympa/bin/etc/web_tt2/setlang.tt2
 sympa/bin/etc/web_tt2/show_cert.tt2
+sympa/bin/etc/web_tt2/show_sessions.tt2
 sympa/bin/etc/web_tt2/sigrequest.tt2
 sympa/bin/etc/web_tt2/skinsedit.tt2
 sympa/bin/etc/web_tt2/sso_login.tt2
@@ -402,13 +397,16 @@ sympa/bin/etc/web_tt2/title.tt2
 sympa/bin/etc/web_tt2/tt2_error.tt2
 sympa/bin/etc/web_tt2/view_template.tt2
 sympa/bin/etc/web_tt2/viewbounce.tt2
+sympa/bin/etc/web_tt2/viewlogs.tt2
 sympa/bin/etc/web_tt2/viewmod.tt2
 sympa/bin/etc/web_tt2/which.tt2
 sympa/bin/etc/web_tt2/your_lists.tt2
+sympa/bin/familyqueue
 sympa/bin/init_comment.pl
 sympa/bin/ldap_alias_manager.pl
 sympa/bin/mail.pm
 sympa/bin/mod2html.pl
+sympa/bin/mysql_alias_manager.pl
 sympa/bin/p12topem.pl
 sympa/bin/parser.pl
 sympa/bin/queue
@@ -416,6 +414,7 @@ sympa/bin/report.pm
 sympa/bin/sympa.pl
 sympa/bin/sympa_soap_client.pl
 sympa/bin/sympa_soap_server.fcgi
+sympa/bin/sympa_soap_server-wrapper.fcgi
 sympa/bin/sympa_wizard.pl
 sympa/bin/sympasoap.pm
 sympa/bin/task_manager.pl
@@ -428,32 +427,34 @@ sympa/bin/tt2.pl
 sympa/bin/virtualwrapper
 sympa/bin/wwslib.pm
 sympa/bin/wwsympa.fcgi
+sympa/bin/wwsympa-wrapper.fcgi
 sympa/bin/wwsympa_sudo_wrapper.pl
-sympa/httpd/icons/back.png
-sympa/httpd/icons/begin.png
-sympa/httpd/icons/binary.png
-sympa/httpd/icons/down.png
-sympa/httpd/icons/end.png
-sympa/httpd/icons/folder.open.png
-sympa/httpd/icons/folder.png
-sympa/httpd/icons/image2.png
-sympa/httpd/icons/left.png
-sympa/httpd/icons/link.png
-sympa/httpd/icons/locked.png
-sympa/httpd/icons/logo-s-lock.png
-sympa/httpd/icons/logo-s.png
-sympa/httpd/icons/movie.png
-sympa/httpd/icons/right.png
-sympa/httpd/icons/sound1.png
-sympa/httpd/icons/text.png
-sympa/httpd/icons/unknown.png
-@dirrm sympa/httpd/icons
-@dirrm sympa/httpd
+sympa/static_content/icons/back.png
+sympa/static_content/icons/begin.png
+sympa/static_content/icons/binary.png
+sympa/static_content/icons/down.png
+sympa/static_content/icons/end.png
+sympa/static_content/icons/folder.open.png
+sympa/static_content/icons/folder.png
+sympa/static_content/icons/image2.png
+sympa/static_content/icons/left.png
+sympa/static_content/icons/link.png
+sympa/static_content/icons/locked.png
+sympa/static_content/icons/logo-s-lock.png
+sympa/static_content/icons/logo-s.png
+sympa/static_content/icons/movie.png
+sympa/static_content/icons/right.png
+sympa/static_content/icons/sound1.png
+sympa/static_content/icons/text.png
+sympa/static_content/icons/unknown.png
+@dirrm sympa/static_content/icons
+@dirrm sympa/static_content
 @dirrm sympa/bin/etc/web_tt2
 @dirrm sympa/bin/etc/scenari
 @dirrm sympa/bin/etc/mail_tt2
 @dirrm sympa/bin/etc/list_task_models
 @dirrm sympa/bin/etc/global_task_models
+@dirrm sympa/bin/etc/families
 @dirrm sympa/bin/etc/create_list_templates/public_web_forum
 @dirrm sympa/bin/etc/create_list_templates/private_working_group
 @dirrm sympa/bin/etc/create_list_templates/news-letter
@@ -466,7 +467,6 @@ sympa/httpd/icons/unknown.png
 @dirrm sympa/bin/Marc
 @dirrm sympa/bin
 @dirrm sympa
-@dirrm share/doc/html/sympa
 @dirrm share/doc/sympa
 @dirrm share/examples/sympa/sample-list
 @dirrm share/examples/sympa
diff --git a/mail/sympa/distinfo b/mail/sympa/distinfo
index 0874e028353..55e0dcb910d 100644
--- a/mail/sympa/distinfo
+++ b/mail/sympa/distinfo
@@ -1,10 +1,13 @@
-$NetBSD: distinfo,v 1.8 2007/04/20 18:52:34 bouyer Exp $
+$NetBSD: distinfo,v 1.9 2008/04/27 17:06:40 bouyer Exp $
 
-SHA1 (sympa-5.2.4.tar.gz) = 8c250b9637c54cc8bc07085994721c7e379fc9a5
-RMD160 (sympa-5.2.4.tar.gz) = eaad800b25b03ec45a906bd2c6dfe4981dfb4e8f
-Size (sympa-5.2.4.tar.gz) = 5140447 bytes
-SHA1 (patch-aa) = 61e523ef848ef4698204a5ebef70e4af5df62081
-SHA1 (patch-ab) = b72ef22e9bf27e4f2994c9c7ee72ed8f9e6eb553
+SHA1 (sympa-5.4.2.tar.gz) = 80b3de57b1809049f9a6772a0ca153c5eafef282
+RMD160 (sympa-5.4.2.tar.gz) = 7e9525e469d2611553418e6664a784067661eeb1
+Size (sympa-5.4.2.tar.gz) = 5513067 bytes
+SHA1 (patch-aa) = 8db2096214d667d5bada0ffb97994be9e0891547
+SHA1 (patch-ab) = 404ce642a733ef7922f58613c56f449f75641a9a
 SHA1 (patch-ac) = 77802bab188da024c18810c07bf62064b28e3af1
-SHA1 (patch-ae) = 28279bf0f1dad1e3cf0e6e5985e6f9cbdbb19426
-SHA1 (patch-af) = ec05dfef197d7d2c3c655117994534478a615403
+SHA1 (patch-af) = ba9888ed1eed387f7758946aaeeaa5f408c2d760
+SHA1 (patch-ag) = 97af077204f004945619d9a457e03430df1e2642
+SHA1 (patch-ah) = 6a0b34ef49a7d68ac996251adee14ef29519f92d
+SHA1 (patch-ai) = 4ce47ec2a664978cccbba7f075ee5315ee0bfa5d
+SHA1 (patch-aj) = 639241f48effabc49d46a23f255a33cb51404d44
diff --git a/mail/sympa/patches/patch-aa b/mail/sympa/patches/patch-aa
index f15815c1d93..aff3cb9df35 100644
--- a/mail/sympa/patches/patch-aa
+++ b/mail/sympa/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.4 2007/03/28 20:51:10 bouyer Exp $
+$NetBSD: patch-aa,v 1.5 2008/04/27 17:06:40 bouyer Exp $
 
---- Makefile.in.orig	2007-02-06 15:25:52.000000000 +0100
-+++ Makefile.in	2007-02-28 20:32:50.000000000 +0100
-@@ -510,7 +510,7 @@
+--- Makefile.in.orig	2007-12-05 16:37:14.000000000 +0100
++++ Makefile.in	2008-04-27 15:16:02.000000000 +0200
+@@ -508,7 +508,7 @@
  	@CVS2CL@
  #endif
  
--all:	warning checkperl checkcpan sources man locale
-+all:	sources man locale
+-all:	warning checkperl checkcpan sources wrapper soap_wrapper man locale
++all:	sources wrapper soap_wrapper man locale
  
  rpm: build_rh_rpm build_mdk_rpm
  
-@@ -604,7 +604,7 @@
+@@ -612,7 +612,7 @@
  	$(MAKE) PERL='${PERL}' clean) || exit 1; \
  	done;
  
@@ -20,7 +20,16 @@ $NetBSD: patch-aa,v 1.4 2007/03/28 20:51:10 bouyer Exp $
  
  nextstep: 
  	@echo ""
-@@ -749,7 +749,7 @@
+@@ -751,7 +751,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) $(DIR)/sympa/static_content $(DIR)/sympa/static_content/icons ; do \
+ 		if [ ! -d $(DESTDIR)$$dir ] ; then \
+ 			echo "Creating $(DESTDIR)$$dir"; \
+ 			mkdir -p $(DESTDIR)$$dir; \
+@@ -760,7 +760,7 @@
  			chmod 755 $(DESTDIR)$$dir; \
  		fi \
  	done
@@ -29,7 +38,7 @@ $NetBSD: patch-aa,v 1.4 2007/03/28 20:51:10 bouyer Exp $
  	echo "First installation : installing conf directories..."; \
  	for dir in create_list_templates mail_tt2 web_tt2 scenari \
  	task_models general_task_models; do \
-@@ -772,7 +772,7 @@
+@@ -783,7 +783,7 @@
  		$(PERL) ./subst.pl src/etc/README_etc \
  	) \
  	fi
@@ -38,7 +47,7 @@ $NetBSD: patch-aa,v 1.4 2007/03/28 20:51:10 bouyer Exp $
  	echo "First installation : installing spool directories..."; \
  	for dir in $(SPOOLDIR) $(SPOOLDIR)/msg $(SPOOLDIR)/digest $(SPOOLDIR)/moderation \
  	$(SPOOLDIR)/expire $(SPOOLDIR)/auth $(SPOOLDIR)/outgoing $(SPOOLDIR)/tmp \
-@@ -786,7 +786,7 @@
+@@ -797,7 +797,7 @@
  		fi \
  	done \
  	fi
diff --git a/mail/sympa/patches/patch-ab b/mail/sympa/patches/patch-ab
index f1a60d1563c..b9b54899280 100644
--- a/mail/sympa/patches/patch-ab
+++ b/mail/sympa/patches/patch-ab
@@ -1,12 +1,14 @@
-$NetBSD: patch-ab,v 1.3 2007/03/28 20:51:10 bouyer Exp $
+$NetBSD: patch-ab,v 1.4 2008/04/27 17:06:40 bouyer Exp $
 
---- check_perl_modules.pl.orig	2006-11-16 10:47:33.000000000 +0100
-+++ check_perl_modules.pl	2007-02-28 20:09:50.000000000 +0100
-@@ -171,35 +171,7 @@
+--- check_perl_modules.pl.orig	2008-03-27 17:41:49.000000000 +0100
++++ check_perl_modules.pl	2008-04-27 14:20:25.000000000 +0200
+@@ -180,69 +180,7 @@
  # Install a CPAN module
  ##----------------------
  sub install_module {
--    my ($module, $default) = @_;
+-    my ($module, $options) = @_;
+-
+-    my $default = $options->{'default'};
 -
 -    unless ($ENV{'FTP_PASSIVE'} eq 1) {
 -	$ENV{'FTP_PASSIVE'} = 1;
@@ -24,13 +26,45 @@ $NetBSD: patch-ab,v 1.3 2007/03/28 20:51:10 bouyer Exp $
 -	return undef;
 -    }
 -
--    printf "Description: %s\n", $opt_features{$module};
--    print "Install module $module ? [$default]";
--    my $answer = <STDIN>; chomp $answer;
--    $answer ||= $default;
--    next unless ($answer =~ /^y$/i);
+-    unless ($options->{'force'}) {
+-	printf "Description: %s\n", $opt_features{$module};
+-	print "Install module $module ? [$default]";
+-	my $answer = <STDIN>; chomp $answer;
+-	$answer ||= $default;
+-	return unless ($answer =~ /^y$/i);
+-    }
+-    
 -    $CPAN::Config->{'inactivity_timeout'} = 4;
--    CPAN::Shell->install($module);
+-    $CPAN::Config->{'colorize_output'} = 1;
+-
+-    #CPAN::Shell->clean($module) if ($options->{'force'});
+-
+-    CPAN::Shell->make($module);
+-    
+-    if ($options->{'force'}) {
+-	CPAN::Shell->force('test', $module);
+-      }else {
+-	  CPAN::Shell->test($module);
+-      }
+-    
+-
+-    CPAN::Shell->install($module); ## Could use CPAN::Shell->force('install') if make test failed
+-
+-    ## Check if module has been successfuly installed
+-    unless (&test_module($module) == 1) {
+-
+-	## Prevent recusive calls if already in force mode
+-	if ($options->{'force'}) {
+-	    print  "Installation of $module still FAILED. You should download the tar.gz from http://search.cpan.org and install it manually.";
+-	    my $answer = <STDIN>;
+-	}else {
+-	    print  "Installation of $module FAILED. Do you want to force the installation of this module? (y/N) ";
+-	    my $answer = <STDIN>; chomp $answer;
+-	    if ($answer =~ /^y/i) {
+-		&install_module($module, {'force' => 1});
+-	    }
+-	}
+-    }
 -
 -    ## Restore lang
 -    $ENV{'LANG'} = $lang if (defined $lang);
diff --git a/mail/sympa/patches/patch-ae b/mail/sympa/patches/patch-ae
deleted file mode 100644
index c4c4512654b..00000000000
--- a/mail/sympa/patches/patch-ae
+++ /dev/null
@@ -1,9 +0,0 @@
---- doc/Makefile.orig	2007-04-13 20:20:26.000000000 +0200
-+++ doc/Makefile	2007-04-13 20:21:08.000000000 +0200
-@@ -151,7 +151,7 @@
- 	@if [  -d $(DESTDIR)$(DOCDIR)/html ]; then \
- 		rm -rf $(DESTDIR)$(DOCDIR)/html; \
- 	fi
--	cp -R html/ $(DESTDIR)$(DOCDIR)
-+	cp -R html/. $(DESTDIR)$(DOCDIR)
- 
diff --git a/mail/sympa/patches/patch-af b/mail/sympa/patches/patch-af
index d1e7f9fe579..447d11b5098 100644
--- a/mail/sympa/patches/patch-af
+++ b/mail/sympa/patches/patch-af
@@ -1,19 +1,13 @@
-$NetBSD: patch-af,v 1.1 2007/03/28 20:51:11 bouyer Exp $
+$NetBSD: patch-af,v 1.2 2008/04/27 17:06:40 bouyer Exp $
 
---- src/Language.pm.orig	2007-02-28 22:25:02.000000000 +0100
-+++ src/Language.pm	2007-02-28 22:26:10.000000000 +0100
-@@ -174,10 +174,10 @@
- 		last;
- 	    }	
- 	}
--	unless ($success) {
--	    &do_log('err','Failed to setlocale(%s) ; you either have a problem with the catalogue .mo files or you should extend available locales in  your /etc/locale.gen (or /etc/sysconfig/i18n) file', $locale);
--	    return undef;
--	}
-+#	unless ($success) {
-+#	    &do_log('err','Failed to setlocale(%s) ; you either have a problem with the catalogue .mo files or you should extend available locales in  your /etc/locale.gen (or /etc/sysconfig/i18n) file', $locale);
-+#	    return undef;
-+#	}
-     }
-     
-     ## Define what catalog is used
+--- src/Language.pm.orig	2008-04-27 17:43:28.000000000 +0200
++++ src/Language.pm	2008-04-27 17:43:47.000000000 +0200
+@@ -162,7 +162,7 @@
+     ## Set Locale::Messages context
+     my $locale_dashless = $locale.'.utf-8';
+     $locale_dashless =~ s/-//g;
+-    foreach my $type (&POSIX::LC_ALL, &POSIX::LC_TIME) {
++    foreach my $type (&POSIX::LC_CTYPE) {
+ 	my $success;
+ 	foreach my $try ($locale.'.utf-8',
+ 			 $locale.'.UTF-8',  ## UpperCase required for FreeBSD
diff --git a/mail/sympa/patches/patch-ag b/mail/sympa/patches/patch-ag
new file mode 100644
index 00000000000..3eff540eb47
--- /dev/null
+++ b/mail/sympa/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2008/04/27 17:06:40 bouyer Exp $
+
+--- src/sympa_wizard.pl.orig	2008-04-27 15:11:31.000000000 +0200
++++ src/sympa_wizard.pl	2008-04-27 15:11:56.000000000 +0200
+@@ -128,7 +128,7 @@
+ 	       'advice' =>''},
+ 
+ 	      {'name' => 'static_content_path',
+-	       'default' => '--DIR--/static_content',
++	       'default' => '--DIR--/sympa/static_content',
+ 	       'query' => 'The directory where Sympa stores static contents (CSS, members pictures, documentation) directly delivered by Apache',
+ 	       'file' => 'sympa.conf',
+ 	       'advice' =>''},	      
diff --git a/mail/sympa/patches/patch-ah b/mail/sympa/patches/patch-ah
new file mode 100644
index 00000000000..a2c33ad8d09
--- /dev/null
+++ b/mail/sympa/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2008/04/27 17:06:40 bouyer Exp $
+
+--- src/Conf.pm.orig	2008-04-27 15:12:30.000000000 +0200
++++ src/Conf.pm	2008-04-27 15:13:05.000000000 +0200
+@@ -267,7 +267,7 @@
+      'pictures_feature' => 'on',
+      'use_blacklist' => 'send,subscribe',
+      'static_content_url' => '/static-sympa',
+-     'static_content_path' => '--DIR--/static_content',
++     'static_content_path' => '--DIR--/sympa/static_content',
+      'filesystem_encoding' => 'utf-8',
+      'cache_list_config' => 'none', ## none | binary_file
+      'lock_method' => 'flock', ## flock | nfs
diff --git a/mail/sympa/patches/patch-ai b/mail/sympa/patches/patch-ai
new file mode 100644
index 00000000000..c6f2fe3c1c9
--- /dev/null
+++ b/mail/sympa/patches/patch-ai
@@ -0,0 +1,15 @@
+$NetBSD: patch-ai,v 1.1 2008/04/27 17:06:41 bouyer Exp $
+
+--- wwsympa/Makefile.orig	2008-04-27 15:14:36.000000000 +0200
++++ wwsympa/Makefile	2008-04-27 15:14:59.000000000 +0200
+@@ -100,8 +100,8 @@
+ 
+ installicons:
+ 	@echo "Installing icons..."
+-	@echo $(DIR)/static_content/icons
+-	cp icons/*.png $(DIR)/static_content/icons
++	@echo $(DIR)/sympa/static_content/icons
++	cp icons/*.png $(DIR)/sympa/static_content/icons
+ 
+ installwrapper:
+ 	@echo "Installing wwsympa-wrapper binary..."
diff --git a/mail/sympa/patches/patch-aj b/mail/sympa/patches/patch-aj
new file mode 100644
index 00000000000..571b48591bb
--- /dev/null
+++ b/mail/sympa/patches/patch-aj
@@ -0,0 +1,12 @@
+$NetBSD: patch-aj,v 1.1 2008/04/27 17:06:41 bouyer Exp $
+
+--- po/Makefile.orig	2008-04-27 16:51:00.000000000 +0200
++++ po/Makefile	2008-04-27 16:53:44.000000000 +0200
+@@ -1,6 +1,6 @@
+ 
+ 
+-LINGUAS = af ar br bg ca cs de el en_US es et eu fi fr hu id it ja ko ml nb_NO nn_NO nl oc pl pt pt_BR ro ru sv tr vi zh_CN zh_TW
++LINGUAS = ar cs de el en_US es et fi fr hu id it ja nb_NO nl oc pl pt_BR ro sv tr zh_CN 
+ SYMPA_LOCALES = af_ZA ar_SY br_FR bg_BG ca_ES cs_CZ de_DE el_GR en_US es_ES et_EE eu_ES fi_FI fr_FR hu_HU id_ID it_IT ja_JP ko_KR ml_IN nb_NO nn_NO nl_NL oc_FR pl_PL pt_BR pt_PT ro_RO ru_RU sv_SE tr_TR vi_VN zh_CN zh_TW
+ MOBASICFILES = $(addsuffix .mo, $(LINGUAS))
+ MOHELPFILES = $(addprefix web_help_, $(MOBASICFILES))