CVS commit: pkgsrc/mail/postfix

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Tue Jan 28 08:16:51 UTC 2020

Modified Files:
        pkgsrc/mail/postfix: Makefile Makefile.common PLIST

Log Message:
mail/postfix: fix insufficient permissions for var/spool/postfix/...

pkgsrc changes:
---------------
  * Remove the subdirectories of var/spool/postfix to avoid insufficient
    permissions when upgrading (Thanks Matthias!).


To generate a diff of this commit:
cvs rdiff -u -r1.315 -r1.316 pkgsrc/mail/postfix/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/mail/postfix/Makefile.common
cvs rdiff -u -r1.31 -r1.32 pkgsrc/mail/postfix/PLIST

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

Modified files:

Index: pkgsrc/mail/postfix/Makefile
diff -u pkgsrc/mail/postfix/Makefile:1.315 pkgsrc/mail/postfix/Makefile:1.316
--- pkgsrc/mail/postfix/Makefile:1.315  Sat Jan 18 21:49:53 2020
+++ pkgsrc/mail/postfix/Makefile        Tue Jan 28 08:16:51 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.315 2020/01/18 21:49:53 jperkin Exp $
+# $NetBSD: Makefile,v 1.316 2020/01/28 08:16:51 triaxx Exp $
 
-PKGREVISION= 1
+PKGREVISION= 2
 .include "../../mail/postfix/Makefile.common"
 
 COMMENT=       Fast, easy to administer, and secure mail transfer agent
@@ -76,5 +76,8 @@ do-install:
                ${DESTDIR}${PREFIX}/sbin/qshape
        ${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 \
                ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+.for dir in ${POSTFIX_QUEUE_SUBDIR}
+       ${RMDIR} ${DESTDIR}${POSTFIX_QUEUE_DIR}/${dir}
+.endfor
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/postfix/Makefile.common
diff -u pkgsrc/mail/postfix/Makefile.common:1.22 pkgsrc/mail/postfix/Makefile.common:1.23
--- pkgsrc/mail/postfix/Makefile.common:1.22    Mon Dec  9 08:45:14 2019
+++ pkgsrc/mail/postfix/Makefile.common Tue Jan 28 08:16:51 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2019/12/09 08:45:14 triaxx Exp $
+# $NetBSD: Makefile.common,v 1.23 2020/01/28 08:16:51 triaxx Exp $
 # used by mail/postfix/Makefile
 # used by mail/postfix/Makefile.module
 
@@ -30,6 +30,8 @@ MAILDROP_GROUP?=      maildrop
 #
 POSTFIX_DATA_DIR?=     ${VARBASE}/db/postfix
 POSTFIX_QUEUE_DIR?=    ${VARBASE}/spool/postfix
+POSTFIX_QUEUE_SUBDIR=  active bounce corrupt defer deferred flush hold \
+                       incoming maildrop pid private public saved trace
 BUILD_DEFS+=           VARBASE POSTFIX_DATA_DIR POSTFIX_QUEUE_DIR
 
 # CCARGS is a list of options to pass to the preprocessor/compiler.

Index: pkgsrc/mail/postfix/PLIST
diff -u pkgsrc/mail/postfix/PLIST:1.31 pkgsrc/mail/postfix/PLIST:1.32
--- pkgsrc/mail/postfix/PLIST:1.31      Wed Jul 17 13:33:00 2019
+++ pkgsrc/mail/postfix/PLIST   Tue Jan 28 08:16:51 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2019/07/17 13:33:00 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.32 2020/01/28 08:16:51 triaxx Exp $
 bin/mailq
 bin/newaliases
 lib/postfix/libpostfix-dns.so
@@ -203,20 +203,7 @@ share/examples/postfix/relocated
 ${PLIST.csasl}share/examples/postfix/smtpd.conf
 share/examples/postfix/transport
 share/examples/postfix/virtual
-@pkgdir var/spool/postfix/trace
-@pkgdir var/spool/postfix/saved
-@pkgdir var/spool/postfix/public
-@pkgdir var/spool/postfix/private
-@pkgdir var/spool/postfix/pid
-@pkgdir var/spool/postfix/maildrop
-@pkgdir var/spool/postfix/incoming
-@pkgdir var/spool/postfix/hold
-@pkgdir var/spool/postfix/flush
-@pkgdir var/spool/postfix/deferred
-@pkgdir var/spool/postfix/defer
-@pkgdir var/spool/postfix/corrupt
-@pkgdir var/spool/postfix/bounce
-@pkgdir var/spool/postfix/active
+@pkgdir var/spool/postfix
 @pkgdir var/db/postfix
 @pkgdir libexec/postfix/postfix-files.d
 @pkgdir libexec/postfix/dynamicmaps.cf.d