original distribution updated to 1.94.4.

1.94.4 includes security fix, and jfitz is on vacation, so I committed this.
I would like to have a review by jfitz, after he comes back.

15 files changed, 41 insertions, 50 deletions

diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index 6327f87edfed..a25ef7c23ee9 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:	majordomo
-# Version required:	1.94.3
+# Version required:	1.94.4
 # Date created:		23 October 1996
 # Whom:			jfitz@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.9 1997/04/28 00:53:11 jfitz Exp $
+# $Id: Makefile,v 1.10 1997/04/29 10:55:56 jfitz Exp $
 #
 
-DISTNAME=	majordomo-1.94.3
+DISTNAME=	majordomo-1.94.4
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.greatcircle.com/pub/majordomo/1.94.3/ \
-		ftp://ftp.sgi.com/other/majordomo/1.94.3/ \
-		ftp://ftp-europe.sgi.com/other/majordomo/
-EXTRACT_SUFX=   .tar.Z
+MASTER_SITES=	ftp://ftp.sgi.com/other/majordomo/1.94.4/ \
+		ftp://ftp-europe.sgi.com/other/majordomo/1.94.4/
+#		ftp://ftp.greatcircle.com/pub/majordomo/1.94.3/ \
+EXTRACT_SUFX=   .tgz
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
diff --git a/mail/majordomo/distinfo b/mail/majordomo/distinfo
index ebdc1478b0be..3c2893ca279a 100644
--- a/mail/majordomo/distinfo
+++ b/mail/majordomo/distinfo
@@ -1 +1 @@
-MD5 (majordomo-1.94.3.tar.Z) = e775f2247095b7eaf75d0114b8aa4747
+MD5 (majordomo-1.94.4.tgz) = c58f51102d87ca271af1d583a7fc8522
diff --git a/mail/majordomo/files/patch-aa b/mail/majordomo/files/patch-aa
index de5661cb1e3a..f21547126ee3 100644
--- a/mail/majordomo/files/patch-aa
+++ b/mail/majordomo/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Tue Dec 10 00:41:18 1996
-+++ Makefile	Sun Jan 12 01:39:10 1997
+--- Makefile.orig	Thu Aug 28 00:56:21 1997
++++ Makefile	Wed Sep 10 00:56:08 1997
 @@ -12,22 +12,22 @@
  #
   
@@ -28,7 +28,7 @@
  
  # These set the permissions for all installed files and executables (except
  # the wrapper), respectively.  Some sites may wish to make these more
-@@ -61,11 +61,11 @@
+@@ -62,11 +62,11 @@
  # parent process, and without the leading "W_" in the variable names) gets
  # passed to processes run by "wrapper"
  W_SHELL = /bin/sh
diff --git a/mail/majordomo/files/patch-ab b/mail/majordomo/files/patch-ab
index 0580d4331435..b14461abb3d8 100644
--- a/mail/majordomo/files/patch-ab
+++ b/mail/majordomo/files/patch-ab
@@ -1,5 +1,5 @@
---- sample.cf.orig	Sun Apr 27 10:56:45 1997
-+++ sample.cf	Sun Apr 27 20:19:32 1997
+--- sample.cf.orig	Thu Aug 28 00:00:31 1997
++++ sample.cf	Wed Sep 10 00:56:10 1997
 @@ -6,11 +6,11 @@
  
  # $whereami -- What machine am I running on?
