Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 10 Sep 1997 01:17:06 +0900
From:      itojun@itojun.org
To:        jfits@freebsd.org
Cc:        itojun@csl.sony.co.jp
Subject:   mail/majordomo 1.94.3 -> 1.94.4
Message-ID:  <14413.873821826@coconut.itojun.org>

next in thread | raw e-mail | index | archive | help

	Here's a patch from majordomo 1.94.3 to 1.94.4.
	Could you review this if possible?
	(1.94.3 has security hole, reportedly... so it will be important to
	upgrade)

itojun



diff -cr majordomo-/Makefile majordomo/Makefile
*** majordomo-/Makefile	Sun Jul 13 22:59:48 1997
--- majordomo/Makefile	Wed Sep 10 00:48:55 1997
***************
*** 1,17 ****
  # New ports collection makefile for:	majordomo
! # Version required:	1.94.3
  # Date created:		23 October 1996
  # Whom:			jfitz@FreeBSD.ORG
  #
  # $Id: Makefile,v 1.10 1997/04/29 10:55:56 jfitz Exp $
  #
  
! DISTNAME=	majordomo-1.94.3
  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
  
  MAINTAINER=	jfitz@FreeBSD.ORG
  
--- 1,17 ----
  # New ports collection makefile for:	majordomo
! # Version required:	1.94.4
  # Date created:		23 October 1996
  # Whom:			jfitz@FreeBSD.ORG
  #
  # $Id: Makefile,v 1.10 1997/04/29 10:55:56 jfitz Exp $
  #
  
! DISTNAME=	majordomo-1.94.4
  CATEGORIES=	mail
! 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 -cr majordomo-/files/md5 majordomo/files/md5
*** majordomo-/files/md5	Sun Jul 13 22:59:48 1997
--- majordomo/files/md5	Wed Sep 10 00:50:20 1997
***************
*** 1 ****
! MD5 (majordomo-1.94.3.tar.Z) = e775f2247095b7eaf75d0114b8aa4747
--- 1 ----
! MD5 (majordomo-1.94.4.tgz) = c58f51102d87ca271af1d583a7fc8522
Only in majordomo-/patches: CVS
diff -cr majordomo-/patches/patch-aa majordomo/patches/patch-aa
*** majordomo-/patches/patch-aa	Sun Jan 12 04:56:25 1997
--- majordomo/patches/patch-aa	Wed Sep 10 01:12:31 1997
***************
*** 1,11 ****
! --- Makefile.orig	Tue Dec 10 00:41:18 1996
! +++ Makefile	Sun Jan 12 01:39:10 1997
! @@ -12,22 +12,22 @@
   #
    
   # Put the location of your Perl binary here:
  -PERL = /bin/perl
! +PERL = ${PREFIX}/bin/perl
   
   # What do you call your C compiler?
   CC = cc
--- 1,11 ----
! --- Makefile.orig	Thu Aug 28 00:56:21 1997
! +++ Makefile	Wed Sep 10 00:56:08 1997
! @@ -13,22 +13,22 @@
   #
    
   # Put the location of your Perl binary here:
  -PERL = /bin/perl
! +PERL = /usr/bin/perl
   
   # What do you call your C compiler?
   CC = cc
***************
*** 28,34 ****
   
   # 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 @@
   # parent process, and without the leading "W_" in the variable names) gets
   # passed to processes run by "wrapper"
   W_SHELL = /bin/sh
--- 28,34 ----
   
   # These set the permissions for all installed files and executables (except
   # the wrapper), respectively.  Some sites may wish to make these more
! @@ -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 -cr majordomo-/patches/patch-ab majordomo/patches/patch-ab
*** majordomo-/patches/patch-ab	Sun Jul 13 22:59:48 1997
--- majordomo/patches/patch-ab	Wed Sep 10 01:01:33 1997
***************
*** 1,5 ****
! --- sample.cf.orig	Sun Apr 27 10:56:45 1997
! +++ sample.cf	Sun Apr 27 20:19:32 1997
  @@ -6,11 +6,11 @@
   
   # $whereami -- What machine am I running on?
--- 1,5 ----
! --- 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 -cr majordomo-/patches/patch-ac majordomo/patches/patch-ac
*** majordomo-/patches/patch-ac	Sun Jul 13 22:59:48 1997
--- majordomo/patches/patch-ac	Wed Sep 10 01:01:33 1997
***************
*** 1,15 ****
! --- 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 @@
   	    } else {
   		# Read and execute the .cf file
   		$cf = $opt_c || $ENV{"MAJORDOMO_CF"} || 
--- 1,6 ----
! --- 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,29 ****
   		require "$cf";
   
   		chdir($homedir);
! @@ -325,7 +325,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;
--- 9,20 ----
   		require "$cf";
   
   		chdir($homedir);
! @@ -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;
!  $mailer = "$sendmail_command -oi -oee -f\$sender"
!    unless defined $mailer;
diff -cr majordomo-/patches/patch-ba majordomo/patches/patch-ba
*** majordomo-/patches/patch-ba	Mon Apr 28 09:37:25 1997
--- majordomo/patches/patch-ba	Wed Sep 10 01:01:33 1997
***************
*** 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 @@
       exit 1;
   }
   
--- 1,6 ----
! --- 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 -cr majordomo-/patches/patch-bb majordomo/patches/patch-bb
*** majordomo-/patches/patch-bb	Mon Apr 28 09:37:25 1997
--- majordomo/patches/patch-bb	Wed Sep 10 01:01:33 1997
***************
*** 1,5 ****
! --- bounce.orig	Sun Apr 27 20:22:35 1997
! +++ bounce	Sun Apr 27 20:22:45 1997
  @@ -41,7 +41,7 @@
   # $Locker:  $
   #
