- recreated patches for 2.1.20, x-imap patch was applying in wrong code section
authorMarcin Krol <hawk@tld-linux.org>
Sun, 9 Aug 2015 14:34:26 +0000 (14:34 +0000)
committerMarcin Krol <hawk@tld-linux.org>
Sun, 9 Aug 2015 14:34:26 +0000 (14:34 +0000)
15 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
mailman-build.patch
mailman-cron.patch
mailman-daemonize-fds.patch
mailman-dont-send-broken-reminder-ugly-hack.patch [deleted file]
mailman-httpauth.patch
mailman-lib64.patch
mailman-mailmanctl-status.patch
mailman-umbrella-anon-hack.patch
mailman-x-imap-folder.patch
mailman.spec

index a3b1732c16a84527d69acaba7c9446f47f29c30a..db79f461f5c9f6850de40db36726e5df32caa963 100644 (file)
@@ -26,9 +26,10 @@ 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>
---- 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 @@
+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():
              f = gzip.open(true_filename, 'r')
          else:
              f = open(true_filename, 'r')
@@ -41,9 +42,25 @@ Signed-off-by: Elan Ruusamäe <glen@delfi.ee>
      except IOError:
          msg = _('Private archive file not found')
          doc.SetTitle(msg)
---- 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 @@
+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
      fp = open(path, 'w')
      fp.write(decodedpayload)
      fp.close()
@@ -59,17 +76,3 @@ Signed-off-by: Elan Ruusamäe <glen@delfi.ee>
      # 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 ab3929bb0537ed137cce79528eddc39cb28977a3..ebf9b695d648f8af026ee00548d2fe81e7bb2c6e 100644 (file)
@@ -1,6 +1,7 @@
---- 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 @@
+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():
          print _('checking mode for %(prefix)s')
      dirs = {}
      for d in (mm_cfg.PREFIX, mm_cfg.EXEC_PREFIX, mm_cfg.VAR_PREFIX,
          dirs[d] = True
      for d in dirs.keys():
          try:
---- 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 @@
+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"
  AC_SUBST(VAR_PREFIX)
  AC_MSG_CHECKING(for --with-var-prefix)
  AC_ARG_WITH(var-prefix, dnl
@@ -21,7 +23,7 @@
  case "$with_var_prefix" in
          yes)    VAR_PREFIX="$default_var_prefix"; ans=$VAR_PREFIX;;
          ""|no)  VAR_PREFIX="$prefix"; ans="no";;
-@@ -207,6 +207,61 @@
+@@ -333,6 +333,61 @@ else
      prefixcheck=$VAR_PREFIX
  fi
  
@@ -81,9 +83,9 @@
 +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
