Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 31 Dec 2020 12:14:42 +0000 (UTC)
From:      Dirk Meyer <dinoex@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r559726 - in head/mail/milter-regex: . files
Message-ID:  <202012311214.0BVCEgeK082248@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dinoex
Date: Thu Dec 31 12:14:42 2020
New Revision: 559726
URL: https://svnweb.freebsd.org/changeset/ports/559726

Log:
  - add patch for enabling foreground operation without debug
  PR:		250708
  Submitted by:	dewayne@heuristicsystems.com.au

Added:
  head/mail/milter-regex/files/patch-foreground   (contents, props changed)
Modified:
  head/mail/milter-regex/Makefile

Modified: head/mail/milter-regex/Makefile
==============================================================================
--- head/mail/milter-regex/Makefile	Thu Dec 31 12:08:26 2020	(r559725)
+++ head/mail/milter-regex/Makefile	Thu Dec 31 12:14:42 2020	(r559726)
@@ -3,7 +3,7 @@
 
 PORTNAME=	milter-regex
 PORTVERSION=	2.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	https://www.benzedrine.ch/
 

Added: head/mail/milter-regex/files/patch-foreground
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/milter-regex/files/patch-foreground	Thu Dec 31 12:14:42 2020	(r559726)
@@ -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;
+ 	}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012311214.0BVCEgeK082248>