diff options
author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-09-01 21:25:59 +0000 |
---|---|---|
committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-09-01 21:25:59 +0000 |
commit | 8003ba152f15aa82aaadd76fcd6b669cc0cc9981 (patch) | |
tree | 7842527232644d8f0fc76639a38e9596a910d381 /mail/majordomo/files | |
parent | Convert to USES=libtool and add INSTALL_TARGET=install-strip (diff) |
Remove non staged ports without pending PR from ma*
Diffstat (limited to 'mail/majordomo/files')
27 files changed, 0 insertions, 948 deletions
diff --git a/mail/majordomo/files/aliases.majordomo b/mail/majordomo/files/aliases.majordomo deleted file mode 100644 index f9085edd4b16..000000000000 --- a/mail/majordomo/files/aliases.majordomo +++ /dev/null @@ -1,126 +0,0 @@ -## -## Basic Majordomo Aliases -## -## Replace your own email for "Postmaster" in the "majordomo-owner" alias. -## - -majordomo: "|/usr/local/majordomo/wrapper majordomo" -majordomo-owner: Postmaster -owner-majordomo: majordomo-owner -majordom: majordomo-owner - -## The bounces mailing list is used to move people off of lists when their -## e-mail address becomes undeliverable. See the bounce-remind script for a -## way to inform people that they've been moved. - -## bounces mailing list -#owner-bounces:majordomo-owner -#bounces-approval:owner-bounces -#owner-bounces-outgoing:owner-bounces - -#bounces: "|/usr/local/majordomo/wrapper resend -l bounces -h %%HOSTNAME%% bounces-outgoing" - -#bounces-outgoing::include:/usr/local/majordomo/lists/bounces - -## Test List -## -## This is a testing list that should be removed once you are familiar with -## the operation of Majordomo. -## -owner-test-l:Postmaster -owner-test-l-digest:owner-test-l -owner-test-l-outgoing:owner-test-l -owner-test-l-digest-outgoing:owner-test-l -test-l-approval:owner-test-l -test-l-digest-approval:owner-test-l - -test-l: "|/usr/local/majordomo/wrapper resend -l test-l -h %%HOSTNAME%% test-l-outgoing" -test-l-digest:test-l -test-l-outgoing::include:/usr/local/majordomo/lists/test-l, - "|/usr/local/majordomo/wrapper archive -a -m -f /usr/local/majordomo/lists/test-l.archive/test-l.archive", - "|/usr/local/majordomo/wrapper digest -r -C -l test-l-digest test-l-digest-outgoing" -test-l-digest-outgoing::include:/usr/local/majordomo/lists/test-l-digest - -test-l-request: "|/usr/local/majordomo/wrapper majordomo -l test-l" -test-l-digest-request: "|/usr/local/majordomo/wrapper majordomo -l test-l-digest" - - -## Sample Lists -## -## Majordomo lists take one of four general forms: -## -## 1. Regular mailing list -## 2. Mailing list with archiving -## 3. Mailing list with a digested form of the list -## 4. Mailing list with a digested form of the list and archiving -## -## Examples for each are commented out below -## - - -# Regular Mailing List -# - -#owner-listname:user -#owner-listname-outgoing:owner-listname -#listname-approval:owner-listname - -#listname: "|/usr/local/majordomo/wrapper resend -l listname -h %%HOSTNAME%% listname-outgoing" -#listname-outgoing::include:/usr/local/majordomo/lists/listname - -#listname-request: "|/usr/local/majordomo/wrapper majordomo -l listname" - - -# Mailing List with archiving -# - -#owner-listname:user -#owner-listname-outgoing:owner-listname -#listname-approval:owner-listname - -#listname: "|/usr/local/majordomo/wrapper resend -l listname -h %%HOSTNAME%% listname-outgoing" -#listname-outgoing::include:/usr/local/majordomo/lists/listname, -# "|/usr/local/majordomo/wrapper archive -a -m -f /usr/local/majordomo/lists/listname.archive/listname.archive" - -#listname-request: "|/usr/local/majordomo/wrapper majordomo -l listname" - - -# Mailing List with a digested form of the list -# - -#owner-listname:user -#owner-listname-digest:owner-listname -#owner-listname-outgoing:owner-listname -#owner-listname-digest-outgoing:owner-listname -#listname-approval:owner-listname -#listname-digest-approval:owner-listname - -#listname: "|/usr/local/majordomo/wrapper resend -l listname -h %%HOSTNAME%% listname-outgoing" -#listname-digest:listname -#listname-outgoing::include:/usr/local/majordomo/lists/listname, -# "|/usr/local/majordomo/wrapper digest -r -C -l listname-digest listname-digest-outgoing" -#listname-digest-outgoing::include:/usr/local/majordomo/lists/listname-digest - -#listname-request: "|/usr/local/majordomo/wrapper majordomo -l listname" -#listname-digest-request: "|/usr/local/majordomo/wrapper majordomo -l listname-digest" - - -# Mailing List with a digested form of the list and archiving -# - -#owner-listname:user -#owner-listname-digest:owner-listname -#owner-listname-outgoing:owner-listname -#owner-listname-digest-outgoing:owner-listname -#listname-approval:owner-listname -#listname-digest-approval:owner-listname - -#listname: "|/usr/local/majordomo/wrapper resend -l listname -h %%HOSTNAME%% listname-outgoing" -#listname-digest:listname -#listname-outgoing::include:/usr/local/majordomo/lists/listname, -# "|/usr/local/majordomo/wrapper archive -a -m -f /usr/local/majordomo/lists/listname.archive/listname.archive", -# "|/usr/local/majordomo/wrapper digest -r -C -l listname-digest listname-digest-outgoing" -#listname-digest-outgoing::include:/usr/local/majordomo/lists/listname-digest - -#listname-request: "|/usr/local/majordomo/wrapper majordomo -l listname" -#listname-digest-request: "|/usr/local/majordomo/wrapper majordomo -l listname-digest" diff --git a/mail/majordomo/files/patch-aa b/mail/majordomo/files/patch-aa deleted file mode 100644 index d1cf4ded20e0..000000000000 --- a/mail/majordomo/files/patch-aa +++ /dev/null @@ -1,65 +0,0 @@ ---- Makefile.orig Tue Jan 18 15:01:17 2000 -+++ Makefile Mon Jul 23 03:35:47 2001 -@@ -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 - - # Where do you want Majordomo to be installed? This CANNOT be the - # current directory (where you unpacked the distribution) --W_HOME = /usr/test/majordomo-$(VERSION) -+W_HOME = ${PREFIX}/majordomo - - # Where do you want man pages to be installed? --MAN = $(W_HOME)/man -+MAN = ${PREFIX}/man - - # You need to have or create a user and group which majordomo will run as. - # Enter the numeric UID and GID (not their names!) here: --W_USER = 123 --W_GROUP = 45 -+W_USER = %%MJUID%% -+W_GROUP = %%MJGID%% - - # These set the permissions for all installed files and executables (except - # the wrapper), respectively. Some sites may wish to make these more -@@ -40,9 +40,9 @@ - # If your system is POSIX (e.g. Sun Solaris, SGI Irix 5 and 6, Dec Ultrix MIPS, - # BSDI or other 4.4-based BSD, Linux) use the following four lines. Do not - # change these values! --WRAPPER_OWNER = root -+WRAPPER_OWNER = $(W_USER) - WRAPPER_GROUP = $(W_GROUP) --WRAPPER_MODE = 4755 -+WRAPPER_MODE = 4550 - POSIX = -DPOSIX_UID=$(W_USER) -DPOSIX_GID=$(W_GROUP) - # Otherwise, if your system is NOT POSIX (e.g. SunOS 4.x, SGI Irix 4, - # HP DomainOS) then comment out the above four lines and uncomment -@@ -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 --W_PATH = /bin:/usr/bin:/usr/ucb -+W_PATH = /bin:/usr/bin - W_MAJORDOMO_CF = $(W_HOME)/majordomo.cf - - # A directory for temp files.. --TMPDIR = /usr/tmp -+TMPDIR ?= /var/tmp - - #--------YOU SHOULDN'T HAVE TO CHANGE ANYTHING BELOW THIS LINE.------------- - -@@ -103,7 +103,7 @@ - @echo " install-scripts: only install the scripts." - @echo " wrapper: only make wrapper." - --install: wrapper install-scripts install-cf install-man -+install: wrapper install-scripts install-cf - @echo "" - @echo "To finish the installation, 'su' to root and type:" - @echo "" diff --git a/mail/majordomo/files/patch-ab b/mail/majordomo/files/patch-ab deleted file mode 100644 index 27f5de6705c4..000000000000 --- a/mail/majordomo/files/patch-ab +++ /dev/null @@ -1,78 +0,0 @@ ---- sample.cf.orig Thu Aug 28 01:00:31 1997 -+++ sample.cf Thu Jul 22 11:00:18 1999 -@@ -6,11 +6,11 @@ - - # $whereami -- What machine am I running on? - # --$whereami = "example.com"; -+$whereami = "%%HOSTNAME%%"; - - # $whoami -- Who do users send requests to me as? - # --$whoami = "Majordomo\@$whereami"; -+$whoami = "majordomo\@$whereami"; - - # $whoami_owner -- Who is the owner of the above, in case of problems? - # -@@ -19,11 +19,7 @@ - # $homedir -- Where can I find my extra .pl files, like majordomo.pl? - # the environment variable HOME is set by the wrapper - # --if ( defined $ENV{"HOME"}) { -- $homedir = $ENV{"HOME"}; --} else { -- $homedir = "/usr/test/majordomo"; --} -+$homedir = "%%PREFIX%%/majordomo"; - - # $listdir -- Where are the mailing lists? - # -@@ -35,7 +31,7 @@ - # /usr/local/mail/digest/bblisa - # as its directory. - # --$digest_work_dir = "/usr/local/mail/digest"; -+$digest_work_dir = "%%PREFIX%%/majordomo/digests"; - - # $log -- Where do I write my log? - # -@@ -45,8 +41,8 @@ - # usually /usr/lib/sendmail, but some newer BSD systems - # seem to prefer /usr/sbin/sendmail - # --$sendmail_command = "/usr/lib/sendmail"; --# $sendmail_command = "/usr/sbin/sendmail"; -+# $sendmail_command = "/usr/lib/sendmail"; -+$sendmail_command = "/usr/sbin/sendmail"; - - # $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 +76,15 @@ - # 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: --# 5:23pm up 5:51, 9 users, load average: 0.19, 0.25, 0.33 -+# 5:23pm up 5:51, 9 users, load averages: 0.19, 0.25, 0.33 - # --#$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. - # - #($avg_1_minute, $avg_5_minutes, $avg_15_minutes) = --# $uptime =~ /average:\s+(\S+),\s+(\S+),\s+(\S+)/; -+# $uptime =~ /averages:\s+(\S+),\s+(\S+),\s+(\S+)/; - # - #exit 75 if ($avg_15_minutes >= $max_loadavg); # E_TEMPFAIL - # -@@ -190,7 +186,7 @@ - # majordomo has r/w permission to. - # Uses the environment variable TMPDIR, since that's pretty common - # --$TMPDIR = $ENV{'TMPDIR'} || "/usr/tmp"; -+$TMPDIR = '%%PREFIX%%/majordomo/tmp'; - - # Tune how long set_lock tries to obtain a lock before giving up. Each - # attempt waits 1 to 10 seconds before trying again and waittime is diff --git a/mail/majordomo/files/patch-ac b/mail/majordomo/files/patch-ac deleted file mode 100644 index ef2d21cd3e2a..000000000000 --- a/mail/majordomo/files/patch-ac +++ /dev/null @@ -1,38 +0,0 @@ ---- 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"; -+ -+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); - -@@ -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. --$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 --git a/mail/majordomo/files/patch-approve b/mail/majordomo/files/patch-approve deleted file mode 100644 index bbaab3dec755..000000000000 --- a/mail/majordomo/files/patch-approve +++ /dev/null @@ -1,14 +0,0 @@ ---- ./approve.orig 2013-11-24 18:53:39.307114948 +0400 -+++ ./approve 2013-11-24 18:45:58.000000000 +0400 -@@ -70,9 +70,9 @@ - if !$MAILER; - - --require "getopts.pl"; -+use Getopt::Std; - --&Getopts("df:") || -+getopts("df:") || - die("USAGE: approve [-f <config-file>] [-d] [<file> ...]\nStopped"); - - if (!defined($opt_f)) { diff --git a/mail/majordomo/files/patch-archive2.pl b/mail/majordomo/files/patch-archive2.pl deleted file mode 100644 index 4932066dbecb..000000000000 --- a/mail/majordomo/files/patch-archive2.pl +++ /dev/null @@ -1,29 +0,0 @@ ---- ./archive2.pl.orig 2013-11-24 18:52:35.932149986 +0400 -+++ ./archive2.pl 2013-11-24 18:49:56.000000000 +0400 -@@ -74,7 +74,7 @@ - - # All these should be in the standard PERL library - unshift(@INC, $homedir); --require "ctime.pl"; # To get MoY definitions for month abbrevs -+use POSIX qw(ctime); - require "majordomo_version.pl"; # What version of Majordomo is this? - require "majordomo.pl"; # all sorts of general-purpose Majordomo subs - require "shlock.pl"; # NNTP-style file locking -@@ -85,7 +85,7 @@ - - # Here's where the fun begins... - --require "getopts.pl"; -+use Getopt::Std; - - $m = 1; - foreach (@ctime'MoY) { -@@ -94,7 +94,7 @@ - - $usage = "Usage: $0 -f <file> {-u|-a} [-d|-D|-m|-M|-y|-Y] [file ...]"; - --&Getopts("f:uadDmMyY") || die("$usage\nStopped"); -+getopts("f:uadDmMyY") || die("$usage\nStopped"); - - if (!defined($opt_f)) { - print STDERR "'-f <list>' required\n$usage\n"; diff --git a/mail/majordomo/files/patch-ba b/mail/majordomo/files/patch-ba deleted file mode 100644 index 286a50cc963f..000000000000 --- a/mail/majordomo/files/patch-ba +++ /dev/null @@ -1,38 +0,0 @@ ---- 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; - } - --$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 deleted file mode 100644 index ddf7f2140d12..000000000000 --- a/mail/majordomo/files/patch-bb +++ /dev/null @@ -1,11 +0,0 @@ ---- bounce.orig Wed Sep 18 02:38:02 1996 -+++ bounce Wed Sep 10 00:57:15 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 deleted file mode 100644 index 66a551a45318..000000000000 --- a/mail/majordomo/files/patch-bc +++ /dev/null @@ -1,35 +0,0 @@ ---- 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"; - 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 deleted file mode 100644 index 10f3814797b5..000000000000 --- a/mail/majordomo/files/patch-bd +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - # 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 deleted file mode 100644 index 2d8146c9b244..000000000000 --- a/mail/majordomo/files/patch-be +++ /dev/null @@ -1,23 +0,0 @@ ---- 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"); - } - --$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 deleted file mode 100644 index 73db454f3935..000000000000 --- a/mail/majordomo/files/patch-bf +++ /dev/null @@ -1,44 +0,0 @@ ---- majordomo.orig Thu Jan 13 18:29:31 2000 -+++ majordomo Mon Jul 23 03:28:21 2001 -@@ -64,6 +64,7 @@ - require "majordomo.pl"; # all sorts of general-purpose Majordomo subs - require "shlock.pl"; # NNTP-style file locking - require "config_parse.pl"; # functions to parse the config files -+use Digest::MD5 qw( md5_hex ); - - print STDERR "$0: requires succeeded. Setting defaults.\n" if $DEBUG; - -@@ -75,7 +76,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; -@@ -405,9 +406,6 @@ - # making the request. - # - if (! $approved -- && ! ((&addr_match($reply_to, $subscriber, -- (&cf_ck_bool($clean_list,"mungedomain") -- ? 2 : undef)))) - && (($unsub_policy =~ /confirm/) - && (&gen_cookie($sm, $clean_list, $subscriber) ne $auth_info))) - { -@@ -1907,13 +1905,7 @@ - # joining that goes on, we need to ignore whitespace. - $combined =~ s/\s//g; - -- for ($i = 0; $i < length($combined); $i++) { -- $cookie ^= ord(substr($combined, $i)); -- $carry = ($cookie >> 28) & 0xf; -- $cookie <<= 4; -- $cookie |= $carry; -- } -- return (sprintf("%08x", $cookie)); -+ return md5_hex( $combined ); - } - - diff --git a/mail/majordomo/files/patch-bg b/mail/majordomo/files/patch-bg deleted file mode 100644 index 396b9ab46a3c..000000000000 --- a/mail/majordomo/files/patch-bg +++ /dev/null @@ -1,11 +0,0 @@ ---- 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"; - $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 deleted file mode 100644 index 77caae090df6..000000000000 --- a/mail/majordomo/files/patch-bh +++ /dev/null @@ -1,38 +0,0 @@ ---- 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. --$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 deleted file mode 100644 index 1c97b28e878c..000000000000 --- a/mail/majordomo/files/patch-bi +++ /dev/null @@ -1,48 +0,0 @@ ---- 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. --$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"); -@@ -936,7 +948,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 deleted file mode 100644 index 31733f74a053..000000000000 --- a/mail/majordomo/files/patch-bj +++ /dev/null @@ -1,62 +0,0 @@ ---- approve.orig 2011-03-08 14:31:12.422976680 +0100 -+++ approve 2011-03-08 14:31:06.810610862 +0100 -@@ -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!" -@@ -137,6 +137,7 @@ - - sub process_approve { - local($FILE) = shift; -+ my @words; - while (<$FILE>) { - if ((/^\tsubscribe\s/) || (/^\tunsubscribe\s/)) { - if (!defined($reply_to)) { -@@ -144,8 +145,8 @@ - exit(1); - } - s/^\t//; -- split; -- $list = $_[1]; -+ @words = split; -+ $list = $words[1]; - $list =~ tr/A-Z/a-z/; - $passwd = $passwd{"$list\@$reply_to"}; - if (! $passwd) { -@@ -214,6 +215,11 @@ - $from_skipped = 1; - next; - } -+ if (/^delivered-to: $post_to/i) { -+ # Remove Delivered-To: lines that point to the list, since they -+ # will cause postfix to think that the message is looping. -+ next; -+ } - s/^~/~~/; - print MAIL $_; - } -@@ -231,12 +237,13 @@ - s/\n$//; - s/#.*//; - if (/^$/) { next; } -- split; -- $l = $_[0]; $l =~ tr/A-Z/a-z/; # list -- $p = $_[1]; # password -- $m = $_[2]; $m =~ tr/A-Z/a-z/; # majordomo@site -- split(/\@/, $m); -- $s = $_[1]; $s =~ tr/A-Z/a-z/; # site -+ my @words = split; -+ -+ $l = $words[0]; $l =~ tr/A-Z/a-z/; # list -+ $p = $words[1]; # password -+ $m = $words[2]; $m =~ tr/A-Z/a-z/; # majordomo@site -+ @words = split(/\@/, $m); -+ $s = $words[1]; $s =~ tr/A-Z/a-z/; # site - - $passwd{$l} = $p; - $passwd{"$l\@$m"} = $p; diff --git a/mail/majordomo/files/patch-config-test b/mail/majordomo/files/patch-config-test deleted file mode 100644 index 0f1d6c805865..000000000000 --- a/mail/majordomo/files/patch-config-test +++ /dev/null @@ -1,13 +0,0 @@ ---- ./config-test.orig 2013-11-24 18:52:22.394976553 +0400 -+++ ./config-test 2013-11-24 18:49:26.000000000 +0400 -@@ -7,8 +7,8 @@ - # execute this by cd to your majordomo dir, then 'wrapper config-test' - # - --@requires = ( "ctime.pl", -- "majordomo_version.pl", -+use POSIX qw(ctime); -+@requires = ( "majordomo_version.pl", - "majordomo.pl", - "shlock.pl", - "config_parse.pl", diff --git a/mail/majordomo/files/patch-contrib__sequencer b/mail/majordomo/files/patch-contrib__sequencer deleted file mode 100644 index 2ab3bb8a4a2c..000000000000 --- a/mail/majordomo/files/patch-contrib__sequencer +++ /dev/null @@ -1,18 +0,0 @@ ---- ./contrib/sequencer.orig 2013-11-24 18:53:58.067356022 +0400 -+++ ./contrib/sequencer 2013-11-24 18:48:32.000000000 +0400 -@@ -59,13 +59,13 @@ - - chdir($homedir) || die("Can't chdir(\"$homedir\"): $!"); - unshift(@INC, $homedir); -+use Getopt::Std; - require "majordomo.pl"; - require "majordomo_version.pl"; --require "getopts.pl"; - require "config_parse.pl"; - require "shlock.pl"; - --&Getopts("Aa:df:h:I:l:m:M:nNp:Rr:s") || die("sequencer: Getopts() failed: $!"); -+getopts("Aa:df:h:I:l:m:M:nNp:Rr:s") || die("sequencer: Getopts() failed: $!"); - - if (! defined($opt_l) || ! defined($opt_h)) { - die("sequencer: must specify both '-l list' and '-h host' arguments"); diff --git a/mail/majordomo/files/patch-majordomo b/mail/majordomo/files/patch-majordomo deleted file mode 100644 index b5cab6bf966b..000000000000 --- a/mail/majordomo/files/patch-majordomo +++ /dev/null @@ -1,11 +0,0 @@ ---- ./majordomo.orig 2013-11-24 18:52:53.333372091 +0400 -+++ ./majordomo 2013-11-24 18:50:33.000000000 +0400 -@@ -71,7 +71,7 @@ - - # All these should be in the standard PERL library - unshift(@INC, $homedir); --require "ctime.pl"; # To get MoY definitions for month abbrevs -+use POSIX qw(ctime); # To get MoY definitions for month abbrevs - require "majordomo_version.pl"; # What version of Majordomo is this? - require "majordomo.pl"; # all sorts of general-purpose Majordomo subs - require "shlock.pl"; # NNTP-style file locking diff --git a/mail/majordomo/files/patch-majordomo.pl b/mail/majordomo/files/patch-majordomo.pl deleted file mode 100644 index e621377bacbf..000000000000 --- a/mail/majordomo/files/patch-majordomo.pl +++ /dev/null @@ -1,47 +0,0 @@ ---- majordomo.pl.orig 2011-03-08 14:26:57.730103144 +0100 -+++ majordomo.pl 2011-03-08 14:27:45.390265818 +0100 -@@ -44,7 +44,7 @@ - - sub main'ParseMailHeader ## Public - { -- local($save1, $save2) = ($*, $/); -+ local($save) = ($/); - local($FH, *array) = @_; - local ($keyw, $val); - -@@ -54,7 +54,7 @@ - local($package) = caller; - $FH =~ s/^[^':]+$/$package'$&/; - -- ($*, $/) = (1, ''); -+ $/ = ''; - $array = $_ = <$FH>; - s/\n\s+/ /g; - -@@ -69,7 +69,7 @@ - $array{$keyw} = $val; - } - } -- ($*, $/) = ($save1, $save2); -+ $/ = $save; - } - - -@@ -95,14 +95,14 @@ - local($_) = shift; - 1 while s/\([^\(\)]*\)//g; # strip comments - 1 while s/"[^"]*"\s//g; # strip comments" -- split(/,/); # split into parts -- foreach (@_) { -+ my @parts = split(/,/); # split into parts -+ foreach (@parts) { - 1 while s/.*<(.*)>.*/$1/; - s/^\s+//; - s/\s+$//; - } - -- @_; -+ @parts; - } - - # Check to see if a list is valid. If it is, return the validated list diff --git a/mail/majordomo/files/patch-md-sub__md-sub.cgi b/mail/majordomo/files/patch-md-sub__md-sub.cgi deleted file mode 100644 index def15deb0ecb..000000000000 --- a/mail/majordomo/files/patch-md-sub__md-sub.cgi +++ /dev/null @@ -1,20 +0,0 @@ ---- ./md-sub/md-sub.cgi.orig 2013-11-24 18:54:07.634476295 +0400 -+++ ./md-sub/md-sub.cgi 2013-11-24 18:47:15.000000000 +0400 -@@ -78,7 +78,7 @@ - # - # Required file - require 'cgi-lib.pl'; --require 'getopts.pl'; -+use Getopt::Std; - - # - # Version number -@@ -90,7 +90,7 @@ - - # - # Call Getopts --&Getopts( 'C:v'); -+getopts( 'C:v'); - - # - # Check to see if we are creating a DB diff --git a/mail/majordomo/files/patch-resend b/mail/majordomo/files/patch-resend deleted file mode 100644 index 1bf709eed553..000000000000 --- a/mail/majordomo/files/patch-resend +++ /dev/null @@ -1,23 +0,0 @@ ---- ./resend.orig 2013-11-24 18:53:15.076805222 +0400 -+++ ./resend 2013-11-24 18:50:15.000000000 +0400 -@@ -71,8 +71,9 @@ - # getopts.pl was place where it's supposed to be. This changes previous - # behavior which allowed getopts.pl to be in the same place as - # majordomo.cf. --require "getopts.pl"; --&Getopts("C:c:Aa:df:h:I:l:M:p:Rr:s") || die("resend: Getopts() failed: $!"); -+use Getopt::Std; -+ -+getopts("C:c:Aa:df:h:I:l:M:p:Rr:s") || die("resend: Getopts() failed: $!"); - - if (! defined($opt_l)) { - die("resend: must specify '-l list'"); -@@ -105,7 +106,7 @@ - chdir($homedir) || die("Can't chdir(\"$homedir\"): $!"); - - unshift(@INC, $homedir); --require "ctime.pl"; # For logging purposes -+use POSIX qw(ctime); # For logging purposes - require "majordomo.pl"; - require "majordomo_version.pl"; - require "config_parse.pl"; diff --git a/mail/majordomo/files/patch-sec1 b/mail/majordomo/files/patch-sec1 deleted file mode 100644 index d13161a1aefd..000000000000 --- a/mail/majordomo/files/patch-sec1 +++ /dev/null @@ -1,87 +0,0 @@ ---- bounce-remind Mon Jan 3 14:35:32 2000 -+++ bounce-remind.new Mon Jan 3 14:38:16 2000 -@@ -24,10 +24,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; -+} - - # Go to the home directory specified by the .cf file - chdir("$homedir"); ---- config-test.orig Wed Aug 27 08:17:13 1997 -+++ config-test Wed Jan 5 01:41:37 2000 -@@ -119,10 +119,21 @@ - - $cf = $ARGV[0] || $ENV{'MAJORDOMO_CF'}; - --if (eval "require '$cf'") { -- &good("'require'd $cf okay."); --} else { -- &bad("something's wrong with $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; - } - - foreach (@requires) { ---- majordomo Mon Jan 3 13:37:13 2000 -+++ majordomo.new Mon Jan 3 14:15:29 2000 -@@ -40,11 +40,23 @@ - die "Unknown argument $ARGV[0]\n"; - } - } --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; -+} - - # Go to the home directory specified by the .cf file - chdir("$homedir") || die "chdir to $homedir failed, $!\n"; diff --git a/mail/majordomo/files/post-install-notes b/mail/majordomo/files/post-install-notes deleted file mode 100644 index 8da1f39db8f7..000000000000 --- a/mail/majordomo/files/post-install-notes +++ /dev/null @@ -1,43 +0,0 @@ -Post-Install Notes for Majordomo -================================ - -Before you can use Majordomo, you will need to complete a few steps -manually: - - - customize 'majordomo.cf' in your majordomo directory - - - look at 'aliases.majordomo-sample' in your majordomo directory for - examples of how to create lists. Before editing, copy this list to - where you keep your alias files (for example, copy it to - /etc/aliases.majordomo. A test list (test-l) has been created and - configured for you. Be sure to remove this list if you do not want - to use it for testing. - - - substitute your own email address for "Postmaster" for the - "majordomo-owner" alias. - - - add 'aliases.majordomo' to your sendmail configuration. This can - be done by adding a line similar to the following to - /etc/mail/sendmail.cf and /etc/mail/submit.cf: - - OA/etc/aliases.majordomo - (for 8.6.x Sendmail) - - O AliasFile=/etc/aliases,/etc/aliases.majordomo - (for 8.7.x and up) - - or a line similar to the following to your m4 macros file : - - define(`ALIAS_FILE',`/etc/aliases,/etc/aliases.majordomo') - - Sendmail will need a restart after this. - - - consider using ports/mail/tlb to process your deliveries if you - want to hide your outgoing aliases. This way you can prevent people - from evading restrictions for posting to your lists. - - - to prepare proper permissions for the wrapper script, run - ports/mail/majordomo/scripts/adaptwrapper (if it has not already - been run) - -Enjoy Majordomo! diff --git a/mail/majordomo/files/postfix-approve-patch b/mail/majordomo/files/postfix-approve-patch deleted file mode 100644 index 9a648b617532..000000000000 --- a/mail/majordomo/files/postfix-approve-patch +++ /dev/null @@ -1,10 +0,0 @@ ---- approve.orig Mon Jul 23 01:44:46 2001 -+++ approve Mon Jul 23 01:45:07 2001 -@@ -214,6 +214,7 @@ - $from_skipped = 1; - next; - } -+ next if /^Delivered-To: /i; - s/^~/~~/; - print MAIL $_; - } diff --git a/mail/majordomo/files/test-l.info b/mail/majordomo/files/test-l.info deleted file mode 100644 index 41fec21c5da9..000000000000 --- a/mail/majordomo/files/test-l.info +++ /dev/null @@ -1,4 +0,0 @@ -This is a tester list installed with the FreeBSD port of majordomo. - -See ~majordom/doc/post-install-notes for more detail. - diff --git a/mail/majordomo/files/test-l.passwd b/mail/majordomo/files/test-l.passwd deleted file mode 100644 index 9daeafb9864c..000000000000 --- a/mail/majordomo/files/test-l.passwd +++ /dev/null @@ -1 +0,0 @@ -test |