--- 1,5 ----
! --- bounce.orig	Wed Sep 18 02:38:02 1996
! +++ bounce	Wed Sep 10 00:57:15 1997
  @@ -41,7 +41,7 @@
   # $Locker:  $
   #
diff -cr majordomo-/patches/patch-bc majordomo/patches/patch-bc
*** majordomo-/patches/patch-bc	Mon Apr 28 09:37:26 1997
--- majordomo/patches/patch-bc	Wed Sep 10 01:01:33 1997
***************
*** 1,5 ****
! --- config-test.orig	Sun Apr 27 20:23:06 1997
! +++ config-test	Sun Apr 27 20:23:21 1997
  @@ -237,9 +237,9 @@
   else {
       print "You have defined neither \$mailer, nor \$sendmail_command.\n";
--- 1,5 ----
! --- 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 -cr majordomo-/patches/patch-bd majordomo/patches/patch-bd
*** majordomo-/patches/patch-bd	Mon Apr 28 09:37:26 1997
--- majordomo/patches/patch-bd	Wed Sep 10 01:01:33 1997
***************
*** 1,5 ****
! --- contrib/new-list.orig	Sun Apr 27 20:23:43 1997
! +++ contrib/new-list	Sun Apr 27 20:23:58 1997
  @@ -41,7 +41,7 @@
   # Define all of the mailer properties:
   # It is possible that one or both of $sendmail_command and $bounce_mailer
--- 1,5 ----
! --- 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 -cr majordomo-/patches/patch-be majordomo/patches/patch-be
*** majordomo-/patches/patch-be	Mon Apr 28 09:37:26 1997
--- majordomo/patches/patch-be	Wed Sep 10 01:01:33 1997
***************
*** 1,5 ****
! --- contrib/sequencer.orig	Sun Apr 27 20:23:46 1997
! +++ contrib/sequencer	Sun Apr 27 20:24:01 1997
  @@ -399,7 +399,7 @@
       &bounce("Approval required");
   }
--- 1,5 ----
! --- 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 -cr majordomo-/patches/patch-bf majordomo/patches/patch-bf
*** majordomo-/patches/patch-bf	Mon Apr 28 09:37:27 1997
--- majordomo/patches/patch-bf	Wed Sep 10 01:01:33 1997
***************
*** 1,5 ****
! --- majordomo.orig	Sun Apr 27 20:24:41 1997
! +++ majordomo	Sun Apr 27 20:24:59 1997
  @@ -75,7 +75,7 @@
   # Define all of the mailer properties:
   # It is possible that one or both of $sendmail_command and $bounce_mailer
--- 1,5 ----
! --- 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 -cr majordomo-/patches/patch-bg majordomo/patches/patch-bg
*** majordomo-/patches/patch-bg	Mon Apr 28 09:37:27 1997
--- majordomo/patches/patch-bg	Wed Sep 10 01:01:33 1997
***************
*** 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
  @@ -67,7 +67,7 @@
   $cgiloc   = "http://stout/~jco/md-sub.cgi";
   $listsdb  = "/usr/jco/.md-subrc";
--- 1,5 ----
! --- 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 -cr majordomo-/patches/patch-bh majordomo/patches/patch-bh
*** majordomo-/patches/patch-bh	Mon Apr 28 09:37:27 1997
--- majordomo/patches/patch-bh	Wed Sep 10 01:01:33 1997
***************
*** 1,5 ****
! --- request-answer.orig	Sun Apr 27 20:26:05 1997
! +++ request-answer	Sun Apr 27 20:26:14 1997
  @@ -43,7 +43,7 @@
   # Define all of the mailer properties:
   # It is possible that one or both of $sendmail_command and $bounce_mailer
--- 1,5 ----
! --- 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 -cr majordomo-/patches/patch-bi majordomo/patches/patch-bi
*** majordomo-/patches/patch-bi	Mon Apr 28 09:37:27 1997
--- majordomo/patches/patch-bi	Wed Sep 10 01:01:33 1997
***************
*** 1,5 ****
! --- resend.orig	Sun Apr 27 20:26:33 1997
! +++ resend	Sun Apr 27 20:26:49 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,
--- 1,5 ----
! --- 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,15 ****
   $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 @@
       else {
   	# Painful, but we have to provide some kind of backwards
   	# compatibility and this is what 1.93 used
--- 9,15 ----
   $bounce_mailer = $bounce_mailer || "$sendmail_command -f\$sender -t";
   &set_mail_from("owner-$opt_l");
   &set_mail_sender("owner-$opt_l");
! @@ -924,7 +924,7 @@
       else {
   	# Painful, but we have to provide some kind of backwards
   	# compatibility and this is what 1.93 used
diff -cr majordomo-/patches/patch-bj majordomo/patches/patch-bj
*** majordomo-/patches/patch-bj	Mon Apr 28 09:37:28 1997
--- majordomo/patches/patch-bj	Wed Sep 10 01:01:33 1997
***************
*** 1,5 ****
! --- approve.orig	Sun Apr 27 20:28:18 1997
! +++ approve	Sun Apr 27 20:28:27 1997
  @@ -63,7 +63,7 @@
   #
   # $Locker:  $
--- 1,5 ----
! --- approve.orig	Sun Apr  6 04:18:36 1997
! +++ approve	Wed Sep 10 00:57:40 1997
  @@ -63,7 +63,7 @@
   #
   # $Locker:  $
Only in majordomo: patches-



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?14413.873821826>