diff --git a/mail/majordomo/files/patch-ac b/mail/majordomo/files/patch-ac
index ce76cef9f3dc..cfc5defc5595 100644
--- a/mail/majordomo/files/patch-ac
+++ b/mail/majordomo/files/patch-ac
@@ -1,15 +1,6 @@
---- digest.orig	Mon Mar 10 12:11:25 1997
-+++ digest	Sun Apr 27 20:19:56 1997
-@@ -23,7 +23,7 @@
- &readconfig;
- $TEMP = "$TMPDIR/digest.$$" || "/usr/tmp/digest.$$";
- 
--$sendmail_command = "/usr/lib/sendmail" if ! defined $sendmail_command ;
-+$sendmail_command = "/usr/sbin/sendmail" if ! defined $sendmail_command ;
- 
- if (defined($opt_r)) {
-     &receive_message;
-@@ -313,7 +313,7 @@
+--- digest.orig	Wed Aug 27 23:42:52 1997
++++ digest	Wed Sep 10 00:56:12 1997
+@@ -314,7 +314,7 @@
  	    } else {
  		# Read and execute the .cf file
  		$cf = $opt_c || $ENV{"MAJORDOMO_CF"} || 
@@ -18,12 +9,12 @@
  		require "$cf";
  
  		chdir($homedir);
-@@ -325,7 +325,7 @@
+@@ -326,7 +326,7 @@
  # Define all of the mailer properties:
  # It is possible that one or both of $sendmail_command and $bounce_mailer
  # are not defined, so we provide reasonable defaults.
 -$sendmail_command = "/usr/lib/sendmail"
 +$sendmail_command = "/usr/sbin/sendmail"
    unless defined $sendmail_command;
- $bounce_mailer = "$sendmail_command -f\$sender -t"
-   unless defined $bounce_mailer;
+ $mailer = "$sendmail_command -oi -oee -f\$sender"
+   unless defined $mailer;
diff --git a/mail/majordomo/files/patch-ba b/mail/majordomo/files/patch-ba
index f04bec644eb0..9a655b3a364e 100644
--- a/mail/majordomo/files/patch-ba
+++ b/mail/majordomo/files/patch-ba
@@ -1,6 +1,6 @@
---- archive2.pl.orig	Sun Apr 27 20:22:15 1997
-+++ archive2.pl	Sun Apr 27 20:22:23 1997
-@@ -85,7 +85,7 @@
+--- archive2.pl.orig	Thu Aug 28 00:07:44 1997
++++ archive2.pl	Wed Sep 10 00:57:13 1997
+@@ -88,7 +88,7 @@
      exit 1;
  }
  
diff --git a/mail/majordomo/files/patch-bb b/mail/majordomo/files/patch-bb
index 5020055f41ae..ddf7f2140d12 100644
--- a/mail/majordomo/files/patch-bb
+++ b/mail/majordomo/files/patch-bb
@@ -1,5 +1,5 @@
---- bounce.orig	Sun Apr 27 20:22:35 1997
-+++ bounce	Sun Apr 27 20:22:45 1997
+--- bounce.orig	Wed Sep 18 02:38:02 1996
++++ bounce	Wed Sep 10 00:57:15 1997
 @@ -41,7 +41,7 @@
  # $Locker:  $
  #
diff --git a/mail/majordomo/files/patch-bc b/mail/majordomo/files/patch-bc
index eea601904230..66a551a45318 100644
--- a/mail/majordomo/files/patch-bc
+++ b/mail/majordomo/files/patch-bc
@@ -1,5 +1,5 @@
---- config-test.orig	Sun Apr 27 20:23:06 1997
-+++ config-test	Sun Apr 27 20:23:21 1997
+--- config-test.orig	Thu Aug 28 00:17:13 1997
++++ config-test	Wed Sep 10 00:57:17 1997
 @@ -237,9 +237,9 @@
  else {
      print "You have defined neither \$mailer, nor \$sendmail_command.\n";
diff --git a/mail/majordomo/files/patch-bd b/mail/majordomo/files/patch-bd
index 6e45fee3edbd..10f3814797b5 100644
--- a/mail/majordomo/files/patch-bd
+++ b/mail/majordomo/files/patch-bd
@@ -1,5 +1,5 @@
---- contrib/new-list.orig	Sun Apr 27 20:23:43 1997
-+++ contrib/new-list	Sun Apr 27 20:23:58 1997
+--- contrib/new-list.orig	Tue Dec 10 01:50:45 1996
++++ contrib/new-list	Wed Sep 10 00:57:18 1997
 @@ -41,7 +41,7 @@
  # Define all of the mailer properties:
  # It is possible that one or both of $sendmail_command and $bounce_mailer
diff --git a/mail/majordomo/files/patch-be b/mail/majordomo/files/patch-be
index 0ae3544d0dc9..2d8146c9b244 100644
--- a/mail/majordomo/files/patch-be
+++ b/mail/majordomo/files/patch-be
@@ -1,5 +1,5 @@
---- contrib/sequencer.orig	Sun Apr 27 20:23:46 1997
-+++ contrib/sequencer	Sun Apr 27 20:24:01 1997
+--- contrib/sequencer.orig	Tue Dec 10 01:50:48 1996
++++ contrib/sequencer	Wed Sep 10 00:57:20 1997
 @@ -399,7 +399,7 @@
      &bounce("Approval required");
  }
