Unverified Commit 357c1634 authored by IKEDA Soji's avatar IKEDA Soji Committed by GitHub
Browse files

Merge branch 'sympa-6.2' into pr/release-6.2.64

parents f68f1c18 136bc0bc
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.60) AC_PREREQ(2.60)
AC_INIT(sympa, 6.2.63b.1, sympa-developpers@listes.renater.fr) AC_INIT(sympa, 6.2.63b.2, sympa-developpers@listes.renater.fr)
AM_INIT_AUTOMAKE([foreign -Wall -Werror 1.9 tar-pax]) AM_INIT_AUTOMAKE([foreign -Wall -Werror 1.9 tar-pax])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AM_PO_SUBDIRS AM_PO_SUBDIRS
......
...@@ -208,9 +208,11 @@ feature 'x509-auth', 'Required to extract user certificates for SSL clients and ...@@ -208,9 +208,11 @@ feature 'x509-auth', 'Required to extract user certificates for SSL clients and
}; };
feature 'smime', 'Required to sign, verify, encrypt and decrypt S/MIME messages.' => sub { feature 'smime', 'Required to sign, verify, encrypt and decrypt S/MIME messages.' => sub {
requires 'Convert::ASN1';
requires 'Crypt::SMIME', '>= 0.15'; requires 'Crypt::SMIME', '>= 0.15';
# Required to extract user certificates for SSL clients and S/MIME messages. # Required to extract user certificates for SSL clients and S/MIME messages.
requires 'Crypt::OpenSSL::X509', '>= 1.800.1'; # Note: On versions < 1.808, the value() method for extension was broken.
requires 'Crypt::OpenSSL::X509', '>= 1.808';
}; };
feature 'csv', 'CSV database driver, required if you include list members, owners or moderators from CSV file.' => sub { feature 'csv', 'CSV database driver, required if you include list members, owners or moderators from CSV file.' => sub {
......
...@@ -46,6 +46,9 @@ ...@@ -46,6 +46,9 @@
[%~ ELSIF report_entry == 'create_list_listmaster' ~%] [%~ ELSIF report_entry == 'create_list_listmaster' ~%]
[%|loc()%]List creation is restricted to listmaster.[%END%] [%|loc()%]List creation is restricted to listmaster.[%END%]
[%~ ELSIF report_entry == 'create_list_closed' ~%]
[%|loc()%]List creation is not allowed.[%END%]
[%~ ELSIF report_entry == 'd_edit_subscriber' ~%] [%~ ELSIF report_entry == 'd_edit_subscriber' ~%]
[%|loc()%]Shared document edition is restricted to list subscribers.[%END%] [%|loc()%]Shared document edition is restricted to list subscribers.[%END%]
[%|loc()%]If you are subscribed to the list with a different email address, you should either use that other email address or update your list membership with the new email address.[%END%] [%|loc()%]If you are subscribed to the list with a different email address, you should either use that other email address or update your list membership with the new email address.[%END%]
......
title.gettext closed
true() smtp,dkim,md5,smime -> reject('create_list_closed')
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment