diff options
Diffstat (limited to 'mail/majordomo/patches/patch-am')
| -rw-r--r-- | mail/majordomo/patches/patch-am | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/mail/majordomo/patches/patch-am b/mail/majordomo/patches/patch-am index 6b8c29ee654..ec915fc1226 100644 --- a/mail/majordomo/patches/patch-am +++ b/mail/majordomo/patches/patch-am @@ -1,10 +1,22 @@ -$NetBSD: patch-am,v 1.3 2010/10/30 23:48:36 spz Exp $ +$NetBSD: patch-am,v 1.4 2011/08/27 15:47:43 schnoebe Exp $ -bring up to perl 5.12 standard (this is old code) +bring up to perl 5.14 standard (this is old code) ---- approve.orig 1997-04-05 20:18:36.000000000 +0100 -+++ approve 2010-08-20 22:22:40.000000000 +0100 -@@ -137,6 +137,7 @@ +--- approve.orig 1997-04-05 19:18:36.000000000 +0000 ++++ approve +@@ -70,9 +70,9 @@ die "Couldn't find a sendmail to invoke, + if !$MAILER; + + +-require "getopts.pl"; ++use Getopt::Std; + +-&Getopts("df:") || ++getopts("df:") || + die("USAGE: approve [-f <config-file>] [-d] [<file> ...]\nStopped"); + + if (!defined($opt_f)) { +@@ -137,6 +137,7 @@ sub process_file { sub process_approve { local($FILE) = shift; @@ -12,7 +24,7 @@ bring up to perl 5.12 standard (this is old code) while (<$FILE>) { if ((/^\tsubscribe\s/) || (/^\tunsubscribe\s/)) { if (!defined($reply_to)) { -@@ -144,8 +145,8 @@ +@@ -144,8 +145,8 @@ sub process_approve { exit(1); } s/^\t//; @@ -23,7 +35,7 @@ bring up to perl 5.12 standard (this is old code) $list =~ tr/A-Z/a-z/; $passwd = $passwd{"$list\@$reply_to"}; if (! $passwd) { -@@ -214,6 +215,11 @@ +@@ -214,6 +215,11 @@ sub process_bounce { $from_skipped = 1; next; } @@ -35,7 +47,7 @@ bring up to perl 5.12 standard (this is old code) s/^~/~~/; print MAIL $_; } -@@ -231,12 +237,13 @@ +@@ -231,12 +237,13 @@ sub read_config { s/\n$//; s/#.*//; if (/^$/) { next; } |