 @@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.43 2011/08/27 15:47:42 schnoebe Exp $
+# $NetBSD: Makefile,v 1.43.2.1 2011/11/02 22:55:24 tron Exp $
 DISTNAME=		majordomo-1.94.5
-PKGREVISION=		13
+PKGREVISION=		14
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.sgi.com/other/majordomo/1.94.5/ \
 			ftp://ftp-europe.sgi.com/other/majordomo/1.94.5/
-EXTRACT_SUFX=	.tgz
+EXTRACT_SUFX=		.tgz
 MAINTAINER=		spz@NetBSD.org
 HOMEPAGE=		http://www.greatcircle.com/majordomo/
 COMMENT=		The Majordomo mailing list manager
 LICENSE=		majordomo-license
 PKG_DESTDIR_SUPPORT=	destdir
 MAKE_JOBS_SAFE=		NO
 RESTRICTED=		No distribution of modified binary packages to the general public
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}

 @@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.15 2011/08/27 15:47:43 schnoebe Exp $
+$NetBSD: distinfo,v 1.15.2.1 2011/11/02 22:55:24 tron Exp $
 SHA1 (majordomo-1.94.5.tgz) = 44b18c7b9133f2cd992f6e718551d613d9d45c00
 RMD160 (majordomo-1.94.5.tgz) = 7f6b48fb5cc5b23948133658b055588d0d6608c4
 Size (majordomo-1.94.5.tgz) = 312244 bytes
 SHA1 (patch-aa) = 2be639e71d75780f82d2d6364431d7d40d97ba94
 SHA1 (patch-ab) = 58aec7d2ad3625caf8bdcd9b41792a2075605fa5
 SHA1 (patch-ac) = 3f8973808314927f167392d640aefc67cd504a70
-SHA1 (patch-ad) = 0e31ae0be84246e0691dfdc8aa86301eadd5cf79
+SHA1 (patch-ad) = 418f7fc79217871e608ca0ab2f71d477804fc7fb
 SHA1 (patch-ae) = 99285559c0fe86084fedbaad5a482062187b404d
 SHA1 (patch-af) = 1626b7580f3d4f00b3b8c0ed567bad7da84a30b2
 SHA1 (patch-ag) = 759a32dacb26221d83de97b463b2131b0f52a914
 SHA1 (patch-ah) = ac08fa5d2fa321afe7fdf72783f8f2c887073bcd
-SHA1 (patch-ai) = 883a72515d793ea8376e1bb54063dd4d53b4f630
+SHA1 (patch-ai) = b890754ba3b0b1311f82745ecc8949b127fe0ee2
-SHA1 (patch-aj) = 2185ba182561ca3e003fa0879e696092c3b237fd
+SHA1 (patch-aj) = e423f61f6b493ae6ae30dda8b0de3ffa10caeefe
 SHA1 (patch-ak) = b33b0fc9e013642cc842c6d7ee70f590281764ae
 SHA1 (patch-al) = 776088c5916b1b0516e8abaecd69870ba57f4a76
 SHA1 (patch-am) = 74e46f28cb152e152594d949b0116f1370dd1ae3
-SHA1 (patch-an) = db4b9c47bd6efb1fb883cb0c505bd1d0d6f2d83e
+SHA1 (patch-an) = 2e9a38d7d9eb46f472cec555349f19cad0a5036b

 @@ -1,32 +1,42 @@
-$NetBSD: patch-ad,v 1.2 2011/01/29 19:39:14 spz Exp $
+$NetBSD: patch-ad,v 1.2.6.1 2011/11/02 22:55:24 tron Exp $
 avoid the wrapper + -C trap
 --- config-test.orig	1997-08-27 15:17:13.000000000 +0000
 +++ config-test
-@@ -117,7 +117,7 @@ wellokay
+@@ -7,8 +7,7 @@
  # execute this by cd to your majordomo dir, then 'wrapper config-test'
