diff options
| author | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2018-06-23 05:57:21 +0900 |
|---|---|---|
| committer | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2018-06-23 05:57:21 +0900 |
| commit | f647dd6c9e7e50b21150076bc9dfc3792f63e022 (patch) | |
| tree | 74fcfa8883921abdd5cc08f35f29852d3a8ec440 | |
| parent | cb03394bc0ec828ddc23b22392ea8d1a21798644 (diff) | |
| parent | 11c0af19222d0176b4f9c9c515274c61b49eec33 (diff) | |
| download | mailman2-f647dd6c9e7e50b21150076bc9dfc3792f63e022.tar.gz mailman2-f647dd6c9e7e50b21150076bc9dfc3792f63e022.tar.xz mailman2-f647dd6c9e7e50b21150076bc9dfc3792f63e022.zip | |
merge lp:mailman/2.1 up to rev 1784 (release 2.1.27)
Diffstat (limited to '')
248 files changed, 283 insertions, 246 deletions
diff --git a/ACKNOWLEDGMENTS b/ACKNOWLEDGMENTS index 4c718742..422bd531 100644 --- a/ACKNOWLEDGMENTS +++ b/ACKNOWLEDGMENTS @@ -1,5 +1,5 @@ Mailman - The GNU Mailing List Management System -Copyright (C) 1998-2007 by the Free Software Foundation, Inc. +Copyright (C) 1998-2018 by the Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA The following folks are or have been core developers of Mailman (in reverse @@ -1,5 +1,5 @@ Mailman - The GNU Mailing List Management System -Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +Copyright (C) 1998-2018 by the Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA The Mailman project is being managed on Launchpad at @@ -1,5 +1,5 @@ Mailman - The GNU Mailing List Management System -Copyright (C) 1998-2005 by the Free Software Foundation, Inc. +Copyright (C) 1998-2018 by the Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA Note: We've migrated the FAQ to the wiki at http://wiki.list.org/ @@ -1,5 +1,5 @@ Mailman - The GNU Mailing List Management System -Copyright (C) 1998-2005 Free Software Foundation, Inc. +Copyright (C) 1998-2018 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA The installation and upgrading instructions are now completely contained in diff --git a/Mailman/Archiver/Archiver.py b/Mailman/Archiver/Archiver.py index 32892033..266db592 100644 --- a/Mailman/Archiver/Archiver.py +++ b/Mailman/Archiver/Archiver.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2003 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Archiver/HyperArch.py b/Mailman/Archiver/HyperArch.py index 1b0cdce5..44691935 100644 --- a/Mailman/Archiver/HyperArch.py +++ b/Mailman/Archiver/HyperArch.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2015 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Archiver/HyperDatabase.py b/Mailman/Archiver/HyperDatabase.py index 1de58d6f..2475d47d 100644 --- a/Mailman/Archiver/HyperDatabase.py +++ b/Mailman/Archiver/HyperDatabase.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2010 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Archiver/Makefile.in b/Mailman/Archiver/Makefile.in index 65e46cbf..aef5f90a 100644 --- a/Mailman/Archiver/Makefile.in +++ b/Mailman/Archiver/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2003 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Archiver/__init__.py b/Mailman/Archiver/__init__.py index 6a4aac30..0abdc63f 100644 --- a/Mailman/Archiver/__init__.py +++ b/Mailman/Archiver/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Autoresponder.py b/Mailman/Autoresponder.py index aa29e733..62e3221a 100644 --- a/Mailman/Autoresponder.py +++ b/Mailman/Autoresponder.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Bouncer.py b/Mailman/Bouncer.py index ae0c012c..5077f84c 100644 --- a/Mailman/Bouncer.py +++ b/Mailman/Bouncer.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2014 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -259,6 +259,7 @@ class Bouncer: umsg.send(self) def sendNextNotification(self, member): + global _ info = self.getBounceInfo(member) if info is None: return diff --git a/Mailman/Bouncers/AOL.py b/Mailman/Bouncers/AOL.py index df8dd8c4..02351a29 100644 --- a/Mailman/Bouncers/AOL.py +++ b/Mailman/Bouncers/AOL.py @@ -1,4 +1,4 @@ -# Copyright (C) 2009 by the Free Software Foundation, Inc. +# Copyright (C) 2009-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Bouncers/BouncerAPI.py b/Mailman/Bouncers/BouncerAPI.py index 5f83faf1..9b941143 100644 --- a/Mailman/Bouncers/BouncerAPI.py +++ b/Mailman/Bouncers/BouncerAPI.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2009 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Bouncers/Caiwireless.py b/Mailman/Bouncers/Caiwireless.py index b71b0624..b1aea634 100644 --- a/Mailman/Bouncers/Caiwireless.py +++ b/Mailman/Bouncers/Caiwireless.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2008 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Bouncers/Compuserve.py b/Mailman/Bouncers/Compuserve.py index 89085d2c..0a94b00c 100644 --- a/Mailman/Bouncers/Compuserve.py +++ b/Mailman/Bouncers/Compuserve.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Bouncers/DSN.py b/Mailman/Bouncers/DSN.py index 2eacd0f4..701617db 100644 --- a/Mailman/Bouncers/DSN.py +++ b/Mailman/Bouncers/DSN.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2008 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Bouncers/Exchange.py b/Mailman/Bouncers/Exchange.py index 2f6eeda0..a49ad81a 100644 --- a/Mailman/Bouncers/Exchange.py +++ b/Mailman/Bouncers/Exchange.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Bouncers/Exim.py b/Mailman/Bouncers/Exim.py index ce677385..a5129156 100644 --- a/Mailman/Bouncers/Exim.py +++ b/Mailman/Bouncers/Exim.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Bouncers/GroupWise.py b/Mailman/Bouncers/GroupWise.py index e5122f73..b3798217 100644 --- a/Mailman/Bouncers/GroupWise.py +++ b/Mailman/Bouncers/GroupWise.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2008 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Bouncers/LLNL.py b/Mailman/Bouncers/LLNL.py index 97c56e22..1e038182 100644 --- a/Mailman/Bouncers/LLNL.py +++ b/Mailman/Bouncers/LLNL.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Bouncers/Makefile.in b/Mailman/Bouncers/Makefile.in index 8865a9f2..509d8d14 100644 --- a/Mailman/Bouncers/Makefile.in +++ b/Mailman/Bouncers/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2003 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Bouncers/Microsoft.py b/Mailman/Bouncers/Microsoft.py index fec7cc93..357cece2 100644 --- a/Mailman/Bouncers/Microsoft.py +++ b/Mailman/Bouncers/Microsoft.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2008 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Bouncers/Netscape.py b/Mailman/Bouncers/Netscape.py index 8c21f629..8bc6b9dd 100644 --- a/Mailman/Bouncers/Netscape.py +++ b/Mailman/Bouncers/Netscape.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2008 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Bouncers/Postfix.py b/Mailman/Bouncers/Postfix.py index 3c250e95..5fc5bbd3 100644 --- a/Mailman/Bouncers/Postfix.py +++ b/Mailman/Bouncers/Postfix.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2008 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Bouncers/Qmail.py b/Mailman/Bouncers/Qmail.py index 6d742373..a22771b5 100755..100644 --- a/Mailman/Bouncers/Qmail.py +++ b/Mailman/Bouncers/Qmail.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2011 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Bouncers/SMTP32.py b/Mailman/Bouncers/SMTP32.py index f2397b24..db6b4c52 100644 --- a/Mailman/Bouncers/SMTP32.py +++ b/Mailman/Bouncers/SMTP32.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2007 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Bouncers/SimpleMatch.py b/Mailman/Bouncers/SimpleMatch.py index e84d2255..ca648f65 100644 --- a/Mailman/Bouncers/SimpleMatch.py +++ b/Mailman/Bouncers/SimpleMatch.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2010 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Bouncers/SimpleWarning.py b/Mailman/Bouncers/SimpleWarning.py index 4f5958ea..43ad5396 100644 --- a/Mailman/Bouncers/SimpleWarning.py +++ b/Mailman/Bouncers/SimpleWarning.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2013 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Bouncers/Sina.py b/Mailman/Bouncers/Sina.py index 3e39ffac..9256104d 100644 --- a/Mailman/Bouncers/Sina.py +++ b/Mailman/Bouncers/Sina.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Bouncers/Yahoo.py b/Mailman/Bouncers/Yahoo.py index 47fedce2..f60cf3d7 100644 --- a/Mailman/Bouncers/Yahoo.py +++ b/Mailman/Bouncers/Yahoo.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2013 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Bouncers/Yale.py b/Mailman/Bouncers/Yale.py index 6b4aa3ee..61fd2600 100644 --- a/Mailman/Bouncers/Yale.py +++ b/Mailman/Bouncers/Yale.py @@ -1,4 +1,4 @@ -# Copyright (C) 2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 2000-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Bouncers/__init__.py b/Mailman/Bouncers/__init__.py index f569e43f..b271f895 100644 --- a/Mailman/Bouncers/__init__.py +++ b/Mailman/Bouncers/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/CSRFcheck.py b/Mailman/CSRFcheck.py index d531ffc2..a1e78d98 100644 --- a/Mailman/CSRFcheck.py +++ b/Mailman/CSRFcheck.py @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2013 by the Free Software Foundation, Inc. +# Copyright (C) 2011-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Cgi/Auth.py b/Mailman/Cgi/Auth.py index 986a9235..cffd33d0 100644 --- a/Mailman/Cgi/Auth.py +++ b/Mailman/Cgi/Auth.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2010 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Cgi/Makefile.in b/Mailman/Cgi/Makefile.in index 47929e92..946f8bf7 100644 --- a/Mailman/Cgi/Makefile.in +++ b/Mailman/Cgi/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2003 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Cgi/__init__.py b/Mailman/Cgi/__init__.py index f569e43f..b271f895 100644 --- a/Mailman/Cgi/__init__.py +++ b/Mailman/Cgi/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py index f44e01db..a92ab378 100644 --- a/Mailman/Cgi/admin.py +++ b/Mailman/Cgi/admin.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2017 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -295,7 +295,7 @@ def admin_overview(msg=''): else: advertised.append((mlist.GetScriptURL('admin'), mlist.real_name, - mlist.description)) + Utils.websafe(mlist.GetDescription()))) # Greeting depends on whether there was an error or not if msg: greeting = FontAttr(msg, color="ff5060", size="+1") @@ -1401,6 +1401,7 @@ def submit_button(name='submit'): def change_options(mlist, category, subcat, cgidata, doc): + global _ def safeint(formvar, defaultval=None): try: return int(cgidata.getfirst(formvar)) diff --git a/Mailman/Cgi/admindb.py b/Mailman/Cgi/admindb.py index 010d8aae..58bb3578 100644 --- a/Mailman/Cgi/admindb.py +++ b/Mailman/Cgi/admindb.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2017 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Cgi/confirm.py b/Mailman/Cgi/confirm.py index 100db00c..8dd39aff 100644 --- a/Mailman/Cgi/confirm.py +++ b/Mailman/Cgi/confirm.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2017 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Cgi/create.py b/Mailman/Cgi/create.py index 8f20385d..ebb211ae 100644 --- a/Mailman/Cgi/create.py +++ b/Mailman/Cgi/create.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2017 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Cgi/edithtml.py b/Mailman/Cgi/edithtml.py index 8bf1652a..796d8539 100644 --- a/Mailman/Cgi/edithtml.py +++ b/Mailman/Cgi/edithtml.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2017 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Cgi/listinfo.py b/Mailman/Cgi/listinfo.py index b55c263d..f1b455da 100644 --- a/Mailman/Cgi/listinfo.py +++ b/Mailman/Cgi/listinfo.py @@ -114,7 +114,7 @@ def listinfo_overview(msg=''): else: advertised.append((mlist.GetScriptURL('listinfo'), mlist.real_name, - Utils.websafe(mlist.description))) + Utils.websafe(mlist.GetDescription()))) if msg: greeting = FontAttr(msg, color="ff5060", size="+1") else: diff --git a/Mailman/Cgi/options.py b/Mailman/Cgi/options.py index c2a84ecb..34a7718e 100644 --- a/Mailman/Cgi/options.py +++ b/Mailman/Cgi/options.py @@ -59,6 +59,7 @@ AUTH_CONTEXTS = (mm_cfg.AuthListAdmin, mm_cfg.AuthSiteAdmin, def main(): + global _ doc = Document() doc.set_language(mm_cfg.DEFAULT_SERVER_LANGUAGE) diff --git a/Mailman/Cgi/private.py b/Mailman/Cgi/private.py index 131c5de8..7112c6c4 100755..100644 --- a/Mailman/Cgi/private.py +++ b/Mailman/Cgi/private.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2017 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Cgi/rmlist.py b/Mailman/Cgi/rmlist.py index f30c358e..4472c1c5 100644 --- a/Mailman/Cgi/rmlist.py +++ b/Mailman/Cgi/rmlist.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2017 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Cgi/roster.py b/Mailman/Cgi/roster.py index 02286c09..abf87e08 100644 --- a/Mailman/Cgi/roster.py +++ b/Mailman/Cgi/roster.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2017 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Cgi/subscribe.py b/Mailman/Cgi/subscribe.py index b6527a2a..b6527a2a 100755..100644 --- a/Mailman/Cgi/subscribe.py +++ b/Mailman/Cgi/subscribe.py diff --git a/Mailman/Commands/Makefile.in b/Mailman/Commands/Makefile.in index 645d78b9..c61cc527 100644 --- a/Mailman/Commands/Makefile.in +++ b/Mailman/Commands/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2003 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Commands/__init__.py b/Mailman/Commands/__init__.py index b248fe49..6e8efcb9 100644 --- a/Mailman/Commands/__init__.py +++ b/Mailman/Commands/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Commands/cmd_confirm.py b/Mailman/Commands/cmd_confirm.py index 379d23c2..90549270 100644 --- a/Mailman/Commands/cmd_confirm.py +++ b/Mailman/Commands/cmd_confirm.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2015 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Commands/cmd_echo.py b/Mailman/Commands/cmd_echo.py index 206e444a..60e5bffc 100644 --- a/Mailman/Commands/cmd_echo.py +++ b/Mailman/Commands/cmd_echo.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Commands/cmd_end.py b/Mailman/Commands/cmd_end.py index c01fa816..afe28a07 100644 --- a/Mailman/Commands/cmd_end.py +++ b/Mailman/Commands/cmd_end.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Commands/cmd_help.py b/Mailman/Commands/cmd_help.py index 5920f782..3c278c91 100644 --- a/Mailman/Commands/cmd_help.py +++ b/Mailman/Commands/cmd_help.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Commands/cmd_info.py b/Mailman/Commands/cmd_info.py index 177a8ee0..3610b722 100644 --- a/Mailman/Commands/cmd_info.py +++ b/Mailman/Commands/cmd_info.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Commands/cmd_join.py b/Mailman/Commands/cmd_join.py index a8939fca..abafb473 100644 --- a/Mailman/Commands/cmd_join.py +++ b/Mailman/Commands/cmd_join.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Commands/cmd_leave.py b/Mailman/Commands/cmd_leave.py index 01a04ce6..42c0d446 100644 --- a/Mailman/Commands/cmd_leave.py +++ b/Mailman/Commands/cmd_leave.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Commands/cmd_lists.py b/Mailman/Commands/cmd_lists.py index ff5dd355..855b2684 100644 --- a/Mailman/Commands/cmd_lists.py +++ b/Mailman/Commands/cmd_lists.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Commands/cmd_password.py b/Mailman/Commands/cmd_password.py index 19093c0c..00e67a52 100644 --- a/Mailman/Commands/cmd_password.py +++ b/Mailman/Commands/cmd_password.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2004 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Commands/cmd_remove.py b/Mailman/Commands/cmd_remove.py index 3989b0c7..84062c81 100644 --- a/Mailman/Commands/cmd_remove.py +++ b/Mailman/Commands/cmd_remove.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Commands/cmd_set.py b/Mailman/Commands/cmd_set.py index c68a9067..a47d628e 100644 --- a/Mailman/Commands/cmd_set.py +++ b/Mailman/Commands/cmd_set.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2003 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Commands/cmd_stop.py b/Mailman/Commands/cmd_stop.py index 79d2414a..54289d23 100644 --- a/Mailman/Commands/cmd_stop.py +++ b/Mailman/Commands/cmd_stop.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Commands/cmd_subscribe.py b/Mailman/Commands/cmd_subscribe.py index 5f01522f..abe8b762 100644 --- a/Mailman/Commands/cmd_subscribe.py +++ b/Mailman/Commands/cmd_subscribe.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2008 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Commands/cmd_unsubscribe.py b/Mailman/Commands/cmd_unsubscribe.py index 76a864fe..9ffa80cd 100644 --- a/Mailman/Commands/cmd_unsubscribe.py +++ b/Mailman/Commands/cmd_unsubscribe.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Commands/cmd_who.py b/Mailman/Commands/cmd_who.py index 8470ef9d..3fa035a5 100644 --- a/Mailman/Commands/cmd_who.py +++ b/Mailman/Commands/cmd_who.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2007 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Deliverer.py b/Mailman/Deliverer.py index dc867006..e61db50c 100644 --- a/Mailman/Deliverer.py +++ b/Mailman/Deliverer.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2014 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Digester.py b/Mailman/Digester.py index 2d27b844..8a65043b 100644 --- a/Mailman/Digester.py +++ b/Mailman/Digester.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Errors.py b/Mailman/Errors.py index d4af216e..f4895248 100644 --- a/Mailman/Errors.py +++ b/Mailman/Errors.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2009 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/GatewayManager.py b/Mailman/GatewayManager.py index 094f0c76..86bc7d5d 100644 --- a/Mailman/GatewayManager.py +++ b/Mailman/GatewayManager.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Gui/Archive.py b/Mailman/Gui/Archive.py index 4afe8c7c..fc313c00 100644 --- a/Mailman/Gui/Archive.py +++ b/Mailman/Gui/Archive.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Gui/Autoresponse.py b/Mailman/Gui/Autoresponse.py index 0b334778..e527a678 100644 --- a/Mailman/Gui/Autoresponse.py +++ b/Mailman/Gui/Autoresponse.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Gui/Bounce.py b/Mailman/Gui/Bounce.py index e559dcc8..d2900275 100644 --- a/Mailman/Gui/Bounce.py +++ b/Mailman/Gui/Bounce.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2014 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Gui/ContentFilter.py b/Mailman/Gui/ContentFilter.py index 9043fe89..963e7945 100644 --- a/Mailman/Gui/ContentFilter.py +++ b/Mailman/Gui/ContentFilter.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2005 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Gui/Digest.py b/Mailman/Gui/Digest.py index 77691aee..55cee19d 100644 --- a/Mailman/Gui/Digest.py +++ b/Mailman/Gui/Digest.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2013 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Gui/Language.py b/Mailman/Gui/Language.py index e9400fca..280f7bf9 100644 --- a/Mailman/Gui/Language.py +++ b/Mailman/Gui/Language.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Gui/Makefile.in b/Mailman/Gui/Makefile.in index 000441ef..9aa9bb12 100644 --- a/Mailman/Gui/Makefile.in +++ b/Mailman/Gui/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2000-2003 by the Free Software Foundation, Inc. +# Copyright (C) 2000-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Gui/Membership.py b/Mailman/Gui/Membership.py index fdf5a7ca..c180df0c 100644 --- a/Mailman/Gui/Membership.py +++ b/Mailman/Gui/Membership.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Gui/NonDigest.py b/Mailman/Gui/NonDigest.py index e4d7d526..2b2c78ec 100755..100644 --- a/Mailman/Gui/NonDigest.py +++ b/Mailman/Gui/NonDigest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2010 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Gui/Passwords.py b/Mailman/Gui/Passwords.py index 8ea9bcf7..09ddcacd 100644 --- a/Mailman/Gui/Passwords.py +++ b/Mailman/Gui/Passwords.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Gui/Privacy.py b/Mailman/Gui/Privacy.py index b1e1eecf..25e49d2f 100644 --- a/Mailman/Gui/Privacy.py +++ b/Mailman/Gui/Privacy.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2017 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Gui/Topics.py b/Mailman/Gui/Topics.py index c65d44c1..b1db0c51 100644 --- a/Mailman/Gui/Topics.py +++ b/Mailman/Gui/Topics.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2017 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Gui/Usenet.py b/Mailman/Gui/Usenet.py index 9cfbd6f1..664ecc86 100644 --- a/Mailman/Gui/Usenet.py +++ b/Mailman/Gui/Usenet.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2003 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Gui/__init__.py b/Mailman/Gui/__init__.py index 5bf28bcc..e1d4fb89 100644 --- a/Mailman/Gui/__init__.py +++ b/Mailman/Gui/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/HTMLFormatter.py b/Mailman/HTMLFormatter.py index a6e1b88f..098a2881 100644 --- a/Mailman/HTMLFormatter.py +++ b/Mailman/HTMLFormatter.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2017 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -389,11 +389,16 @@ class HTMLFormatter: listlangs = _(Utils.GetLanguageDescr(self.preferred_language)) else: listlangs = self.GetLangSelectBox(lang).Format() + if lang: + cset = Utils.GetCharSet(lang) or 'us-ascii' + else: + cset = Utils.GetCharSet(self.preferred_language) or 'us-ascii' d = { '<mm-mailman-footer>' : self.GetMailmanFooter(), '<mm-list-name>' : self.real_name, '<mm-email-user>' : self._internal_name, - '<mm-list-description>' : Utils.websafe(self.description), + '<mm-list-description>' : + Utils.websafe(self.GetDescription(cset)), '<mm-list-info>' : '<!---->' + BR.join(self.info.split(NL)) + '<!---->', '<mm-form-end>' : self.FormatFormEnd(), diff --git a/Mailman/Handlers/Acknowledge.py b/Mailman/Handlers/Acknowledge.py index dc817577..59e508cf 100644 --- a/Mailman/Handlers/Acknowledge.py +++ b/Mailman/Handlers/Acknowledge.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Handlers/AfterDelivery.py b/Mailman/Handlers/AfterDelivery.py index 64bdb1f2..6efd4b4a 100644 --- a/Mailman/Handlers/AfterDelivery.py +++ b/Mailman/Handlers/AfterDelivery.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Handlers/Approve.py b/Mailman/Handlers/Approve.py index cfd76f46..51078bb0 100644 --- a/Mailman/Handlers/Approve.py +++ b/Mailman/Handlers/Approve.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2011 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Handlers/AvoidDuplicates.py b/Mailman/Handlers/AvoidDuplicates.py index 549d8e79..25c1b410 100644 --- a/Mailman/Handlers/AvoidDuplicates.py +++ b/Mailman/Handlers/AvoidDuplicates.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2008 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Handlers/CalcRecips.py b/Mailman/Handlers/CalcRecips.py index 069c88a8..51733cee 100755..100644 --- a/Mailman/Handlers/CalcRecips.py +++ b/Mailman/Handlers/CalcRecips.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2008 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Handlers/Cleanse.py b/Mailman/Handlers/Cleanse.py index 5270bb5a..aab47abe 100644 --- a/Mailman/Handlers/Cleanse.py +++ b/Mailman/Handlers/Cleanse.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Handlers/CleanseDKIM.py b/Mailman/Handlers/CleanseDKIM.py index 3e70313b..45ac5edc 100644 --- a/Mailman/Handlers/CleanseDKIM.py +++ b/Mailman/Handlers/CleanseDKIM.py @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2016 by the Free Software Foundation, Inc. +# Copyright (C) 2006-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Handlers/CookHeaders.py b/Mailman/Handlers/CookHeaders.py index 3e2806f0..e36c5291 100755..100644 --- a/Mailman/Handlers/CookHeaders.py +++ b/Mailman/Handlers/CookHeaders.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2017 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Handlers/Decorate.py b/Mailman/Handlers/Decorate.py index d1c8c5b4..6c057f4c 100644 --- a/Mailman/Handlers/Decorate.py +++ b/Mailman/Handlers/Decorate.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2017 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Handlers/Emergency.py b/Mailman/Handlers/Emergency.py index 3f738ee3..47612d1b 100644 --- a/Mailman/Handlers/Emergency.py +++ b/Mailman/Handlers/Emergency.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Handlers/FileRecips.py b/Mailman/Handlers/FileRecips.py index fc3f890a..c811b69a 100644 --- a/Mailman/Handlers/FileRecips.py +++ b/Mailman/Handlers/FileRecips.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Handlers/Hold.py b/Mailman/Handlers/Hold.py index 2faebae1..fa8f2e9a 100644 --- a/Mailman/Handlers/Hold.py +++ b/Mailman/Handlers/Hold.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Handlers/Makefile.in b/Mailman/Handlers/Makefile.in index 71e5576c..7345e16e 100644 --- a/Mailman/Handlers/Makefile.in +++ b/Mailman/Handlers/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2003 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Handlers/MimeDel.py b/Mailman/Handlers/MimeDel.py index 691a6e85..1f1d8724 100644 --- a/Mailman/Handlers/MimeDel.py +++ b/Mailman/Handlers/MimeDel.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2016 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Handlers/Moderate.py b/Mailman/Handlers/Moderate.py index 49ed1d7e..b763f390 100644 --- a/Mailman/Handlers/Moderate.py +++ b/Mailman/Handlers/Moderate.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2015 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Handlers/OwnerRecips.py b/Mailman/Handlers/OwnerRecips.py index 88dccfa8..13b34721 100644 --- a/Mailman/Handlers/OwnerRecips.py +++ b/Mailman/Handlers/OwnerRecips.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Handlers/Replybot.py b/Mailman/Handlers/Replybot.py index 3c9536a0..95429acc 100644 --- a/Mailman/Handlers/Replybot.py +++ b/Mailman/Handlers/Replybot.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2003 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Handlers/SMTPDirect.py b/Mailman/Handlers/SMTPDirect.py index ca6aebdd..775e0b9e 100644 --- a/Mailman/Handlers/SMTPDirect.py +++ b/Mailman/Handlers/SMTPDirect.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Handlers/Scrubber.py b/Mailman/Handlers/Scrubber.py index d1e6414f..429312be 100644 --- a/Mailman/Handlers/Scrubber.py +++ b/Mailman/Handlers/Scrubber.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2011 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Handlers/Sendmail.py b/Mailman/Handlers/Sendmail.py index a75f7423..7e02df06 100644 --- a/Mailman/Handlers/Sendmail.py +++ b/Mailman/Handlers/Sendmail.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Handlers/SpamDetect.py b/Mailman/Handlers/SpamDetect.py index 4e554d70..7e035184 100644 --- a/Mailman/Handlers/SpamDetect.py +++ b/Mailman/Handlers/SpamDetect.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Handlers/Tagger.py b/Mailman/Handlers/Tagger.py index ed9a7e71..5292242c 100644 --- a/Mailman/Handlers/Tagger.py +++ b/Mailman/Handlers/Tagger.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2015 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Handlers/ToArchive.py b/Mailman/Handlers/ToArchive.py index 533f2012..79d49def 100644 --- a/Mailman/Handlers/ToArchive.py +++ b/Mailman/Handlers/ToArchive.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2006 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Handlers/ToDigest.py b/Mailman/Handlers/ToDigest.py index 15042075..d4a4da3a 100644 --- a/Mailman/Handlers/ToDigest.py +++ b/Mailman/Handlers/ToDigest.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2017 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Handlers/ToOutgoing.py b/Mailman/Handlers/ToOutgoing.py index 7273c41b..01ff6b93 100644 --- a/Mailman/Handlers/ToOutgoing.py +++ b/Mailman/Handlers/ToOutgoing.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Handlers/ToUsenet.py b/Mailman/Handlers/ToUsenet.py index 805d7f11..26b5ecfa 100644 --- a/Mailman/Handlers/ToUsenet.py +++ b/Mailman/Handlers/ToUsenet.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Handlers/WrapMessage.py b/Mailman/Handlers/WrapMessage.py index 2bb540d6..0ee08cb1 100644 --- a/Mailman/Handlers/WrapMessage.py +++ b/Mailman/Handlers/WrapMessage.py @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2016 by the Free Software Foundation, Inc. +# Copyright (C) 2013-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Handlers/__init__.py b/Mailman/Handlers/__init__.py index f569e43f..b271f895 100644 --- a/Mailman/Handlers/__init__.py +++ b/Mailman/Handlers/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/ListAdmin.py b/Mailman/ListAdmin.py index 8825760a..fe58109c 100755..100644 --- a/Mailman/ListAdmin.py +++ b/Mailman/ListAdmin.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2014 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -421,6 +421,7 @@ class ListAdmin: i18n.set_language(lang) def __handlesubscription(self, record, value, comment): + global _ stime, addr, fullname, password, digest, lang = record if value == mm_cfg.DEFER: return DEFER diff --git a/Mailman/LockFile.py b/Mailman/LockFile.py index 195615e6..d7cd9252 100644 --- a/Mailman/LockFile.py +++ b/Mailman/LockFile.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2008 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Logging/Logger.py b/Mailman/Logging/Logger.py index f3d30164..4e917b5e 100644 --- a/Mailman/Logging/Logger.py +++ b/Mailman/Logging/Logger.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2005 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Logging/Makefile.in b/Mailman/Logging/Makefile.in index e185775f..8e15297b 100644 --- a/Mailman/Logging/Makefile.in +++ b/Mailman/Logging/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2003 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Logging/MultiLogger.py b/Mailman/Logging/MultiLogger.py index 7d9435e9..ab4043aa 100644 --- a/Mailman/Logging/MultiLogger.py +++ b/Mailman/Logging/MultiLogger.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Logging/StampedLogger.py b/Mailman/Logging/StampedLogger.py index ca313c53..2657d7fc 100644 --- a/Mailman/Logging/StampedLogger.py +++ b/Mailman/Logging/StampedLogger.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Logging/Syslog.py b/Mailman/Logging/Syslog.py index 81e27214..28aa7313 100644 --- a/Mailman/Logging/Syslog.py +++ b/Mailman/Logging/Syslog.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2005 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Logging/Utils.py b/Mailman/Logging/Utils.py index 46bf487a..bbcaee06 100644 --- a/Mailman/Logging/Utils.py +++ b/Mailman/Logging/Utils.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Logging/__init__.py b/Mailman/Logging/__init__.py index f569e43f..b271f895 100644 --- a/Mailman/Logging/__init__.py +++ b/Mailman/Logging/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/MTA/Makefile.in b/Mailman/MTA/Makefile.in index 03388060..98b8bd40 100644 --- a/Mailman/MTA/Makefile.in +++ b/Mailman/MTA/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2003 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/MTA/Manual.py b/Mailman/MTA/Manual.py index 14158263..2acfb3b4 100644 --- a/Mailman/MTA/Manual.py +++ b/Mailman/MTA/Manual.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2016 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/MTA/Postfix.py b/Mailman/MTA/Postfix.py index 6fa3f14a..798957a5 100644 --- a/Mailman/MTA/Postfix.py +++ b/Mailman/MTA/Postfix.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2017 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/MTA/Utils.py b/Mailman/MTA/Utils.py index 07d8bcad..7ed253c9 100644 --- a/Mailman/MTA/Utils.py +++ b/Mailman/MTA/Utils.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2008 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/MTA/__init__.py b/Mailman/MTA/__init__.py index 51962525..6e8efcb9 100644 --- a/Mailman/MTA/__init__.py +++ b/Mailman/MTA/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/MailList.py b/Mailman/MailList.py index d2a15e29..8e2518c5 100755..100644 --- a/Mailman/MailList.py +++ b/Mailman/MailList.py @@ -262,6 +262,27 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin, user = Utils.ObscureEmail(user) return '%s/%s' % (url, urllib.quote(user.lower())) + def GetDescription(self, cset=None, errors='xmlcharrefreplace'): + # Get list's description in charset specified by cset. + # If cset is None, it uses charset of context language. + mcset = Utils.GetCharSet(self.preferred_language) + if cset is None: + # translation context may not be initialized + trns = i18n.get_translation() + if trns is None: + ccset = 'us-ascii' + else: + ccset = i18n.get_translation().charset() or 'us-ascii' + else: + ccset = cset + if isinstance(self.description, unicode): + return self.description.encode(ccset, errors) + if mcset == ccset: + return self.description + return Utils.xml_to_unicode(self.description, mcset).encode(ccset, + errors) + + # # Instance and subcomponent initialization @@ -1301,6 +1322,7 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin, # Confirmation processing # def ProcessConfirmation(self, cookie, context=None): + global _ rec = self.pend_confirm(cookie) if rec is None: raise Errors.MMBadConfirmation, 'No cookie record for %s' % cookie diff --git a/Mailman/Mailbox.py b/Mailman/Mailbox.py index a8fa4d0b..6a984a3c 100644 --- a/Mailman/Mailbox.py +++ b/Mailman/Mailbox.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2013 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Makefile.in b/Mailman/Makefile.in index 93c7efdf..c754f922 100644 --- a/Mailman/Makefile.in +++ b/Mailman/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2003 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/MemberAdaptor.py b/Mailman/MemberAdaptor.py index bcaf1ace..b2c178ae 100644 --- a/Mailman/MemberAdaptor.py +++ b/Mailman/MemberAdaptor.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2003 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Message.py b/Mailman/Message.py index 5d68e7ef..2d68fd8f 100644 --- a/Mailman/Message.py +++ b/Mailman/Message.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2014 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/OldStyleMemberships.py b/Mailman/OldStyleMemberships.py index d50bc62f..6f1ae42b 100644 --- a/Mailman/OldStyleMemberships.py +++ b/Mailman/OldStyleMemberships.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2008 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Pending.py b/Mailman/Pending.py index 191ead1a..abec1eaf 100644 --- a/Mailman/Pending.py +++ b/Mailman/Pending.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2009 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Post.py b/Mailman/Post.py index 5b7af77c..7f86696d 100644 --- a/Mailman/Post.py +++ b/Mailman/Post.py @@ -1,6 +1,6 @@ #! /usr/bin/env python # -# Copyright (C) 2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Queue/ArchRunner.py b/Mailman/Queue/ArchRunner.py index 17056e29..0fef7809 100644 --- a/Mailman/Queue/ArchRunner.py +++ b/Mailman/Queue/ArchRunner.py @@ -1,4 +1,4 @@ -# Copyright (C) 2000-2016 by the Free Software Foundation, Inc. +# Copyright (C) 2000-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Queue/BounceRunner.py b/Mailman/Queue/BounceRunner.py index 2d14f284..bc7ec0d9 100644 --- a/Mailman/Queue/BounceRunner.py +++ b/Mailman/Queue/BounceRunner.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2015 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Queue/CommandRunner.py b/Mailman/Queue/CommandRunner.py index a9f6f000..6ea50255 100644 --- a/Mailman/Queue/CommandRunner.py +++ b/Mailman/Queue/CommandRunner.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2015 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Queue/IncomingRunner.py b/Mailman/Queue/IncomingRunner.py index 2c6c2815..8c8acdb5 100644 --- a/Mailman/Queue/IncomingRunner.py +++ b/Mailman/Queue/IncomingRunner.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2015 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Queue/MaildirRunner.py b/Mailman/Queue/MaildirRunner.py index d9fe02cb..433d2975 100644 --- a/Mailman/Queue/MaildirRunner.py +++ b/Mailman/Queue/MaildirRunner.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2007 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Queue/Makefile.in b/Mailman/Queue/Makefile.in index 179f3d97..454a5a29 100644 --- a/Mailman/Queue/Makefile.in +++ b/Mailman/Queue/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2003 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Queue/NewsRunner.py b/Mailman/Queue/NewsRunner.py index fe693f28..f9aec7a0 100644 --- a/Mailman/Queue/NewsRunner.py +++ b/Mailman/Queue/NewsRunner.py @@ -1,4 +1,4 @@ -# Copyright (C) 2000-2016 by the Free Software Foundation, Inc. +# Copyright (C) 2000-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Queue/OutgoingRunner.py b/Mailman/Queue/OutgoingRunner.py index 86d26808..86d26808 100755..100644 --- a/Mailman/Queue/OutgoingRunner.py +++ b/Mailman/Queue/OutgoingRunner.py diff --git a/Mailman/Queue/Runner.py b/Mailman/Queue/Runner.py index 26bd0c29..4b16d7c7 100644 --- a/Mailman/Queue/Runner.py +++ b/Mailman/Queue/Runner.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2011 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Queue/Switchboard.py b/Mailman/Queue/Switchboard.py index a2c31263..58592e89 100644 --- a/Mailman/Queue/Switchboard.py +++ b/Mailman/Queue/Switchboard.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2013 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Queue/VirginRunner.py b/Mailman/Queue/VirginRunner.py index 7d09ef8e..410a9336 100644 --- a/Mailman/Queue/VirginRunner.py +++ b/Mailman/Queue/VirginRunner.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Queue/__init__.py b/Mailman/Queue/__init__.py index 7fef2245..3bf720f9 100644 --- a/Mailman/Queue/__init__.py +++ b/Mailman/Queue/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 2000-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Queue/sbcache.py b/Mailman/Queue/sbcache.py index dee1bca7..8021bb72 100644 --- a/Mailman/Queue/sbcache.py +++ b/Mailman/Queue/sbcache.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/SafeDict.py b/Mailman/SafeDict.py index 12cf03f5..561065b6 100644 --- a/Mailman/SafeDict.py +++ b/Mailman/SafeDict.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/SecurityManager.py b/Mailman/SecurityManager.py index 7ca4e084..9b7f03f3 100644 --- a/Mailman/SecurityManager.py +++ b/Mailman/SecurityManager.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2013 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Site.py b/Mailman/Site.py index 2a1025ae..13c1d5d6 100644 --- a/Mailman/Site.py +++ b/Mailman/Site.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2003 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/TopicMgr.py b/Mailman/TopicMgr.py index 27f113fb..ab287eb0 100644 --- a/Mailman/TopicMgr.py +++ b/Mailman/TopicMgr.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/UserDesc.py b/Mailman/UserDesc.py index ec7db748..b861e3a8 100644 --- a/Mailman/UserDesc.py +++ b/Mailman/UserDesc.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2004 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Version.py b/Mailman/Version.py index 1a5775b3..2d90eee8 100644 --- a/Mailman/Version.py +++ b/Mailman/Version.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -16,7 +16,7 @@ # USA. # Mailman version -VERSION = '2.1.26' +VERSION = '2.1.27' # And as a hex number in the manner of PY_VERSION_HEX ALPHA = 0xa @@ -28,7 +28,7 @@ FINAL = 0xf MAJOR_REV = 2 MINOR_REV = 1 -MICRO_REV = 26 +MICRO_REV = 27 REL_LEVEL = FINAL # at most 15 beta releases! REL_SERIAL = 0 diff --git a/Mailman/__init__.py b/Mailman/__init__.py index f569e43f..b271f895 100644 --- a/Mailman/__init__.py +++ b/Mailman/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/htmlformat.py b/Mailman/htmlformat.py index 210150ed..31795a8a 100755..100644 --- a/Mailman/htmlformat.py +++ b/Mailman/htmlformat.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2017 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/i18n.py b/Mailman/i18n.py index 605d4e76..7faee54c 100644 --- a/Mailman/i18n.py +++ b/Mailman/i18n.py @@ -1,4 +1,4 @@ -# Copyright (C) 2000-2016 by the Free Software Foundation, Inc. +# Copyright (C) 2000-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/mm_cfg.py.dist.in b/Mailman/mm_cfg.py.dist.in index a5a206ac..22937941 100644 --- a/Mailman/mm_cfg.py.dist.in +++ b/Mailman/mm_cfg.py.dist.in @@ -1,6 +1,6 @@ # -*- python -*- -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/versions.py b/Mailman/versions.py index b6c4231f..428bb0af 100755..100644 --- a/Mailman/versions.py +++ b/Mailman/versions.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Makefile.in b/Makefile.in index b70f0134..574fe758 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2003 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -5,14 +5,16 @@ Copyright (C) 1998-2018 by the Free Software Foundation, Inc. Here is a history of user visible changes to Mailman. -2.1.27 (xx-xxx-xxxx) +2.1.27 (22-Jun-2018) Security - Existing protections against malicious listowners injecting evil scripts into listinfo pages have had a few more checks added. + JVN#00846677/JPCERT#97432283 - A few more error messages have had their values HTML escaped. + JVN#00846677/JPCERT#97432283 - The hash generated when SUBSCRIBE_FORM_SECRET is set could have been the same as one generated at the same time for a different list and @@ -94,6 +96,10 @@ Here is a history of user visible changes to Mailman. - Approving a held subscription for a user with a 'different' preferred language no longer corrupts the results page. (LP: #1777222) + - An issue with garbled descriptions on listinfo and admin overview pages + and the heading of a list's listinfo page due to incompatible character + sets has been fixed thanks to Yasuhito FUTATSUKI. + Miscellaneous - Added to the contrib directory, a script from Jim Popovitch to generate @@ -1,5 +1,5 @@ Mailman - The GNU Mailing List Management System -Copyright (C) 1998-2015 by the Free Software Foundation, Inc. +Copyright (C) 1998-2018 by the Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA INTRODUCTION diff --git a/README-I18N.en b/README-I18N.en index ade319bd..0d73d9f5 100644 --- a/README-I18N.en +++ b/README-I18N.en @@ -1,5 +1,5 @@ Mailman - The GNU Mailing List Management System -Copyright (C) 2001-2003 by the Free Software Foundation, Inc. +Copyright (C) 2001-2018 by the Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA diff --git a/README.CONTRIB b/README.CONTRIB index c378f3bc..185916b5 100644 --- a/README.CONTRIB +++ b/README.CONTRIB @@ -1,5 +1,5 @@ Mailman - The GNU Mailing List Management System -Copyright (C) 2001,2002 by the Free Software Foundation, Inc. +Copyright (C) 2001-2018 by the Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA Encrypted mailing lists diff --git a/README.NETSCAPE b/README.NETSCAPE index 9828127f..e8d4ffe7 100644 --- a/README.NETSCAPE +++ b/README.NETSCAPE @@ -1,5 +1,5 @@ Mailman - The GNU Mailing List Management System -Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +Copyright (C) 1998-2018 by the Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA diff --git a/README.USERAGENT b/README.USERAGENT index af5718ec..4611d3ff 100644 --- a/README.USERAGENT +++ b/README.USERAGENT @@ -1,5 +1,5 @@ Mailman - The GNU Mailing List Management System -Copyright (C) 2001,2002 by the Free Software Foundation, Inc. +Copyright (C) 2001-2018 by the Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA @@ -1,5 +1,5 @@ Mailman - The GNU Mailing List Management System -Copyright (C) 1998-2003 by the Free Software Foundation, Inc. +Copyright (C) 1998-2018 by the Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA @@ -1,5 +1,5 @@ Mailman - The GNU Mailing List Management System -Copyright (C) 1998-2014 by the Free Software Foundation, Inc. +Copyright (C) 1998-2018 by the Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/b4b5-archfix b/bin/b4b5-archfix index 366b320d..74e2c11a 100644 --- a/bin/b4b5-archfix +++ b/bin/b4b5-archfix @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 2002-2016 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/change_pw b/bin/change_pw index 28270949..da4ea1c7 100644 --- a/bin/change_pw +++ b/bin/change_pw @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 2001-2016 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/check_db b/bin/check_db index 702d4bc1..bb18aa28 100755 --- a/bin/check_db +++ b/bin/check_db @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/check_perms b/bin/check_perms index c10e46e9..9ed012c9 100755 --- a/bin/check_perms +++ b/bin/check_perms @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/cleanarch b/bin/cleanarch index 7fd3e79d..9e4d2bde 100644 --- a/bin/cleanarch +++ b/bin/cleanarch @@ -1,6 +1,6 @@ #! @PYTHON@ -# Copyright (C) 2001-2016 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/clone_member b/bin/clone_member index 4872ffd0..e2ff0cfb 100755 --- a/bin/clone_member +++ b/bin/clone_member @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/config_list b/bin/config_list index 72f0f381..caf4fc11 100644 --- a/bin/config_list +++ b/bin/config_list @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/convert.py b/bin/convert.py index 94ae046c..b0d8d7e7 100644 --- a/bin/convert.py +++ b/bin/convert.py @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 2002-2016 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/discard b/bin/discard index 7a9b890b..ef8a7fe6 100644 --- a/bin/discard +++ b/bin/discard @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 2003-2016 by the Free Software Foundation, Inc. +# Copyright (C) 2003-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/export.py b/bin/export.py index 38b27664..18253a87 100644 --- a/bin/export.py +++ b/bin/export.py @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 2006-2016 by the Free Software Foundation, Inc. +# Copyright (C) 2006-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/find_member b/bin/find_member index e30b835a..d83b6f59 100755 --- a/bin/find_member +++ b/bin/find_member @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/fix_url.py b/bin/fix_url.py index 5a63e2c4..e49d1ae1 100644 --- a/bin/fix_url.py +++ b/bin/fix_url.py @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 2001-2016 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/genaliases b/bin/genaliases index 82251794..aa9012a0 100644 --- a/bin/genaliases +++ b/bin/genaliases @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 2001-2016 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 2002-2016 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/list_admins b/bin/list_admins index 08ad3d8a..e4b74ca2 100644 --- a/bin/list_admins +++ b/bin/list_admins @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 2001-2016 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/list_lists b/bin/list_lists index a6824c31..09c5fa73 100644 --- a/bin/list_lists +++ b/bin/list_lists @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 1998-2017 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/list_members b/bin/list_members index bfb91db3..65a33ada 100755 --- a/bin/list_members +++ b/bin/list_members @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/list_owners b/bin/list_owners index b58d95da..c4f2a9bc 100644 --- a/bin/list_owners +++ b/bin/list_owners @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 2002-2016 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/mailmanctl b/bin/mailmanctl index 07f7ca1e..dcaac05c 100644 --- a/bin/mailmanctl +++ b/bin/mailmanctl @@ -1,6 +1,6 @@ #! @PYTHON@ -# Copyright (C) 2001-2016 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/mmsitepass b/bin/mmsitepass index b473354b..097cf403 100755 --- a/bin/mmsitepass +++ b/bin/mmsitepass @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/msgfmt.py b/bin/msgfmt.py index 8a2d4e66..8a2d4e66 100755..100644 --- a/bin/msgfmt.py +++ b/bin/msgfmt.py diff --git a/bin/newlist b/bin/newlist index 710109a6..d02a9199 100755 --- a/bin/newlist +++ b/bin/newlist @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/pygettext.py b/bin/pygettext.py index 84421ee8..84421ee8 100755..100644 --- a/bin/pygettext.py +++ b/bin/pygettext.py diff --git a/bin/qrunner b/bin/qrunner index 8d939488..0ca2f993 100644 --- a/bin/qrunner +++ b/bin/qrunner @@ -1,6 +1,6 @@ #! @PYTHON@ -# Copyright (C) 2001-2016 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/rb-archfix b/bin/rb-archfix index 13916f05..7dfbcea2 100644 --- a/bin/rb-archfix +++ b/bin/rb-archfix @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 2003-2016 by the Free Software Foundation, Inc. +# Copyright (C) 2003-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/remove_members b/bin/remove_members index 4fd7493c..59097b13 100755 --- a/bin/remove_members +++ b/bin/remove_members @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/reset_pw.py b/bin/reset_pw.py index 9f89162b..11563669 100644 --- a/bin/reset_pw.py +++ b/bin/reset_pw.py @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 2004-2016 by the Free Software Foundation, Inc. +# Copyright (C) 2004-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/show_qfiles b/bin/show_qfiles index 461b9e8b..a5a66e63 100644 --- a/bin/show_qfiles +++ b/bin/show_qfiles @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 2006-2016 by the Free Software Foundation, Inc. +# Copyright (C) 2006-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/sync_members b/bin/sync_members index 9357db58..6684dd28 100755 --- a/bin/sync_members +++ b/bin/sync_members @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/unshunt b/bin/unshunt index 1c7e4d8e..88b3e016 100644 --- a/bin/unshunt +++ b/bin/unshunt @@ -1,6 +1,6 @@ #! @PYTHON@ -# Copyright (C) 2002-2016 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/version b/bin/version index 7645095e..9af2501b 100644 --- a/bin/version +++ b/bin/version @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/bin/withlist b/bin/withlist index 924b4b8b..ba770c83 100644 --- a/bin/withlist +++ b/bin/withlist @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/contrib/auto b/contrib/auto index eaa8ab46..881e3953 100644 --- a/contrib/auto +++ b/contrib/auto @@ -1,6 +1,6 @@ # -*- python -*- # -# Copyright (C) 2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 2000-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/contrib/check_perms_grsecurity.py b/contrib/check_perms_grsecurity.py index 0a4ece1e..46cb75b4 100644 --- a/contrib/check_perms_grsecurity.py +++ b/contrib/check_perms_grsecurity.py @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 1998-2009 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/contrib/rotatelogs.py b/contrib/rotatelogs.py index eb682635..0341d811 100644 --- a/contrib/rotatelogs.py +++ b/contrib/rotatelogs.py @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 2000-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/cron/Makefile.in b/cron/Makefile.in index 2a7c8fd2..afb718e1 100644 --- a/cron/Makefile.in +++ b/cron/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2008 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/cron/bumpdigests b/cron/bumpdigests index 57cc45e1..da5597b3 100755 --- a/cron/bumpdigests +++ b/cron/bumpdigests @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/cron/checkdbs b/cron/checkdbs index e776f15d..1a3b3cc1 100755 --- a/cron/checkdbs +++ b/cron/checkdbs @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 1998-2011 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/cron/cull_bad_shunt b/cron/cull_bad_shunt index 3428a78f..eaef0a69 100755 --- a/cron/cull_bad_shunt +++ b/cron/cull_bad_shunt @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 2008 by the Free Software Foundation, Inc. +# Copyright (C) 2008-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/cron/disabled b/cron/disabled index 409fba60..ebd40273 100755 --- a/cron/disabled +++ b/cron/disabled @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 2001-2013 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/cron/gate_news b/cron/gate_news index 8b6476a3..22caea79 100755 --- a/cron/gate_news +++ b/cron/gate_news @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 1998-2015 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/cron/mailpasswds b/cron/mailpasswds index da643761..9738e23f 100755 --- a/cron/mailpasswds +++ b/cron/mailpasswds @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 1998-2003 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/cron/nightly_gzip b/cron/nightly_gzip index de493d0e..9d4a07f1 100755 --- a/cron/nightly_gzip +++ b/cron/nightly_gzip @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 1998-2014 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/cron/senddigests b/cron/senddigests index 9997096c..24408dfd 100755 --- a/cron/senddigests +++ b/cron/senddigests @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/messages/Makefile.in b/messages/Makefile.in index 486f4eea..f2b30ce6 100644 --- a/messages/Makefile.in +++ b/messages/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2016 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/misc/Makefile.in b/misc/Makefile.in index 5125cd86..cf22b0bd 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2006 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/misc/mailman.in b/misc/mailman.in index af9d0e92..166b22da 100644 --- a/misc/mailman.in +++ b/misc/mailman.in @@ -2,7 +2,7 @@ # # mailman This shell script starts and stops GNU Mailman. # -# Copyright (C) 2001-2016 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/misc/paths.py.in b/misc/paths.py.in index b4aae14e..1491639b 100644 --- a/misc/paths.py.in +++ b/misc/paths.py.in @@ -1,6 +1,6 @@ # -*- python -*- -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 49b82ec0..2b4fb3a1 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2003 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/scripts/bounces b/scripts/bounces index 67de045a..cd0e0390 100644 --- a/scripts/bounces +++ b/scripts/bounces @@ -1,6 +1,6 @@ # -*- python -*- # -# Copyright (C) 2001 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/scripts/confirm b/scripts/confirm index f95634f4..a307cd2a 100755 --- a/scripts/confirm +++ b/scripts/confirm @@ -1,6 +1,6 @@ # -*- python -*- # -# Copyright (C) 2002 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/scripts/join b/scripts/join index 4e76010c..b5790770 100755 --- a/scripts/join +++ b/scripts/join @@ -1,6 +1,6 @@ # -*- python -*- # -# Copyright (C) 2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/scripts/leave b/scripts/leave index a95c26a6..80fa385d 100755 --- a/scripts/leave +++ b/scripts/leave @@ -1,6 +1,6 @@ # -*- python -*- # -# Copyright (C) 2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/scripts/owner b/scripts/owner index e03030ee..9c44301d 100755 --- a/scripts/owner +++ b/scripts/owner @@ -1,6 +1,6 @@ # -*- python -*- # -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/scripts/post b/scripts/post index 12ff0381..3e121ec6 100755 --- a/scripts/post +++ b/scripts/post @@ -1,6 +1,6 @@ # -*- python -*- # -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/scripts/request b/scripts/request index 12600a2b..b7a084bc 100755 --- a/scripts/request +++ b/scripts/request @@ -1,6 +1,6 @@ # -*- python -*- # -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/src/Makefile.in b/src/Makefile.in index a50e4958..c673ddb4 100755 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2012 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/src/cgi-wrapper.c b/src/cgi-wrapper.c index 29d9ec5a..ec581d3d 100644 --- a/src/cgi-wrapper.c +++ b/src/cgi-wrapper.c @@ -1,7 +1,7 @@ /* cgi-wrapper.c --- Generic wrapper that will take info from a environment * variable, and pass it to two commands. * - * Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. + * Copyright (C) 1998-2018 by the Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/src/common.c b/src/common.c index 585b1e9b..caec57d6 100644 --- a/src/common.c +++ b/src/common.c @@ -1,6 +1,6 @@ /* common.c --- Common routines, constants, etc. Used by all the wrappers. * - * Copyright (C) 1998-2005 by the Free Software Foundation, Inc. + * Copyright (C) 1998-2018 by the Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/src/common.h b/src/common.h index 451a1561..c681bb7c 100644 --- a/src/common.h +++ b/src/common.h @@ -1,6 +1,6 @@ /* common.h --- Prototypes for common routines * - * Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. + * Copyright (C) 1998-2018 by the Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/src/mail-wrapper.c b/src/mail-wrapper.c index f268d5a5..78b912c1 100644 --- a/src/mail-wrapper.c +++ b/src/mail-wrapper.c @@ -1,7 +1,7 @@ /* mail-wrapper.c --- Generic wrapper that will take info from a environment * variable, and pass it to two commands. * - * Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. + * Copyright (C) 1998-2018 by the Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/templates/Makefile.in b/templates/Makefile.in index eb5582bd..fa548c51 100644 --- a/templates/Makefile.in +++ b/templates/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2005 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/tests/EmailBase.py b/tests/EmailBase.py index 69868c82..135850f9 100644 --- a/tests/EmailBase.py +++ b/tests/EmailBase.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2010 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/tests/Makefile.in b/tests/Makefile.in index 26d6e316..f346c912 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2003 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/tests/TestBase.py b/tests/TestBase.py index 2381f4ca..f44282ca 100644 --- a/tests/TestBase.py +++ b/tests/TestBase.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2003 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/tests/bounces/Makefile.in b/tests/bounces/Makefile.in index 57980975..e7124e91 100644 --- a/tests/bounces/Makefile.in +++ b/tests/bounces/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2003 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/tests/msgs/Makefile.in b/tests/msgs/Makefile.in index 736d721f..cd053d26 100644 --- a/tests/msgs/Makefile.in +++ b/tests/msgs/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2003 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/tests/onebounce.py b/tests/onebounce.py index 846c4fa6..00a695f8 100755..100644 --- a/tests/onebounce.py +++ b/tests/onebounce.py @@ -1,6 +1,6 @@ #! /usr/bin/env python -# Copyright (C) 2002-2013 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/tests/test_bounces.py b/tests/test_bounces.py index 44db3b9b..e9bcff17 100755..100644 --- a/tests/test_bounces.py +++ b/tests/test_bounces.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2013 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/tests/test_handlers.py b/tests/test_handlers.py index 878fd84a..7a3fc827 100644 --- a/tests/test_handlers.py +++ b/tests/test_handlers.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2016 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/tests/test_lockfile.py b/tests/test_lockfile.py index 4a7cf41e..31eddcf5 100644 --- a/tests/test_lockfile.py +++ b/tests/test_lockfile.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2010 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/tests/test_membership.py b/tests/test_membership.py index eca57862..79a636a8 100644 --- a/tests/test_membership.py +++ b/tests/test_membership.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2010 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/tests/test_message.py b/tests/test_message.py index 0d2cb622..08bc91cc 100644 --- a/tests/test_message.py +++ b/tests/test_message.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2017 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/tests/test_runners.py b/tests/test_runners.py index a0613b33..d76dcc8e 100644 --- a/tests/test_runners.py +++ b/tests/test_runners.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2010 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/tests/test_safedict.py b/tests/test_safedict.py index bf8dd921..c4138480 100644 --- a/tests/test_safedict.py +++ b/tests/test_safedict.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2010 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/tests/test_security_mgr.py b/tests/test_security_mgr.py index 425a472b..9d3b9367 100644 --- a/tests/test_security_mgr.py +++ b/tests/test_security_mgr.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2010 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/tests/test_smtp.py b/tests/test_smtp.py index 857f968c..45001145 100644 --- a/tests/test_smtp.py +++ b/tests/test_smtp.py @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2010 by the Free Software Foundation, Inc. +# Copyright (C) 2003-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/tests/testall.py b/tests/testall.py index 1afbfe5d..5cf1c58a 100644 --- a/tests/testall.py +++ b/tests/testall.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2003 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License |