-@@ -619,7 +674,7 @@
+@@ -728,7 +783,7 @@ AC_OUTPUT([misc/paths.py Mailman/Default
             templates/Makefile cron/Makefile scripts/Makefile messages/Makefile
             cron/crontab.in misc/mailman Makefile
             tests/Makefile tests/bounces/Makefile tests/msgs/Makefile
          echo "configuration completed at" `date`)
  
  # Make sure all the build scripts are executable.
---- 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 @@
+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
  
  # Useful directories
  LIST_DATA_DIR   = os.path.join(VAR_PREFIX, 'lists')
  SPAM_DIR        = os.path.join(VAR_PREFIX, 'spam')
  WRAPPER_DIR     = os.path.join(EXEC_PREFIX, 'mail')
  BIN_DIR         = os.path.join(PREFIX, 'bin')
-@@ -1211,7 +1213,7 @@
+@@ -1596,7 +1598,7 @@ PUBLIC_ARCHIVE_FILE_DIR  = os.path.join(
  PRIVATE_ARCHIVE_FILE_DIR = os.path.join(VAR_PREFIX, 'archives', 'private')
  
  # Directories used by the qrunner subsystem
  INQUEUE_DIR     = os.path.join(QUEUE_DIR, 'in')
  OUTQUEUE_DIR    = os.path.join(QUEUE_DIR, 'out')
  CMDQUEUE_DIR    = os.path.join(QUEUE_DIR, 'commands')
-@@ -1225,9 +1227,9 @@
+@@ -1610,9 +1612,9 @@ RETRYQUEUE_DIR  = os.path.join(QUEUE_DIR
  MAILDIR_DIR     = os.path.join(QUEUE_DIR, 'maildir')
  
  # Other useful files
  
  # Import a bunch of version numbers
  from Version import *
---- 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
-@@ -32,8 +32,8 @@
+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
  from Mailman.Logging.Syslog import syslog
  
  LOCKFILE = os.path.join(mm_cfg.LOCK_DIR, 'creator')
  
  try:
      True, False
---- 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 @@
+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@
  prefix=               @prefix@
  exec_prefix=  @exec_prefix@
  var_prefix=   @VAR_PREFIX@
  DESTDIR=
  
  CC=           @CC@
-@@ -41,8 +46,12 @@
+@@ -41,8 +46,12 @@ DEFS=               @DEFS@
  OPT=          @OPT@
  CFLAGS=               @CFLAGS@ $(OPT) $(DEFS)
  
        archives/private archives/public
  
  ARCH_INDEP_DIRS= \
-@@ -96,6 +105,15 @@
+@@ -104,6 +113,15 @@ doinstall: $(SUBDIRS)
+               $(INSTALL) -d -m $(DIRMODE) $$dir; \
            else true; \
            fi; \
-       done
++      done
 +      @for d in $(FHS_DIRS); \
 +      do \
 +          dir=$(DESTDIR)/$$d; \
 +              $(INSTALL) -d -m $(DIRMODE) $$dir; \
 +          else true; \
 +          fi; \
-+      done
+       done
        chmod o-r $(DESTDIR)$(var_prefix)/archives/private
        @for d in $(ARCH_INDEP_DIRS); \
-       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 @@
+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@
  prefix=       @prefix@
  exec_prefix=  @exec_prefix@
  var_prefix=   @VAR_PREFIX@
  DESTDIR=
  
  CC=           @CC@
-@@ -84,7 +90,7 @@
+@@ -87,7 +93,7 @@ install-other:
            $(INSTALL) -m $(FILEMODE) paths.py $$dir; \
        done
        $(INSTALL) -m $(EXEMODE) mailman $(DESTDIR)$(SCRIPTSDIR)
 +      $(INSTALL) -m $(FILEMODE) sitelist.cfg $(DESTDIR)$(configdir)
  
  install-packages:
-       for p in $(PACKAGES); \
+       if [ -z "$(EMAILPKG)" -a -d $(DESTDIR)$(PYTHONLIBDIR)/email ] ; \
index 1e9cf72f734e3372bbfb6372f6ebc1e19ea02d23..3ed396e50e834ad694d4dfa5f8ee2e8a413ab11e 100644 (file)
@@ -1,7 +1,7 @@
-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 @@
+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], [
  # $1 == variable name
  # $2 == user id to check for
  AC_SUBST($1)
@@ -36,4 +36,3 @@ diff -urN mailman-2.1.2.orig/configure.in mailman-2.1.2/configure.in
  
  
  # new macro for finding UIDs
-
index 239dbb8fd64c3dcc1afdf1c117bc41c4436ce256..81f23b937756ab4ecef1b999dd4a98dccb432ab4 100644 (file)
@@ -1,6 +1,7 @@
---- 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 @@
+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], [
  # $1 == variable name
  # $2 == user id to check for
  AC_SUBST($1)
index b15942081784f761aa6af6d8dc06a07d67118eda..2c4c0f20ddb5959704d01479f4e1a6d66c7fb109 100644 (file)
@@ -1,12 +1,7 @@
-
-NOTE: be sure to use vim -b when editing this file!
-
-http://stackoverflow.com/questions/5461153/how-to-completely-turn-off-vims-abilty-to-recode-files
-
-diff -ur mailman-2.1.14/templates/ar/admlogin.html mailman-2.1.14-form/templates/ar/admlogin.html
---- mailman-2.1.14/templates/ar/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/ar/admlogin.html     2011-09-04 10:55:52.865551595 +0200
-@@ -14,7 +14,8 @@
+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>
@@ -16,10 +11,10 @@ diff -ur mailman-2.1.14/templates/ar/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/ast/admlogin.html mailman-2.1.14-form/templates/ast/admlogin.html
---- mailman-2.1.14/templates/ast/admlogin.html 2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/ast/admlogin.html    2011-09-04 10:55:52.868884928 +0200
-@@ -15,7 +15,8 @@
+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>
@@ -29,10 +24,10 @@ diff -ur mailman-2.1.14/templates/ast/admlogin.html mailman-2.1.14-form/template
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/ca/admlogin.html mailman-2.1.14-form/templates/ca/admlogin.html
---- mailman-2.1.14/templates/ca/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/ca/admlogin.html     2011-09-04 10:55:52.868884928 +0200
-@@ -14,7 +14,8 @@
+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>
@@ -42,10 +37,10 @@ diff -ur mailman-2.1.14/templates/ca/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/cs/admlogin.html mailman-2.1.14-form/templates/cs/admlogin.html
---- mailman-2.1.14/templates/cs/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/cs/admlogin.html     2011-09-04 10:55:52.872218260 +0200
-@@ -14,7 +14,8 @@
+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>
@@ -55,10 +50,10 @@ diff -ur mailman-2.1.14/templates/cs/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/da/admlogin.html mailman-2.1.14-form/templates/da/admlogin.html
---- mailman-2.1.14/templates/da/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/da/admlogin.html     2011-09-04 10:55:52.872218260 +0200
-@@ -14,7 +14,8 @@
+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>
@@ -68,10 +63,10 @@ diff -ur mailman-2.1.14/templates/da/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/de/admlogin.html mailman-2.1.14-form/templates/de/admlogin.html
---- mailman-2.1.14/templates/de/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/de/admlogin.html     2011-09-04 10:55:52.875551592 +0200
-@@ -14,7 +14,8 @@
+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>
@@ -81,10 +76,10 @@ diff -ur mailman-2.1.14/templates/de/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/en/admlogin.html mailman-2.1.14-form/templates/en/admlogin.html
---- mailman-2.1.14/templates/en/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/en/admlogin.html     2011-09-04 10:55:52.875551592 +0200
-@@ -14,7 +14,8 @@
+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>
@@ -94,10 +89,10 @@ diff -ur mailman-2.1.14/templates/en/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/es/admlogin.html mailman-2.1.14-form/templates/es/admlogin.html
---- mailman-2.1.14/templates/es/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/es/admlogin.html     2011-09-04 10:55:52.878884925 +0200
-@@ -14,7 +14,8 @@
+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>
@@ -107,10 +102,10 @@ diff -ur mailman-2.1.14/templates/es/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/et/admlogin.html mailman-2.1.14-form/templates/et/admlogin.html
---- mailman-2.1.14/templates/et/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/et/admlogin.html     2011-09-04 10:55:52.878884925 +0200
-@@ -14,7 +14,8 @@
+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>
@@ -120,10 +115,10 @@ diff -ur mailman-2.1.14/templates/et/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/eu/admlogin.html mailman-2.1.14-form/templates/eu/admlogin.html
---- mailman-2.1.14/templates/eu/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/eu/admlogin.html     2011-09-04 10:55:52.878884925 +0200
-@@ -14,7 +14,8 @@
+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>
@@ -133,10 +128,10 @@ diff -ur mailman-2.1.14/templates/eu/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/fi/admlogin.html mailman-2.1.14-form/templates/fi/admlogin.html
---- mailman-2.1.14/templates/fi/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/fi/admlogin.html     2011-09-04 10:55:52.882218259 +0200
-@@ -15,7 +15,8 @@
+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>
@@ -146,10 +141,10 @@ diff -ur mailman-2.1.14/templates/fi/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/fr/admlogin.html mailman-2.1.14-form/templates/fr/admlogin.html
---- mailman-2.1.14/templates/fr/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/fr/admlogin.html     2011-09-04 10:55:52.882218259 +0200
-@@ -14,7 +14,8 @@
+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>
@@ -159,10 +154,10 @@ diff -ur mailman-2.1.14/templates/fr/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle> <INPUT type="SUBMIT" 
-diff -ur mailman-2.1.14/templates/gl/admlogin.html mailman-2.1.14-form/templates/gl/admlogin.html
---- mailman-2.1.14/templates/gl/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/gl/admlogin.html     2011-09-04 10:55:52.885551594 +0200
-@@ -14,7 +14,8 @@
+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>
@@ -172,10 +167,10 @@ diff -ur mailman-2.1.14/templates/gl/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/he/admlogin.html mailman-2.1.14-form/templates/he/admlogin.html
---- mailman-2.1.14/templates/he/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/he/admlogin.html     2011-09-04 10:55:52.885551594 +0200
-@@ -14,7 +14,8 @@
+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>
@@ -185,10 +180,10 @@ diff -ur mailman-2.1.14/templates/he/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/hr/admlogin.html mailman-2.1.14-form/templates/hr/admlogin.html
---- mailman-2.1.14/templates/hr/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/hr/admlogin.html     2011-09-04 10:55:52.888884928 +0200
-@@ -14,7 +14,8 @@
+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>
@@ -198,10 +193,10 @@ diff -ur mailman-2.1.14/templates/hr/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/hu/admlogin.html mailman-2.1.14-form/templates/hu/admlogin.html
---- mailman-2.1.14/templates/hu/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/hu/admlogin.html     2011-09-04 10:55:52.888884928 +0200
-@@ -13,7 +13,8 @@
+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>
@@ -211,8 +206,9 @@ diff -ur mailman-2.1.14/templates/hu/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle> <INPUT TYPE="SUBMIT" name="admlogin"
---- mailman-2.1.20/templates/ia/admlogin.html~ 2015-05-25 11:30:53.000000000 +0300
-+++ mailman-2.1.20/templates/ia/admlogin.html  2015-05-25 11:30:54.870489260 +0300
+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>
@@ -223,10 +219,10 @@ diff -ur mailman-2.1.14/templates/hu/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/it/admlogin.html mailman-2.1.14-form/templates/it/admlogin.html
---- mailman-2.1.14/templates/it/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/it/admlogin.html     2011-09-04 10:55:52.892218261 +0200
-@@ -14,7 +14,8 @@
+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>
@@ -236,10 +232,10 @@ diff -ur mailman-2.1.14/templates/it/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/ja/admlogin.html mailman-2.1.14-form/templates/ja/admlogin.html
---- mailman-2.1.14/templates/ja/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/ja/admlogin.html     2011-09-04 10:55:52.892218261 +0200
-@@ -14,7 +14,8 @@
+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>
@@ -249,10 +245,10 @@ diff -ur mailman-2.1.14/templates/ja/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/ko/admlogin.html mailman-2.1.14-form/templates/ko/admlogin.html
---- mailman-2.1.14/templates/ko/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/ko/admlogin.html     2011-09-04 10:58:38.895559084 +0200
-@@ -14,7 +14,8 @@
+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>
@@ -262,10 +258,10 @@ diff -ur mailman-2.1.14/templates/ko/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle> <INPUT TYPE=SUBMIT name="request_login"
-diff -ur mailman-2.1.14/templates/lt/admlogin.html mailman-2.1.14-form/templates/lt/admlogin.html
---- mailman-2.1.14/templates/lt/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/lt/admlogin.html     2011-09-04 10:55:52.895551593 +0200
-@@ -14,7 +14,8 @@
+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>
@@ -275,10 +271,10 @@ diff -ur mailman-2.1.14/templates/lt/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/nl/admlogin.html mailman-2.1.14-form/templates/nl/admlogin.html
---- mailman-2.1.14/templates/nl/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/nl/admlogin.html     2011-09-04 10:55:52.898884926 +0200
-@@ -14,7 +14,8 @@
+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>
@@ -288,10 +284,10 @@ diff -ur mailman-2.1.14/templates/nl/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/no/admlogin.html mailman-2.1.14-form/templates/no/admlogin.html
---- mailman-2.1.14/templates/no/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/no/admlogin.html     2011-09-04 10:55:52.898884926 +0200
-@@ -14,7 +14,8 @@
+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>
@@ -301,10 +297,10 @@ diff -ur mailman-2.1.14/templates/no/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/pl/admlogin.html mailman-2.1.14-form/templates/pl/admlogin.html
---- mailman-2.1.14/templates/pl/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/pl/admlogin.html     2011-09-04 10:55:52.902218260 +0200
-@@ -15,7 +15,8 @@
+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>
@@ -314,10 +310,10 @@ diff -ur mailman-2.1.14/templates/pl/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/pt/admlogin.html mailman-2.1.14-form/templates/pt/admlogin.html
---- mailman-2.1.14/templates/pt/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/pt/admlogin.html     2011-09-04 10:55:52.902218260 +0200
-@@ -14,7 +14,8 @@
+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>
@@ -327,10 +323,10 @@ diff -ur mailman-2.1.14/templates/pt/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/pt_BR/admlogin.html mailman-2.1.14-form/templates/pt_BR/admlogin.html
---- mailman-2.1.14/templates/pt_BR/admlogin.html       2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/pt_BR/admlogin.html  2011-09-04 10:55:52.905551594 +0200
-@@ -14,7 +14,8 @@
+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>
@@ -340,10 +336,10 @@ diff -ur mailman-2.1.14/templates/pt_BR/admlogin.html mailman-2.1.14-form/templa
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/ro/admlogin.html mailman-2.1.14-form/templates/ro/admlogin.html
---- mailman-2.1.14/templates/ro/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/ro/admlogin.html     2011-09-04 10:55:52.905551594 +0200
-@@ -14,7 +14,8 @@
+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>
@@ -353,8 +349,9 @@ diff -ur mailman-2.1.14/templates/ro/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
---- mailman-2.1.20/templates/ru/admlogin.html~ 2015-03-31 20:21:49.000000000 +0300
-+++ mailman-2.1.20/templates/ru/admlogin.html  2015-05-25 11:37:56.109031155 +0300
+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>
@@ -365,10 +362,10 @@ diff -ur mailman-2.1.14/templates/ro/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT" name="admlogin" value="Начать работу..."></td>
-diff -ur mailman-2.1.14/templates/sk/admlogin.html mailman-2.1.14-form/templates/sk/admlogin.html
---- mailman-2.1.14/templates/sk/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/sk/admlogin.html     2011-09-04 10:55:52.908884928 +0200
-@@ -14,7 +14,8 @@
+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>
@@ -378,10 +375,10 @@ diff -ur mailman-2.1.14/templates/sk/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/sl/admlogin.html mailman-2.1.14-form/templates/sl/admlogin.html
---- mailman-2.1.14/templates/sl/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/sl/admlogin.html     2011-09-04 10:55:52.908884928 +0200
-@@ -14,7 +14,8 @@
+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>
@@ -391,10 +388,10 @@ diff -ur mailman-2.1.14/templates/sl/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/sr/admlogin.html mailman-2.1.14-form/templates/sr/admlogin.html
---- mailman-2.1.14/templates/sr/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/sr/admlogin.html     2011-09-04 10:55:52.912218262 +0200
-@@ -12,7 +12,8 @@
+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>
@@ -404,10 +401,10 @@ diff -ur mailman-2.1.14/templates/sr/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/sv/admlogin.html mailman-2.1.14-form/templates/sv/admlogin.html
---- mailman-2.1.14/templates/sv/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/sv/admlogin.html     2011-09-04 10:55:52.912218262 +0200
-@@ -13,7 +13,8 @@
+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>
@@ -417,10 +414,10 @@ diff -ur mailman-2.1.14/templates/sv/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/tr/admlogin.html mailman-2.1.14-form/templates/tr/admlogin.html
---- mailman-2.1.14/templates/tr/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/tr/admlogin.html     2011-09-04 10:55:52.915551595 +0200
-@@ -14,7 +14,8 @@
+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>
@@ -430,10 +427,10 @@ diff -ur mailman-2.1.14/templates/tr/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/uk/admlogin.html mailman-2.1.14-form/templates/uk/admlogin.html
---- mailman-2.1.14/templates/uk/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/uk/admlogin.html     2011-09-04 10:55:52.915551595 +0200
-@@ -14,7 +14,8 @@
+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>
@@ -443,10 +440,10 @@ diff -ur mailman-2.1.14/templates/uk/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/vi/admlogin.html mailman-2.1.14-form/templates/vi/admlogin.html
---- mailman-2.1.14/templates/vi/admlogin.html  2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/vi/admlogin.html     2011-09-04 10:55:52.918884928 +0200
-@@ -14,7 +14,8 @@
+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>
@@ -456,10 +453,10 @@ diff -ur mailman-2.1.14/templates/vi/admlogin.html mailman-2.1.14-form/templates
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/zh_CN/admlogin.html mailman-2.1.14-form/templates/zh_CN/admlogin.html
---- mailman-2.1.14/templates/zh_CN/admlogin.html       2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/zh_CN/admlogin.html  2011-09-04 10:55:52.918884928 +0200
-@@ -14,7 +14,8 @@
+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>
@@ -469,10 +466,10 @@ diff -ur mailman-2.1.14/templates/zh_CN/admlogin.html mailman-2.1.14-form/templa
      </tr>
      <tr>
        <td colspan=2 align=middle><INPUT type="SUBMIT"
-diff -ur mailman-2.1.14/templates/zh_TW/admlogin.html mailman-2.1.14-form/templates/zh_TW/admlogin.html
---- mailman-2.1.14/templates/zh_TW/admlogin.html       2010-09-20 20:18:27.000000000 +0200
-+++ mailman-2.1.14-form/templates/zh_TW/admlogin.html  2011-09-04 10:59:24.015561119 +0200
-@@ -13,7 +13,8 @@
+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>
index 8fd8fc5f7e6821fbe4fb4914060e1fe2a799c66a..6a7daf13d6744328fadb0e1924f615b8caeb44ac 100644 (file)
@@ -1,6 +1,7 @@
---- 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 @@
+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@
  DESTDIR=
  
  CC=           @CC@
@@ -8,7 +9,7 @@
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -55,7 +54,7 @@
+@@ -56,7 +55,7 @@ BUILDDIR=    ../build/bin
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
@@ -17,7 +18,7 @@
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -71,8 +70,6 @@
+@@ -72,8 +71,6 @@ install:
            $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(SCRIPTSDIR); \
        done
  
  clean:
  
  distclean:
---- 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 @@
+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@
  DESTDIR=
  
  CC=           @CC@
@@ -36,7 +38,7 @@
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -68,8 +67,6 @@
+@@ -68,8 +67,6 @@ install:
            $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(CRONDIR); \
        done
  
  clean:
  
  distclean:
---- 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 @@
+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@
  DESTDIR=
  
  CC=           @CC@
@@ -55,7 +58,7 @@
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -47,7 +46,7 @@
+@@ -47,7 +46,7 @@ pipermail.py
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
@@ -64,7 +67,7 @@
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -63,8 +62,6 @@
+@@ -63,8 +62,6 @@ install:
            $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
        done
  
  clean:
  
  distclean:
---- 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 @@
+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@
  DESTDIR=
  
  CC=           @CC@
@@ -83,7 +87,7 @@
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -45,7 +44,7 @@
+@@ -45,7 +44,7 @@ MODULES=     *.py
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
@@ -92,7 +96,7 @@
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
+@@ -61,8 +60,6 @@ install:
            $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
        done
  
  clean:
  
  distclean:
---- 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 @@
+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@
  DESTDIR=
  
  CC=           @CC@
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -47,7 +46,7 @@
+@@ -47,7 +46,7 @@ CGI_MODULES= *.py
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -63,8 +62,6 @@
+@@ -63,8 +62,6 @@ install:
            $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(CGIDIR); \
          done
  
  clean:
  
  distclean:
---- 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 @@
+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@
  DESTDIR=
  
  CC=           @CC@
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -45,7 +44,7 @@
+@@ -45,7 +44,7 @@ MODULES=     *.py
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
+@@ -61,8 +60,6 @@ install:
            $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
        done
  
  clean:
  
  distclean:
---- 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 @@
+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@
  DESTDIR=
  
  CC=           @CC@
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -45,7 +44,7 @@
+@@ -45,7 +44,7 @@ MODULES=     *.py
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
+@@ -61,8 +60,6 @@ install:
            $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
        done
  
  clean:
  
  distclean:
---- 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 @@
+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@
  DESTDIR=
  
  CC=           @CC@
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -45,7 +44,7 @@
+@@ -45,7 +44,7 @@ MODULES=     *.py
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
+@@ -61,8 +60,6 @@ install:
            $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
        done
  
  clean:
  
  distclean:
---- 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 @@
+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@
  DESTDIR=
  
  CC=           @CC@
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -45,7 +44,7 @@
+@@ -45,7 +44,7 @@ MODULES=     *.py
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
+@@ -61,8 +60,6 @@ install:
            $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
        done
  
  clean:
  
  distclean:
---- 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
+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
 @@ -20,8 +20,6 @@
  
  # Variables set by configure
  VPATH=                @srcdir@
  srcdir=       @srcdir@
  bindir=       @bindir@
-@@ -30,7 +28,6 @@
+@@ -30,7 +28,6 @@ exec_prefix= @exec_prefix@
  DESTDIR=
  
  CC=           @CC@
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -48,7 +45,7 @@
+@@ -48,7 +45,7 @@ SUBDIRS=     Cgi Logging Archiver Handlers B
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -79,12 +76,6 @@
+@@ -79,12 +76,6 @@ install: install-here
            (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
        done
  
  clean:
        for d in $(SUBDIRS); \
        do \
---- 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 @@
+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@
  DESTDIR=
  
  CC=           @CC@
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -45,7 +44,7 @@
+@@ -45,7 +44,7 @@ MODULES=     *.py
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
+@@ -61,8 +60,6 @@ install:
            $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
        done
  
  clean:
  
  distclean:
---- 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 @@
+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@
  DESTDIR=
  
  CC=           @CC@
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -45,7 +44,7 @@
+@@ -45,7 +44,7 @@ MODULES=     *.py
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
+@@ -61,8 +60,6 @@ install:
            $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
        done
  
  clean:
  
  distclean:
---- 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 @@
+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
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
  
  DATE = $(shell python -c 'import time; print time.strftime("%d-%b-%Y"),')
  LANGPACK = README-I18N.en templates messages
-@@ -85,14 +84,24 @@
+@@ -85,14 +84,24 @@ install: doinstall update
  
  doinstall: $(SUBDIRS)
        @echo "Creating architecture independent directories..."
            else true; \
            fi; \
        done
-@@ -102,9 +111,7 @@
+@@ -102,9 +111,7 @@ doinstall: $(SUBDIRS)
            dir=$(DESTDIR)$(prefix)/$$d; \
            if test ! -d $$dir; then \
                echo "Creating directory hierarchy $$dir"; \
            else true; \
            fi; \
        done
-@@ -114,9 +121,7 @@
+@@ -114,9 +121,7 @@ doinstall: $(SUBDIRS)
            dir=$(DESTDIR)$(exec_prefix)/$$d; \
            if test ! -d $$dir; then \
                echo "Creating directory hierarchy $$dir"; \
            else true; \
            fi; \
        done
---- 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 @@
+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@
  DESTDIR=
  
  CC=           @CC@
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -43,7 +42,6 @@
+@@ -43,7 +42,6 @@ OPT=         @OPT@
  CFLAGS=               $(OPT) $(DEFS)
  PACKAGEDIR=   $(prefix)/messages
  SHELL=                /bin/sh
  MSGFMT=       @PYTHON@ ../build/bin/msgfmt.py
  MSGMERGE=     msgmerge
  
-@@ -60,7 +58,7 @@
+@@ -60,7 +58,7 @@ TARGETS=     $(MOFILES)
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -90,9 +88,8 @@
+@@ -90,9 +88,8 @@ doinstall: mofiles
        do \
            dir=$(DESTDIR)$(prefix)/$$d; \
            echo "Creating language directory $$dir"; \
        done
        @for d in $(LANGUAGES); \
        do \
-@@ -112,8 +109,6 @@
+@@ -113,8 +110,6 @@ doinstall: mofiles
  
  mofiles: $(MOFILES)
  
  clean:
        -rm -f */LC_MESSAGES/mailman.mo
  
---- 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 @@
+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@
  DESTDIR=
  
  CC=           @CC@
  INSTALL=      @INSTALL@
  PYTHON=               @PYTHON@
  
-@@ -61,7 +60,7 @@
+@@ -62,7 +61,7 @@ PACKAGES= $(EMAILPKG) $(JACODECSPKG) $(K
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
  EXEMODE=      755
  FILEMODE=     644
  DATAMODE=     664
-@@ -93,8 +92,6 @@
+@@ -101,8 +100,6 @@ install-packages:
            (cd $(PKGDIR)/$$p ; umask 02 ; PYTHONPATH=$(PYTHONLIBDIR) $(PYTHON) $(SETUPCMD)); \
        done
  
  clean:
  
  distclean:
---- 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 @@
+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@
  DESTDIR=
  
  CC=           @CC@
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -49,7 +48,7 @@
+@@ -49,7 +48,7 @@ SCRIPTS=     bounces confirm driver join lea
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -68,8 +67,6 @@
+@@ -68,8 +67,6 @@ install:
        $(INSTALL) -m $(FILEMODE) $(srcdir)/join    $(DESTDIR)$(SCRIPTSDIR)/subscribe
        $(INSTALL) -m $(FILEMODE) $(srcdir)/leave   $(DESTDIR)$(SCRIPTSDIR)/unsubscribe
  
  clean:
  
  distclean:
---- 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 @@
+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@
  DESTDIR=
  
  CC=           @CC@
  INSTALL=      @INSTALL@
  PYTHON=       @PYTHON@
  
-@@ -63,10 +62,9 @@
+@@ -65,10 +64,9 @@ COMMON_FLAGS=       -DPREFIX="\"$(prefix)\"" \
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
  
  # Fixed definitions
  
-@@ -110,20 +108,10 @@
+@@ -112,20 +110,10 @@ install: all
        do \
            exe=$(DESTDIR)$(CGIDIR)/$$f$(CGIEXT); \
            $(INSTALL_PROGRAM) $$f $$exe; \
        done
  
  clean:
---- 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 @@
+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@
  DESTDIR=
  
  CC=           @CC@
  INSTALL=      @INSTALL@
  TRUE=         @TRUE@
  
-@@ -48,7 +47,7 @@
+@@ -49,7 +48,7 @@ LANGUAGES=   ar ast ca cs da de el en es e
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,15 +60,13 @@
+@@ -62,15 +61,13 @@ all:
  install:
        for d in $(LANGUAGES); \
        do \
  clean:
  
  distclean:
---- 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 @@
+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@
  DESTDIR=
  
  CC=           @CC@
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -46,7 +45,7 @@
+@@ -46,7 +45,7 @@ BOUNCE_FILES=        $(srcdir)/*.txt
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -60,8 +59,6 @@
+@@ -60,8 +59,6 @@ install:
            $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(BOUNCEDIR); \
        done
  
  clean:
  
  distclean:
---- 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 @@
+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@
  DESTDIR=
  
  CC=           @CC@
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -46,7 +45,7 @@
+@@ -46,7 +45,7 @@ EXECS=       $(srcdir)/onebounce.py $(srcdir
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -71,8 +70,6 @@
+@@ -71,8 +70,6 @@ install:
            (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
        done
  
  clean:
  
  distclean:
---- 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 @@
+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@
  DESTDIR=
  
  CC=           @CC@
  INSTALL=      @INSTALL@
  
  DEFS=         @DEFS@
-@@ -46,7 +45,7 @@
+@@ -46,7 +45,7 @@ MSG_FILES=   $(srcdir)/*.txt
  # Modes for directories and executables created by the install
  # process.  Default to group-writable directories but
  # user-only-writable for executables.
  EXEMODE=      755
  FILEMODE=     644
  INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -60,8 +59,6 @@
+@@ -60,8 +59,6 @@ install:
            $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(MSGSDIR); \
        done
  
index 6dd08bfd6fd99c407636eb6abc81cfdf5d664909..368eed8f70d183b986c156fe3e6a14a9037912f4 100644 (file)
@@ -1,24 +1,24 @@
-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
+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
 @@ -1,4 +1,4 @@
 -#! @PYTHON@
 +#! @PYTHON@ -S
  #
  # Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
  #
-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
+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
 @@ -1,4 +1,4 @@
 -#! @PYTHON@
 +#! @PYTHON@ -S
  #
- # Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
+ # Copyright (C) 1998-2011 by the Free Software Foundation, Inc.
  #
-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
+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
 @@ -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 -r -u mailman-2.1.5.orig/cron/crontab.in.in mailman-2.1.5/cron/crontab.in.i
  # 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 -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
+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
 @@ -1,4 +1,4 @@
 -#! @PYTHON@
 +#! @PYTHON@ -S
  #
- # Copyright (C) 2001-2004 by the Free Software Foundation, Inc.
+ # Copyright (C) 2001-2013 by the Free Software Foundation, Inc.
  #
-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
+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
 @@ -1,4 +1,4 @@
 -#! @PYTHON@
 +#! @PYTHON@ -S
  #
- # Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
+ # Copyright (C) 1998-2011 by the Free Software Foundation, Inc.
  #
-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
+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
 @@ -1,4 +1,4 @@
 -#! @PYTHON@
 +#! @PYTHON@ -S
  #
  # Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
  #
-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
+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
 @@ -1,4 +1,4 @@
 -#! @PYTHON@
 +#! @PYTHON@ -S
  # 
- # Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
+ # Copyright (C) 1998-2014 by the Free Software Foundation, Inc.
  #
-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
+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
 @@ -1,4 +1,4 @@
 -#! @PYTHON@
 +#! @PYTHON@ -S
  #
- # Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
+ # Copyright (C) 1998-2007 by the Free Software Foundation, Inc.
  #
index 92f918fcad58995427f9cc8d00537f568efe1380..cca22fdda05c2007e413b8272b2c97abb01e3932 100644 (file)
@@ -1,6 +1,7 @@
---- 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 @@
+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():
          os.chdir(mm_cfg.PREFIX)
          # Set our file mode creation umask
          os.umask(007)
diff --git a/mailman-dont-send-broken-reminder-ugly-hack.patch b/mailman-dont-send-broken-reminder-ugly-hack.patch
deleted file mode 100644 (file)
index 32aa8cd..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
---- mailman-2.1.5/templates/pl/cronpass.txt~   Fri Oct  1 06:28:28 2004
-+++ mailman-2.1.5/templates/pl/cronpass.txt    Fri Oct  1 06:28:28 2004
-@@ -1,21 +1,21 @@
--To jest przypomnienie, wysy³ane raz na miesi±c, o tym, ¿e jeste¶ 
--cz³onkiem list dyskusyjnych na serwerze %(hostname)s.  Znajdziesz 
--tutaj informacje o tym w jaki sposób zmieniæ parametry swojej 
--subskrybcji lub jak siê wypisaæ z listy.
-+To jest przypomnienie, wysylane raz na miesiac, o tym, ze jestes 
-+czlonkiem list dyskusyjnych na serwerze %(hostname)s.  Znajdziesz 
-+tutaj informacje o tym w jaki sposob zmienic parametry swojej 
-+subskrybcji lub jak sie wypisac z listy.
--Przez stronê WWW mo¿esz zmieniaæ to w jaki sposób i czy w ogóle 
--maj± byæ do Ciebie wysy³ane wiadomo¶ci. Mo¿esz zmieniæ swój adres, 
--prze³±czyæ dostarczanie na tryb paczek, albo chwilowo wstrzymaæ 
--wysy³anie do listów na Twój adres (np. z powodu wyjazdu na wakacje) 
-+Przez strone WWW mozesz zmieniac to w jaki sposob i czy w ogole 
-+maja byc do Ciebie wysylane wiadomosci. Mozesz zmienic swoj adres, 
-+przelaczyc dostarczanie na tryb paczek, albo chwilowo wstrzymac 
-+wysylanie do listow na Twoj adres (np. z powodu wyjazdu na wakacje) 
- i wiele innych opcji.
--Oprócz interfesju przez WWW, wiêkszo¶æ zmian w subskrybcji mo¿e byæ 
--dokonywana za po¶rednictwem emaila. Wy¶lij wiadomo¶æ na adres
--'-request' swojej listy (np. %(exreq)s) ze s³owem 'help' w tre¶ci, 
--w odpowiedzi otrzymasz emaila z dalszymi wskazówkami.
-+Oprocz interfesju przez WWW, wiekszosc zmian w subskrybcji moze byc 
-+dokonywana za posrednictwem emaila. Wyslij wiadomosc na adres
-+'-request' swojej listy (np. %(exreq)s) ze slowem 'help' w tresci, 
-+w odpowiedzi otrzymasz emaila z dalszymi wskazowkami.
--Wszystkie pytania, problemy i komentarze proszê kierowaæ do opiekuna
-+Wszystkie pytania, problemy i komentarze prosze kierowac do opiekuna
- tej listy %(owner)s.
--Has³o dla %(useraddr)s:
-+Haslo dla %(useraddr)s:
index 3e97933bf58514141121338d807ff01a9c713ab2..3a6f41bbcef3d812dc24990cfa3aa078a6dd95a8 100644 (file)
@@ -2,11 +2,12 @@ Maybe for security have USE_HTTP_AUTH = ['user1', 'user2']
 
 NOTE: you won't be able to authorize with list password anymore.
 
---- 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)
+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 (
  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.
@@ -15,9 +16,10 @@ NOTE: you won't be able to authorize with list password anymore.
  # Useful directories
  LIST_DATA_DIR   = os.path.join(VAR_PREFIX, 'lists')
  LOG_DIR         = '@LOG_DIR@'
---- 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 @@
+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):
  
  
  def check_global_password(response, siteadmin=True):
index d3f88a5f35c98984e63cb3bbc5dcd239ec3a7892..2c8b44e4c66122c62b429e95e92bfa59e91ebc59 100644 (file)
@@ -1,6 +1,7 @@
---- 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 @@
+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)
  sys.path.insert(0, os.path.join(prefix, 'pythonlib'))
  
  # Include Python's site-packages directory.
index ba2473dcbdc3a6a1b58b3986de551defe10dfffc..ac24335fb4381f9a1d0db6b15179f62b50ba52b1 100644 (file)
@@ -1,7 +1,7 @@
-diff -r -u mailman-2.1.5.orig/bin/mailmanctl mailman-2.1.5/bin/mailmanctl
---- mailman-2.1.5.orig/bin/mailmanctl  2004-02-03 17:26:08.000000000 -0500
-+++ mailman-2.1.5/bin/mailmanctl       2004-09-10 18:23:34.000000000 -0400
-@@ -35,7 +35,7 @@
+diff -urp mailman-2.1.20.orig/bin/mailmanctl mailman-2.1.20/bin/mailmanctl
+--- mailman-2.1.20.orig/bin/mailmanctl 2015-03-31 17:21:49.000000000 +0000
++++ mailman-2.1.20/bin/mailmanctl      2015-08-09 13:38:26.206340518 +0000
+@@ -36,7 +36,7 @@ in the file data/master-qrunner.pid but
  pid directly.  The `start', `stop', `restart', and `reopen' commands handle
  everything for you.
  
@@ -10,7 +10,7 @@ diff -r -u mailman-2.1.5.orig/bin/mailmanctl mailman-2.1.5/bin/mailmanctl
  
  Options:
  
-@@ -89,6 +89,9 @@
+@@ -90,6 +90,9 @@ Commands:
  
      reopen  - This will close all log files, causing them to be re-opened the
                next time a message is written to them
@@ -20,7 +20,7 @@ diff -r -u mailman-2.1.5.orig/bin/mailmanctl mailman-2.1.5/bin/mailmanctl
  """
  
  import sys
-@@ -189,6 +192,52 @@
+@@ -190,6 +193,52 @@ def qrunner_state():
          return 0
      return 1
  
@@ -73,7 +73,7 @@ diff -r -u mailman-2.1.5.orig/bin/mailmanctl mailman-2.1.5/bin/mailmanctl
  
  def acquire_lock_1(force):
      # Be sure we can acquire the master qrunner lock.  If not, it means some
-@@ -336,13 +385,15 @@
+@@ -338,13 +387,15 @@ def main():
          command = COMMASPACE.join(args)
          usage(1, _('Bad command: %(command)s'))
  
@@ -91,7 +91,7 @@ diff -r -u mailman-2.1.5.orig/bin/mailmanctl mailman-2.1.5/bin/mailmanctl
      if command == 'stop':
          # Sent the master qrunner process a SIGINT, which is equivalent to
          # giving cron/qrunner a ctrl-c or KeyboardInterrupt.  This will
-@@ -361,6 +412,14 @@
+@@ -363,6 +414,14 @@ def main():
          if not quiet:
              print _('Re-opening all log files')
          kill_watcher(signal.SIGHUP)
@@ -106,9 +106,10 @@ diff -r -u mailman-2.1.5.orig/bin/mailmanctl mailman-2.1.5/bin/mailmanctl
      elif command == 'start':
          # First, complain loudly if there's no site list.
          check_for_site_list()
---- mailman-2.1.20/misc/mailman.in~    2015-03-31 20:21:49.000000000 +0300
-+++ mailman-2.1.20/misc/mailman.in     2015-05-25 11:22:11.283298992 +0300
-@@ -37,23 +37,61 @@
+diff -urp mailman-2.1.20.orig/misc/mailman.in mailman-2.1.20/misc/mailman.in
+--- mailman-2.1.20.orig/misc/mailman.in        2015-03-31 17:21:49.000000000 +0000
++++ mailman-2.1.20/misc/mailman.in     2015-08-09 13:38:26.207340518 +0000
+@@ -37,23 +37,61 @@ PYTHON=@PYTHON@
  MAILMANHOME=@prefix@
  MAILMANCTL=$MAILMANHOME/bin/mailmanctl
  
index 997e86fc838c69ae16226fda8410c633178c40a6..dcdbf9361cd4f634788aed2417716ef3a069ec1c 100644 (file)
@@ -6,26 +6,22 @@ from umbrella list to be accepted by sublists without moderation.
 
 This patch makes possible to reply to original poster instead of umbrella list.
 
---- 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',
+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):
                 mlist.internal_name(), msg.get('from'))
-+        del msg['reply-to']
-+        msg['Reply-To'] = msg.get('from')
          del msg['from']
--        del msg['reply-to']
+         del msg['reply-to']
++        msg['Reply-To'] = msg.get('from')
          del msg['sender']
-         # Hotmail sets this one
-         del msg['x-originating-email']
+         del msg['organization']
+         del msg['return-path']
+@@ -82,7 +83,6 @@ def process(mlist, msg, msgdata):
+         remove_nonkeepers(msg)
          i18ndesc = str(uheader(mlist, mlist.description, 'From'))
          msg['From'] = formataddr((i18ndesc, mlist.GetListEmail()))
 -        msg['Reply-To'] = mlist.GetListEmail()
-+        # msg['Reply-To'] = mlist.GetListEmail()
-     # Some headers can be used to fish for membership
-     del msg['return-receipt-to']
-     del msg['disposition-notification-to']
+         uf = msg.get_unixfrom()
+         if uf:
+             uf = re.sub(r'\S*@\S*', mlist.GetListEmail(), uf)
index de2f6caf864645720e4103879802b08edd5295ee..cde8efc05451a147a7bd78421b878447dc1107d0 100644 (file)
@@ -1,8 +1,9 @@
---- mailman-2.1.9/Mailman/Gui/General.py       2006-08-30 17:54:22.000000000 +0300
-+++ mailman-2.1.9/Mailman/Gui/General.py       2007-09-20 17:45:31.857725007 +0300
-@@ -409,6 +409,13 @@
-              headers.)"""))
-             )
+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):
+                  here."""))
+                 )
  
 +        # add X-IMAP-Folder header
 +        rtn.append(
          # Discard held messages after this number of days
          rtn.append(
              ('max_days_to_hold', mm_cfg.Number, 7, 0,
---- mailman-2.1.20/Mailman/Handlers/CookHeaders.py~    2015-03-31 20:21:49.000000000 +0300
-+++ mailman-2.1.20/Mailman/Handlers/CookHeaders.py     2015-05-25 11:28:53.400847919 +0300
-@@ -107,6 +107,11 @@
+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):
      # X-BeenThere's intact.
      change_header('X-BeenThere', mlist.GetListEmail(),
                    mlist, msg, msgdata, delete=False)
      # 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.
---- mailman-2.1.14/Mailman/MailList.py~        2010-09-20 21:18:27.000000000 +0300
-+++ mailman-2.1.14/Mailman/MailList.py 2010-09-21 18:33:08.352249806 +0300
-@@ -363,6 +363,7 @@
+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,
          self.available_languages = []
          self.include_rfc2369_headers = 1
          self.include_list_post_header = 1
          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
---- mailman-2.1.9/Mailman/versions.py  2005-12-30 20:50:08.000000000 +0200
-+++ mailman-2.1.9/Mailman/versions.py  2007-09-20 16:49:02.206553877 +0300
-@@ -407,6 +407,8 @@
-     add_only_if_missing('collapse_alternatives',
-                         mm_cfg.DEFAULT_COLLAPSE_ALTERNATIVES)
+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', '')
-+
  
  \f
- def UpdateOldUsers(mlist):
index 2f429593397be500d718082f342cfd0e3b31fb89..ff952043d9c17061aa6567a2844d6e8998638877 100644 (file)
@@ -1,7 +1,7 @@
 # Conditional build:
 %bcond_with    umbrella_hack   # break anonimization (for use with moderated umbrella list of moderated lists)
 
-%define                rel     1
+%define                rel     2
 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
@@ -23,7 +23,6 @@ Source5:      %{name}.logrotate
 Source6:       add_nonmembers
 Source7:       subscribe_list
 Patch0:                %{name}-MM_FIND_GROUP_NAME.patch
-Patch1:                %{name}-dont-send-broken-reminder-ugly-hack.patch
 Patch2:                %{name}-mailmanctl-status.patch
 Patch3:                %{name}-cron.patch
 Patch4:                %{name}-python-compile.patch
@@ -173,7 +172,6 @@ uruchamiać mailmana.
 %prep
 %setup -q
 %patch0 -p1
-#patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1