From db468c1ae19a44b9e7ea91ad549f90f31757c39a Mon Sep 17 00:00:00 2001 From: Dirk Meyer Date: Thu, 31 Dec 2020 12:14:42 +0000 Subject: [PATCH] - add patch for enabling foreground operation without debug PR: 250708 Submitted by: dewayne@heuristicsystems.com.au --- mail/milter-regex/Makefile | 2 +- mail/milter-regex/files/patch-foreground | 39 ++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 mail/milter-regex/files/patch-foreground diff --git a/mail/milter-regex/Makefile b/mail/milter-regex/Makefile index 81705326b448..a6d3da486a54 100644 --- a/mail/milter-regex/Makefile +++ b/mail/milter-regex/Makefile @@ -3,7 +3,7 @@ PORTNAME= milter-regex PORTVERSION= 2.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= https://www.benzedrine.ch/ diff --git a/mail/milter-regex/files/patch-foreground b/mail/milter-regex/files/patch-foreground new file mode 100644 index 000000000000..71d8388c6005 --- /dev/null +++ b/mail/milter-regex/files/patch-foreground @@ -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; + }