[pkgsrc/trunk]: pkgsrc/mail/postfix mail/postfix: fix insufficient permission...

[triaxx <triaxx%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cc02b80e8cb3
branches:  trunk
changeset: 410734:cc02b80e8cb3
user:      triaxx <triaxx%pkgsrc.org@localhost>
date:      Tue Jan 28 08:16:51 2020 +0000

description:
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!).

diffstat:

 mail/postfix/Makefile        |   7 +++++--
 mail/postfix/Makefile.common |   4 +++-
 mail/postfix/PLIST           |  17 ++---------------
 3 files changed, 10 insertions(+), 18 deletions(-)

diffs (70 lines):

diff -r 83bf1480dc3c -r cc02b80e8cb3 mail/postfix/Makefile
--- a/mail/postfix/Makefile     Tue Jan 28 08:04:38 2020 +0000
+++ b/mail/postfix/Makefile     Tue Jan 28 08:16:51 2020 +0000
@@ -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 @@
                ${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"
diff -r 83bf1480dc3c -r cc02b80e8cb3 mail/postfix/Makefile.common
--- a/mail/postfix/Makefile.common      Tue Jan 28 08:04:38 2020 +0000
+++ b/mail/postfix/Makefile.common      Tue Jan 28 08:16:51 2020 +0000
@@ -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 @@
 #
 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.
diff -r 83bf1480dc3c -r cc02b80e8cb3 mail/postfix/PLIST
--- a/mail/postfix/PLIST        Tue Jan 28 08:04:38 2020 +0000
+++ b/mail/postfix/PLIST        Tue Jan 28 08:16:51 2020 +0000
@@ -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 @@
 ${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