Change permissions of installed files to match what is required by

the software to work.  Run "check_perms -f" to make sure permissions
are correct (it still fixes a setgid problem with "mail/mailman").

Remove mm_cfg.pyc (compiled copy of mm_cfg.py) always, so the package
can be deinstalled cleanly.

Closes PR pkg/24041.

4 files changed, 25 insertions, 5 deletions

diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 77cfa9a8121..b023dbb6947 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/12/19 21:25:42 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2004/12/25 16:55:33 kim Exp $
 
 DISTNAME=	mailman-2.1.4
 PKGREVISION=	1
@@ -44,7 +44,7 @@ PLIST_SUBST+=		MAILMAN_CGIEXT=${MAILMAN_CGIEXT:S/none//}
 PKG_GROUPS=		${MAILMAN_GROUP}
 PKG_USERS=		${MAILMAN_USER}:${MAILMAN_GROUP}::Mailman\\ user::${SH}
 
-OWN_DIRS_PERMS+=	${EXECDIR} root ${MAILMAN_GROUP} 755
+OWN_DIRS_PERMS+=	${EXECDIR} root ${MAILMAN_GROUP} 775
 OWN_DIRS_PERMS+=	${MAILMAN_DATADIR} ${MAILMAN_USER} ${MAILMAN_GROUP} 755
 MAKE_DIRS_PERMS+=	${MAILMAN_DATADIR}/archives ${MAILMAN_USER} ${MAILMAN_GROUP} 775
 MAKE_DIRS_PERMS+=	${MAILMAN_DATADIR}/archives/public ${MAILMAN_USER} ${MAILMAN_GROUP} 775
@@ -61,7 +61,10 @@ CONF_FILES+=		${EXECDIR}/Mailman/mm_cfg.py.dist ${EXECDIR}/Mailman/mm_cfg.py
 
 RCD_SCRIPTS=		mailman
 
-PYTHON_VERSIONS_ACCEPTED= 23 23pth 22 22pth 21 21pth
+INSTALL_EXTRA_TMPL+=	${FILESDIR}/INSTALL
+DEINSTALL_EXTRA_TMPL+=	${FILESDIR}/DEINSTALL
+
+PYTHON_VERSIONS_ACCEPTED= 24 24pth 23 23pth 22 22pth 21 21pth
 PYTHON_PATCH_SCRIPTS+=	Mailman/Archiver/pipermail.py
 PYTHON_PATCH_SCRIPTS+=	Mailman/Post.py
 PYTHON_PATCH_SCRIPTS+=	admin/bin/Release.py
@@ -108,7 +111,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKDIR}/mailman.conf.dist ${EGDIR}/mailman.conf
 	${CHOWN} -R root:${MAILMAN_GROUP} ${EXECDIR}
-	${CHMOD} -R g-w ${EXECDIR}
+	${CHMOD} -R g+w ${EXECDIR}
 	${CHMOD} g+s ${EXECDIR}/cgi-bin/*
 
 .include "../../lang/python/application.mk"
diff --git a/mail/mailman/PLIST b/mail/mailman/PLIST
index 47595e905cc..c0f6fa23471 100644
--- a/mail/mailman/PLIST
+++ b/mail/mailman/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/01/14 01:46:29 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/12/25 16:55:33 kim Exp $
 lib/mailman/Mailman/Archiver/Archiver.py
 lib/mailman/Mailman/Archiver/Archiver.pyc
 lib/mailman/Mailman/Archiver/HyperArch.py
@@ -313,6 +313,7 @@ lib/mailman/bin/mmsitepass
 lib/mailman/bin/msgfmt.py
 lib/mailman/bin/newlist
 lib/mailman/bin/paths.py
+lib/mailman/bin/paths.pyc
 lib/mailman/bin/qrunner
 lib/mailman/bin/rb-archfix
 lib/mailman/bin/remove_members
diff --git a/mail/mailman/files/DEINSTALL b/mail/mailman/files/DEINSTALL
new file mode 100644
index 00000000000..934d4d28b6b
--- /dev/null
+++ b/mail/mailman/files/DEINSTALL
@@ -0,0 +1,8 @@
+# $NetBSD: DEINSTALL,v 1.1 2004/12/25 16:55:33 kim Exp $
+
+case ${STAGE} in
+DEINSTALL)
+    # Remove compiled copy of configuration
+    ${RM} -f ${PKG_PREFIX}/lib/mailman/Mailman/mm_cfg.pyc
+    ;;
+esac
diff --git a/mail/mailman/files/INSTALL b/mail/mailman/files/INSTALL
new file mode 100644
index 00000000000..edaa878708a
--- /dev/null
+++ b/mail/mailman/files/INSTALL
@@ -0,0 +1,8 @@
+# $NetBSD: INSTALL,v 1.1 2004/12/25 16:55:33 kim Exp $
+
+case ${STAGE} in
+POST-INSTALL)
+    # Fix file permissions
+    ${PKG_PREFIX}/lib/mailman/bin/check_perms -f
+    ;;
+esac