- merged 2.1.19 from PLD master
authorMarcin Krol <hawk@tld-linux.org>
Mon, 22 Oct 2018 10:32:57 +0000 (10:32 +0000)
committerMarcin Krol <hawk@tld-linux.org>
Mon, 22 Oct 2018 10:32:57 +0000 (10:32 +0000)
14 files changed:
keep-original-mime-headers.patch
mailman-FHS.patch
mailman-MM_FIND_GROUP_NAME.patch
mailman-MM_FIND_USER_NAME.patch
mailman-browser-save-passwd.patch [deleted file]
mailman-build.patch
mailman-cron.patch
mailman-daemonize-fds.patch
mailman-httpauth.patch
mailman-lib64.patch
mailman-umbrella-anon-hack.patch
mailman-x-imap-folder.patch
mailman.init [changed mode: 0644->0755]
mailman.spec

index db79f461f5c9f6850de40db36726e5df32caa963..a3b1732c16a84527d69acaba7c9446f47f29c30a 100644 (file)
@@ -26,10 +26,9 @@ to send. (altho if we mod_asis could work here, but that means totally
 incompatible storage from previous versions)
 
 Signed-off-by: Elan Ruusamäe <glen@delfi.ee>
-diff -urp mailman-2.1.20.orig/Mailman/Cgi/private.py mailman-2.1.20/Mailman/Cgi/private.py
---- mailman-2.1.20.orig/Mailman/Cgi/private.py 2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/Mailman/Cgi/private.py      2015-08-09 14:29:35.803790532 +0000
-@@ -202,6 +202,12 @@ def main():
+--- mailman-2.1.13/Mailman/Cgi/private.py~     2010-08-27 14:28:41.000000000 +0300
++++ mailman-2.1.13/Mailman/Cgi/private.py      2010-08-27 14:28:45.036366738 +0300
+@@ -175,6 +175,12 @@
              f = gzip.open(true_filename, 'r')
          else:
              f = open(true_filename, 'r')
@@ -42,25 +41,9 @@ diff -urp mailman-2.1.20.orig/Mailman/Cgi/private.py mailman-2.1.20/Mailman/Cgi/
      except IOError:
          msg = _('Private archive file not found')
          doc.SetTitle(msg)
