diff options
author | spz <spz@pkgsrc.org> | 2010-11-09 07:09:58 +0000 |
---|---|---|
committer | spz <spz@pkgsrc.org> | 2010-11-09 07:09:58 +0000 |
commit | 519c7e8985b7973e27d32c440d8e9423e8774cb7 (patch) | |
tree | 7d58616fa673d510a1457545b1587ae282a4c1b4 /mail | |
parent | 560d3837c90c309c5eee99a7d4e6a8ff43b200a4 (diff) | |
download | pkgsrc-519c7e8985b7973e27d32c440d8e9423e8774cb7.tar.gz |
add List-Id:, Mail-Reply-To: and Mail-Followup-To: headers
fix copying of majordomo.cf
bump pkgrev
Diffstat (limited to 'mail')
-rw-r--r-- | mail/majordomo/Makefile | 6 | ||||
-rw-r--r-- | mail/majordomo/distinfo | 4 | ||||
-rw-r--r-- | mail/majordomo/patches/patch-ai | 35 |
3 files changed, 35 insertions, 10 deletions
diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile index f6421b8ada3..db5582e7b33 100644 --- a/mail/majordomo/Makefile +++ b/mail/majordomo/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.38 2010/11/09 06:40:13 spz Exp $ +# $NetBSD: Makefile,v 1.39 2010/11/09 07:09:58 spz Exp $ DISTNAME= majordomo-1.94.5 -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= mail MASTER_SITES= ftp://ftp.sgi.com/other/majordomo/1.94.5/ \ ftp://ftp-europe.sgi.com/other/majordomo/1.94.5/ @@ -32,7 +32,7 @@ MAKE_FILE= Makefile.netbsd PKG_SYSCONFSUBDIR= majordomo CONF_FILES+= ${EXAMPLEDIR}/aliases.majordomo ${PKG_SYSCONFDIR}/aliases -CONF_FILES+= ${EXAMPLEDIR}/majordomo.cf ${PKG_SYSCONFDIR}/majordomo.cf +CONF_FILES+= ${EXAMPLEDIR}/majordomo.cf ${MAJORDOMO_CF} MAJORDOMO_HOMEDIR?= ${VARBASE}/majordomo MAJORDOMO_TMPDIR?= ${VARBASE}/majordomo/tmp diff --git a/mail/majordomo/distinfo b/mail/majordomo/distinfo index 1e7915eda60..a17a7dc103f 100644 --- a/mail/majordomo/distinfo +++ b/mail/majordomo/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2010/11/09 06:40:13 spz Exp $ +$NetBSD: distinfo,v 1.11 2010/11/09 07:09:58 spz Exp $ SHA1 (majordomo-1.94.5.tgz) = 44b18c7b9133f2cd992f6e718551d613d9d45c00 RMD160 (majordomo-1.94.5.tgz) = 7f6b48fb5cc5b23948133658b055588d0d6608c4 @@ -11,7 +11,7 @@ SHA1 (patch-ae) = 984547fb26e22bba03d163eb7ce976dcd4582b16 SHA1 (patch-af) = b4a50a472a16eead08c189f68d47d2cf136308c6 SHA1 (patch-ag) = b469a639270d369732e75e6ae4df7f559e9c436e SHA1 (patch-ah) = 666b52100cb50a948c145da0ba83c197386cbd1e -SHA1 (patch-ai) = 771c487d1a3392bf3b523330b8d60fd9a190c58b +SHA1 (patch-ai) = 530a33b788960f288eaa5c065b26fe27b5ed8c7e SHA1 (patch-aj) = 2185ba182561ca3e003fa0879e696092c3b237fd SHA1 (patch-ak) = b33b0fc9e013642cc842c6d7ee70f590281764ae SHA1 (patch-al) = 776088c5916b1b0516e8abaecd69870ba57f4a76 diff --git a/mail/majordomo/patches/patch-ai b/mail/majordomo/patches/patch-ai index 388e25e2de6..aa612588008 100644 --- a/mail/majordomo/patches/patch-ai +++ b/mail/majordomo/patches/patch-ai @@ -1,17 +1,42 @@ -$NetBSD: patch-ai,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $ +$NetBSD: patch-ai,v 1.2 2010/11/09 07:09:59 spz Exp $ ---- ./resend.orig Wed Aug 27 08:59:24 1997 -+++ ./resend Tue Jun 8 10:55:13 1999 -@@ -93,4 +93,5 @@ +--- resend.orig 2000-01-07 15:32:39.000000000 +0000 ++++ resend +@@ -92,6 +92,7 @@ require "$cf"; + chdir($homedir) || die("Can't chdir(\"$homedir\"): $!"); +unshift(@INC, $bindir); unshift(@INC, $homedir); require "ctime.pl"; # For logging purposes -@@ -316,5 +317,5 @@ + require "majordomo.pl"; +@@ -316,7 +317,7 @@ $is_admin_header .= "\$taboo = \"\";\n}; + if (! defined($admin_body)) { &bitch("resend: \$admin_body not defined in $cf !!\n" . "Majordomo will only catch \"subscribe\" and \"unsubscribe\" in\n" . - "the body.\nLook at $homedir/sample.cf for a good definition."); + "the body.\nLook at $bindir/sample.cf for a good definition."); @admin_body = ('/^subject:\s*subscribe\b/i' , '/^subject:\s*unsubscribe\b/i'); + } else { +@@ -747,12 +748,20 @@ sub parse_header { + + # add new header fields + print OUT "Sender: $sender\n"; ++ print OUT "List-Id: ".$opt_l.".".$whereami."\n"; ++ + if (defined($opt_p)) { + print OUT "Precedence: $opt_p\n"; + } + + if (defined($opt_r)) { + print OUT "Reply-To: ", &config'substitute_values($opt_r), "\n"; #'; ++ if (defined $reply_to) { ++ print OUT "Mail-Reply-To: $reply_to\n"; #'; ++ } else { ++ print OUT "Mail-Reply-To: $from\n"; #'; ++ } ++ print OUT "Mail-Followup-To: ", &config'substitute_values($opt_r), "\n"; #'; + } + + # print out per-list additonal headers |