1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00

Update to version 1.94.5.

PR:		17820
Submitted by:	Doug Barton <DougB@gorean.org> and
		Klaus Brunner <klaus@winf.htu.at>
This commit is contained in:
Steve Price 2000-05-29 18:17:39 +00:00
parent 2d610cd8b4
commit 5373fd28de
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=28932
7 changed files with 122 additions and 147 deletions

View File

@ -6,11 +6,10 @@
#
PORTNAME= majordomo
PORTVERSION= 1.94.4
PORTVERSION= 1.94.5
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/ \
MASTER_SITES= ftp://ftp.greatcircle.com/pub/majordomo/1.94.5/ \
ftp://ftp.sgi.com/other/majordomo/1.94.5/
EXTRACT_SUFX= .tgz
MAINTAINER= jfitz@FreeBSD.org
@ -69,9 +68,9 @@ post-install:
@ ${CHMOD} 660 ${PREFIX}/majordomo/lists/test-l.passwd
@ ${CHOWN} -R majordom.majordom ${PREFIX}/majordomo/lists
@ ${CHMOD} -R 664 ${PREFIX}/majordomo/lists
@ ${CHMOD} 775 ${PREFIX}/majordomo/lists
@ ${CHMOD} 775 ${PREFIX}/majordomo/lists/test-l.archive
@ ${CHMOD} 775 ${PREFIX}/majordomo/lists/test-l-digest.archive
@ ${CHMOD} 755 ${PREFIX}/majordomo/lists
@ ${CHMOD} 755 ${PREFIX}/majordomo/lists/test-l.archive
@ ${CHMOD} 755 ${PREFIX}/majordomo/lists/test-l-digest.archive
@ ${CHMOD} 660 ${PREFIX}/majordomo/lists/*.passwd
.if !defined(BATCH)
@ /usr/bin/more -e ${FILESDIR}/post-install-notes

View File

@ -1 +1 @@
MD5 (majordomo-1.94.4.tgz) = c58f51102d87ca271af1d583a7fc8522
MD5 (majordomo-1.94.5.tgz) = 337b2bbcc866803c6700e403e27390a7

View File

@ -1,15 +1,33 @@
--- digest.orig Wed Aug 27 23:42:52 1997
+++ digest Wed Sep 10 00:56:12 1997
@@ -314,7 +314,7 @@
--- digest.Dist Fri Jan 7 03:04:34 2000
+++ digest Sun Apr 16 23:15:49 2000
@@ -323,8 +323,24 @@
} else {
# Read and execute the .cf file
$cf = $opt_c || $ENV{"MAJORDOMO_CF"} ||
- "/etc/majordomo.cf";
- require "$cf";
+ "%%PREFIX%%/majordomo/majordomo.cf";
require "$cf";
+
+if (not sysopen CONFIG,$cf,O_RDONLY)
+{
+ die sprintf qq|Unable to sysopen config file "$cf"%s.\n|,$! ? ": $!" : '';
+}
+elsif ((stat CONFIG)[4] != $>)
+{
+ die qq|Config file "$cf" not owned by effective UID.\n|;
+}
+elsif (eval(join '',<CONFIG>),$@)
+{
+ die qq|Unable to eval "$cf": $@.\n|;
+}
+else
+{
+ close CONFIG;
+}
chdir($homedir);
@@ -326,7 +326,7 @@
@@ -335,7 +351,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.

View File

@ -1,6 +1,33 @@
--- archive2.pl.orig Thu Aug 28 00:07:44 1997
+++ archive2.pl Wed Sep 10 00:57:13 1997
@@ -88,7 +88,7 @@
--- archive2.pl.Dist Fri Jan 7 03:00:49 2000
+++ archive2.pl Sun Apr 16 23:15:49 2000
@@ -54,10 +54,23 @@
shift(@ARGV);
shift(@ARGV);
}
-if (! -r $cf) {
- die("$cf not readable; stopped");
+
+if (not sysopen CONFIG,$cf,O_RDONLY)
+{
+ die sprintf qq|Unable to sysopen config file "$cf"%s.\n|,$! ? ": $!" : '';
+}
+elsif ((stat CONFIG)[4] != $>)
+{
+ die qq|Config file "$cf" not owned by effective UID.\n|;
+}
+elsif (eval(join '',<CONFIG>),$@)
+{
+ die qq|Unable to eval "$cf": $@.\n|;
+}
+else
+{
+ close CONFIG;
}
-require "$cf";
# All these should be in the standard PERL library
unshift(@INC, $homedir);
@@ -88,7 +101,7 @@
exit 1;
}

View File

@ -1,6 +1,33 @@
--- request-answer.orig Tue Dec 10 01:50:20 1996
+++ request-answer Wed Sep 10 00:57:36 1997
@@ -43,7 +43,7 @@
--- request-answer.Dist Fri Jan 7 03:10:18 2000
+++ request-answer Sun Apr 16 23:15:50 2000
@@ -20,10 +20,23 @@
shift(@ARGV);
shift(@ARGV);
}
-if (! -r $cf) {
- die("$cf not readable; stopped");
+
+if (not sysopen CONFIG,$cf,O_RDONLY)
+{
+ die sprintf qq|Unable to sysopen config file "$cf"%s.\n|,$! ? ": $!" : '';
+}
+elsif ((stat CONFIG)[4] != $>)
+{
+ die qq|Config file "$cf" not owned by effective UID.\n|;
+}
+elsif (eval(join '',<CONFIG>),$@)
+{
+ die qq|Unable to eval "$cf": $@.\n|;
+}
+else
+{
+ close CONFIG;
}
-require "$cf";
chdir($homedir) || die("Can't chdir(\"$homedir\"): $!");
unshift(@INC, $homedir);
@@ -51,7 +64,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.

View File

@ -1,6 +1,34 @@
--- resend.orig Wed Aug 27 23:59:24 1997
+++ resend Wed Sep 10 00:57:38 1997
@@ -111,7 +111,7 @@
--- resend.Dist Fri Jan 7 07:32:39 2000
+++ resend Sun Apr 16 23:15:50 2000
@@ -84,11 +84,23 @@
# 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...
#
-if (! -r $cf) {
- die("$cf not readable; stopped");
-}
-require "$cf";
+if (not sysopen CONFIG,$cf,O_RDONLY)
+{
+ die sprintf qq|Unable to sysopen config file "$cf"%s.\n|,$! ? ": $!" : '';
+}
+elsif ((stat CONFIG)[4] != $>)
+{
+ die qq|Config file "$cf" not owned by effective UID.\n|;
+}
+elsif (eval(join '',<CONFIG>),$@)
+{
+ die qq|Unable to eval "$cf": $@.\n|;
+}
+else
+{
+ close CONFIG;
+}
chdir($homedir) || die("Can't chdir(\"$homedir\"): $!");
@@ -111,7 +123,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,
# but might not clearly indicate the list name.
@ -9,7 +37,7 @@
$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 @@
@@ -936,7 +948,7 @@
else {
# Painful, but we have to provide some kind of backwards
# compatibility and this is what 1.93 used

View File

@ -1,32 +1,3 @@
--- archive2.pl Mon Jan 3 14:35:32 2000
+++ archive2.pl.new Mon Jan 3 14:36:16 2000
@@ -54,10 +54,23 @@
shift(@ARGV);
shift(@ARGV);
}
-if (! -r $cf) {
- die("$cf not readable; stopped");
+
+if (not sysopen CONFIG,$cf,O_RDONLY)
+{
+ die sprintf qq|Unable to sysopen config file "$cf"%s.\n|,$! ? ": $!" : '';
}
-require "$cf";
+elsif ((stat CONFIG)[4] != $>)
+{
+ die qq|Config file "$cf" not owned by effective UID.\n|;
+}
+elsif (eval(join '',<CONFIG>),$@)
+{
+ die qq|Unable to eval "$cf": $@.\n|;
+}
+else
+{
+ close CONFIG;
+}
# All these should be in the standard PERL library
unshift(@INC, $homedir);
--- bounce-remind Mon Jan 3 14:35:32 2000
+++ bounce-remind.new Mon Jan 3 14:38:16 2000
@@ -24,10 +24,23 @@
@ -84,33 +55,6 @@
}
foreach (@requires) {
--- digest.orig Wed Jan 5 01:44:09 2000
+++ digest Wed Jan 5 01:45:38 2000
@@ -315,7 +315,23 @@
# Read and execute the .cf file
$cf = $opt_c || $ENV{"MAJORDOMO_CF"} ||
"%%PREFIX%%/majordomo/majordomo.cf";
- require "$cf";
+
+if (not sysopen CONFIG,$cf,O_RDONLY)
+{
+ die sprintf qq|Unable to sysopen config file "$cf"%s.\n|,$! ? ": $!" : '';
+}
+elsif ((stat CONFIG)[4] != $>)
+{
+ die qq|Config file "$cf" not owned by effective UID.\n|;
+}
+elsif (eval(join '',<CONFIG>),$@)
+{
+ die qq|Unable to eval "$cf": $@.\n|;
+}
+else
+{
+ close CONFIG;
+}
chdir($homedir);
--- majordomo Mon Jan 3 13:37:13 2000
+++ majordomo.new Mon Jan 3 14:15:29 2000
@@ -40,11 +40,23 @@
@ -141,71 +85,3 @@
# Go to the home directory specified by the .cf file
chdir("$homedir") || die "chdir to $homedir failed, $!\n";
--- request-answer Mon Jan 3 14:35:32 2000
+++ request-answer.new Mon Jan 3 15:09:02 2000
@@ -20,10 +20,23 @@
shift(@ARGV);
shift(@ARGV);
}
-if (! -r $cf) {
- die("$cf not readable; stopped");
+
+if (not sysopen CONFIG,$cf,O_RDONLY)
+{
+ die sprintf qq|Unable to sysopen config file "$cf"%s.\n|,$! ? ": $!" : '';
}
-require "$cf";
+elsif ((stat CONFIG)[4] != $>)
+{
+ die qq|Config file "$cf" not owned by effective UID.\n|;
+}
+elsif (eval(join '',<CONFIG>),$@)
+{
+ die qq|Unable to eval "$cf": $@.\n|;
+}
+else
+{
+ close CONFIG;
+}
chdir($homedir) || die("Can't chdir(\"$homedir\"): $!");
unshift(@INC, $homedir);
--- resend Mon Jan 3 15:14:49 2000
+++ resend.new Mon Jan 3 15:16:01 2000
@@ -56,7 +56,7 @@
if ($ARGV[0] =~ /^\@/) {
$fn = shift(@ARGV);
$fn =~ s/^@//;
- open(AV, $fn) || die("open(AV, \"$fn\"): $!\nStopped");
+ sysopen(AV, $fn, O_RDONLY) || die("sysopen(AV, \"$fn\", O_RDONLY): $!\nStopped");
undef($/); # set input field separator
$av = <AV>; # read whole file into string
close(AV);
@@ -84,11 +84,23 @@
# 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...
#
-if (! -r $cf) {
- die("$cf not readable; stopped");
-}
-require "$cf";
+if (not sysopen CONFIG,$cf,O_RDONLY)
+{
+ die sprintf qq|Unable to sysopen config file "$cf"%s.\n|,$! ? ": $!" : '';
+}
+elsif ((stat CONFIG)[4] != $>)
+{
+ die qq|Config file "$cf" not owned by effective UID.\n|;
+}
+elsif (eval(join '',<CONFIG>),$@)
+{
+ die qq|Unable to eval "$cf": $@.\n|;
+}
+else
+{
+ close CONFIG;
+}
chdir($homedir) || die("Can't chdir(\"$homedir\"): $!");