summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2010-08-20 21:25:02 +0000
committertron <tron@pkgsrc.org>2010-08-20 21:25:02 +0000
commit7e992dc565fa2bd5ccb13d8f97ba2da551127923 (patch)
tree45bbe6a02e67eefa9935b57339653b93d2406454
parentd214b05aadfb3df9bec2970ba213deb7a9e99848 (diff)
downloadpkgsrc-7e992dc565fa2bd5ccb13d8f97ba2da551127923.tar.gz
Fix patch for "approve" to make it work with Perl 5.12.1.
-rw-r--r--mail/majordomo/Makefile4
-rw-r--r--mail/majordomo/distinfo4
-rw-r--r--mail/majordomo/patches/patch-am47
3 files changed, 47 insertions, 8 deletions
diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index f20b9f1187d..8507a1e697c 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2010/02/19 18:49:41 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2010/08/20 21:25:02 tron Exp $
DISTNAME= majordomo-1.94.5
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= mail
MASTER_SITES= ftp://ftp.sgi.com/other/majordomo/1.94.5/ \
ftp://ftp-europe.sgi.com/other/majordomo/1.94.5/
diff --git a/mail/majordomo/distinfo b/mail/majordomo/distinfo
index b9aa41c9c07..20f618e04ed 100644
--- a/mail/majordomo/distinfo
+++ b/mail/majordomo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2006/06/16 17:11:25 jlam Exp $
+$NetBSD: distinfo,v 1.6 2010/08/20 21:25:02 tron Exp $
SHA1 (majordomo-1.94.5.tgz) = 44b18c7b9133f2cd992f6e718551d613d9d45c00
RMD160 (majordomo-1.94.5.tgz) = 7f6b48fb5cc5b23948133658b055588d0d6608c4
@@ -15,4 +15,4 @@ SHA1 (patch-ai) = 771c487d1a3392bf3b523330b8d60fd9a190c58b
SHA1 (patch-aj) = 6d4fe712af39cb986c24d0227f86aacb6d048870
SHA1 (patch-ak) = 401da2e552ff92ef35a60e45d6b8994dfd091b49
SHA1 (patch-al) = 776088c5916b1b0516e8abaecd69870ba57f4a76
-SHA1 (patch-am) = bbdc7c4d650c99e182bac2ae50ccd82f111c7bcc
+SHA1 (patch-am) = cb557337c586c39f86b1c8f8fe265c7db022491c
diff --git a/mail/majordomo/patches/patch-am b/mail/majordomo/patches/patch-am
index 632eebcd563..1e79a35ce21 100644
--- a/mail/majordomo/patches/patch-am
+++ b/mail/majordomo/patches/patch-am
@@ -1,8 +1,27 @@
-$NetBSD: patch-am,v 1.1 2005/07/23 14:44:39 he Exp $
+$NetBSD: patch-am,v 1.2 2010/08/20 21:25:02 tron Exp $
---- approve.orig 1997-04-05 21:18:36.000000000 +0200
-+++ approve
-@@ -214,6 +214,11 @@ sub process_bounce {
+--- approve.orig 1997-04-05 20:18:36.000000000 +0100
++++ approve 2010-08-20 22:22:40.000000000 +0100
+@@ -137,6 +137,7 @@
+
+ sub process_approve {
+ local($FILE) = shift;
++ my @words;
+ while (<$FILE>) {
+ if ((/^\tsubscribe\s/) || (/^\tunsubscribe\s/)) {
+ if (!defined($reply_to)) {
+@@ -144,8 +145,8 @@
+ exit(1);
+ }
+ s/^\t//;
+- split;
+- $list = $_[1];
++ @words = split;
++ $list = $words[1];
+ $list =~ tr/A-Z/a-z/;
+ $passwd = $passwd{"$list\@$reply_to"};
+ if (! $passwd) {
+@@ -214,6 +215,11 @@
$from_skipped = 1;
next;
}
@@ -14,3 +33,23 @@ $NetBSD: patch-am,v 1.1 2005/07/23 14:44:39 he Exp $
s/^~/~~/;
print MAIL $_;
}
+@@ -231,12 +237,13 @@
+ s/\n$//;
+ s/#.*//;
+ if (/^$/) { next; }
+- split;
+- $l = $_[0]; $l =~ tr/A-Z/a-z/; # list
+- $p = $_[1]; # password
+- $m = $_[2]; $m =~ tr/A-Z/a-z/; # majordomo@site
+- split(/\@/, $m);
+- $s = $_[1]; $s =~ tr/A-Z/a-z/; # site
++ my @words = split;
++
++ $l = $words[0]; $l =~ tr/A-Z/a-z/; # list
++ $p = $words[1]; # password
++ $m = $words[2]; $m =~ tr/A-Z/a-z/; # majordomo@site
++ @words = split(/\@/, $m);
++ $s = $words[1]; $s =~ tr/A-Z/a-z/; # site
+
+ $passwd{$l} = $p;
+ $passwd{"$l\@$m"} = $p;