This is a new port of maildrop, a replacement local mail delivery agent. Maildrop is similar to procmail but features many improvements.
On Mon, Nov 16, 1998 at 09:35:27PM -0000, I wrote: > > This is a new port of maildrop, a replacement local mail delivery agent. > Maildrop is similar to procmail but features many improvements. Maildrop 0.60 has now been released. I am sending patches which should be applied to my original (0.55c) submission to upgrade the port. Please note: The scripts directory and the file contained within it (post-patch) have been removed. Thanks, Tom diff -ruN maildrop.bak/Makefile maildrop/Makefile --- maildrop.bak/Makefile Mon Nov 30 16:31:14 1998 +++ maildrop/Makefile Mon Nov 30 16:30:47 1998 @@ -1,14 +1,15 @@ # New ports collection makefile for: maildrop -# Version required: 0.55c +# Version required: 0.60 # Date created: 16 November 1998 # Whom: Tom Hukins <tom@eborcom.com> # # $Id$ # -DISTNAME= maildrop-0.55c +DISTNAME= maildrop-0.60 CATEGORIES= mail -MASTER_SITES= http://www.geocities.com/SiliconValley/Peaks/5799/ +MASTER_SITES= ${MASTER_SITE_SUNSITE} +MASTER_SITE_SUBDIR= system/mail/mailhandlers MAINTAINER= tom@eborcom.com @@ -41,5 +42,11 @@ MAN5= maildropex.5 maildropfilter.5 MANCOMPRESSED= yes .endif + +post-patch: +.for file in README.html maildrop.1 maildrop.html maildropfilter.5 maildropfilter.html main.C recipenode.C + @${MV} ${WRKSRC}/${file} ${WRKSRC}/${file}.bak + @${SED} < ${WRKSRC}/${file}.bak > ${WRKSRC}/${file} s+!!PREFIX!!+${PREFIX}+g +.endfor .include <bsd.port.mk> diff -ruN maildrop.bak/files/md5 maildrop/files/md5 --- maildrop.bak/files/md5 Mon Nov 30 16:31:14 1998 +++ maildrop/files/md5 Thu Nov 26 16:46:23 1998 @@ -1 +1 @@ -MD5 (maildrop-0.55c.tar.gz) = 4cde4a505ca9d9a5c00b29219d764e65 +MD5 (maildrop-0.60.tar.gz) = 6751c4978733f4cffbd5336d74a51a70 diff -ruN maildrop.bak/patches/patch-aa maildrop/patches/patch-aa --- maildrop.bak/patches/patch-aa Mon Nov 30 16:31:14 1998 +++ maildrop/patches/patch-aa Mon Nov 30 16:13:59 1998 @@ -18,15 +18,15 @@ Fixed obscure bug that can trash a file descriptor.</LI> <BR> ---- maildrop.1.orig Fri Oct 30 05:15:08 1998 -+++ maildrop.1 Fri Nov 13 13:29:13 1998 -@@ -257,12 +257,12 @@ +--- maildrop.1.orig Tue Nov 17 02:49:53 1998 ++++ maildrop.1 Mon Nov 30 16:10:57 1998 +@@ -253,12 +253,12 @@ If $HOME/.mailfilter does not exist, \fImaildrop\fP will simply deliver the message to the user's mailbox. .PP --If the file /etc/maildroprc exists, \fImaildrop\fP will first read -+If the file !!PREFIX!!/etc/maildroprc exists, \fImaildrop\fP will first read - filtering instructions from this file, before reading $HOME/.mailfilter. +-If the file /etc/maildroprc exists, \fImaildrop\fP will read filtering ++If the file !!PREFIX!!/etc/maildroprc exists, \fImaildrop\fP will read filtering + instructions from this file first, before reading $HOME/.mailfilter. This allows the system administrator to provide global filtering instructions for all users. .PP @@ -35,43 +35,47 @@ .PP .br .br -@@ -300,21 +300,21 @@ - statement, and the \fIEXITCODE\fP environment variable. +@@ -296,23 +296,23 @@ + EXITCODE environment variable. .br .br -.SH "/ETC/MAILDROPRCS IN EMBEDDED MODE +.SH "MAILDROPRCS IN EMBEDDED MODE - This is a new feature to version 0.55. If while running in embedded mode - \fImaildrop\fP encounters an include --statement where the filename begins with /etc/maildroprcs/, the -+statement where the filename begins with !!PREFIX!!/etc/maildroprcs/, the - above restrictions for the embedded mode are suspended for the filter file --in the /etc/maildroprcs directory, and any additional filter files -+in the !!PREFIX!!/etc/maildroprcs directory, and any additional filter files - that are included from there. The restrictions are reenabled once the \fImaildrop\fP --finishes executing the filter file from /etc/maildroprcs. -+finishes executing the filter file from !!PREFIX!!/etc/maildroprcs. - .PP - This is primarily intended so that the system administrator to have - a controlled environment for running external commands (via the backticks, - or the xfilter command). + This is a new feature to version 0.55. If \fImaildrop\fP encounters an include +-statement where the filename starts with /etc/maildroprcs/, the ++statement where the filename starts with !!PREFIX!!/etc/maildroprcs/, the + normal restrictions for the embedded mode are suspended while executing +-the filter file in the /etc/maildroprcs directory. The restrictions ++the filter file in the !!PREFIX!!/etc/maildroprcs directory. The restrictions + are also suspended for any additional filter files that are included from +-/etc/maildroprcs. The restrictions resume once \fImaildrop\fP finishes +-executing the file from /etc/maildroprcs. ++!!PREFIX!!/etc/maildroprcs. The restrictions resume once \fImaildrop\fP finishes ++executing the file from !!PREFIX!!/etc/maildroprcs. + .PP + This allows the system administrator to have a controlled environment + for running external commands (via the backticks, or the xfilter + command). .PP The name of the file may not contain any periods (so that a creative -individual can't write include "/etc/maildroprcs/../../home/user/recipe"). +individual can't write include "!!PREFIX!!/etc/maildroprcs/../../home/user/recipe"). .PP - Before running the recipe, \fImaildrop\fP will automatically reset the following - variables to their initial values: DEFAULT, HOME, LOCKEXT, -@@ -323,7 +323,7 @@ - PATH, - SENDMAIL, and SHELL. Please note that the previous values - of these variables (if they were changed) will NOT be restored once \fImaildrop\fP --finishes executing the recipe in /etc/maildroprcs. -+finishes executing the recipe in !!PREFIX!!/etc/maildroprcs. +-Before executing the commands in the /etc/maildroprcs file, ++Before executing the commands in the !!PREFIX!!/etc/maildroprcs file, + \fImaildrop\fP automatically resets the following variables to their initial + values: DEFAULT, HOME, LOCKEXT, + LOCKSLEEP, +@@ -322,7 +322,7 @@ + SENDMAIL, + and SHELL. Please note that the previous values of these variables + (if they were changed) will NOT be restored once \fImaildrop\fP finishes executing +-the commands from /etc/maildroprcs. ++the commands from !!PREFIX!!/etc/maildroprcs. .br .br .SH "WATCHDOG TIMER -@@ -339,7 +339,7 @@ +@@ -338,14 +338,14 @@ to set user's home directory, and related variables. If NIS/YP is install, that will be used as well. .TP 14 @@ -80,15 +84,23 @@ global filtering instructions for delivery mode. .TP 14 .B "/var/spool/mail ---- maildrop.html.orig Fri Oct 30 05:15:08 1998 -+++ maildrop.html Fri Nov 13 13:31:00 1998 -@@ -241,11 +241,11 @@ - if it does). + system mailbox (actual directory defined by + the system administrator). + .TP 14 +-.B "/usr/lib/sendmail ++.B "/usr/sbin/sendmail + program to forward mail (exact program defined + by the system administrator). + .TP 14 +--- maildrop.html.orig Mon Nov 30 16:02:00 1998 ++++ maildrop.html Mon Nov 30 16:11:24 1998 +@@ -238,11 +238,11 @@ + or global permissions (<I>maildrop</I> terminates if it does). <P>If <TT>$HOME/.mailfilter</TT> does not exist, <I>maildrop</I> will simply deliver the message to the user's mailbox. --<P>If the file <TT>/etc/maildroprc</TT> exists, <I>maildrop</I> will first read -+<P>If the file <TT>!!PREFIX!!/etc/maildroprc</TT> exists, <I>maildrop</I> will first read - filtering instructions from this file, before reading <TT>$HOME/.mailfilter</TT>. +-<P>If the file <TT>/etc/maildroprc</TT> exists, <I>maildrop</I> will read filtering ++<P>If the file <TT>!!PREFIX!!/etc/maildroprc</TT> exists, <I>maildrop</I> will read filtering + instructions from this file first, before reading <TT>$HOME/.mailfilter</TT>. This allows the system administrator to provide global filtering instructions for all users. -<P>NOTE - <TT>/etc/maildroprc</TT> is read only in delivery mode. @@ -96,49 +108,52 @@ <P><A NAME="embedded"></A> <BR><BR> <H2> -@@ -290,19 +290,19 @@ - statement, and the <I>EXITCODE</I> environment variable. +@@ -287,20 +287,20 @@ + <TT>EXITCODE</TT> environment variable. <BR><BR> <H2> -<TT>/ETC/MAILDROPRCS</TT> IN EMBEDDED MODE</H2> +<TT>MAILDROPRCS</TT> IN EMBEDDED MODE</H2> - This is a new feature to version 0.55. If while running in embedded mode - <I>maildrop</I> encounters an <A HREF="maildropfilter.html#include">include</A> --statement where the filename begins with <TT>/etc/maildroprcs/</TT>, the -+statement where the filename begins with <TT>!!PREFIX!!/etc/maildroprcs/</TT>, the - above restrictions for the embedded mode are suspended for the filter file --in the <TT>/etc/maildroprcs</TT> directory, and any additional filter files -+in the <TT>!!PREFIX!!/etc/maildroprcs</TT> directory, and any additional filter files - that are included from there. The restrictions are reenabled once the <I>maildrop</I> --finishes executing the filter file from <TT>/etc/maildroprcs</TT>. -+finishes executing the filter file from <TT>!!PREFIX!!/etc/maildroprcs</TT>. - <P>This is primarily intended so that the system administrator to have - a controlled environment for running external commands (via the backticks, - or the <A HREF="maildropfilter.html#xfilter">xfilter</A> command). + This is a new feature to version 0.55. If <I>maildrop</I> encounters an <A HREF="maildropfilter.html#include">include</A> +-statement where the filename starts with <TT>/etc/maildroprcs/</TT>, the ++statement where the filename starts with <TT>!!PREFIX!!/etc/maildroprcs/</TT>, the + normal restrictions for the embedded mode are suspended while executing +-the filter file in the <TT>/etc/maildroprcs</TT> directory. The restrictions ++the filter file in the <TT>!!PREFIX!!/etc/maildroprcs</TT> directory. The restrictions + are also suspended for any additional filter files that are included from +-<TT>/etc/maildroprcs</TT>. The restrictions resume once <I>maildrop</I> finishes +-executing the file from <TT>/etc/maildroprcs</TT>. ++<TT>!!PREFIX!!/etc/maildroprcs</TT>. The restrictions resume once <I>maildrop</I> finishes ++executing the file from <TT>!!PREFIX!!/etc/maildroprcs</TT>. + <P>This allows the system administrator to have a controlled environment + for running external commands (via the backticks, or the <A HREF="maildropfilter.html#xfilter">xfilter</A> + command). <P>The name of the file may not contain any periods (so that a creative -individual can't write <TT>include "/etc/maildroprcs/../../home/user/recipe"</TT>). +-<P>Before executing the commands in the <TT>/etc/maildroprcs</TT> file, +individual can't write <TT>include "!!PREFIX!!/etc/maildroprcs/../../home/user/recipe"</TT>). - <P>Before running the recipe, <I>maildrop</I> will automatically reset the following - variables to their initial values: <TT>DEFAULT</TT>, <TT>HOME</TT>, <TT>LOCKEXT</TT>, ++<P>Before executing the commands in the <TT>!!PREFIX!!/etc/maildroprcs</TT> file, + <I>maildrop</I> automatically resets the following variables to their initial + values: <TT>DEFAULT</TT>, <TT>HOME</TT>, <TT>LOCKEXT</TT>, <TT>LOCKSLEEP</TT>, @@ -310,7 +310,7 @@ - <TT>PATH</TT>, - <TT>SENDMAIL</TT>, and <TT>SHELL</TT>. Please note that the previous values - of these variables (if they were changed) will NOT be restored once <I>maildrop</I> --finishes executing the recipe in <TT>/etc/maildroprcs</TT>. -+finishes executing the recipe in <TT>!!PREFIX!!/etc/maildroprcs</TT>. + <TT>SENDMAIL</TT>, + and <TT>SHELL</TT>. Please note that the previous values of these variables + (if they were changed) will NOT be restored once <I>maildrop</I> finishes executing +-the commands from <TT>/etc/maildroprcs</TT>. ++the commands from <TT>!!PREFIX!!/etc/maildroprcs</TT>. <BR><BR> <H2> WATCHDOG TIMER</H2> -@@ -328,7 +328,7 @@ - If NIS/YP is install, that will be used as well.</LI> +@@ -335,7 +335,7 @@ + the system administrator).</LI> <LI> --<TT>/etc/maildroprc</TT> - global filtering instructions for delivery mode.</LI> -+<TT>!!PREFIX!!/etc/maildroprc</TT> - global filtering instructions for delivery mode.</LI> +-<TT>/usr/lib/sendmail</TT> - program to forward mail (exact program defined ++<TT>/usr/sbin/sendmail</TT> - program to forward mail (exact program defined + by the system administrator).</LI> <LI> - <TT>/var/spool/mail</TT> - system mailbox (actual directory defined by --- maildropfilter.5.orig Fri Oct 30 05:15:08 1998 +++ maildropfilter.5 Fri Nov 13 13:32:08 1998 @@ -14,7 +14,7 @@ diff -ruN maildrop.bak/scripts/post-patch maildrop/scripts/post-patch --- maildrop.bak/scripts/post-patch Mon Nov 30 16:31:15 1998 +++ maildrop/scripts/post-patch Thu Jan 1 01:00:00 1970 @@ -1,14 +0,0 @@ -#!/bin/sh -# -# Convert !!PREFIX!! to ${PREFIX} in patched files -# - -FILES="README.html maildrop.1 maildrop.html maildropfilter.5 \ - maildropfilter.html main.C recipenode.C" - -cd ${WRKSRC} - -for f in $FILES; do - mv $f $f.bak && - sed <$f.bak >$f s+!!PREFIX!!+$PREFIX+g -done
State Changed From-To: open->closed New port committed, thanks!