svn commit: r565989 - in branches/2021Q1/mail: qmail qmail-mysql qmail-spamcontrol qmail-tls qmail/files

[Dmitry Marakasov]

Author: amdmi3
Date: Thu Feb 18 21:19:13 2021
New Revision: 565989
URL: https://svnweb.freebsd.org/changeset/ports/565989

Log:
  MFH: r565379
  
  Fix qmail's qmailsend wrapper script by using correct PATH and removing bad quoting
  
  PR:		252457, 252293
  Submitted by:	erdgeist at erdgeist.org (maintainer)
  Reported by:	callumgibson at optusnet.com.au

Modified:
  branches/2021Q1/mail/qmail-mysql/Makefile
  branches/2021Q1/mail/qmail-spamcontrol/Makefile
  branches/2021Q1/mail/qmail-tls/Makefile
  branches/2021Q1/mail/qmail/Makefile
  branches/2021Q1/mail/qmail/files/qmailsend.in
Directory Properties:
  branches/2021Q1/   (props changed)

Modified: branches/2021Q1/mail/qmail-mysql/Makefile
==============================================================================
--- branches/2021Q1/mail/qmail-mysql/Makefile	Thu Feb 18 21:06:55 2021	(r565988)
+++ branches/2021Q1/mail/qmail-mysql/Makefile	Thu Feb 18 21:19:13 2021	(r565989)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${MYSQL_PATCH_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-mysql
 

Modified: branches/2021Q1/mail/qmail-spamcontrol/Makefile
==============================================================================
--- branches/2021Q1/mail/qmail-spamcontrol/Makefile	Thu Feb 18 21:06:55 2021	(r565988)
+++ branches/2021Q1/mail/qmail-spamcontrol/Makefile	Thu Feb 18 21:19:13 2021	(r565989)
@@ -2,7 +2,7 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${SPAMCONTROL_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES+=	http://www.fehcom.de/qmail/spamcontrol/:spamcontrol \
 		LOCAL/bdrewery/qmail/:spamcontrol

Modified: branches/2021Q1/mail/qmail-tls/Makefile
==============================================================================
--- branches/2021Q1/mail/qmail-tls/Makefile	Thu Feb 18 21:06:55 2021	(r565988)
+++ branches/2021Q1/mail/qmail-tls/Makefile	Thu Feb 18 21:19:13 2021	(r565989)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${TLS_PATCH_DATE}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-tls
 

Modified: branches/2021Q1/mail/qmail/Makefile
==============================================================================
--- branches/2021Q1/mail/qmail/Makefile	Thu Feb 18 21:06:55 2021	(r565988)
+++ branches/2021Q1/mail/qmail/Makefile	Thu Feb 18 21:19:13 2021	(r565989)
@@ -3,7 +3,7 @@
 
 PORTNAME=	${QMAIL_PORTNAME}
 PORTVERSION?=	${QMAIL_VERSION}
-PORTREVISION?=	5
+PORTREVISION?=	6
 CATEGORIES=	mail
 MASTER_SITES+=	QMAIL
 DISTNAME=	${PORTNAME}-${QMAIL_VERSION}

Modified: branches/2021Q1/mail/qmail/files/qmailsend.in
==============================================================================
--- branches/2021Q1/mail/qmail/files/qmailsend.in	Thu Feb 18 21:06:55 2021	(r565988)
+++ branches/2021Q1/mail/qmail/files/qmailsend.in	Thu Feb 18 21:19:13 2021	(r565989)
@@ -54,7 +54,7 @@ qmailsend_start() {
 '"${command_args}"
   fi
 
-  exec env - PATH="%%PREFIX%%/bin:$PATH" ${command} \'"${command_args}"\' splogger qmail&
+  exec env - PATH="%%PREFIX%%/bin:%%LOCALBASE%%/bin:$PATH" ${command} "${command_args}" splogger qmail&
   /bin/pgrep -P $$ > ${pidfile}
 }