CVS commit: pkgsrc/mail/postgrey

["Kimmo Suominen" <kim%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kim
Date:           Sat Sep  7 17:13:56 UTC 2019

Modified Files:
        pkgsrc/mail/postgrey: Makefile
        pkgsrc/mail/postgrey/files: postgrey.sh

Log Message:
Avoid an error about pidfile removal on service stop


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/mail/postgrey/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/postgrey/files/postgrey.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/postgrey/Makefile
diff -u pkgsrc/mail/postgrey/Makefile:1.50 pkgsrc/mail/postgrey/Makefile:1.51
--- pkgsrc/mail/postgrey/Makefile:1.50  Fri Sep  6 09:58:25 2019
+++ pkgsrc/mail/postgrey/Makefile       Sat Sep  7 17:13:56 2019
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.50 2019/09/06 09:58:25 jperkin Exp $
+# $NetBSD: Makefile,v 1.51 2019/09/07 17:13:56 kim Exp $
 
 DISTNAME=      postgrey-1.36
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    mail
 MASTER_SITES=  http://postgrey.schweikert.ch/pub/
 
-MAINTAINER=    kim%tac.nyc.ny.us@localhost
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://postgrey.schweikert.ch/
 COMMENT=       Postfix Greylist Policy Server
 LICENSE=       gnu-gpl-v2

Index: pkgsrc/mail/postgrey/files/postgrey.sh
diff -u pkgsrc/mail/postgrey/files/postgrey.sh:1.2 pkgsrc/mail/postgrey/files/postgrey.sh:1.3
--- pkgsrc/mail/postgrey/files/postgrey.sh:1.2  Wed Feb 16 19:37:50 2011
+++ pkgsrc/mail/postgrey/files/postgrey.sh      Sat Sep  7 17:13:56 2019
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: postgrey.sh,v 1.2 2011/02/16 19:37:50 shattered Exp $
+# $NetBSD: postgrey.sh,v 1.3 2019/09/07 17:13:56 kim Exp $
 #
 
 # PROVIDE: postgrey
@@ -11,7 +11,7 @@
 
 name="@PKGBASE@"
 rcvar=$name
-pidfile="@VARBASE@/run/${name}.pid"
+pidfile="@VARBASE@/run/${name}/${name}.pid"
 command_interpreter="@PERL@"
 command="@PREFIX@/sbin/postgrey"
 command_args="-d --pidfile=${pidfile}"
@@ -21,7 +21,16 @@ required_files="
 "
 @PKGBASE@_flags=${@PKGBASE@_flags-"-i 2525"}
 extra_commands="reload"
-stop_postcmd='rm -f $pidfile'
+start_precmd="postgrey_precmd"
+
+postgrey_precmd()
+{
+       if [ ! -d "@VARBASE@/run/${name}" ]; then
+               @MKDIR@ "@VARBASE@/run/${name}"
+               @CHMOD@ 775 "@VARBASE@/run/${name}"
+               @CHOWN@ @POSTGREY_USER@:@POSTGREY_GROUP@ "@VARBASE@/run/${name}"
+       fi
+}
 
 load_rc_config $name
 run_rc_command "$1"