Regen patches.

This commit is contained in:
landry 2011-03-02 12:40:41 +00:00
parent 6c498e11c6
commit e06e8b68c9
13 changed files with 53 additions and 53 deletions

View File

@ -1,6 +1,6 @@
--- Makefile.orig Tue Jan 18 11:01:17 2000
+++ Makefile Tue May 23 07:05:24 2000
@@ -63,7 +63,8 @@
--- Makefile.orig Tue Jan 18 15:01:17 2000
+++ Makefile Wed Feb 2 13:31:41 2011
@@ -63,7 +63,8 @@ POSIX = -DPOSIX_UID=$(W_USER) -DPOSIX_GID=$(W_GROUP)
# passed to processes run by "wrapper"
W_SHELL = /bin/sh
W_PATH = /bin:/usr/bin:/usr/ucb
@ -10,7 +10,7 @@
# A directory for temp files..
TMPDIR = /usr/tmp
@@ -77,7 +78,8 @@
@@ -77,7 +78,8 @@ SHELL = /bin/sh
WRAPPER_FLAGS = -DBIN=\"$(W_HOME)\" -DPATH=\"PATH=$(W_PATH)\" \
-DHOME=\"HOME=$(W_HOME)\" -DSHELL=\"SHELL=$(W_SHELL)\" \

View File

@ -1,6 +1,6 @@
--- archive2.pl.orig Fri Jan 7 08:00:49 2000
+++ archive2.pl Tue May 23 07:47:09 2000
@@ -50,7 +50,7 @@
--- archive2.pl.orig Fri Jan 7 12:00:49 2000
+++ archive2.pl Wed Feb 2 13:31:41 2011
@@ -50,7 +50,7 @@ chdir($ENV{'HOME'}) if $ENV{'HOME'};
# Read and execute the .cf file
$cf = $ENV{"MAJORDOMO_CF"} || "/etc/majordomo.cf";
if ($ARGV[0] eq "-C") {
@ -9,7 +9,7 @@
shift(@ARGV);
shift(@ARGV);
}
@@ -88,7 +88,7 @@
@@ -88,7 +88,7 @@ if (!defined($opt_f)) {
exit 1;
}

View File

