diff options
author | jfitz <jfitz@FreeBSD.org> | 1997-04-28 08:37:28 +0800 |
---|---|---|
committer | jfitz <jfitz@FreeBSD.org> | 1997-04-28 08:37:28 +0800 |
commit | a2b4dd65f9fac54929bd4e32f18dac88f1bf42f5 (patch) | |
tree | 04f8e83c1d6dd1c320916fb72d76799c653ce246 /mail/majordomo | |
parent | b720d97a3a3b27ac00b59b94459ed3041cc3eb34 (diff) | |
download | freebsd-ports-gnome-a2b4dd65f9fac54929bd4e32f18dac88f1bf42f5.tar.gz freebsd-ports-gnome-a2b4dd65f9fac54929bd4e32f18dac88f1bf42f5.tar.zst freebsd-ports-gnome-a2b4dd65f9fac54929bd4e32f18dac88f1bf42f5.zip |
- Upgrade to v1.94.2
- Change the way that the /usr/lib/sendmail -> /usr/sbin/sendmail patches are stored to make future upgrades of the port easier.
- Change the way that the links in the install dirs were being set up.
Diffstat (limited to 'mail/majordomo')
-rw-r--r-- | mail/majordomo/files/patch-ab | 12 | ||||
-rw-r--r-- | mail/majordomo/files/patch-ac | 30 | ||||
-rw-r--r-- | mail/majordomo/files/patch-ba | 11 | ||||
-rw-r--r-- | mail/majordomo/files/patch-bb | 11 | ||||
-rw-r--r-- | mail/majordomo/files/patch-bc | 35 | ||||
-rw-r--r-- | mail/majordomo/files/patch-bd | 11 | ||||
-rw-r--r-- | mail/majordomo/files/patch-be | 23 | ||||
-rw-r--r-- | mail/majordomo/files/patch-bf | 11 | ||||
-rw-r--r-- | mail/majordomo/files/patch-bg | 11 | ||||
-rw-r--r-- | mail/majordomo/files/patch-bh | 11 | ||||
-rw-r--r-- | mail/majordomo/files/patch-bi | 20 | ||||
-rw-r--r-- | mail/majordomo/files/patch-bj | 11 |
12 files changed, 185 insertions, 12 deletions
diff --git a/mail/majordomo/files/patch-ab b/mail/majordomo/files/patch-ab index bebb70c0d150..0580d4331435 100644 --- a/mail/majordomo/files/patch-ab +++ b/mail/majordomo/files/patch-ab @@ -1,5 +1,5 @@ ---- sample.cf.orig Mon Dec 23 10:05:15 1996 -+++ sample.cf Fri Dec 27 00:31:03 1996 +--- 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? @@ -54,12 +54,12 @@ -#$max_loadavg = 10; # Choose the maximum allowed load +$max_loadavg = 10; # Choose the maximum allowed load # --#$uptime = `/usr/bin/uptime` if -x </usr/bin/uptime>; # Get system uptime -+$uptime = `/usr/bin/uptime` if -x </usr/bin/uptime>; # Get system uptime - #$uptime = `/usr/bsd/uptime` if -x </usr/bsd/uptime>; # or uptime is over here. +-#$uptime = `/usr/bin/uptime` if -x '/usr/bin/uptime'; # Get system uptime ++$uptime = `/usr/bin/uptime` if -x '/usr/bin/uptime'; # Get system uptime + #$uptime = `/usr/bsd/uptime` if -x '/usr/bsd/uptime'; # or uptime is over here. # #($avg_1_minute, $avg_5_minutes, $avg_15_minutes) = -@@ -181,7 +177,7 @@ +@@ -190,7 +186,7 @@ # majordomo has r/w permission to. # Uses the environment variable TMPDIR, since that's pretty common # diff --git a/mail/majordomo/files/patch-ac b/mail/majordomo/files/patch-ac index 5acf2de7b243..ce76cef9f3dc 100644 --- a/mail/majordomo/files/patch-ac +++ b/mail/majordomo/files/patch-ac @@ -1,11 +1,29 @@ ---- digest.orig Mon Dec 23 10:41:51 1996 -+++ digest Fri Dec 27 00:34:39 1996 -@@ -317,7 +317,7 @@ +--- 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 = $ENV{"MAJORDOMO_CF"} || -- "/etc/majordomo.cf"; -+ "%%PREFIX%%/majordomo/majordomo.cf"; + $cf = $opt_c || $ENV{"MAJORDOMO_CF"} || +- "/etc/majordomo.cf"; ++ "%%PREFIX%%/majordomo/majordomo.cf"; 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; diff --git a/mail/majordomo/files/patch-ba b/mail/majordomo/files/patch-ba new file mode 100644 index 000000000000..f04bec644eb0 --- /dev/null +++ b/mail/majordomo/files/patch-ba @@ -0,0 +1,11 @@ +--- 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; + } + +-$sendmail_command = $sendmail_command || "/usr/lib/sendmail"; ++$sendmail_command = $sendmail_command || "/usr/sbin/sendmail"; + $bounce_mailer = $bounce_mailer || "$sendmail_command -f\$sender -t"; + &set_abort_addr($whoami_owner); + &set_mail_from($whoami); diff --git a/mail/majordomo/files/patch-bb b/mail/majordomo/files/patch-bb new file mode 100644 index 000000000000..5020055f41ae --- /dev/null +++ b/mail/majordomo/files/patch-bb @@ -0,0 +1,11 @@ +--- bounce.orig Sun Apr 27 20:22:35 1997 ++++ bounce Sun Apr 27 20:22:45 1997 +@@ -41,7 +41,7 @@ + # $Locker: $ + # + +-$MAILER = "/usr/lib/sendmail"; ++$MAILER = "/usr/sbin/sendmail"; + + $default_maxage = 21; + diff --git a/mail/majordomo/files/patch-bc b/mail/majordomo/files/patch-bc new file mode 100644 index 000000000000..eea601904230 --- /dev/null +++ b/mail/majordomo/files/patch-bc @@ -0,0 +1,35 @@ +--- 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"; + print "Majordomo will use\n"; +- print "/usr/lib/sendmail -f\\\$sender\n"; ++ print "/usr/sbin/sendmail -f\\\$sender\n"; + print "to deliver mail to the list.\n"; +- $x = "/usr/lib/sendmail"; ++ $x = "/usr/sbin/sendmail"; + } + + print "Attempting to verify that this is a valid mailer..."; +@@ -266,9 +266,9 @@ + else { + print "You have defined neither \$mailer, nor \$sendmail_command.\n"; + print "Majordomo will use\n"; +- print "/usr/lib/sendmail -f\\\$sender -t\n"; ++ print "/usr/sbin/sendmail -f\\\$sender -t\n"; + print "to deliver administrative mail.\n"; +- $x = "/usr/lib/sendmail"; ++ $x = "/usr/sbin/sendmail"; + } + + print "Attempting to verify that this is a valid mailer..."; +@@ -375,7 +375,7 @@ + print RF $majordomo_version; + close RF; + +- $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; diff --git a/mail/majordomo/files/patch-bd b/mail/majordomo/files/patch-bd new file mode 100644 index 000000000000..6e45fee3edbd --- /dev/null +++ b/mail/majordomo/files/patch-bd @@ -0,0 +1,11 @@ +--- 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 + # 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; diff --git a/mail/majordomo/files/patch-be b/mail/majordomo/files/patch-be new file mode 100644 index 000000000000..0ae3544d0dc9 --- /dev/null +++ b/mail/majordomo/files/patch-be @@ -0,0 +1,23 @@ +--- 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"); + } + +-$sendmail_cmd = "/usr/lib/sendmail $opt_m -f$sendmail_sender " . ++$sendmail_cmd = "/usr/sbin/sendmail $opt_m -f$sendmail_sender " . + join(" ", @ARGV); + + if (defined($opt_d)) { +@@ -541,9 +541,9 @@ + if (defined($opt_d)) { + # debugging, so just say it, don't do it + open(MAIL, ">-"); +- print MAIL ">>> /usr/lib/sendmail -f$sendmail_sender -t\n"; ++ print MAIL ">>> /usr/sbin/sendmail -f$sendmail_sender -t\n"; + } else { +- local(@mailer) = split(' ',"/usr/lib/sendmail -f$sendmail_sender -t"); ++ local(@mailer) = split(' ',"/usr/sbin/sendmail -f$sendmail_sender -t"); + open(MAIL, "|-") || &do_exec_sendmail(@mailer); + } + diff --git a/mail/majordomo/files/patch-bf b/mail/majordomo/files/patch-bf new file mode 100644 index 000000000000..ef24a527229f --- /dev/null +++ b/mail/majordomo/files/patch-bf @@ -0,0 +1,11 @@ +--- 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 + # 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; diff --git a/mail/majordomo/files/patch-bg b/mail/majordomo/files/patch-bg new file mode 100644 index 000000000000..3f483caaa4cc --- /dev/null +++ b/mail/majordomo/files/patch-bg @@ -0,0 +1,11 @@ +--- 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"; + $logfile = "/usr/jco/md-sub.log"; +-#$sendmail = "|/usr/lib/sendmail -t"; ++#$sendmail = "|/usr/sbin/sendmail -t"; + $sendmail = "|/usr/bin/cat - > /tmp/test.out"; # This one is for + # testing... + diff --git a/mail/majordomo/files/patch-bh b/mail/majordomo/files/patch-bh new file mode 100644 index 000000000000..1834844f4856 --- /dev/null +++ b/mail/majordomo/files/patch-bh @@ -0,0 +1,11 @@ +--- 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 + # 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; diff --git a/mail/majordomo/files/patch-bi b/mail/majordomo/files/patch-bi new file mode 100644 index 000000000000..41e12ab99115 --- /dev/null +++ b/mail/majordomo/files/patch-bi @@ -0,0 +1,20 @@ +--- 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, + # but might not clearly indicate the list name. +-$sendmail_command = $sendmail_command || "/usr/lib/sendmail"; ++$sendmail_command = $sendmail_command || "/usr/sbin/sendmail"; + $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 +- $mailcmd = "/usr/lib/sendmail -f$sender -t"; ++ $mailcmd = "/usr/sbin/sendmail -f$sender -t"; + } + + # clean up the addresses, for use on the sendmail command line diff --git a/mail/majordomo/files/patch-bj b/mail/majordomo/files/patch-bj new file mode 100644 index 000000000000..7bf379ae8092 --- /dev/null +++ b/mail/majordomo/files/patch-bj @@ -0,0 +1,11 @@ +--- approve.orig Sun Apr 27 20:28:18 1997 ++++ approve Sun Apr 27 20:28:27 1997 +@@ -63,7 +63,7 @@ + # + # $Locker: $ + +-$MAILER = '/usr/lib/sendmail' if -x '/usr/lib/sendmail'; ++$MAILER = '/usr/sbin/sendmail' if -x '/usr/sbin/sendmail'; + $MAILER = '/usr/sbin/sendmail' if -x '/usr/sbin/sendmail'; + + die "Couldn't find a sendmail to invoke, please define!" |