diff options
| -rw-r--r-- | mail/mailman/Makefile | 1 | ||||
| -rw-r--r-- | mail/mailman/files/patch-aa | 26 |
2 files changed, 27 insertions, 0 deletions
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile index afa7bcdcda7..2fafb7c3f46 100644 --- a/mail/mailman/Makefile +++ b/mail/mailman/Makefile @@ -7,6 +7,7 @@ PORTNAME= mailman PORTVERSION= 2.0.1 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= mailman diff --git a/mail/mailman/files/patch-aa b/mail/mailman/files/patch-aa new file mode 100644 index 00000000000..ec6b5df8cca --- /dev/null +++ b/mail/mailman/files/patch-aa @@ -0,0 +1,26 @@ +*** Mailman/Utils.py.orig Thu Nov 16 22:43:11 2000 +--- Mailman/Utils.py Thu Feb 15 19:42:10 2001 +*************** +*** 407,413 **** + f = open(mm_cfg.SITE_PW_FILE) + pw2 = f.read() + f.close() +! return Crypt.crypt(pw1, pw2[:2]) == pw2 + # There probably is no site admin password if there was an exception + except IOError: + return 0 +--- 407,420 ---- + f = open(mm_cfg.SITE_PW_FILE) + pw2 = f.read() + f.close() +! # First we check for the Modular Crypt Format +! mcf = re.match(r'\$\d\$(\w+)\$', pw2) +! if mcf: # Is it MCF? +! salt=mcf.group(1) +! else: # No, it's traditional DES. +! salt=pw2[:2] +! +! return Crypt.crypt(pw1, salt) == pw2 + # There probably is no site admin password if there was an exception + except IOError: + return 0
\ No newline at end of file |