@ -1,6 +1,6 @@
--- bounce-remind.orig Mon Dec 9 13:49:46 1996
+++ bounce-remind Tue May 23 07:47:27 2000
@@ -20,7 +20,7 @@
--- bounce-remind.orig Mon Dec 9 17:49:46 1996
+++ bounce-remind Wed Feb 2 13:31:41 2011
@@ -20,7 +20,7 @@ $main'program_name = 'mj_bounce-remind';
# Read and execute the .cf file
$cf = $ENV{"MAJORDOMO_CF"} || "/etc/majordomo.cf";
if ($ARGV[0] eq "-C") {

View File

@ -1,6 +1,6 @@
--- config-test.orig Wed Aug 27 12:17:13 1997
+++ config-test Tue May 23 16:32:22 2000
@@ -117,6 +117,8 @@
--- config-test.orig Wed Aug 27 17:17:13 1997
+++ config-test Wed Feb 2 13:31:41 2011
@@ -117,6 +117,8 @@ wellokay
print "\n\tNon obvious things that cause headaches:\n\n";
&header('');
@ -9,7 +9,7 @@
$cf = $ARGV[0] || $ENV{'MAJORDOMO_CF'};
if (eval "require '$cf'") {
@@ -125,6 +127,7 @@
@@ -125,6 +127,7 @@ if (eval "require '$cf'") {
&bad("something's wrong with $cf: $@");
}
@ -17,7 +17,7 @@
foreach (@requires) {
if (require $_) {
&good("found $_ okay.");
@@ -237,9 +240,9 @@
@@ -237,9 +240,9 @@ elsif ($sendmail_command) {
else {
print "You have defined neither \$mailer, nor \$sendmail_command.\n";
print "Majordomo will use\n";
@ -29,7 +29,7 @@
}
print "Attempting to verify that this is a valid mailer...";
@@ -266,9 +269,9 @@
@@ -266,9 +269,9 @@ elsif ($sendmail_command) {
else {
print "You have defined neither \$mailer, nor \$sendmail_command.\n";
print "Majordomo will use\n";
@ -41,7 +41,7 @@
}
print "Attempting to verify that this is a valid mailer...";
@@ -375,7 +378,7 @@
@@ -375,7 +378,7 @@ ZOT
print RF $majordomo_version;
close RF;

View File

@ -1,6 +1,6 @@
--- config_parse.pl.orig Fri Jan 7 15:00:26 2000
+++ config_parse.pl Thu Feb 6 20:13:40 2003
@@ -80,8 +80,8 @@
+++ config_parse.pl Wed Feb 2 13:31:41 2011
@@ -80,8 +80,8 @@ $installing_defaults = 0; # Set to 1 when installing d
'announcements', 'yes', # send sub/unsub audits to list owner
'get_access', "open\001closed\001list\001list", # open, anyone can access
'index_access', "open\001closed\001list\001open", # closed, nobody can

View File

@ -1,6 +1,6 @@
--- digest.orig Fri Jan 7 08:04:34 2000
+++ digest Tue May 23 16:33:13 2000
@@ -322,8 +322,9 @@
--- digest.orig Fri Jan 7 12:04:34 2000
+++ digest Wed Feb 2 13:31:41 2011
@@ -322,8 +322,9 @@ sub readconfig {
&abort("-C used without -l");
} else {
# Read and execute the .cf file
@ -12,7 +12,7 @@
require "$cf";
chdir($homedir);
@@ -335,7 +336,7 @@
@@ -335,7 +336,7 @@ sub readconfig {
# 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.
@ -21,7 +21,7 @@
unless defined $sendmail_command;
$mailer = "$sendmail_command -oi -oee -f\$sender"
unless defined $mailer;
@@ -414,7 +415,7 @@
@@ -414,7 +415,7 @@ $bounce_mailer = "$sendmail_command -f\$sender -t"
# Define all of the mailer properties:
# The majordomo.cf file isn't used in this option, so fake everything.

View File

@ -1,6 +1,6 @@
--- majordomo.orig Thu Jan 13 14:29:31 2000
+++ majordomo Tue May 23 07:48:42 2000
@@ -29,7 +29,7 @@
--- majordomo.orig Thu Jan 13 18:29:31 2000
+++ majordomo Wed Feb 2 13:31:41 2011
@@ -29,7 +29,7 @@ $cf = $ENV{"MAJORDOMO_CF"} || "/etc/majordomo.cf";
while ($ARGV[0]) { # parse for config file or default list
if ($ARGV[0] =~ /^-C$/i) { # sendmail v8 clobbers case
@ -9,7 +9,7 @@
shift(@ARGV);
shift(@ARGV);
} elsif ($ARGV[0] eq "-l") {
@@ -75,7 +75,7 @@
@@ -75,7 +75,7 @@ die("\$listdir not defined. Is majordomo.cf being incl
# 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,6 @@
--- medit.orig Mon Apr 28 15:38:05 1997
+++ medit Tue May 23 07:48:55 2000
@@ -19,7 +19,7 @@
--- medit.orig Mon Apr 28 20:38:05 1997
+++ medit Wed Feb 2 13:31:41 2011
@@ -19,7 +19,7 @@ $ENV{'PATH'} = "/bin:/usr/bin:/usr/ucb";
# Read and execute the .cf file
$cf = $ENV{"MAJORDOMO_CF"} || "/etc/majordomo.cf";
if ($ARGV[0] eq "-C") {

View File

@ -1,6 +1,6 @@
--- contrib/new-list.orig Mon Dec 9 13:50:45 1996
+++ contrib/new-list Tue May 23 07:50:41 2000
@@ -15,7 +15,7 @@
--- contrib/new-list.orig Mon Dec 9 17:50:45 1996
+++ contrib/new-list Wed Feb 2 13:31:41 2011
@@ -15,7 +15,7 @@ $ENV{'PATH'} = "/bin:/usr/bin:/usr/ucb";
# Read and execute the .cf file
$cf = $ENV{"MAJORDOMO_CF"} || "/etc/majordomo.cf";
if ($ARGV[0] eq "-C") {

View File

@ -1,5 +1,5 @@
--- request-answer.orig Fri Jan 7 08:10:18 2000
+++ request-answer Tue May 23 07:49:10 2000
--- request-answer.orig Fri Jan 7 12:10:18 2000
+++ request-answer Wed Feb 2 13:31:41 2011
@@ -16,7 +16,7 @@
# Read and execute the .cf file
$cf = $ENV{"MAJORDOMO_CF"} || "/etc/majordomo.cf";
@ -9,7 +9,7 @@
shift(@ARGV);
shift(@ARGV);
}
@@ -51,7 +51,7 @@
@@ -51,7 +51,7 @@ $list = $ARGV[0];
# 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,6 @@
--- resend.orig Fri Jan 7 12:32:39 2000
+++ resend Tue May 23 16:33:49 2000
@@ -79,6 +79,9 @@
--- resend.orig Fri Jan 7 16:32:39 2000
+++ resend Wed Feb 2 13:31:41 2011
@@ -79,6 +79,9 @@ if (! defined($opt_l)) {
}
# Read and execute the .cf file
@ -10,7 +10,7 @@
$cf = $opt_C || $opt_c || $ENV{"MAJORDOMO_CF"} || "/etc/majordomo.cf";
# Despite not having a place to send the remains of the body,
@@ -111,7 +114,7 @@
@@ -111,7 +114,7 @@ $opt_l =~ tr/A-Z/a-z/;
# 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.
@ -19,7 +19,7 @@
$bounce_mailer = $bounce_mailer || "$sendmail_command -f\$sender -t";
&set_mail_from("owner-$opt_l");
&set_mail_sender("owner-$opt_l");
@@ -936,7 +939,7 @@
@@ -936,7 +939,7 @@ sub send_bounce {
else {
# Painful, but we have to provide some kind of backwards
# compatibility and this is what 1.93 used

View File

@ -1,6 +1,6 @@
--- sample.cf.orig Thu Feb 6 20:20:08 2003
+++ sample.cf Thu Feb 6 20:21:45 2003
@@ -27,7 +27,7 @@
--- sample.cf.orig Wed Aug 27 17:00:31 1997
+++ sample.cf Wed Feb 2 13:31:41 2011
@@ -27,7 +27,7 @@ if ( defined $ENV{"HOME"}) {
# $listdir -- Where are the mailing lists?
#
@ -9,7 +9,7 @@
# $digest_work_dir -- the parent directory for digest's queue area
# Each list must have a subdirectory under this directory in order for
@@ -35,18 +35,18 @@
@@ -35,18 +35,18 @@ $listdir = "$homedir/lists";
# /usr/local/mail/digest/bblisa
# as its directory.
#
@ -32,7 +32,7 @@
# $mailer -- What program and args do I use to send mail to the list?
# $bounce_mailer -- What is used to send mail anywhere else?
@@ -80,15 +80,15 @@
@@ -80,15 +80,15 @@ $bounce_mailer = "$sendmail_command -oi -oee -f\$sende
# high by uncommenting the following lines. THIS ONLY WORKS if your "uptime"
# command (usually found in /usr/bin/uptime or /usr/bsd/uptime)
# returns a string like:
@ -52,7 +52,7 @@
#
#exit 75 if ($avg_15_minutes >= $max_loadavg); # E_TEMPFAIL
#
@@ -164,13 +164,18 @@
@@ -164,13 +164,18 @@ $majordomo_request = 0;
# number of hits that are allowed using which before an error is returned.
# Arguably this should be a per list settable number.
#
@ -74,7 +74,7 @@
# don't change this. It checks to make sure that you have a new enough
# version of perl to run majordomo. It is in here because this file is
@@ -188,9 +193,8 @@
@@ -188,9 +193,8 @@ die "Perl version $] too old\n" if ($] < 4.019);
# Directory where resend temporarily puts its rewritten output message.
# For the paranoid, this could be changed to a directory that only
# majordomo has r/w permission to.

View File

@ -1,6 +1,6 @@
--- contrib/sequencer.orig Mon Dec 9 13:50:48 1996
+++ contrib/sequencer Tue May 23 07:50:58 2000
@@ -48,7 +48,7 @@
--- contrib/sequencer.orig Mon Dec 9 17:50:48 1996
+++ contrib/sequencer Wed Feb 2 13:31:41 2011
@@ -48,7 +48,7 @@ if ($ARGV[0] =~ /^@/) {
# Read and execute the .cf file
$cf = $ENV{"MAJORDOMO_CF"} || "/etc/majordomo.cf";
if ($ARGV[0] eq "-C") {