Merge branch 'sympa-6.2' into issue-1186_rev

.github/workflows/make-check.yml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          #- 'macos-latest' # Crypt::OpenSSL::X509 doesn't support openssl@3
+          - 'macos-latest'
           - 'ubuntu-latest'
         perl:
           - '5.34'
@@ -73,6 +73,6 @@ jobs:
           autoreconf -i
           ./configure --with-defaultdir=`pwd`/default
           cd src; make; cd ..
-          make check-local TEST_FILES='xt/perltidy.t' || true
+          #make check-local TEST_FILES='xt/perltidy.t' || true
           make check-local
         shell: bash

.gitignore

@@ -18,7 +18,6 @@ Makefile
 /po/sympa/POTFILES
 /po/web_help/POTFILES
 /sympa.conf
-/sympa.conf-dist
 
 # make
 
@@ -31,7 +30,6 @@ Makefile
 *.o
 *.po~
 /previous_sympa_version
-/mk-sympa-dist.pl
 /src/bin/*.pl
 /src/cgi/*.fcgi
 /src/libexec/*.pl
@@ -42,7 +40,10 @@ Makefile
 /po/sympa/stamp-po
 /po/web_help/remove-potcdate.sed
 /po/web_help/stamp-po
-/src/etc/script/sympa
+/service/sympa
+/service/*.service
+/service/*.socket
+/service/sympa-tmpfiles.conf
 /src/lib/stamp-man3
 /src/lib/stamp-man1
 /src/lib/Sympa/Constants.pm
@@ -55,7 +56,6 @@ Makefile
 # make install
 
 /data_structure.version
-/sympa_wizard.pl.inst
 
 # make dist
 

CONTRIBUTING.md

@@ -34,7 +34,7 @@ The site for development of Sympa documentation launced:
 
   * [Incubating the new Sympa documentation site](https://github.com/sympa-community/sympa-community.github.io)
 
-This site aims to renovate Sympa documentation.  We expect inputs including addition, correction and suggestion from the community.  For further details, please see the page "[Contributing for Sympa documentation](https://github.com/sympa-community/sympa-community.github.io/blob/master/CONTRIBUTING.md)".
+This site aims to renovate Sympa documentation.  We expect inputs including addition, correction and suggestion from the community.  For further details, please see the page "[Contributing for Sympa documentation](https://sympa-community.github.io/CONTRIBUTING.html)".
 
 ----
 [The Sympa Community](https://github.com/sympa-community)

Makefile.am

@@ -1,13 +1,11 @@
-# $Id$
-
 # Sympa - SYsteme de Multi-Postage Automatique
 #
 # Copyright (c) 1997, 1998, 1999 Institut Pasteur & Christophe Wolfhugel
 # Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 # 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
 # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
-# Copyright 2017, 2018, 2019 The Sympa Community. See the AUTHORS.md file at
-# the top-level directory of this distribution and at
+# Copyright 2017, 2018, 2019, 2022 The Sympa Community. See the
+# AUTHORS.md file at the top-level directory of this distribution and at
 # <https://github.com/sympa-community/sympa.git>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -23,7 +21,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-SUBDIRS = src default doc po www
+SUBDIRS = src default doc po service www
 
 check_SCRIPTS = \
 	t/01_Conf.t \
@@ -77,7 +75,8 @@ check_DATA = \
 	t/samples/signed.eml \
 	t/samples/unsigned.eml \
 	t/stub/Sympa/Constants.pm \
-	xt/perlcriticrc
+	xt/perlcriticrc \
+	xt/tidyallrc
 noinst_SCRIPTS = \
 	xt/critic.t \
 	xt/fixme.t \
@@ -101,8 +100,7 @@ EXTRA_DIST = \
 	$(noinst_SCRIPTS) \
 	$(nobase_modules_DATA)
 
-CLEANFILES = \
-	sympa.conf-dist
+CLEANFILES =
 
 MSGFMT=@MSGFMT@
 .po.mo:
@@ -158,11 +156,6 @@ installconfig: installdir
 		chown $(USER) $(DESTDIR)$(confdir)/sympa.conf; \
 		chgrp $(GROUP) $(DESTDIR)$(confdir)/sympa.conf; \
 	fi
-	@echo "Installing configuration template ..."
-	-@echo "installing sympa.conf-dist"; \
-	$(INSTALL) -m 644 -T sympa.conf-dist $(DESTDIR)$(confdir)/sympa.conf-dist; \
-	chown $(USER) $(DESTDIR)$(confdir)/sympa.conf-dist; \
-	chgrp $(GROUP) $(DESTDIR)$(confdir)/sympa.conf-dist
 	-@if [ ! -f $(DESTDIR)$(sysconfdir)/data_structure.version ]; then \
 		cd $(DESTDIR)$(sysconfdir); \
 		echo "# automatically created file" >> data_structure.version; \
@@ -204,21 +197,13 @@ nextstep:
 	@echo "#    * Edit this file to define initial configuration:"
 	@echo "#        $(confdir)/sympa.conf"
 	@echo "#"
-	@echo "# ADDITIONAL SETTINGS:"
-	@echo "#    * You will find all available configuration settings in:"
-	@echo "#        $(confdir)/sympa.conf-dist"
-	@echo "#"
-	@echo "#    * Copy the configuration settings you want in:"
-	@echo "#        $(confdir)/sympa.conf"
-	@echo "#"
 	@echo "# UPGRADING"
 	@echo "#    * Run this script to upgrade your data structures:"
 	@echo "#        $(sbindir)/sympa upgrade"
 	@echo "#######################################################"
 
 uninstall-hook:
 	cd $(DESTDIR)$(confdir) && rm -f sympa.conf
-	cd $(DESTDIR)$(confdir) && rm -f sympa.conf-dist
 	cd $(DESTDIR)$(confdir) && rm -f wwsympa.conf
 	cd $(DESTDIR)$(sysconfdir) && rm -f data_structure.version
 	cd $(DESTDIR)$(sysconfdir) && rm -f README
@@ -233,16 +218,11 @@ distcheck-hook:
 	-sha256sum $(DIST_ARCHIVES) > $(DIST_ARCHIVES).sha256
 	-openssl sha512 $(DIST_ARCHIVES) > $(DIST_ARCHIVES).sha512
 
-# tidyall --conf-file doc/dot.tidyallrc --root-dir . --recursive src t xt
+# tidyall --conf-file xt/tidyallrc --root-dir . --recursive src t xt
 tidyall:
 	@ ( echo 'exit 1 if grep { $$_->error }'; \
 	    echo 'Code::TidyAll->new_from_conf_file('; \
-	    echo '  "doc/dot.tidyallrc", root_dir => ".", recursive => 1'; \
-	    echo ')->process_paths(qw(src xt t))' \
+	    echo '  "xt/tidyallrc", root_dir => ".", recursive => 1'; \
+	    echo ')->process_paths(qw(src t xt))' \
 	) | $(PERL) -MCode::TidyAll
 
-all-local: sympa.conf-dist
-
-sympa.conf-dist:
-	@PERL5LIB=$(srcdir)/src/lib; export PERL5LIB; \
-	$(PERL) mk-sympa-dist.pl

configure.ac

@@ -1,13 +1,12 @@
 # configure.ac - Top-level configure.in for Sympa
-# $Id$
 #
 # Sympa - SYsteme de Multi-Postage Automatique
 #
 # Copyright (c) 1997, 1998, 1999 Institut Pasteur & Christophe Wolfhugel
 # Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 # 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
 # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
-# Copyright 2017, 2018, 2019, 2020, 2021 The Sympa Community. See the
+# Copyright 2017, 2018, 2019, 2020, 2021, 2022 The Sympa Community. See the
 # AUTHORS.md file at the top-level directory of this distribution and at
 # <https://github.com/sympa-community/sympa.git>.
 #
@@ -658,17 +657,15 @@ AM_CONDITIONAL(SETUID_QUEUE, [test "x$enable_setuid_queue" = "xyes"])
 AC_CONFIG_FILES([
     Makefile
     sympa.conf
-    mk-sympa-dist.pl
     default/Makefile
     doc/Makefile
     po/Makefile
     po/sympa/Makefile.in
     po/web_help/Makefile.in
+    service/Makefile
     src/Makefile
     src/bin/Makefile
     src/cgi/Makefile
-    src/etc/Makefile
-    src/etc/script/Makefile
     src/lib/Makefile
     src/libexec/Makefile
     src/sbin/Makefile

default/mail_tt2/report.tt2

@@ -487,7 +487,7 @@
   [%|loc%]List name has been lowercased[%END%]
 
 [%~ ELSIF report_entry == 'auto_aliases' ~%]
-  [%|loc%]Aliases have been installed.[%END%]
+  [%|loc%]Aliases have been installed.[%END%] ([% report_param.listname %])
 
 [%~ ELSIF report_entry == 'user_notified' ~%]
   [%|loc(report_param.notified_user)%]User %1 has been notified[%END%]
@@ -663,6 +663,15 @@ Warning: this message may already have been sent by one of the list's moderators
 [%~ ELSIF report_entry == 'blocklisted_domain' ~%]
   [%|loc(report_param.email || report_param.value)%]Address "%1" belongs to a blocklisted domain[%END%]
 
+[%~ ELSIF report_entry == 'email_is_the_list' ~%]
+  [% IF report_param.role == 'owner' ~%]
+    [%|loc(report_param.email)%]Address "%1" is the address for the list owners[%END%]
+  [%~ ELSIF report_param.role == 'editor' ~%]
+    [%|loc(report_param.email)%]Address "%1" is the address for the list moderators[%END%]
+  [%~ ELSE ~%]
+    [%|loc(report_param.email)%]Address "%1" is the address of the list[%END%]
+  [%~ END %]
+
 [%~ ELSIF report_entry == 'incorrect_passwd' ~%]
   [%|loc%]Provided password is incorrect[%END%]
 

default/web_tt2/arcsearch.tt2

@@ -67,18 +67,28 @@
                 </em>
             </dt>
             <dd>
+            [%|obfuscate(listconf.web_archive_spam_protection) ~%]
                 [%~ FOREACH r = u.rich.from ~%]
-                    [% IF r.format == 'b' %]<b>[% r.text %]</b>
-                    [%~ ELSIF r.format == 'br' %]<br />
-                    [%~ ELSE%][% r.text %][%END ~%]
+                    [% IF r.format == 'b' ~%]
+                        <b>[% r.text %]</b>
+                    [%~ ELSIF r.format == 'br' ~%]
+                        <br />
+                    [%~ ELSE ~%]
+                        [% r.text %]
+                    [%~ END ~%]
                 [%END ~%]
                 <pre>
                     [%~ FOREACH r = u.rich.body_string ~%]
-                        [% IF r.format == 'b' %]<b>[% r.text %]</b>
-                        [%~ ELSIF r.format == 'br' %]<br />
-                        [%~ ELSE%][% r.text %][%END ~%]
+                        [% IF r.format == 'b' ~%]
+                            <b>[% r.text %]</b>
+                        [%~ ELSIF r.format == 'br' ~%]
+                            <br />
+                        [%~ ELSE ~%]
+                            [% r.text %]
+                        [%~ END ~%]
                     [%END ~%]
                 </pre>
+            [%~ END %]
             </dd>
         [% END %]
     </dl>

default/web_tt2/arcsearch_form.tt2

@@ -75,7 +75,7 @@
 
             <label for="directories">[%|loc%]Extend search field:[%END%] </label>
             <br />
-            <select name="directories" multiple="multiple" size="4">
+            <select name="directories" id="directories" multiple="multiple" size="4">
                 [% FOREACH u = yyyymm %]
                     [% SET tmp = u.key u = u.value u.NAME = tmp IF u.key.defined %]
                     <option value="[% u %]">[% u %]</option>

default/web_tt2/confirm_action.tt2

@@ -520,7 +520,7 @@
             [%~ END %]
         </ul>
         [% IF is_listmaster || is_owner %]
-            <input type="checkbox" name="signal_as_spam"
+            <input type="checkbox" name="signal_as_spam" id="signal_as_spam"
                    [% IF signal_as_spam %]checked[% END %] />
             <label for="signal_as_spam">
                 [%|loc%]Report messages as undetected spam[%END%]

default/web_tt2/d_properties.tt2

@@ -120,7 +120,7 @@
                 [%|loc(shared_doc.name)%]Rename file %1[%END%]
             [% END %]
         </label>
-        <input size="50" maxlength="100" name="new_name" />
+        <input size="50" maxlength="100" name="new_name" id="new_name" />
 
         <input type="hidden" name="list"   value="[% list %]" />
         <input type="hidden" name="path"   value="[% shared_doc.paths.join("/") %]" />

default/web_tt2/pref.tt2

@@ -43,7 +43,7 @@
     <br />
 
 
-    <h3>[%|loc%]Changing your email address[%END%]</h3>
+    <h3 id="pref-change-email">[%|loc%]Changing your email address[%END%]</h3>
 
     <p>[%|loc%]You can update your email address for all your list memberships at once. Any list owner or list moderator email addresses will also be updated.[%END%]</p>
     <form action="[% path_cgi %]" method="post">
@@ -59,7 +59,7 @@
     <br />
 
     [% UNLESS sso.size %]
-        <h4>[%|loc%]Changing your password[%END%]</h4>
+        <h3 id="pref-change-password">[%|loc%]Changing your password[%END%]</h3>
 
         <form action="[% path_cgi %]" method="post">
             <fieldset>
@@ -73,7 +73,7 @@
     [% END %]
 
     [% IF session.auth == 'classic' AND conf.allow_account_deletion == 'on' %]
-        <h4>[%|loc%]Deleting your account[%END%]</h4>
+        <h3 id="pref-delete-account">[%|loc%]Deleting your account[%END%]</h3>
         <p>
             [%|loc%]Deleting your account will unsubscribe you from all your lists, remove your ownership of your lists and permanently delete your account.[%END%]
             <br />