-diff -urp mailman-2.1.20.orig/Mailman/Defaults.py.in mailman-2.1.20/Mailman/Defaults.py.in
---- mailman-2.1.20.orig/Mailman/Defaults.py.in 2015-08-09 14:26:57.000000000 +0000
-+++ mailman-2.1.20/Mailman/Defaults.py.in      2015-08-09 14:29:35.805790532 +0000
-@@ -416,6 +416,11 @@ ARCHIVER_ALLOWABLE_SANE_DATE_SKEW = days
- # in the archives too.
- ARCHIVER_OBSCURES_EMAILADDRS = Yes
-+# Whether archive stores attachment headers which contain original MIME type
-+# and filenames For private archives those headers are sent back as well when
-+# serving content. Note that this changes behaviour and maybe insecure.
-+ARCHIVER_STORES_ATTACHMENT_HEADERS = No
-+
- # Pipermail assumes that message bodies contain US-ASCII text.
- # Change this option to define a different character set to be used as
- # the default character set for the archive.  The term "character set"
-diff -urp mailman-2.1.20.orig/Mailman/Handlers/Scrubber.py mailman-2.1.20/Mailman/Handlers/Scrubber.py
---- mailman-2.1.20.orig/Mailman/Handlers/Scrubber.py   2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/Mailman/Handlers/Scrubber.py        2015-08-09 14:29:35.803790532 +0000
-@@ -523,6 +523,15 @@ def save_attachment(mlist, msg, dir, fil
+--- mailman-2.1.13/Mailman/Handlers/Scrubber.py~       2010-08-27 15:27:27.000000000 +0300
++++ mailman-2.1.13/Mailman/Handlers/Scrubber.py        2010-08-27 15:27:33.452165228 +0300
+@@ -520,6 +520,15 @@
      fp = open(path, 'w')
      fp.write(decodedpayload)
      fp.close()
@@ -76,3 +59,17 @@ diff -urp mailman-2.1.20.orig/Mailman/Handlers/Scrubber.py mailman-2.1.20/Mailma
      # Now calculate the url
      baseurl = mlist.GetBaseArchiveURL()
      # Private archives will likely have a trailing slash.  Normalize.
+--- mailman-2.1.13/Mailman/Defaults.py.in~     2010-08-27 17:48:45.000000000 +0300
++++ mailman-2.1.13/Mailman/Defaults.py.in      2010-08-29 16:15:45.888393508 +0300
+@@ -335,6 +335,11 @@
+ # in the archives too.
+ ARCHIVER_OBSCURES_EMAILADDRS = Yes
++# Whether archive stores attachment headers which contain original MIME type
++# and filenames For private archives those headers are sent back as well when
++# serving content. Note that this changes behaviour and maybe insecure.
++ARCHIVER_STORES_ATTACHMENT_HEADERS = No
++
+ # Pipermail assumes that message bodies contain US-ASCII text.
+ # Change this option to define a different character set to be used as
+ # the default character set for the archive.  The term "character set"
index ebf9b695d648f8af026ee00548d2fe81e7bb2c6e..97b2214d1f95e141e806242934b802a47f3f45ab 100644 (file)
@@ -1,7 +1,6 @@
-diff -urp mailman-2.1.20.orig/bin/check_perms mailman-2.1.20/bin/check_perms
---- mailman-2.1.20.orig/bin/check_perms        2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/bin/check_perms     2015-08-09 14:07:51.054790532 +0000
-@@ -183,7 +183,8 @@ def checkall():
+--- mailman-2.1.5.orig/bin/check_perms 2003-03-31 15:07:55.000000000 -0500
++++ mailman-2.1.5.FHS/bin/check_perms  2004-10-08 16:05:09.000000000 -0400
+@@ -164,7 +164,8 @@
          print _('checking mode for %(prefix)s')
      dirs = {}
      for d in (mm_cfg.PREFIX, mm_cfg.EXEC_PREFIX, mm_cfg.VAR_PREFIX,
@@ -11,10 +10,9 @@ diff -urp mailman-2.1.20.orig/bin/check_perms mailman-2.1.20/bin/check_perms
          dirs[d] = True
      for d in dirs.keys():
          try:
-diff -urp mailman-2.1.20.orig/configure.in mailman-2.1.20/configure.in
---- mailman-2.1.20.orig/configure.in   2015-08-09 13:24:54.000000000 +0000
-+++ mailman-2.1.20/configure.in        2015-08-09 14:07:51.055790532 +0000
-@@ -306,7 +306,7 @@ default_var_prefix="/var/mailman"
+--- mailman-2.1.5.orig/configure.in    2003-12-24 12:11:48.000000000 -0500
++++ mailman-2.1.5.FHS/configure.in     2004-09-30 16:13:56.000000000 -0400
+@@ -180,7 +180,7 @@
  AC_SUBST(VAR_PREFIX)
  AC_MSG_CHECKING(for --with-var-prefix)
  AC_ARG_WITH(var-prefix, dnl
@@ -23,7 +21,7 @@ diff -urp mailman-2.1.20.orig/configure.in mailman-2.1.20/configure.in
  case "$with_var_prefix" in
          yes)    VAR_PREFIX="$default_var_prefix"; ans=$VAR_PREFIX;;
          ""|no)  VAR_PREFIX="$prefix"; ans="no";;
-@@ -333,6 +333,61 @@ else
+@@ -207,6 +207,61 @@
      prefixcheck=$VAR_PREFIX
  fi
  
@@ -83,9 +81,9 @@ diff -urp mailman-2.1.20.orig/configure.in mailman-2.1.20/configure.in
 +AC_MSG_RESULT($QUEUE_DIR)
 +
  # new macro for finding group names
- AC_DEFUN([MM_FIND_GROUP_NAME], [
+ AC_DEFUN(MM_FIND_GROUP_NAME, [
  # $1 == variable name
-@@ -728,7 +783,7 @@ AC_OUTPUT([misc/paths.py Mailman/Default
+@@ -619,7 +674,7 @@
             templates/Makefile cron/Makefile scripts/Makefile messages/Makefile
             cron/crontab.in misc/mailman Makefile
             tests/Makefile tests/bounces/Makefile tests/msgs/Makefile
@@ -94,10 +92,9 @@ diff -urp mailman-2.1.20.orig/configure.in mailman-2.1.20/configure.in
          echo "configuration completed at" `date`)
  
  # Make sure all the build scripts are executable.
-diff -urp mailman-2.1.20.orig/Mailman/Defaults.py.in mailman-2.1.20/Mailman/Defaults.py.in
---- mailman-2.1.20.orig/Mailman/Defaults.py.in 2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/Mailman/Defaults.py.in      2015-08-09 14:07:51.056790532 +0000
-@@ -1583,9 +1583,11 @@ AuthListPoster = 6    # List poster (App
+--- mailman-2.1.5.orig/Mailman/Defaults.py.in  2004-04-24 22:30:03.000000000 -0400
++++ mailman-2.1.5.FHS/Mailman/Defaults.py.in   2004-10-08 14:38:57.000000000 -0400
+@@ -1198,9 +1198,11 @@
  
  # Useful directories
  LIST_DATA_DIR   = os.path.join(VAR_PREFIX, 'lists')
@@ -111,7 +108,7 @@ diff -urp mailman-2.1.20.orig/Mailman/Defaults.py.in mailman-2.1.20/Mailman/Defa
  SPAM_DIR        = os.path.join(VAR_PREFIX, 'spam')
  WRAPPER_DIR     = os.path.join(EXEC_PREFIX, 'mail')
  BIN_DIR         = os.path.join(PREFIX, 'bin')
-@@ -1596,7 +1598,7 @@ PUBLIC_ARCHIVE_FILE_DIR  = os.path.join(
+@@ -1211,7 +1213,7 @@
  PRIVATE_ARCHIVE_FILE_DIR = os.path.join(VAR_PREFIX, 'archives', 'private')
  
  # Directories used by the qrunner subsystem
@@ -120,7 +117,7 @@ diff -urp mailman-2.1.20.orig/Mailman/Defaults.py.in mailman-2.1.20/Mailman/Defa
  INQUEUE_DIR     = os.path.join(QUEUE_DIR, 'in')
  OUTQUEUE_DIR    = os.path.join(QUEUE_DIR, 'out')
  CMDQUEUE_DIR    = os.path.join(QUEUE_DIR, 'commands')
-@@ -1610,9 +1612,9 @@ RETRYQUEUE_DIR  = os.path.join(QUEUE_DIR
+@@ -1225,9 +1227,9 @@
  MAILDIR_DIR     = os.path.join(QUEUE_DIR, 'maildir')
  
  # Other useful files
@@ -133,10 +130,9 @@ diff -urp mailman-2.1.20.orig/Mailman/Defaults.py.in mailman-2.1.20/Mailman/Defa
  
  # Import a bunch of version numbers
  from Version import *
-diff -urp mailman-2.1.20.orig/Mailman/MTA/Postfix.py mailman-2.1.20/Mailman/MTA/Postfix.py
---- mailman-2.1.20.orig/Mailman/MTA/Postfix.py 2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/Mailman/MTA/Postfix.py      2015-08-09 14:07:51.056790532 +0000
-@@ -32,8 +32,8 @@ from Mailman.MTA.Utils import makealiase
+--- mailman-2.1.5.orig/Mailman/MTA/Postfix.py  2003-03-31 16:49:43.000000000 -0500
++++ mailman-2.1.5.FHS/Mailman/MTA/Postfix.py   2004-10-08 16:02:20.000000000 -0400
+@@ -33,8 +33,8 @@ from Mailman.MTA.Utils import makealiase
  from Mailman.Logging.Syslog import syslog
  
  LOCKFILE = os.path.join(mm_cfg.LOCK_DIR, 'creator')
@@ -144,13 +140,12 @@ diff -urp mailman-2.1.20.orig/Mailman/MTA/Postfix.py mailman-2.1.20/Mailman/MTA/
 -VIRTFILE = os.path.join(mm_cfg.DATA_DIR, 'virtual-mailman')
 +ALIASFILE = os.path.join(mm_cfg.CONFIG_DIR, 'aliases')
 +VIRTFILE = os.path.join(mm_cfg.CONFIG_DIR, 'virtual-mailman')
- try:
-     True, False
-diff -urp mailman-2.1.20.orig/Makefile.in mailman-2.1.20/Makefile.in
---- mailman-2.1.20.orig/Makefile.in    2015-08-09 14:05:31.000000000 +0000
-+++ mailman-2.1.20/Makefile.in 2015-08-09 14:07:51.057790532 +0000
-@@ -28,6 +28,11 @@ bindir=             @bindir@
+ # Desired mode for aliases(.db) and virtual-mailman(.db) for both creation
+ # and check_perms.
+ targetmode = S_IFREG | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH
+--- mailman-2.1.5.orig/Makefile.in     2003-03-31 14:26:57.000000000 -0500
++++ mailman-2.1.5.FHS/Makefile.in      2004-10-15 16:48:17.000000000 -0400
+@@ -28,6 +28,11 @@
  prefix=               @prefix@
  exec_prefix=  @exec_prefix@
  var_prefix=   @VAR_PREFIX@
@@ -162,7 +157,7 @@ diff -urp mailman-2.1.20.orig/Makefile.in mailman-2.1.20/Makefile.in
  DESTDIR=
  
  CC=           @CC@
-@@ -41,8 +46,12 @@ DEFS=               @DEFS@
+@@ -41,8 +46,12 @@
  OPT=          @OPT@
  CFLAGS=               @CFLAGS@ $(OPT) $(DEFS)
  
@@ -176,11 +171,10 @@ diff -urp mailman-2.1.20.orig/Makefile.in mailman-2.1.20/Makefile.in
        archives/private archives/public
  
  ARCH_INDEP_DIRS= \
-@@ -104,6 +113,15 @@ doinstall: $(SUBDIRS)
-               $(INSTALL) -d -m $(DIRMODE) $$dir; \
+@@ -96,6 +105,15 @@
            else true; \
            fi; \
-+      done
+       done
 +      @for d in $(FHS_DIRS); \
 +      do \
 +          dir=$(DESTDIR)/$$d; \
@@ -189,13 +183,13 @@ diff -urp mailman-2.1.20.orig/Makefile.in mailman-2.1.20/Makefile.in
 +              $(INSTALL) -d -m $(DIRMODE) $$dir; \
 +          else true; \
 +          fi; \
-       done
++      done
        chmod o-r $(DESTDIR)$(var_prefix)/archives/private
        @for d in $(ARCH_INDEP_DIRS); \
-diff -urp mailman-2.1.20.orig/misc/Makefile.in mailman-2.1.20/misc/Makefile.in
---- mailman-2.1.20.orig/misc/Makefile.in       2015-08-09 14:05:31.000000000 +0000
-+++ mailman-2.1.20/misc/Makefile.in    2015-08-09 14:07:51.057790532 +0000
-@@ -27,6 +27,12 @@ bindir=     @bindir@
+       do \
+--- mailman-2.1.5.orig/misc/Makefile.in        2004-05-13 23:34:34.000000000 -0400
++++ mailman-2.1.5.FHS/misc/Makefile.in 2004-10-13 14:00:19.000000000 -0400
+@@ -26,6 +26,12 @@
  prefix=       @prefix@
  exec_prefix=  @exec_prefix@
  var_prefix=   @VAR_PREFIX@
@@ -208,7 +202,7 @@ diff -urp mailman-2.1.20.orig/misc/Makefile.in mailman-2.1.20/misc/Makefile.in
  DESTDIR=
  
  CC=           @CC@
-@@ -87,7 +93,7 @@ install-other:
+@@ -84,7 +90,7 @@
            $(INSTALL) -m $(FILEMODE) paths.py $$dir; \
        done
        $(INSTALL) -m $(EXEMODE) mailman $(DESTDIR)$(SCRIPTSDIR)
@@ -216,4 +210,4 @@ diff -urp mailman-2.1.20.orig/misc/Makefile.in mailman-2.1.20/misc/Makefile.in
 +      $(INSTALL) -m $(FILEMODE) sitelist.cfg $(DESTDIR)$(configdir)
  
  install-packages:
-       if [ -z "$(EMAILPKG)" -a -d $(DESTDIR)$(PYTHONLIBDIR)/email ] ; \
+       for p in $(PACKAGES); \
index 3ed396e50e834ad694d4dfa5f8ee2e8a413ab11e..1e9cf72f734e3372bbfb6372f6ebc1e19ea02d23 100644 (file)
@@ -1,7 +1,7 @@
-diff -urp mailman-2.1.20.orig/configure.in mailman-2.1.20/configure.in
---- mailman-2.1.20.orig/configure.in   2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/configure.in        2015-08-09 13:24:54.339340518 +0000
-@@ -338,31 +338,9 @@ AC_DEFUN([MM_FIND_GROUP_NAME], [
+diff -urN mailman-2.1.2.orig/configure.in mailman-2.1.2/configure.in
+--- mailman-2.1.2.orig/configure.in    2003-04-22 05:34:51.000000000 +0200
++++ mailman-2.1.2/configure.in 2003-10-04 10:27:52.070293960 +0200
+@@ -212,31 +212,9 @@
  # $1 == variable name
  # $2 == user id to check for
  AC_SUBST($1)
@@ -36,3 +36,4 @@ diff -urp mailman-2.1.20.orig/configure.in mailman-2.1.20/configure.in
  
  
  # new macro for finding UIDs
+
index 81f23b937756ab4ecef1b999dd4a98dccb432ab4..239dbb8fd64c3dcc1afdf1c117bc41c4436ce256 100644 (file)
@@ -1,7 +1,6 @@
-diff -urp mailman-2.1.20.orig/configure.in mailman-2.1.20/configure.in
---- mailman-2.1.20.orig/configure.in   2015-08-09 14:07:51.000000000 +0000
-+++ mailman-2.1.20/configure.in        2015-08-09 14:28:51.671790532 +0000
-@@ -403,31 +403,8 @@ AC_DEFUN([MM_FIND_USER_NAME], [
+--- mailman-2.1.12/configure.in~       2010-01-20 14:28:15.842832566 +0100
++++ mailman-2.1.12/configure.in        2010-01-20 14:34:13.560833631 +0100
+@@ -318,31 +318,8 @@
  # $1 == variable name
  # $2 == user id to check for
  AC_SUBST($1)
diff --git a/mailman-browser-save-passwd.patch b/mailman-browser-save-passwd.patch
deleted file mode 100644 (file)
index 2c4c0f2..0000000
+++ /dev/null
@@ -1,481 +0,0 @@
-diff -urp mailman-2.1.20.orig/templates/ar/admlogin.html mailman-2.1.20/templates/ar/admlogin.html
---- mailman-2.1.20.orig/templates/ar/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/ar/admlogin.html  2015-08-09 14:31:40.519790532 +0000
-@@ -15,7 +15,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="Right">كلمة سر %(who)s القائمة:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/ast/admlogin.html mailman-2.1.20/templates/ast/admlogin.html
---- mailman-2.1.20.orig/templates/ast/admlogin.html    2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/ast/admlogin.html 2015-08-09 14:31:40.520790532 +0000
-@@ -16,7 +16,8 @@
-     <tr>
-       <td><div align="right">Llista Contrase&ntilde;es %(who)s:</div>
- </td>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/ca/admlogin.html mailman-2.1.20/templates/ca/admlogin.html
---- mailman-2.1.20.orig/templates/ca/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/ca/admlogin.html  2015-08-09 14:31:40.520790532 +0000
-@@ -15,7 +15,8 @@
-     </TR>
-     <tr>
-       <TD><div align="right">Contrasenya de %(who)s de la llista:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/cs/admlogin.html mailman-2.1.20/templates/cs/admlogin.html
---- mailman-2.1.20.orig/templates/cs/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/cs/admlogin.html  2015-08-09 14:31:40.520790532 +0000
-@@ -15,7 +15,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="Right">Heslo pro %(who)s:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/da/admlogin.html mailman-2.1.20/templates/da/admlogin.html
---- mailman-2.1.20.orig/templates/da/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/da/admlogin.html  2015-08-09 14:31:40.521790532 +0000
-@@ -15,7 +15,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="Right">Listens %(who)s adgangskode:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/de/admlogin.html mailman-2.1.20/templates/de/admlogin.html
---- mailman-2.1.20.orig/templates/de/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/de/admlogin.html  2015-08-09 14:31:40.521790532 +0000
-@@ -15,7 +15,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="Right">%(who)s-Passwort:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/en/admlogin.html mailman-2.1.20/templates/en/admlogin.html
---- mailman-2.1.20.orig/templates/en/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/en/admlogin.html  2015-08-09 14:31:40.522790532 +0000
-@@ -15,7 +15,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="Right">List %(who)s Password:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/es/admlogin.html mailman-2.1.20/templates/es/admlogin.html
---- mailman-2.1.20.orig/templates/es/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/es/admlogin.html  2015-08-09 14:31:40.522790532 +0000
-@@ -15,7 +15,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="Right">Clave del %(who)s de la lista:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/et/admlogin.html mailman-2.1.20/templates/et/admlogin.html
---- mailman-2.1.20.orig/templates/et/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/et/admlogin.html  2015-08-09 14:31:40.522790532 +0000
-@@ -15,7 +15,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="Right">Listi %(who)s parool:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/eu/admlogin.html mailman-2.1.20/templates/eu/admlogin.html
---- mailman-2.1.20.orig/templates/eu/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/eu/admlogin.html  2015-08-09 14:31:40.522790532 +0000
-@@ -15,7 +15,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="Right">%(who)sren Pasahitza:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/fi/admlogin.html mailman-2.1.20/templates/fi/admlogin.html
---- mailman-2.1.20.orig/templates/fi/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/fi/admlogin.html  2015-08-09 14:31:40.523790532 +0000
-@@ -16,7 +16,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="Right">Listan %(who)s Salasana:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/fr/admlogin.html mailman-2.1.20/templates/fr/admlogin.html
---- mailman-2.1.20.orig/templates/fr/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/fr/admlogin.html  2015-08-09 14:31:40.523790532 +0000
-@@ -15,7 +15,8 @@
-     </TR>
-     <tr>
-       <TD> <div ALIGN="Right">Mot de passe %(who)s de la liste: </div> </TD>
--      <TD> <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD> <INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle> <INPUT type="SUBMIT" 
-diff -urp mailman-2.1.20.orig/templates/gl/admlogin.html mailman-2.1.20/templates/gl/admlogin.html
---- mailman-2.1.20.orig/templates/gl/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/gl/admlogin.html  2015-08-09 14:31:40.523790532 +0000
-@@ -15,7 +15,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="Right"></Chave de %(who)s da rolda:></div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/he/admlogin.html mailman-2.1.20/templates/he/admlogin.html
---- mailman-2.1.20.orig/templates/he/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/he/admlogin.html  2015-08-09 14:31:40.524790532 +0000
-@@ -15,7 +15,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="left">סיסמת הרשימה %(who)s:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/hr/admlogin.html mailman-2.1.20/templates/hr/admlogin.html
---- mailman-2.1.20.orig/templates/hr/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/hr/admlogin.html  2015-08-09 14:31:40.524790532 +0000
-@@ -15,7 +15,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="Right">%(who)sska lozinka liste:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/hu/admlogin.html mailman-2.1.20/templates/hu/admlogin.html
---- mailman-2.1.20.orig/templates/hu/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/hu/admlogin.html  2015-08-09 14:31:40.524790532 +0000
-@@ -14,7 +14,8 @@
-     </TR>
-     <tr>
-       <TD> <div ALIGN="Right">Lista %(who)s Jelszava: </div> </TD>
--      <TD> <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD> <INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle> <INPUT TYPE="SUBMIT" name="admlogin"
-diff -urp mailman-2.1.20.orig/templates/ia/admlogin.html mailman-2.1.20/templates/ia/admlogin.html
---- mailman-2.1.20.orig/templates/ia/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/ia/admlogin.html  2015-08-09 14:31:40.524790532 +0000
-@@ -15,7 +15,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="Right">Contrasigno de %(who)s pro le lista:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/it/admlogin.html mailman-2.1.20/templates/it/admlogin.html
---- mailman-2.1.20.orig/templates/it/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/it/admlogin.html  2015-08-09 14:31:40.525790532 +0000
-@@ -15,7 +15,8 @@
-     </TR>
-     <tr>
-     <TD><div ALIGN="Right">Password di lista per %(who)s:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/ja/admlogin.html mailman-2.1.20/templates/ja/admlogin.html
---- mailman-2.1.20.orig/templates/ja/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/ja/admlogin.html  2015-08-09 14:31:40.525790532 +0000
-@@ -15,7 +15,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="Right">¥ê¥¹¥È %(who)s ¥Ñ¥¹¥ï¡¼¥É:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/ko/admlogin.html mailman-2.1.20/templates/ko/admlogin.html
---- mailman-2.1.20.orig/templates/ko/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/ko/admlogin.html  2015-08-09 14:31:40.525790532 +0000
-@@ -15,7 +15,8 @@
-     </TR>
-     <tr>
-       <TD> <div ALIGN="Right"> ¸ÞÀϸµ ¸®½ºÆ® °ü¸®ÀÚ ºñ¹Ð¹øÈ£: </div> </TD>
--      <TD> <INPUT TYPE=password NAME=adminpw SIZE=30></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle> <INPUT TYPE=SUBMIT name="request_login"
-diff -urp mailman-2.1.20.orig/templates/lt/admlogin.html mailman-2.1.20/templates/lt/admlogin.html
---- mailman-2.1.20.orig/templates/lt/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/lt/admlogin.html  2015-08-09 14:31:40.525790532 +0000
-@@ -15,7 +15,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="Right">Forumo %(who)s slaptaþodis:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/nl/admlogin.html mailman-2.1.20/templates/nl/admlogin.html
---- mailman-2.1.20.orig/templates/nl/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/nl/admlogin.html  2015-08-09 14:31:40.526790532 +0000
-@@ -15,7 +15,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="Right">Lijst%(who)s wachtwoord:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/no/admlogin.html mailman-2.1.20/templates/no/admlogin.html
---- mailman-2.1.20.orig/templates/no/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/no/admlogin.html  2015-08-09 14:31:40.526790532 +0000
-@@ -15,7 +15,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="Right">Listens %(who)s passord:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/pl/admlogin.html mailman-2.1.20/templates/pl/admlogin.html
---- mailman-2.1.20.orig/templates/pl/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/pl/admlogin.html  2015-08-09 14:31:40.526790532 +0000
-@@ -16,7 +16,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="Right">Has³o %(who)s:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/pt/admlogin.html mailman-2.1.20/templates/pt/admlogin.html
---- mailman-2.1.20.orig/templates/pt/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/pt/admlogin.html  2015-08-09 14:31:40.527790532 +0000
-@@ -15,7 +15,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="Right">List %(who)s Password:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/pt_BR/admlogin.html mailman-2.1.20/templates/pt_BR/admlogin.html
---- mailman-2.1.20.orig/templates/pt_BR/admlogin.html  2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/pt_BR/admlogin.html       2015-08-09 14:31:40.527790532 +0000
-@@ -15,7 +15,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="Right">Senha de %(who)s na Lista:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/ro/admlogin.html mailman-2.1.20/templates/ro/admlogin.html
---- mailman-2.1.20.orig/templates/ro/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/ro/admlogin.html  2015-08-09 14:31:40.527790532 +0000
-@@ -15,7 +15,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="Right"><b>%(who)s</b>: parola de acces</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/ru/admlogin.html mailman-2.1.20/templates/ru/admlogin.html
---- mailman-2.1.20.orig/templates/ru/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/ru/admlogin.html  2015-08-09 14:31:40.527790532 +0000
-@@ -14,7 +14,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="Right">Введите пароль %(who)s:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT" name="admlogin" value="Начать работу..."></td>
-diff -urp mailman-2.1.20.orig/templates/sk/admlogin.html mailman-2.1.20/templates/sk/admlogin.html
---- mailman-2.1.20.orig/templates/sk/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/sk/admlogin.html  2015-08-09 14:31:40.528790532 +0000
-@@ -15,7 +15,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="Right">Heslo pre %(who)s:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/sl/admlogin.html mailman-2.1.20/templates/sl/admlogin.html
---- mailman-2.1.20.orig/templates/sl/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/sl/admlogin.html  2015-08-09 14:31:40.528790532 +0000
-@@ -15,7 +15,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="Right">Geslo za %(who)s:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/sr/admlogin.html mailman-2.1.20/templates/sr/admlogin.html
---- mailman-2.1.20.orig/templates/sr/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/sr/admlogin.html  2015-08-09 14:31:40.528790532 +0000
-@@ -14,7 +14,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="Right">Лозинка за листу%(who)s:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/sv/admlogin.html mailman-2.1.20/templates/sv/admlogin.html
---- mailman-2.1.20.orig/templates/sv/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/sv/admlogin.html  2015-08-09 14:31:40.528790532 +0000
-@@ -14,7 +14,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="Right">Listan %(who)s l&ouml;senord:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/tr/admlogin.html mailman-2.1.20/templates/tr/admlogin.html
---- mailman-2.1.20.orig/templates/tr/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/tr/admlogin.html  2015-08-09 14:31:40.529790532 +0000
-@@ -15,7 +15,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="Right">Liste %(who)s Þifresi:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/uk/admlogin.html mailman-2.1.20/templates/uk/admlogin.html
---- mailman-2.1.20.orig/templates/uk/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/uk/admlogin.html  2015-08-09 14:31:40.529790532 +0000
-@@ -15,7 +15,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="Right">Введіть пароль користувача %(who)s:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/vi/admlogin.html mailman-2.1.20/templates/vi/admlogin.html
---- mailman-2.1.20.orig/templates/vi/admlogin.html     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/vi/admlogin.html  2015-08-09 14:31:40.529790532 +0000
-@@ -15,7 +15,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="Right">Mật khẩu hộp thư %(who)s:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/zh_CN/admlogin.html mailman-2.1.20/templates/zh_CN/admlogin.html
---- mailman-2.1.20.orig/templates/zh_CN/admlogin.html  2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/zh_CN/admlogin.html       2015-08-09 14:31:40.530790532 +0000
-@@ -15,7 +15,8 @@
-     </TR>
-     <tr>
-       <TD><div ALIGN="Right">显示 %(who)s密码:</div></TD>
--      <TD><INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -urp mailman-2.1.20.orig/templates/zh_TW/admlogin.html mailman-2.1.20/templates/zh_TW/admlogin.html
---- mailman-2.1.20.orig/templates/zh_TW/admlogin.html  2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/zh_TW/admlogin.html       2015-08-09 14:31:40.530790532 +0000
-@@ -14,7 +14,8 @@
-     </TR>
-     <tr>
-       <TD> <div ALIGN="Right"> 壇主密碼: </div> </TD>
--      <TD> <INPUT TYPE=password NAME=adminpw SIZE=30></TD>
-+      <TD><INPUT STYLE="display: none;" TYPE="text" NAME="userid" VALUE="%(listname)s">
-+          <INPUT TYPE="password" NAME="adminpw" SIZE="30"></TD>
-     </tr>
-     <tr>
-       <td colspan=2 align=middle> <INPUT TYPE=SUBMIT name="request_login"
index 6a7daf13d6744328fadb0e1924f615b8caeb44ac..8fd8fc5f7e6821fbe4fb4914060e1fe2a799c66a 100644 (file)
@@ -1,7 +1,6 @@
-diff -urp mailman-2.1.20.orig/bin/Makefile.in mailman-2.1.20/bin/Makefile.in
---- mailman-2.1.20.orig/bin/Makefile.in        2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/bin/Makefile.in     2015-08-09 14:05:31.198790532 +0000
-@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
+--- mailman-2.1.5.orig/bin/Makefile.in 2003-12-24 12:03:15.000000000 -0500
++++ mailman-2.1.5.build/bin/Makefile.in        2004-10-15 15:36:46.000000000 -0400
+@@ -28,7 +28,6 @@
  DESTDIR=
  
  CC=           @CC@
@@ -9,7 +8,7 @@ diff -urp mailman-2.1.20.orig/bin/Makefile.in mailman-2.1.20/bin/Makefile.in
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -56,7 +55,7 @@ BUILDDIR=    ../build/bin
+@@ -55,7 +54,7 @@
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
@@ -18,7 +17,7 @@ diff -urp mailman-2.1.20.orig/bin/Makefile.in mailman-2.1.20/bin/Makefile.in
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -72,8 +71,6 @@ install:
+@@ -71,8 +70,6 @@
            $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(SCRIPTSDIR); \
        done
  
@@ -27,10 +26,9 @@ diff -urp mailman-2.1.20.orig/bin/Makefile.in mailman-2.1.20/bin/Makefile.in
  clean:
  
  distclean:
-diff -urp mailman-2.1.20.orig/cron/Makefile.in mailman-2.1.20/cron/Makefile.in
---- mailman-2.1.20.orig/cron/Makefile.in       2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/cron/Makefile.in    2015-08-09 14:05:31.198790532 +0000
-@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
+--- mailman-2.1.5.orig/cron/Makefile.in        2003-03-31 14:27:07.000000000 -0500
++++ mailman-2.1.5.build/cron/Makefile.in       2004-10-15 15:36:46.000000000 -0400
+@@ -28,7 +28,6 @@
  DESTDIR=
  
  CC=           @CC@
@@ -38,7 +36,7 @@ diff -urp mailman-2.1.20.orig/cron/Makefile.in mailman-2.1.20/cron/Makefile.in
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -68,8 +67,6 @@ install:
+@@ -68,8 +67,6 @@
            $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(CRONDIR); \
        done
  
@@ -47,10 +45,9 @@ diff -urp mailman-2.1.20.orig/cron/Makefile.in mailman-2.1.20/cron/Makefile.in
  clean:
  
  distclean:
-diff -urp mailman-2.1.20.orig/Mailman/Archiver/Makefile.in mailman-2.1.20/Mailman/Archiver/Makefile.in
---- mailman-2.1.20.orig/Mailman/Archiver/Makefile.in   2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/Mailman/Archiver/Makefile.in        2015-08-09 14:05:31.199790532 +0000
-@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
+--- mailman-2.1.5.orig/Mailman/Archiver/Makefile.in    2003-03-31 14:26:58.000000000 -0500
++++ mailman-2.1.5.build/Mailman/Archiver/Makefile.in   2004-10-15 15:36:46.000000000 -0400
+@@ -28,7 +28,6 @@
  DESTDIR=
  
  CC=           @CC@
@@ -58,7 +55,7 @@ diff -urp mailman-2.1.20.orig/Mailman/Archiver/Makefile.in mailman-2.1.20/Mailma
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -47,7 +46,7 @@ pipermail.py
+@@ -47,7 +46,7 @@
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
@@ -67,7 +64,7 @@ diff -urp mailman-2.1.20.orig/Mailman/Archiver/Makefile.in mailman-2.1.20/Mailma
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -63,8 +62,6 @@ install:
+@@ -63,8 +62,6 @@
            $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
        done
  
@@ -76,10 +73,9 @@ diff -urp mailman-2.1.20.orig/Mailman/Archiver/Makefile.in mailman-2.1.20/Mailma
  clean:
  
  distclean:
-diff -urp mailman-2.1.20.orig/Mailman/Bouncers/Makefile.in mailman-2.1.20/Mailman/Bouncers/Makefile.in
---- mailman-2.1.20.orig/Mailman/Bouncers/Makefile.in   2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/Mailman/Bouncers/Makefile.in        2015-08-09 14:05:31.199790532 +0000
-@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
+--- mailman-2.1.5.orig/Mailman/Bouncers/Makefile.in    2003-03-31 14:26:58.000000000 -0500
++++ mailman-2.1.5.build/Mailman/Bouncers/Makefile.in   2004-10-15 15:36:46.000000000 -0400
+@@ -28,7 +28,6 @@
  DESTDIR=
  
  CC=           @CC@
@@ -87,7 +83,7 @@ diff -urp mailman-2.1.20.orig/Mailman/Bouncers/Makefile.in mailman-2.1.20/Mailma
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -45,7 +44,7 @@ MODULES=     *.py
+@@ -45,7 +44,7 @@
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
@@ -96,7 +92,7 @@ diff -urp mailman-2.1.20.orig/Mailman/Bouncers/Makefile.in mailman-2.1.20/Mailma
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@ install:
+@@ -61,8 +60,6 @@
            $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
        done
  
@@ -105,10 +101,9 @@ diff -urp mailman-2.1.20.orig/Mailman/Bouncers/Makefile.in mailman-2.1.20/Mailma
  clean:
  
  distclean:
-diff -urp mailman-2.1.20.orig/Mailman/Cgi/Makefile.in mailman-2.1.20/Mailman/Cgi/Makefile.in
---- mailman-2.1.20.orig/Mailman/Cgi/Makefile.in        2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/Mailman/Cgi/Makefile.in     2015-08-09 14:05:31.200790532 +0000
-@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
+--- mailman-2.1.5.orig/Mailman/Cgi/Makefile.in 2003-03-31 14:26:59.000000000 -0500
++++ mailman-2.1.5.build/Mailman/Cgi/Makefile.in        2004-10-15 15:36:46.000000000 -0400
+@@ -28,7 +28,6 @@
  DESTDIR=
  
  CC=           @CC@
@@ -116,7 +111,7 @@ diff -urp mailman-2.1.20.orig/Mailman/Cgi/Makefile.in mailman-2.1.20/Mailman/Cgi
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -47,7 +46,7 @@ CGI_MODULES= *.py
+@@ -47,7 +46,7 @@
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
@@ -125,7 +120,7 @@ diff -urp mailman-2.1.20.orig/Mailman/Cgi/Makefile.in mailman-2.1.20/Mailman/Cgi
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -63,8 +62,6 @@ install:
+@@ -63,8 +62,6 @@
            $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(CGIDIR); \
          done
  
@@ -134,10 +129,9 @@ diff -urp mailman-2.1.20.orig/Mailman/Cgi/Makefile.in mailman-2.1.20/Mailman/Cgi
  clean:
  
  distclean:
-diff -urp mailman-2.1.20.orig/Mailman/Commands/Makefile.in mailman-2.1.20/Mailman/Commands/Makefile.in
---- mailman-2.1.20.orig/Mailman/Commands/Makefile.in   2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/Mailman/Commands/Makefile.in        2015-08-09 14:05:31.200790532 +0000
-@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
+--- mailman-2.1.5.orig/Mailman/Commands/Makefile.in    2003-03-31 14:27:00.000000000 -0500
++++ mailman-2.1.5.build/Mailman/Commands/Makefile.in   2004-10-15 15:36:46.000000000 -0400
+@@ -28,7 +28,6 @@
  DESTDIR=
  
  CC=           @CC@
@@ -145,7 +139,7 @@ diff -urp mailman-2.1.20.orig/Mailman/Commands/Makefile.in mailman-2.1.20/Mailma
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -45,7 +44,7 @@ MODULES=     *.py
+@@ -45,7 +44,7 @@
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
@@ -154,7 +148,7 @@ diff -urp mailman-2.1.20.orig/Mailman/Commands/Makefile.in mailman-2.1.20/Mailma
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@ install:
+@@ -61,8 +60,6 @@
            $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
        done
  
@@ -163,10 +157,9 @@ diff -urp mailman-2.1.20.orig/Mailman/Commands/Makefile.in mailman-2.1.20/Mailma
  clean:
  
  distclean:
-diff -urp mailman-2.1.20.orig/Mailman/Gui/Makefile.in mailman-2.1.20/Mailman/Gui/Makefile.in
---- mailman-2.1.20.orig/Mailman/Gui/Makefile.in        2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/Mailman/Gui/Makefile.in     2015-08-09 14:05:31.200790532 +0000
-@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
+--- mailman-2.1.5.orig/Mailman/Gui/Makefile.in 2003-03-31 14:27:01.000000000 -0500
++++ mailman-2.1.5.build/Mailman/Gui/Makefile.in        2004-10-15 15:36:46.000000000 -0400
+@@ -28,7 +28,6 @@
  DESTDIR=
  
  CC=           @CC@
@@ -174,7 +167,7 @@ diff -urp mailman-2.1.20.orig/Mailman/Gui/Makefile.in mailman-2.1.20/Mailman/Gui
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -45,7 +44,7 @@ MODULES=     *.py
+@@ -45,7 +44,7 @@
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
@@ -183,7 +176,7 @@ diff -urp mailman-2.1.20.orig/Mailman/Gui/Makefile.in mailman-2.1.20/Mailman/Gui
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@ install:
+@@ -61,8 +60,6 @@
            $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
        done
  
@@ -192,10 +185,9 @@ diff -urp mailman-2.1.20.orig/Mailman/Gui/Makefile.in mailman-2.1.20/Mailman/Gui
  clean:
  
  distclean:
-diff -urp mailman-2.1.20.orig/Mailman/Handlers/Makefile.in mailman-2.1.20/Mailman/Handlers/Makefile.in
---- mailman-2.1.20.orig/Mailman/Handlers/Makefile.in   2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/Mailman/Handlers/Makefile.in        2015-08-09 14:05:31.200790532 +0000
-@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
+--- mailman-2.1.5.orig/Mailman/Handlers/Makefile.in    2003-03-31 14:27:01.000000000 -0500
++++ mailman-2.1.5.build/Mailman/Handlers/Makefile.in   2004-10-15 15:36:46.000000000 -0400
+@@ -28,7 +28,6 @@
  DESTDIR=
  
  CC=           @CC@
@@ -203,7 +195,7 @@ diff -urp mailman-2.1.20.orig/Mailman/Handlers/Makefile.in mailman-2.1.20/Mailma
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -45,7 +44,7 @@ MODULES=     *.py
+@@ -45,7 +44,7 @@
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
@@ -212,7 +204,7 @@ diff -urp mailman-2.1.20.orig/Mailman/Handlers/Makefile.in mailman-2.1.20/Mailma
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@ install:
+@@ -61,8 +60,6 @@
            $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
        done
  
@@ -221,10 +213,9 @@ diff -urp mailman-2.1.20.orig/Mailman/Handlers/Makefile.in mailman-2.1.20/Mailma
  clean:
  
  distclean:
-diff -urp mailman-2.1.20.orig/Mailman/Logging/Makefile.in mailman-2.1.20/Mailman/Logging/Makefile.in
---- mailman-2.1.20.orig/Mailman/Logging/Makefile.in    2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/Mailman/Logging/Makefile.in 2015-08-09 14:05:31.201790532 +0000
-@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
+--- mailman-2.1.5.orig/Mailman/Logging/Makefile.in     2003-03-31 14:27:02.000000000 -0500
++++ mailman-2.1.5.build/Mailman/Logging/Makefile.in    2004-10-15 15:36:46.000000000 -0400
+@@ -28,7 +28,6 @@
  DESTDIR=
  
  CC=           @CC@
@@ -232,7 +223,7 @@ diff -urp mailman-2.1.20.orig/Mailman/Logging/Makefile.in mailman-2.1.20/Mailman
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -45,7 +44,7 @@ MODULES=     *.py
+@@ -45,7 +44,7 @@
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
@@ -241,7 +232,7 @@ diff -urp mailman-2.1.20.orig/Mailman/Logging/Makefile.in mailman-2.1.20/Mailman
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@ install:
+@@ -61,8 +60,6 @@
            $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
        done
  
@@ -250,9 +241,8 @@ diff -urp mailman-2.1.20.orig/Mailman/Logging/Makefile.in mailman-2.1.20/Mailman
  clean:
  
  distclean:
-diff -urp mailman-2.1.20.orig/Mailman/Makefile.in mailman-2.1.20/Mailman/Makefile.in
---- mailman-2.1.20.orig/Mailman/Makefile.in    2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/Mailman/Makefile.in 2015-08-09 14:05:31.213790532 +0000
+--- mailman-2.1.5.orig/Mailman/Makefile.in     2003-03-31 14:26:58.000000000 -0500
++++ mailman-2.1.5.build/Mailman/Makefile.in    2004-10-15 15:36:46.000000000 -0400
 @@ -20,8 +20,6 @@
  
  # Variables set by configure
@@ -262,7 +252,7 @@ diff -urp mailman-2.1.20.orig/Mailman/Makefile.in mailman-2.1.20/Mailman/Makefil
  VPATH=                @srcdir@
  srcdir=       @srcdir@
  bindir=       @bindir@
-@@ -30,7 +28,6 @@ exec_prefix= @exec_prefix@
+@@ -30,7 +28,6 @@
  DESTDIR=
  
  CC=           @CC@
@@ -270,7 +260,7 @@ diff -urp mailman-2.1.20.orig/Mailman/Makefile.in mailman-2.1.20/Mailman/Makefil
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -48,7 +45,7 @@ SUBDIRS=     Cgi Logging Archiver Handlers B
+@@ -48,7 +45,7 @@
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
@@ -279,7 +269,7 @@ diff -urp mailman-2.1.20.orig/Mailman/Makefile.in mailman-2.1.20/Mailman/Makefil
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -79,12 +76,6 @@ install: install-here
+@@ -79,12 +76,6 @@
            (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
        done
  
@@ -292,10 +282,9 @@ diff -urp mailman-2.1.20.orig/Mailman/Makefile.in mailman-2.1.20/Mailman/Makefil
  clean:
        for d in $(SUBDIRS); \
        do \
-diff -urp mailman-2.1.20.orig/Mailman/MTA/Makefile.in mailman-2.1.20/Mailman/MTA/Makefile.in
---- mailman-2.1.20.orig/Mailman/MTA/Makefile.in        2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/Mailman/MTA/Makefile.in     2015-08-09 14:05:31.213790532 +0000
-@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
+--- mailman-2.1.5.orig/Mailman/MTA/Makefile.in 2003-03-31 14:27:02.000000000 -0500
++++ mailman-2.1.5.build/Mailman/MTA/Makefile.in        2004-10-15 15:36:46.000000000 -0400
+@@ -28,7 +28,6 @@
  DESTDIR=
  
  CC=           @CC@
@@ -303,7 +292,7 @@ diff -urp mailman-2.1.20.orig/Mailman/MTA/Makefile.in mailman-2.1.20/Mailman/MTA
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -45,7 +44,7 @@ MODULES=     *.py
+@@ -45,7 +44,7 @@
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
@@ -312,7 +301,7 @@ diff -urp mailman-2.1.20.orig/Mailman/MTA/Makefile.in mailman-2.1.20/Mailman/MTA
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@ install:
+@@ -61,8 +60,6 @@
            $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
        done
  
@@ -321,10 +310,9 @@ diff -urp mailman-2.1.20.orig/Mailman/MTA/Makefile.in mailman-2.1.20/Mailman/MTA
  clean:
  
  distclean:
-diff -urp mailman-2.1.20.orig/Mailman/Queue/Makefile.in mailman-2.1.20/Mailman/Queue/Makefile.in
---- mailman-2.1.20.orig/Mailman/Queue/Makefile.in      2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/Mailman/Queue/Makefile.in   2015-08-09 14:05:31.213790532 +0000
-@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
+--- mailman-2.1.5.orig/Mailman/Queue/Makefile.in       2003-03-31 14:27:03.000000000 -0500
++++ mailman-2.1.5.build/Mailman/Queue/Makefile.in      2004-10-15 15:36:46.000000000 -0400
+@@ -28,7 +28,6 @@
  DESTDIR=
  
  CC=           @CC@
@@ -332,7 +320,7 @@ diff -urp mailman-2.1.20.orig/Mailman/Queue/Makefile.in mailman-2.1.20/Mailman/Q
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -45,7 +44,7 @@ MODULES=     *.py
+@@ -45,7 +44,7 @@
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
@@ -341,7 +329,7 @@ diff -urp mailman-2.1.20.orig/Mailman/Queue/Makefile.in mailman-2.1.20/Mailman/Q
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@ install:
+@@ -61,8 +60,6 @@
            $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
        done
  
@@ -350,10 +338,9 @@ diff -urp mailman-2.1.20.orig/Mailman/Queue/Makefile.in mailman-2.1.20/Mailman/Q
  clean:
  
  distclean:
-diff -urp mailman-2.1.20.orig/Makefile.in mailman-2.1.20/Makefile.in
---- mailman-2.1.20.orig/Makefile.in    2015-08-09 14:03:22.000000000 +0000
-+++ mailman-2.1.20/Makefile.in 2015-08-09 14:05:31.223790532 +0000
-@@ -61,11 +61,10 @@ SUBDIRS=   bin cron misc Mailman scripts s
+--- mailman-2.1.5.orig/Makefile.in     2003-03-31 14:26:57.000000000 -0500
++++ mailman-2.1.5.build/Makefile.in    2004-10-15 16:26:03.000000000 -0400
+@@ -61,11 +61,10 @@
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
@@ -366,7 +353,7 @@ diff -urp mailman-2.1.20.orig/Makefile.in mailman-2.1.20/Makefile.in
  
  DATE = $(shell python -c 'import time; print time.strftime("%d-%b-%Y"),')
  LANGPACK = README-I18N.en templates messages
-@@ -85,14 +84,24 @@ install: doinstall update
+@@ -85,14 +84,24 @@
  
  doinstall: $(SUBDIRS)
        @echo "Creating architecture independent directories..."
@@ -394,7 +381,7 @@ diff -urp mailman-2.1.20.orig/Makefile.in mailman-2.1.20/Makefile.in
            else true; \
            fi; \
        done
-@@ -102,9 +111,7 @@ doinstall: $(SUBDIRS)
+@@ -102,9 +111,7 @@
            dir=$(DESTDIR)$(prefix)/$$d; \
            if test ! -d $$dir; then \
                echo "Creating directory hierarchy $$dir"; \
@@ -405,7 +392,7 @@ diff -urp mailman-2.1.20.orig/Makefile.in mailman-2.1.20/Makefile.in
            else true; \
            fi; \
        done
-@@ -114,9 +121,7 @@ doinstall: $(SUBDIRS)
+@@ -114,9 +121,7 @@
            dir=$(DESTDIR)$(exec_prefix)/$$d; \
            if test ! -d $$dir; then \
                echo "Creating directory hierarchy $$dir"; \
@@ -416,10 +403,9 @@ diff -urp mailman-2.1.20.orig/Makefile.in mailman-2.1.20/Makefile.in
            else true; \
            fi; \
        done
-diff -urp mailman-2.1.20.orig/messages/Makefile.in mailman-2.1.20/messages/Makefile.in
---- mailman-2.1.20.orig/messages/Makefile.in   2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/messages/Makefile.in        2015-08-09 14:05:31.223790532 +0000
-@@ -32,7 +32,6 @@ exec_prefix= @exec_prefix@
+--- mailman-2.1.5.orig/messages/Makefile.in    2004-04-24 22:30:04.000000000 -0400
++++ mailman-2.1.5.build/messages/Makefile.in   2004-10-15 15:36:46.000000000 -0400
+@@ -32,7 +32,6 @@
  DESTDIR=
  
  CC=           @CC@
@@ -427,7 +413,7 @@ diff -urp mailman-2.1.20.orig/messages/Makefile.in mailman-2.1.20/messages/Makef
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -43,7 +42,6 @@ OPT=         @OPT@
+@@ -43,7 +42,6 @@
  CFLAGS=               $(OPT) $(DEFS)
  PACKAGEDIR=   $(prefix)/messages
  SHELL=                /bin/sh
@@ -435,7 +421,7 @@ diff -urp mailman-2.1.20.orig/messages/Makefile.in mailman-2.1.20/messages/Makef
  MSGFMT=       @PYTHON@ ../build/bin/msgfmt.py
  MSGMERGE=     msgmerge
  
-@@ -60,7 +58,7 @@ TARGETS=     $(MOFILES)
+@@ -60,7 +58,7 @@
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
@@ -444,7 +430,7 @@ diff -urp mailman-2.1.20.orig/messages/Makefile.in mailman-2.1.20/messages/Makef
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -90,9 +88,8 @@ doinstall: mofiles
+@@ -90,9 +88,8 @@
        do \
            dir=$(DESTDIR)$(prefix)/$$d; \
            echo "Creating language directory $$dir"; \
@@ -456,7 +442,7 @@ diff -urp mailman-2.1.20.orig/messages/Makefile.in mailman-2.1.20/messages/Makef
        done
        @for d in $(LANGUAGES); \
        do \
-@@ -113,8 +110,6 @@ doinstall: mofiles
+@@ -112,8 +109,6 @@
  
  mofiles: $(MOFILES)
  
@@ -465,10 +451,9 @@ diff -urp mailman-2.1.20.orig/messages/Makefile.in mailman-2.1.20/messages/Makef
  clean:
        -rm -f */LC_MESSAGES/mailman.mo
  
-diff -urp mailman-2.1.20.orig/misc/Makefile.in mailman-2.1.20/misc/Makefile.in
---- mailman-2.1.20.orig/misc/Makefile.in       2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/misc/Makefile.in    2015-08-09 14:05:31.224790532 +0000
-@@ -30,7 +30,6 @@ var_prefix=  @VAR_PREFIX@
+--- mailman-2.1.5.orig/misc/Makefile.in        2004-05-13 23:34:34.000000000 -0400
++++ mailman-2.1.5.build/misc/Makefile.in       2004-10-15 15:36:46.000000000 -0400
+@@ -29,7 +29,6 @@
  DESTDIR=
  
  CC=           @CC@
@@ -476,7 +461,7 @@ diff -urp mailman-2.1.20.orig/misc/Makefile.in mailman-2.1.20/misc/Makefile.in
  INSTALL=      @INSTALL@
  PYTHON=               @PYTHON@
  
-@@ -62,7 +61,7 @@ PACKAGES= $(EMAILPKG) $(JACODECSPKG) $(K
+@@ -61,7 +60,7 @@
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
@@ -485,7 +470,7 @@ diff -urp mailman-2.1.20.orig/misc/Makefile.in mailman-2.1.20/misc/Makefile.in
  EXEMODE=      755
  FILEMODE=     644
  DATAMODE=     664
-@@ -101,8 +100,6 @@ install-packages:
+@@ -93,8 +92,6 @@
            (cd $(PKGDIR)/$$p ; umask 02 ; PYTHONPATH=$(PYTHONLIBDIR) $(PYTHON) $(SETUPCMD)); \
        done
  
@@ -494,10 +479,9 @@ diff -urp mailman-2.1.20.orig/misc/Makefile.in mailman-2.1.20/misc/Makefile.in
  clean:
  
  distclean:
-diff -urp mailman-2.1.20.orig/scripts/Makefile.in mailman-2.1.20/scripts/Makefile.in
---- mailman-2.1.20.orig/scripts/Makefile.in    2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/scripts/Makefile.in 2015-08-09 14:05:31.224790532 +0000
-@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
+--- mailman-2.1.5.orig/scripts/Makefile.in     2003-03-31 14:27:12.000000000 -0500
++++ mailman-2.1.5.build/scripts/Makefile.in    2004-10-15 15:36:46.000000000 -0400
+@@ -28,7 +28,6 @@
  DESTDIR=
  
  CC=           @CC@
@@ -505,7 +489,7 @@ diff -urp mailman-2.1.20.orig/scripts/Makefile.in mailman-2.1.20/scripts/Makefil
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -49,7 +48,7 @@ SCRIPTS=     bounces confirm driver join lea
+@@ -49,7 +48,7 @@
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
@@ -514,7 +498,7 @@ diff -urp mailman-2.1.20.orig/scripts/Makefile.in mailman-2.1.20/scripts/Makefil
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -68,8 +67,6 @@ install:
+@@ -68,8 +67,6 @@
        $(INSTALL) -m $(FILEMODE) $(srcdir)/join    $(DESTDIR)$(SCRIPTSDIR)/subscribe
        $(INSTALL) -m $(FILEMODE) $(srcdir)/leave   $(DESTDIR)$(SCRIPTSDIR)/unsubscribe
  
@@ -523,10 +507,9 @@ diff -urp mailman-2.1.20.orig/scripts/Makefile.in mailman-2.1.20/scripts/Makefil
  clean:
  
  distclean:
-diff -urp mailman-2.1.20.orig/src/Makefile.in mailman-2.1.20/src/Makefile.in
---- mailman-2.1.20.orig/src/Makefile.in        2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/src/Makefile.in     2015-08-09 14:05:31.224790532 +0000
-@@ -28,7 +28,6 @@ bindir=      @bindir@
+--- mailman-2.1.5.orig/src/Makefile.in 2003-03-31 14:27:14.000000000 -0500
++++ mailman-2.1.5.build/src/Makefile.in        2004-10-15 15:36:46.000000000 -0400
+@@ -28,7 +28,6 @@
  DESTDIR=
  
  CC=           @CC@
@@ -534,7 +517,7 @@ diff -urp mailman-2.1.20.orig/src/Makefile.in mailman-2.1.20/src/Makefile.in
  INSTALL=      @INSTALL@
  PYTHON=       @PYTHON@
  
-@@ -65,10 +64,9 @@ COMMON_FLAGS=       -DPREFIX="\"$(prefix)\"" \
+@@ -63,10 +62,9 @@
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
@@ -547,7 +530,7 @@ diff -urp mailman-2.1.20.orig/src/Makefile.in mailman-2.1.20/src/Makefile.in
  
  # Fixed definitions
  
-@@ -112,20 +110,10 @@ install: all
+@@ -110,20 +108,10 @@
        do \
            exe=$(DESTDIR)$(CGIDIR)/$$f$(CGIEXT); \
            $(INSTALL_PROGRAM) $$f $$exe; \
@@ -568,10 +551,9 @@ diff -urp mailman-2.1.20.orig/src/Makefile.in mailman-2.1.20/src/Makefile.in
        done
  
  clean:
-diff -urp mailman-2.1.20.orig/templates/Makefile.in mailman-2.1.20/templates/Makefile.in
---- mailman-2.1.20.orig/templates/Makefile.in  2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/templates/Makefile.in       2015-08-09 14:05:31.225790532 +0000
-@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
+--- mailman-2.1.5.orig/templates/Makefile.in   2004-04-24 22:30:04.000000000 -0400
++++ mailman-2.1.5.build/templates/Makefile.in  2004-10-18 12:49:01.000000000 -0400
+@@ -28,7 +28,6 @@
  DESTDIR=
  
  CC=           @CC@
@@ -579,7 +561,7 @@ diff -urp mailman-2.1.20.orig/templates/Makefile.in mailman-2.1.20/templates/Mak
  INSTALL=      @INSTALL@
  TRUE=         @TRUE@
  
-@@ -49,7 +48,7 @@ LANGUAGES=   ar ast ca cs da de el en es e
+@@ -48,7 +47,7 @@
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
@@ -588,7 +570,7 @@ diff -urp mailman-2.1.20.orig/templates/Makefile.in mailman-2.1.20/templates/Mak
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -62,15 +61,13 @@ all:
+@@ -61,15 +60,13 @@
  install:
        for d in $(LANGUAGES); \
        do \
@@ -605,10 +587,9 @@ diff -urp mailman-2.1.20.orig/templates/Makefile.in mailman-2.1.20/templates/Mak
  clean:
  
  distclean:
-diff -urp mailman-2.1.20.orig/tests/bounces/Makefile.in mailman-2.1.20/tests/bounces/Makefile.in
---- mailman-2.1.20.orig/tests/bounces/Makefile.in      2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/tests/bounces/Makefile.in   2015-08-09 14:05:31.225790532 +0000
-@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
+--- mailman-2.1.5.orig/tests/bounces/Makefile.in       2003-03-31 14:27:16.000000000 -0500
++++ mailman-2.1.5.build/tests/bounces/Makefile.in      2004-10-15 15:36:46.000000000 -0400
+@@ -28,7 +28,6 @@
  DESTDIR=
  
  CC=           @CC@
@@ -616,7 +597,7 @@ diff -urp mailman-2.1.20.orig/tests/bounces/Makefile.in mailman-2.1.20/tests/bou
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -46,7 +45,7 @@ BOUNCE_FILES=        $(srcdir)/*.txt
+@@ -46,7 +45,7 @@
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
@@ -625,7 +606,7 @@ diff -urp mailman-2.1.20.orig/tests/bounces/Makefile.in mailman-2.1.20/tests/bou
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -60,8 +59,6 @@ install:
+@@ -60,8 +59,6 @@
            $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(BOUNCEDIR); \
        done
  
@@ -634,10 +615,9 @@ diff -urp mailman-2.1.20.orig/tests/bounces/Makefile.in mailman-2.1.20/tests/bou
  clean:
  
  distclean:
-diff -urp mailman-2.1.20.orig/tests/Makefile.in mailman-2.1.20/tests/Makefile.in
---- mailman-2.1.20.orig/tests/Makefile.in      2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/tests/Makefile.in   2015-08-09 14:05:31.225790532 +0000
-@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
+--- mailman-2.1.5.orig/tests/Makefile.in       2003-03-31 14:27:15.000000000 -0500
++++ mailman-2.1.5.build/tests/Makefile.in      2004-10-15 15:36:46.000000000 -0400
+@@ -28,7 +28,6 @@
  DESTDIR=
  
  CC=           @CC@
@@ -645,7 +625,7 @@ diff -urp mailman-2.1.20.orig/tests/Makefile.in mailman-2.1.20/tests/Makefile.in
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -46,7 +45,7 @@ EXECS=       $(srcdir)/onebounce.py $(srcdir
+@@ -46,7 +45,7 @@
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
@@ -654,7 +634,7 @@ diff -urp mailman-2.1.20.orig/tests/Makefile.in mailman-2.1.20/tests/Makefile.in
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -71,8 +70,6 @@ install:
+@@ -71,8 +70,6 @@
            (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
        done
  
@@ -663,10 +643,9 @@ diff -urp mailman-2.1.20.orig/tests/Makefile.in mailman-2.1.20/tests/Makefile.in
  clean:
  
  distclean:
-diff -urp mailman-2.1.20.orig/tests/msgs/Makefile.in mailman-2.1.20/tests/msgs/Makefile.in
---- mailman-2.1.20.orig/tests/msgs/Makefile.in 2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/tests/msgs/Makefile.in      2015-08-09 14:05:31.226790532 +0000
-@@ -28,7 +28,6 @@ exec_prefix= @exec_prefix@
+--- mailman-2.1.5.orig/tests/msgs/Makefile.in  2003-03-31 14:27:17.000000000 -0500
++++ mailman-2.1.5.build/tests/msgs/Makefile.in 2004-10-15 15:36:46.000000000 -0400
+@@ -28,7 +28,6 @@
  DESTDIR=
  
  CC=           @CC@
@@ -674,7 +653,7 @@ diff -urp mailman-2.1.20.orig/tests/msgs/Makefile.in mailman-2.1.20/tests/msgs/M
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -46,7 +45,7 @@ MSG_FILES=   $(srcdir)/*.txt
+@@ -46,7 +45,7 @@
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
@@ -683,7 +662,7 @@ diff -urp mailman-2.1.20.orig/tests/msgs/Makefile.in mailman-2.1.20/tests/msgs/M
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -60,8 +59,6 @@ install:
+@@ -60,8 +59,6 @@
            $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(MSGSDIR); \
        done
  
index 368eed8f70d183b986c156fe3e6a14a9037912f4..6dd08bfd6fd99c407636eb6abc81cfdf5d664909 100644 (file)
@@ -1,24 +1,24 @@
-diff -urp mailman-2.1.20.orig/cron/bumpdigests mailman-2.1.20/cron/bumpdigests
---- mailman-2.1.20.orig/cron/bumpdigests       2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/cron/bumpdigests    2015-08-09 13:57:52.065340518 +0000
+diff -r -u mailman-2.1.5.orig/cron/bumpdigests mailman-2.1.5/cron/bumpdigests
+--- mailman-2.1.5.orig/cron/bumpdigests        2002-10-21 18:36:56.000000000 -0400
++++ mailman-2.1.5/cron/bumpdigests     2004-09-03 10:41:12.000000000 -0400
 @@ -1,4 +1,4 @@
 -#! @PYTHON@
 +#! @PYTHON@ -S
  #
  # Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
  #
-diff -urp mailman-2.1.20.orig/cron/checkdbs mailman-2.1.20/cron/checkdbs
---- mailman-2.1.20.orig/cron/checkdbs  2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/cron/checkdbs       2015-08-09 13:57:52.065340518 +0000
+diff -r -u mailman-2.1.5.orig/cron/checkdbs mailman-2.1.5/cron/checkdbs
+--- mailman-2.1.5.orig/cron/checkdbs   2003-12-26 17:51:10.000000000 -0500
++++ mailman-2.1.5/cron/checkdbs        2004-08-31 12:21:24.000000000 -0400
 @@ -1,4 +1,4 @@
 -#! @PYTHON@
 +#! @PYTHON@ -S
  #
- # Copyright (C) 1998-2011 by the Free Software Foundation, Inc.
+ # Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
  #
-diff -urp mailman-2.1.20.orig/cron/crontab.in.in mailman-2.1.20/cron/crontab.in.in
---- mailman-2.1.20.orig/cron/crontab.in.in     2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/cron/crontab.in.in  2015-08-09 13:57:52.066340518 +0000
+diff -r -u mailman-2.1.5.orig/cron/crontab.in.in mailman-2.1.5/cron/crontab.in.in
+--- mailman-2.1.5.orig/cron/crontab.in.in      2002-01-06 01:28:12.000000000 -0500
++++ mailman-2.1.5/cron/crontab.in.in   2004-09-02 17:43:27.000000000 -0400
 @@ -1,27 +1,27 @@
  # At 8AM every day, mail reminders to admins as to pending requests.
  # They are less likely to ignore these reminders if they're mailed
@@ -54,48 +54,48 @@ diff -urp mailman-2.1.20.orig/cron/crontab.in.in mailman-2.1.20/cron/crontab.in.
  # At 4:30AM daily, cull old entries from the 'bad' and 'shunt' queues.
 -30 4 * * * @PYTHON@ -S @prefix@/cron/cull_bad_shunt
 +30 4 * * * @MAILMAN_USER@ @prefix@/cron/cull_bad_shunt
-diff -urp mailman-2.1.20.orig/cron/disabled mailman-2.1.20/cron/disabled
---- mailman-2.1.20.orig/cron/disabled  2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/cron/disabled       2015-08-09 13:57:52.066340518 +0000
+diff -r -u mailman-2.1.5.orig/cron/disabled mailman-2.1.5/cron/disabled
+--- mailman-2.1.5.orig/cron/disabled   2004-02-10 17:59:45.000000000 -0500
++++ mailman-2.1.5/cron/disabled        2004-08-31 12:22:54.000000000 -0400
 @@ -1,4 +1,4 @@
 -#! @PYTHON@
 +#! @PYTHON@ -S
  #
- # Copyright (C) 2001-2013 by the Free Software Foundation, Inc.
+ # Copyright (C) 2001-2004 by the Free Software Foundation, Inc.
  #
-diff -urp mailman-2.1.20.orig/cron/gate_news mailman-2.1.20/cron/gate_news
---- mailman-2.1.20.orig/cron/gate_news 2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/cron/gate_news      2015-08-09 13:57:52.066340518 +0000
+diff -r -u mailman-2.1.5.orig/cron/gate_news mailman-2.1.5/cron/gate_news
+--- mailman-2.1.5.orig/cron/gate_news  2003-09-21 22:29:51.000000000 -0400
++++ mailman-2.1.5/cron/gate_news       2004-08-31 12:21:48.000000000 -0400
 @@ -1,4 +1,4 @@
 -#! @PYTHON@
 +#! @PYTHON@ -S
  #
- # Copyright (C) 1998-2011 by the Free Software Foundation, Inc.
+ # Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
  #
-diff -urp mailman-2.1.20.orig/cron/mailpasswds mailman-2.1.20/cron/mailpasswds
---- mailman-2.1.20.orig/cron/mailpasswds       2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/cron/mailpasswds    2015-08-09 13:57:52.067340518 +0000
+diff -r -u mailman-2.1.5.orig/cron/mailpasswds mailman-2.1.5/cron/mailpasswds
+--- mailman-2.1.5.orig/cron/mailpasswds        2003-09-21 22:29:51.000000000 -0400
++++ mailman-2.1.5/cron/mailpasswds     2004-08-31 12:21:56.000000000 -0400
 @@ -1,4 +1,4 @@
 -#! @PYTHON@
 +#! @PYTHON@ -S
  #
  # Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
  #
-diff -urp mailman-2.1.20.orig/cron/nightly_gzip mailman-2.1.20/cron/nightly_gzip
---- mailman-2.1.20.orig/cron/nightly_gzip      2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/cron/nightly_gzip   2015-08-09 13:57:52.067340518 +0000
+diff -r -u mailman-2.1.5.orig/cron/nightly_gzip mailman-2.1.5/cron/nightly_gzip
+--- mailman-2.1.5.orig/cron/nightly_gzip       2002-10-21 18:36:58.000000000 -0400
++++ mailman-2.1.5/cron/nightly_gzip    2004-08-31 12:22:32.000000000 -0400
 @@ -1,4 +1,4 @@
 -#! @PYTHON@
 +#! @PYTHON@ -S
  # 
- # Copyright (C) 1998-2014 by the Free Software Foundation, Inc.
+ # Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
  #
-diff -urp mailman-2.1.20.orig/cron/senddigests mailman-2.1.20/cron/senddigests
---- mailman-2.1.20.orig/cron/senddigests       2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/cron/senddigests    2015-08-09 13:57:52.067340518 +0000
+diff -r -u mailman-2.1.5.orig/cron/senddigests mailman-2.1.5/cron/senddigests
+--- mailman-2.1.5.orig/cron/senddigests        2002-10-21 18:36:58.000000000 -0400
++++ mailman-2.1.5/cron/senddigests     2004-08-31 12:22:44.000000000 -0400
 @@ -1,4 +1,4 @@
 -#! @PYTHON@
 +#! @PYTHON@ -S
  #
- # Copyright (C) 1998-2007 by the Free Software Foundation, Inc.
+ # Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
  #
index cca22fdda05c2007e413b8272b2c97abb01e3932..92f918fcad58995427f9cc8d00537f568efe1380 100644 (file)
@@ -1,7 +1,6 @@
-diff -urp mailman-2.1.20.orig/bin/mailmanctl mailman-2.1.20/bin/mailmanctl
---- mailman-2.1.20.orig/bin/mailmanctl 2015-08-09 13:38:26.000000000 +0000
-+++ mailman-2.1.20/bin/mailmanctl      2015-08-09 14:25:57.397790532 +0000
-@@ -488,6 +488,12 @@ def main():
+--- mailman-2.1.11/bin/mailmanctl~     2009-03-06 15:02:12.706376997 +0200
++++ mailman-2.1.11/bin/mailmanctl      2009-03-06 14:55:45.366717626 +0200
+@@ -480,6 +480,12 @@
          os.chdir(mm_cfg.PREFIX)
          # Set our file mode creation umask
          os.umask(007)
index 3a6f41bbcef3d812dc24990cfa3aa078a6dd95a8..3e97933bf58514141121338d807ff01a9c713ab2 100644 (file)
@@ -2,12 +2,11 @@ Maybe for security have USE_HTTP_AUTH = ['user1', 'user2']
 
 NOTE: you won't be able to authorize with list password anymore.
 
-diff -urp mailman-2.1.20.orig/Mailman/Defaults.py.in mailman-2.1.20/Mailman/Defaults.py.in
---- mailman-2.1.20.orig/Mailman/Defaults.py.in 2015-08-09 14:07:51.000000000 +0000
-+++ mailman-2.1.20/Mailman/Defaults.py.in      2015-08-09 14:26:57.652790532 +0000
-@@ -1581,6 +1581,10 @@ AuthListModerator = 4 # List Moderator (
+--- mailman-2.1.11/Mailman/Defaults.py.in~     2009-06-08 16:45:29.000000000 +0300
++++ mailman-2.1.11/Mailman/Defaults.py.in      2009-06-08 16:45:31.967055253 +0300
+@@ -1319,6 +1319,10 @@
+ AuthListModerator = 4 # List Moderator (can only handle held requests)
  AuthSiteAdmin = 5     # Site Administrator (total control over everything)
- AuthListPoster = 6    # List poster (Approved: <pw> header in posts only)
  
 +# If value is True, site administrator is trusted from REMOTE_USER CGI variable
 +# Use this to if you want to use password authentication for site admin.
@@ -16,10 +15,9 @@ diff -urp mailman-2.1.20.orig/Mailman/Defaults.py.in mailman-2.1.20/Mailman/Defa
  # Useful directories
  LIST_DATA_DIR   = os.path.join(VAR_PREFIX, 'lists')
  LOG_DIR         = '@LOG_DIR@'
-diff -urp mailman-2.1.20.orig/Mailman/Utils.py mailman-2.1.20/Mailman/Utils.py
---- mailman-2.1.20.orig/Mailman/Utils.py       2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/Mailman/Utils.py    2015-08-09 14:26:57.653790532 +0000
-@@ -438,6 +438,11 @@ def get_global_password(siteadmin=True):
+--- mailman-2.1.11/Mailman/Utils.py~   2009-06-08 16:45:22.000000000 +0300
++++ mailman-2.1.11/Mailman/Utils.py    2009-06-08 16:45:25.094129761 +0300
+@@ -411,6 +411,11 @@
  
  
  def check_global_password(response, siteadmin=True):
index 2c8b44e4c66122c62b429e95e92bfa59e91ebc59..d3f88a5f35c98984e63cb3bbc5dcd239ec3a7892 100644 (file)
@@ -1,7 +1,6 @@
-diff -urp mailman-2.1.20.orig/misc/paths.py.in mailman-2.1.20/misc/paths.py.in
---- mailman-2.1.20.orig/misc/paths.py.in       2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/misc/paths.py.in    2015-08-09 14:12:57.403790532 +0000
-@@ -58,7 +58,7 @@ sys.path.insert(0, prefix)
+--- mailman-2.1.9/misc/paths.py.in~    2008-04-11 16:57:17.000000000 +0300
++++ mailman-2.1.9/misc/paths.py.in     2008-04-11 17:03:09.313098943 +0300
+@@ -45,7 +45,7 @@
  sys.path.insert(0, os.path.join(prefix, 'pythonlib'))
  
  # Include Python's site-packages directory.
index dcdbf9361cd4f634788aed2417716ef3a069ec1c..997e86fc838c69ae16226fda8410c633178c40a6 100644 (file)
@@ -6,22 +6,26 @@ from umbrella list to be accepted by sublists without moderation.
 
 This patch makes possible to reply to original poster instead of umbrella list.
 
-diff -urp mailman-2.1.20.orig/Mailman/Handlers/Cleanse.py mailman-2.1.20/Mailman/Handlers/Cleanse.py
---- mailman-2.1.20.orig/Mailman/Handlers/Cleanse.py    2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/Mailman/Handlers/Cleanse.py 2015-08-09 14:23:48.871790532 +0000
-@@ -66,6 +66,7 @@ def process(mlist, msg, msgdata):
+--- mailman-2.1.9/Mailman/Handlers/Cleanse.py~ 2006-01-15 22:01:35.000000000 +0100
++++ mailman-2.1.9/Mailman/Handlers/Cleanse.py  2008-04-16 16:28:46.000000000 +0200
+@@ -34,16 +34,17 @@
+     del msg['urgent']
+     # We remove other headers from anonymous lists
+     if mlist.anonymous_list:
+-        syslog('post', 'post to %s from %s anonymized',
++        syslog('post', 'post to %s from %s anonymizored',
                 mlist.internal_name(), msg.get('from'))
-         del msg['from']
-         del msg['reply-to']
++        del msg['reply-to']
 +        msg['Reply-To'] = msg.get('from')
+         del msg['from']
+-        del msg['reply-to']
          del msg['sender']
-         del msg['organization']
-         del msg['return-path']
-@@ -82,7 +83,6 @@ def process(mlist, msg, msgdata):
-         remove_nonkeepers(msg)
+         # Hotmail sets this one
+         del msg['x-originating-email']
          i18ndesc = str(uheader(mlist, mlist.description, 'From'))
          msg['From'] = formataddr((i18ndesc, mlist.GetListEmail()))
 -        msg['Reply-To'] = mlist.GetListEmail()
-         uf = msg.get_unixfrom()
-         if uf:
-             uf = re.sub(r'\S*@\S*', mlist.GetListEmail(), uf)
++        # msg['Reply-To'] = mlist.GetListEmail()
+     # Some headers can be used to fish for membership
+     del msg['return-receipt-to']
+     del msg['disposition-notification-to']
index cde8efc05451a147a7bd78421b878447dc1107d0..a72a8e311bbddea485cff05804fb8980fc99cd78 100644 (file)
@@ -1,7 +1,7 @@
-diff -urp mailman-2.1.20.orig/Mailman/Gui/General.py mailman-2.1.20/Mailman/Gui/General.py
---- mailman-2.1.20.orig/Mailman/Gui/General.py 2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/Mailman/Gui/General.py      2015-08-09 14:09:19.754790532 +0000
-@@ -505,6 +505,13 @@ class General(GUIBase):
+diff -ur mailman-2.1.20.org/Mailman/Gui/General.py mailman-2.1.20/Mailman/Gui/General.py
+--- mailman-2.1.20.org/Mailman/Gui/General.py  2015-03-31 19:21:49.000000000 +0200
++++ mailman-2.1.20/Mailman/Gui/General.py      2016-02-21 10:25:57.685943034 +0100
+@@ -505,6 +505,13 @@
                   here."""))
                  )
  
@@ -15,10 +15,10 @@ diff -urp mailman-2.1.20.orig/Mailman/Gui/General.py mailman-2.1.20/Mailman/Gui/
          # Discard held messages after this number of days
          rtn.append(
              ('max_days_to_hold', mm_cfg.Number, 7, 0,
-diff -urp mailman-2.1.20.orig/Mailman/Handlers/CookHeaders.py mailman-2.1.20/Mailman/Handlers/CookHeaders.py
---- mailman-2.1.20.orig/Mailman/Handlers/CookHeaders.py        2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/Mailman/Handlers/CookHeaders.py     2015-08-09 14:09:19.754790532 +0000
-@@ -107,6 +107,11 @@ def process(mlist, msg, msgdata):
+diff -ur mailman-2.1.20.org/Mailman/Handlers/CookHeaders.py mailman-2.1.20/Mailman/Handlers/CookHeaders.py
+--- mailman-2.1.20.org/Mailman/Handlers/CookHeaders.py 2015-03-31 19:21:49.000000000 +0200
++++ mailman-2.1.20/Mailman/Handlers/CookHeaders.py     2016-02-21 10:25:57.685943034 +0100
+@@ -107,6 +107,11 @@
      # X-BeenThere's intact.
      change_header('X-BeenThere', mlist.GetListEmail(),
                    mlist, msg, msgdata, delete=False)
@@ -30,10 +30,10 @@ diff -urp mailman-2.1.20.orig/Mailman/Handlers/CookHeaders.py mailman-2.1.20/Mai
      # Add Precedence: and other useful headers.  None of these are standard
      # and finding information on some of them are fairly difficult.  Some are
      # just common practice, and we'll add more here as they become necessary.
-diff -urp mailman-2.1.20.orig/Mailman/MailList.py mailman-2.1.20/Mailman/MailList.py
---- mailman-2.1.20.orig/Mailman/MailList.py    2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/Mailman/MailList.py 2015-08-09 14:09:19.755790532 +0000
-@@ -367,6 +367,7 @@ class MailList(HTMLFormatter, Deliverer,
+diff -ur mailman-2.1.20.org/Mailman/MailList.py mailman-2.1.20/Mailman/MailList.py
+--- mailman-2.1.20.org/Mailman/MailList.py     2015-03-31 19:21:49.000000000 +0200
++++ mailman-2.1.20/Mailman/MailList.py 2016-02-21 10:25:57.685943034 +0100
+@@ -367,6 +367,7 @@
          self.available_languages = []
          self.include_rfc2369_headers = 1
          self.include_list_post_header = 1
@@ -41,14 +41,26 @@ diff -urp mailman-2.1.20.orig/Mailman/MailList.py mailman-2.1.20/Mailman/MailLis
          self.include_sender_header = 1
          self.filter_mime_types = mm_cfg.DEFAULT_FILTER_MIME_TYPES
          self.pass_mime_types = mm_cfg.DEFAULT_PASS_MIME_TYPES
-diff -urp mailman-2.1.20.orig/Mailman/versions.py mailman-2.1.20/Mailman/versions.py
---- mailman-2.1.20.orig/Mailman/versions.py    2015-03-31 17:21:49.000000000 +0000
-+++ mailman-2.1.20/Mailman/versions.py 2015-08-09 14:11:07.277790532 +0000
-@@ -532,6 +532,7 @@ def NewVars(l):
-                         mm_cfg.DEFAULT_REGULAR_INCLUDE_LISTS)
-     add_only_if_missing('regular_exclude_ignore',
-                         mm_cfg.DEFAULT_REGULAR_EXCLUDE_IGNORE)
-+    add_only_if_missing('x_imap_folder', '')
+diff -ur mailman-2.1.20.org/Mailman/versions.py mailman-2.1.20/Mailman/versions.py
+--- mailman-2.1.20.org/Mailman/versions.py     2015-03-31 19:21:49.000000000 +0200
++++ mailman-2.1.20/Mailman/versions.py 2016-02-21 10:26:55.443940355 +0100
+@@ -168,6 +168,10 @@
+         else:
+             return None
++    def add_only_if_missing(attr, initval, l=l):
++        if not hasattr(l, attr):
++            setattr(l, attr, initval)
++
+     # Migrate to 2.1b3, baw 17-Aug-2001
+     if hasattr(l, 'dont_respond_to_post_requests'):
+         oldval = getattr(l, 'dont_respond_to_post_requests')
+@@ -414,6 +418,8 @@
+     PreferStored('author_is_list', 'from_is_list',
+                  mm_cfg.DEFAULT_FROM_IS_LIST)
  
++    add_only_if_missing('x_imap_folder', '')
++
  
  \f
+ def NewVars(l):
old mode 100644 (file)
new mode 100755 (executable)
index 5b80b3a1dcc1aacb3378fca2281509288ff326e3..bbae2205f03dc1b590246a316b85c18913628dab 100644 (file)
@@ -2,19 +2,19 @@
 # Conditional build:
 %bcond_with    umbrella_hack   # break anonimization (for use with moderated umbrella list of moderated lists)
 
-%define                rel     2
+%define                rel     1
 Summary:       The GNU Mailing List Management System
 Summary(es.UTF-8):     El Sistema de Mantenimiento de listas de GNU
 Summary(pl.UTF-8):     System Zarządzania Listami Pocztowymi GNU
 Summary(pt_BR.UTF-8):  O Sistema de Manutenção de listas da GNU
 Name:          mailman
-Version:       2.1.23
+Version:       2.1.29
 Release:       %{rel}%{?with_umbrella_hack:.umh}
 Epoch:         5
 License:       GPL v2+
 Group:         Applications/System
 Source0:       http://downloads.sourceforge.net/mailman/%{name}-%{version}.tgz
-# Source0-md5: ceb2d8427e29f4e69b2505423ffeb60b
+# Source0-md5: 463ce7efb4e6f214f28ef17dbe0b7b79
 Source1:       %{name}-man-pages.tar.bz2
 # Source1-md5: 6b55f9f8051c76961b84a12ed17fc14f
 Source2:       %{name}.conf
@@ -37,7 +37,6 @@ Patch10:      %{name}-daemonize-fds.patch
 Patch11:       %{name}-httpauth.patch
 Patch12:       %{name}-MM_FIND_USER_NAME.patch
 Patch13:       keep-original-mime-headers.patch
-Patch14:       %{name}-browser-save-passwd.patch
 URL:           http://www.list.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -188,7 +187,6 @@ uruchamiać mailmana.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch14 -p1
 
 # Conflicts with python built-in email package
 sed -i -e 's,EMAILPKG=,#EMAILPKG=,g' misc/Makefile.in
@@ -509,6 +507,7 @@ rm -f /etc/httpd/httpd.conf/90_%{name}.conf
 %attr(2755,root,mailman) %{_libdir}/%{name}/bin/list_lists
 %attr(2755,root,mailman) %{_libdir}/%{name}/bin/list_members
 %attr(2755,root,mailman) %{_libdir}/%{name}/bin/list_owners
+%attr(2755,root,mailman) %{_libdir}/%{name}/bin/mailman-config
 %attr(2755,root,mailman) %{_libdir}/%{name}/bin/mailmanctl
 %attr(2755,root,mailman) %{_libdir}/%{name}/bin/mmsitepass
 %attr(2755,root,mailman) %{_libdir}/%{name}/bin/newlist