Index: head/mail/milter-regex/Makefile =================================================================== --- head/mail/milter-regex/Makefile (revision 559725) +++ head/mail/milter-regex/Makefile (revision 559726) @@ -1,45 +1,45 @@ # Created by: trevor # $FreeBSD$ PORTNAME= milter-regex PORTVERSION= 2.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= https://www.benzedrine.ch/ MAINTAINER= dinoex@FreeBSD.org COMMENT= Milter plugin to sendmail for regular expression filtering LICENSE= BSD2CLAUSE LICENSE_FILE= ${FILESDIR}/COPYRIGHT USE_RC_SUBR= milterregex SUB_LIST= SPOOLDIR=${SPOOLDIR} PLIST_SUB= SPOOLDIR=${SPOOLDIR} MAILUSER?= mailnull SPOOLDIR?= /var/run/milter-regex .include .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk" post-patch: ${REINPLACE_CMD} -e \ "s:/etc/milter-regex.conf:${PREFIX}/etc/milter-regex.conf:g; \ s:/var/spool/milter-regex:${SPOOLDIR}:g; \ s:_milter-regex:${MAILUSER}:g;" ${WRKSRC}/milter-regex.c ${REINPLACE_CMD} -e \ "s:/etc/milter-regex.conf:${PREFIX}/etc/milter-regex.conf:g; \ s:/var/spool/milter-regex:${SPOOLDIR}:g; \ s:mailstats 1:mailstats 8:;" ${WRKSRC}/milter-regex.8 ${REINPLACE_CMD} -e "s:-I/usr/src/gnu/usr.sbin/sendmail/include::g; \ s:-L/usr/local/lib:-L${LOCALBASE}/lib:g; \ s/-Werror//g" ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/milter-regex ${STAGEDIR}${PREFIX}/libexec/ ${INSTALL_MAN} ${WRKSRC}/milter-regex.8 ${STAGEDIR}${PREFIX}/man/man8/ ${MKDIR} ${STAGEDIR}${SPOOLDIR} .include Index: head/mail/milter-regex/files/patch-foreground =================================================================== --- head/mail/milter-regex/files/patch-foreground (nonexistent) +++ head/mail/milter-regex/files/patch-foreground (revision 559726) @@ -0,0 +1,39 @@ +--- milter-regex.c.orig 2020-10-07 13:25:30.000000000 +1100 ++++ milter-regex.c 2020-10-07 13:26:01.000000000 +1100 +@@ -61,7 +61,7 @@ + size_t); + + static const char *rule_file_name = "/etc/milter-regex.conf"; +-static int debug = 0; ++static int debug = 0, foreground = 0; + static unsigned maxlines = 0; + static pthread_mutex_t mutex; + +@@ -697,7 +697,7 @@ + int test_ruleset = 0; + FILE *f = NULL; + +- while ((ch = getopt(argc, argv, "c:df:j:l:m:p:r:tu:G:P:U:")) != -1) { ++ while ((ch = getopt(argc, argv, "c:dFf:j:l:m:p:r:tu:G:P:U:")) != -1) { + switch (ch) { + case 'c': + rule_file_name = optarg; +@@ -705,6 +705,9 @@ + case 'd': + debug = 1; + break; ++ case 'F': ++ foreground = 1; ++ break; + case 'f': { + int i; + +@@ -863,7 +866,7 @@ + } + + /* daemonize (detach from controlling terminal) */ +- if (!debug && daemon(0, 0)) { ++ if ( !debug && !foreground && daemon(0, 0)) { + perror("daemon"); + goto done; + } Property changes on: head/mail/milter-regex/files/patch-foreground ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property