diff --git a/mail/majordomo/files/patch-bf b/mail/majordomo/files/patch-bf
index ef24a527229f..b37241a86702 100644
--- a/mail/majordomo/files/patch-bf
+++ b/mail/majordomo/files/patch-bf
@@ -1,5 +1,5 @@
---- majordomo.orig	Sun Apr 27 20:24:41 1997
-+++ majordomo	Sun Apr 27 20:24:59 1997
+--- majordomo.orig	Wed Aug 27 23:55:29 1997
++++ majordomo	Wed Sep 10 00:57:24 1997
 @@ -75,7 +75,7 @@
  # Define all of the mailer properties:
  # It is possible that one or both of $sendmail_command and $bounce_mailer
diff --git a/mail/majordomo/files/patch-bg b/mail/majordomo/files/patch-bg
index 3f483caaa4cc..396b9ab46a3c 100644
--- a/mail/majordomo/files/patch-bg
+++ b/mail/majordomo/files/patch-bg
@@ -1,5 +1,5 @@
---- md-sub/md-sub.cgi.orig	Sun Apr 27 20:25:26 1997
-+++ md-sub/md-sub.cgi	Sun Apr 27 20:25:39 1997
+--- md-sub/md-sub.cgi.orig	Fri Feb  2 00:17:44 1996
++++ md-sub/md-sub.cgi	Wed Sep 10 00:57:34 1997
 @@ -67,7 +67,7 @@
  $cgiloc   = "http://stout/~jco/md-sub.cgi";
  $listsdb  = "/usr/jco/.md-subrc";
diff --git a/mail/majordomo/files/patch-bh b/mail/majordomo/files/patch-bh
index 1834844f4856..cbbee781ef40 100644
--- a/mail/majordomo/files/patch-bh
+++ b/mail/majordomo/files/patch-bh
@@ -1,5 +1,5 @@
---- request-answer.orig	Sun Apr 27 20:26:05 1997
-+++ request-answer	Sun Apr 27 20:26:14 1997
+--- request-answer.orig	Tue Dec 10 01:50:20 1996
++++ request-answer	Wed Sep 10 00:57:36 1997
 @@ -43,7 +43,7 @@
  # Define all of the mailer properties:
  # It is possible that one or both of $sendmail_command and $bounce_mailer
diff --git a/mail/majordomo/files/patch-bi b/mail/majordomo/files/patch-bi
index 41e12ab99115..c035bcae5a23 100644
--- a/mail/majordomo/files/patch-bi
+++ b/mail/majordomo/files/patch-bi
@@ -1,5 +1,5 @@
---- resend.orig	Sun Apr 27 20:26:33 1997
-+++ resend	Sun Apr 27 20:26:49 1997
+--- resend.orig	Wed Aug 27 23:59:24 1997
++++ resend	Wed Sep 10 00:57:38 1997
 @@ -111,7 +111,7 @@
  # XXX It is possible that owner-$opt_l won't be the right address, but we
  # have little choice.  Sending the bounces to $whoami_owner is an option,
@@ -9,7 +9,7 @@
  $bounce_mailer = $bounce_mailer || "$sendmail_command -f\$sender -t";
  &set_mail_from("owner-$opt_l");
  &set_mail_sender("owner-$opt_l");
-@@ -928,7 +928,7 @@
+@@ -924,7 +924,7 @@
      else {
  	# Painful, but we have to provide some kind of backwards
  	# compatibility and this is what 1.93 used
diff --git a/mail/majordomo/files/patch-bj b/mail/majordomo/files/patch-bj
index 7bf379ae8092..c9f0bf6e78bd 100644
--- a/mail/majordomo/files/patch-bj
+++ b/mail/majordomo/files/patch-bj
@@ -1,5 +1,5 @@
---- approve.orig	Sun Apr 27 20:28:18 1997
-+++ approve	Sun Apr 27 20:28:27 1997
+--- approve.orig	Sun Apr  6 04:18:36 1997
++++ approve	Wed Sep 10 00:57:40 1997
 @@ -63,7 +63,7 @@
  #
  # $Locker:  $