Thu Jan 10 20:17:57 2008 UTC ()
Make the config files writable for root and strictly read-only for the user
the app runs as.  Bump PKGREVISION.


(ghen)
diff -r1.6 -r1.7 pkgsrc/mail/roundcube/Makefile
cvs diff -r1.6 -r1.7 pkgsrc/mail/roundcube/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/roundcube/Makefile 2007/11/08 23:35:33 1.6
+++ pkgsrc/mail/roundcube/Makefile 2008/01/10 20:17:57 1.7
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.6 2007/11/08 23:35:33 adrianp Exp $ 1# $NetBSD: Makefile,v 1.7 2008/01/10 20:17:57 ghen Exp $
2# 2#
3 3
4DISTNAME= roundcubemail-0.1-rc2 4DISTNAME= roundcubemail-0.1-rc2
5PKGNAME= roundcube-0.1rc2 5PKGNAME= roundcube-0.1rc2
 6PKGREVISION= 1
6CATEGORIES= mail 7CATEGORIES= mail
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=roundcubemail/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=roundcubemail/}
8 9
9MAINTAINER= adrianp@NetBSD.org 10MAINTAINER= adrianp@NetBSD.org
10HOMEPAGE= http://roundcube.net/ 11HOMEPAGE= http://roundcube.net/
11COMMENT= Browser-based multilingual IMAP client 12COMMENT= Browser-based multilingual IMAP client
12 13
13USE_LANGUAGES= # none 14USE_LANGUAGES= # none
14NO_BUILD= yes 15NO_BUILD= yes
15 16
16.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
17 18
18PKG_SYSCONFSUBDIR?= httpd 19PKG_SYSCONFSUBDIR?= httpd
@@ -27,29 +28,29 @@ DOCDIR= ${PREFIX}/share/doc/roundcube @@ -27,29 +28,29 @@ DOCDIR= ${PREFIX}/share/doc/roundcube
27PAX_DIRS= program skins 28PAX_DIRS= program skins
28 29
29MESSAGE_SUBST+= DOCDIR=${DOCDIR:Q} PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} 30MESSAGE_SUBST+= DOCDIR=${DOCDIR:Q} PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
30MESSAGE_SUBST+= VARBASE=${VARBASE:Q} 31MESSAGE_SUBST+= VARBASE=${VARBASE:Q}
31FILES_SUBST+= RCDIR=${RCDIR:Q} 32FILES_SUBST+= RCDIR=${RCDIR:Q}
32 33
33OWN_DIRS+= ${PKG_SYSCONFDIR}/roundcube 34OWN_DIRS+= ${PKG_SYSCONFDIR}/roundcube
34OWN_DIRS_PERMS+=${VARBASE}/log/roundcube ${APACHE_USER} ${APACHE_GROUP} 0755 35OWN_DIRS_PERMS+=${VARBASE}/log/roundcube ${APACHE_USER} ${APACHE_GROUP} 0755
35OWN_DIRS_PERMS+=${VARBASE}/tmp/roundcube ${APACHE_USER} ${APACHE_GROUP} 0755 36OWN_DIRS_PERMS+=${VARBASE}/tmp/roundcube ${APACHE_USER} ${APACHE_GROUP} 0755
36 37
37CONF_FILES= ${EGDIR}/roundcube.conf ${PKG_SYSCONFDIR}/roundcube.conf 38CONF_FILES= ${EGDIR}/roundcube.conf ${PKG_SYSCONFDIR}/roundcube.conf
38CONF_FILES_PERMS+= \ 39CONF_FILES_PERMS+= \
39 ${EGDIR}/db.inc.php ${PKG_SYSCONFDIR}/roundcube/db.inc.php \ 40 ${EGDIR}/db.inc.php ${PKG_SYSCONFDIR}/roundcube/db.inc.php \
40 ${APACHE_USER} ${APACHE_GROUP} 0440 \ 41 ${ROOT_USER} ${APACHE_GROUP} 0640 \
41 ${EGDIR}/main.inc.php ${PKG_SYSCONFDIR}/roundcube/main.inc.php \ 42 ${EGDIR}/main.inc.php ${PKG_SYSCONFDIR}/roundcube/main.inc.php \
42 ${APACHE_USER} ${APACHE_GROUP} 0440 43 ${ROOT_USER} ${APACHE_GROUP} 0640
43 44
44SUBST_CLASSES+= files 45SUBST_CLASSES+= files
45SUBST_STAGE.files= do-configure 46SUBST_STAGE.files= do-configure
46SUBST_FILES.files= roundcube.conf 47SUBST_FILES.files= roundcube.conf
47SUBST_FILES.files+= config/main.inc.php.dist 48SUBST_FILES.files+= config/main.inc.php.dist
48SUBST_FILES.files+= program/include/main.inc 49SUBST_FILES.files+= program/include/main.inc
49SUBST_SED.files= -e "s|@RCDIR@|${RCDIR}|g" 50SUBST_SED.files= -e "s|@RCDIR@|${RCDIR}|g"
50SUBST_SED.files+= -e "s|@VARBASE@|${VARBASE}|g" 51SUBST_SED.files+= -e "s|@VARBASE@|${VARBASE}|g"
51SUBST_SED.files+= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" 52SUBST_SED.files+= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
52SUBST_MESSAGE.files= Fixing configuration files. 53SUBST_MESSAGE.files= Fixing configuration files.
53 54
54INSTALLATION_DIRS= ${RCDIR}/program ${RCDIR}/skins ${EGDIR}/SQL ${DOCDIR} 55INSTALLATION_DIRS= ${RCDIR}/program ${RCDIR}/skins ${EGDIR}/SQL ${DOCDIR}
55 56