diff options
Diffstat (limited to '')
| -rw-r--r-- | mail/mailman/files/patch-Mailman::Defaults.py.in | 10 | ||||
| -rw-r--r-- | mail/mailman/files/patch-misc::paths.py.in | 41 |
2 files changed, 5 insertions, 46 deletions
diff --git a/mail/mailman/files/patch-Mailman::Defaults.py.in b/mail/mailman/files/patch-Mailman::Defaults.py.in index cf83b064af95..4cc7974b8e2b 100644 --- a/mail/mailman/files/patch-Mailman::Defaults.py.in +++ b/mail/mailman/files/patch-Mailman::Defaults.py.in @@ -1,5 +1,5 @@ ---- Mailman/Defaults.py.in.orig 2006-08-04 20:20:33.000000000 +0800 -+++ Mailman/Defaults.py.in 2007-10-03 08:09:00.678284951 +0800 +--- Mailman/Defaults.py.in.orig 2008-04-24 09:47:40.000000000 -0300 ++++ Mailman/Defaults.py.in 2008-04-24 09:50:37.000000000 -0300 @@ -107,7 +107,7 @@ # Command that is used to convert text/html parts into plain text. This # should output results to standard output. %(filename)s will contain the @@ -9,7 +9,7 @@ -@@ -392,8 +392,8 @@ +@@ -395,8 +395,8 @@ # and virtual-mailman.db files, respectively, from the associated plain text # files. The file being updated will be appended to this string (with a # separating space), so it must be appropriate for os.system(). @@ -20,7 +20,7 @@ # Ceiling on the number of recipients that can be specified in a single SMTP # transaction. Set to 0 to submit the entire recipient list in one -@@ -427,7 +427,7 @@ +@@ -430,7 +430,7 @@ # Command for direct command pipe delivery to sendmail compatible program, # when DELIVERY_MODULE is 'Sendmail'. @@ -29,7 +29,7 @@ # Set these variables if you need to authenticate to your NNTP server for # Usenet posting or reading. If no authentication is necessary, specify None -@@ -661,6 +661,12 @@ +@@ -673,6 +673,12 @@ # debugging). MAX_AUTORESPONSES_PER_DAY = 10 diff --git a/mail/mailman/files/patch-misc::paths.py.in b/mail/mailman/files/patch-misc::paths.py.in deleted file mode 100644 index f7db8a1d5d8c..000000000000 --- a/mail/mailman/files/patch-misc::paths.py.in +++ /dev/null @@ -1,41 +0,0 @@ -Index: misc/paths.py.in ---- branches/Release_2_1-maint/mailman/misc/paths.py.in 2005/12/30 18:50:08 7694 -+++ branches/Release_2_1-maint/mailman/misc/paths.py.in 2006/10/12 00:48:48 8056 -@@ -35,6 +35,19 @@ - if exec_prefix == '${prefix}': - exec_prefix = prefix - -+# Check if ja/ko codecs are available before changing path. -+try: -+ s = unicode('OK', 'iso-2022-jp') -+ jaok = True -+except LookupError: -+ jaok = False -+ -+try: -+ s = unicode('OK', 'euc-kr') -+ kook = True -+except LookupError: -+ kook = False -+ - # Hack the path to include the parent directory of the $prefix/Mailman package - # directory. - sys.path.insert(0, prefix) -@@ -53,12 +66,14 @@ - # In a normal interactive Python environment, the japanese.pth and korean.pth - # files would be imported automatically. But because we inhibit the importing - # of the site module, we need to be explicit about importing these codecs. --import japanese -+if not jaok: -+ import japanese - # As of KoreanCodecs 2.0.5, you had to do the second import to get the Korean - # codecs installed, however leave the first import in there in case an upgrade - # changes this. --import korean --import korean.aliases -+if not kook: -+ import korean -+ import korean.aliases - # Arabic and Hebrew (RFC-1556) encoding aliases. (temporary solution) - import encodings.aliases - encodings.aliases.aliases.update({ |