+ #
 -@requires = ( "ctime.pl",
 -	     "majordomo_version.pl",
 +@requires = ( "majordomo_version.pl",
  	     "majordomo.pl",
  	     "shlock.pl",
  	     "config_parse.pl",
@@ -117,7 +116,7 @@ wellokay
  print "\n\tNon obvious things that cause headaches:\n\n";
  &header('');
 -$cf = $ARGV[0] || $ENV{'MAJORDOMO_CF'};
 +$cf = $ENV{'MAJORDOMO_CF'};
  if (eval "require '$cf'") {
      &good("'require'd $cf okay.");
-@@ -125,6 +125,7 @@ if (eval "require '$cf'") {
+@@ -125,6 +124,7 @@ if (eval "require '$cf'") {
      &bad("something's wrong with $cf: $@");
+ }
 +unshift(@INC, $bindir);
  foreach (@requires) {
      if (require $_) {
  	&good("found $_ okay.");
-@@ -286,7 +287,7 @@ print "Checking to see if there are new
+@@ -286,7 +286,7 @@ print "Checking to see if there are new
  print "your majordomo.cf file...";
  open($cf, $cf) || &bad("Couldn't open $cf for reading, $!");
 -open(S, 'sample.cf') || &bad("Couldn't open sample.cf for reading, $!");
 +open(S, "$bindir/sample.cf") || &bad("Couldn't open $bindir/sample.cf for reading, $!");
  while (<S>) {
      next unless /^\s*(\$\w+(('|::)\w+)*)/;

 @@ -1,57 +1,59 @@
-$NetBSD: patch-ai,v 1.4 2011/08/27 15:47:43 schnoebe Exp $
+$NetBSD: patch-ai,v 1.4.2.1 2011/11/02 22:55:24 tron Exp $
 Quite messages from perl 5.14.1, this is very old code.
 --- resend.orig	2000-01-07 15:32:39.000000000 +0000
 +++ resend
 @@ -71,15 +71,15 @@ if ($ARGV[0] =~ /^\@/) {
  # getopts.pl was place where it's supposed to be.  This changes previous
  # behavior which allowed getopts.pl to be in the same place as
  # majordomo.cf.
 -require "getopts.pl";
 -&Getopts("C:c:Aa:df:h:I:l:M:p:Rr:s") || die("resend: Getopts() failed: $!");
 +use Getopt::Std;
 +getopts("C:c:Aa:df:h:I:l:M:p:Rr:s") || die("resend: Getopts() failed: $!");
  if (! defined($opt_l)) {
    die("resend: must specify '-l list'");
+ }
 -# Read and execute the .cf file
 -$cf = $opt_C || $opt_c || $ENV{"MAJORDOMO_CF"} || "/etc/majordomo.cf";
 +# Read and execute the .cf file. For security reasons, let the environment win
 +$cf = $ENV{"MAJORDOMO_CF"} || $opt_C || $opt_c || "/etc/majordomo.cf";
  # Despite not having a place to send the remains of the body,
  # it would be nice to send a message to root or postmaster, at least...
-@@ -92,6 +92,7 @@ require "$cf";
+@@ -92,8 +92,8 @@ require "$cf";
  chdir($homedir) || die("Can't chdir(\"$homedir\"): $!");
 +unshift(@INC, $bindir);
  unshift(@INC, $homedir);
- require "ctime.pl";  # For logging purposes
+-require "ctime.pl";  # For logging purposes
  require "majordomo.pl";
-@@ -316,7 +317,7 @@ $is_admin_header .= "\$taboo = \"\";\n};
+ require "majordomo_version.pl";
  require "config_parse.pl";
@@ -316,7 +316,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 {
+@@ -747,12 +747,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";   #';

 @@ -1,86 +1,100 @@
-$NetBSD: patch-aj,v 1.2 2010/10/29 21:51:22 spz Exp $
+$NetBSD: patch-aj,v 1.2.8.1 2011/11/02 22:55:24 tron Exp $
---- ./sample.cf.orig	Wed Aug 27 09:00:31 1997
+--- sample.cf.orig	1997-08-27 15:00:31.000000000 +0000
-+++ ./sample.cf	Tue Jun  8 10:55:13 1999
++++ sample.cf
-@@ -7,5 +7,5 @@
+@@ -6,7 +6,7 @@
  # $whereami -- What machine am I running on?
+ #
 -$whereami = "example.com";
 +$whereami = "@HOSTNAME@";
  # $whoami -- Who do users send requests to me as?
@@ -17,5 +17,5 @@
@@ -16,13 +16,22 @@ $whoami = "Majordomo\@$whereami";
+ #
  $whoami_owner = "Majordomo-Owner\@$whereami";
 -# $homedir -- Where can I find my extra .pl files, like majordomo.pl?
 +# $homedir -- Where can I find my lists?
  # the environment variable HOME is set by the wrapper
+ #
-@@ -23,5 +23,14 @@
+ if ( defined $ENV{"HOME"}) {
       $homedir = $ENV{"HOME"};
  } else {
 -     $homedir = "/usr/test/majordomo";
 +     $homedir = "@HOME@";
 +}
++
 +# $bindir -- Where can I find my extra .pl files, like majordomo.pl?
 +# the environment variable BIN is set by the wrapper
 +#
 +if ( defined $ENV{"BIN"}) {
 +     $bindir = $ENV{"BIN"};
 +} else {
 +     $bindir = "@PREFIX@/libexec/majordomo";
+ }
-@@ -33,8 +42,8 @@
+ # $listdir -- Where are the mailing lists?
@@ -32,10 +41,10 @@ $listdir = "$homedir/lists";
  # $digest_work_dir -- the parent directory for digest's queue area
  # Each list must have a subdirectory under this directory in order for
  # digest to work. E.G. The bblisa list would use:
 -# 	/usr/local/mail/digest/bblisa
 +# 	@HOME@/digests/bblisa
  # as its directory.
+ #
 -$digest_work_dir = "/usr/local/mail/digest";
 +$digest_work_dir = "$homedir/digests";
  # $log -- Where do I write my log?
@@ -46,6 +55,6 @@
@@ -45,8 +54,8 @@ $log = "$homedir/Log";
  #                      usually /usr/lib/sendmail, but some newer BSD systems
  #                      seem to prefer /usr/sbin/sendmail
+ #
 -$sendmail_command = "/usr/lib/sendmail";
 -# $sendmail_command = "/usr/sbin/sendmail";
 +# $sendmail_command = "/usr/lib/sendmail";
 +$sendmail_command = "/usr/sbin/sendmail";
  # $mailer -- What program and args do I use to send mail to the list?
-@@ -69,5 +78,5 @@
+ # $bounce_mailer -- What is used to send mail anywhere else?
@@ -68,7 +77,7 @@ $bounce_mailer = "$sendmail_command -oi
+ #
  # To use TLB and use no outgoing alias:
  # if ($main'program_name eq 'mj_resend' && $opt_l eq 'test-list') {
 -#   $mailer = "/usr/local/majordomo/tlb /usr/local/lists/${opt_l}.tlb";
 +#   $mailer = "@HOME@/tlb @HOME@/lists/${opt_l}.tlb";
  # }
+ #
-@@ -128,6 +137,6 @@
+ # To use a different Sendmail queue for this list's mail:
@@ -127,15 +136,15 @@ $no_true_x400 = 0;
  # Majordomo will look for "get" and "index" files related to $list in
  # directory "$filedir/$list$filedir_suffix", so set $filedir and
  # $filedir_suffix appropriately.  For instance, to look in
 -# /usr/local/mail/files/$list, use:
 -#   $filedir = "/usr/local/mail/files";
 +# @HOME@/mail/files/$list, use:
 +#   $filedir = "@HOME@/mail/files";
  #   $filedir_suffix = "";		# empty string
  # or to look in $listdir/$list.archive, use:
-@@ -135,6 +144,6 @@
+ #   $filedir = "$listdir";
  #   $filedir_suffix = ".archive";
 -$filedir = "$listdir";
 -$filedir_suffix = ".archive";
 +$filedir = "@HOME@/archives";
 +$filedir_suffix = "";
  # What command should I use to process an "index" request?
@@ -191,5 +200,5 @@
@@ -190,7 +199,7 @@ die "Perl version $] too old\n" if ($] <
  # majordomo has r/w permission to.
  # Uses the environment variable TMPDIR, since that's pretty common
+ #
 -$TMPDIR = $ENV{'TMPDIR'} || "/usr/tmp";
 +$TMPDIR = $ENV{'TMPDIR'} || "@TMPDIR@";
  # Tune how long set_lock tries to obtain a lock before giving up. Each
  # attempt waits 1 to 10 seconds before trying again and waittime is

 @@ -1,14 +1,14 @@
-$NetBSD: patch-an,v 1.2 2010/10/30 23:48:36 spz Exp $
+$NetBSD: patch-an,v 1.2.8.1 2011/11/02 22:55:24 tron Exp $
 bring up to perl 5.12 standard (this is old code)
 --- majordomo.pl.orig	2000-01-07 12:32:04.000000000 +0000
 +++ majordomo.pl
 @@ -44,7 +44,7 @@ $DEBUG = $main'DEBUG;
  sub main'ParseMailHeader  ## Public
+ {
 -    local($save1, $save2) = ($*, $/);
 +    local($save) = ($/);
      local($FH, *array) =  @_;
      local ($keyw, $val);
 @@ -39,13 +39,31 @@ bring up to perl 5.12 standard (this is
 -    foreach (@_) {
 +    my @parts = split(/,/);		# split into parts
 +    foreach (@parts) {
 while s/.*<(.*)>.*/$1/;
  	s/^\s+//;
  	s/\s+$//;
+     }
 -    @_;
 +    @parts;
+ }
  # Check to see if a list is valid.  If it is, return the validated list
@@ -341,6 +341,8 @@ sub main'set_log {
  # Log a message to the log
  sub main'log {
 +    my @month=qw( Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec );
++
      print STDERR "$0:  main'log()\n" if $DEBUG;
      local($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime;
@@ -351,7 +353,7 @@ sub main'log {
      if (&main'lopen(LOG, ">>", $log_file)) { #';
  	# if the log is open, write to the log
  	printf LOG "%s %02d %02d:%02d:%02d %s %s[%d] {%s} ",
 -	    $ctime'MoY[$mon], $mday, $hour, $min, $sec,
 +	    $month[$mon], $mday, $hour, $min, $sec,
  	    $log_host, $log_program, $$, $log_session;
  	print LOG join(" ", @_), "\n";
  	&main'lclose(LOG);