Subject: Package-specific users and groups & unprivileged builds
To: None <tech-pkg@netbsd.org>
From: Johnny C. Lam <jlam@pkgsrc.org>
List: tech-pkg
Date: 06/15/2007 19:20:44
--C7zPtVaVf+AK4Oqc
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
The following diff does two things:
(1) It adds two new variables PKG_GROUPS_VARS and PKG_USERS_VARS to
unprivileged.mk. These two variables are lists of other bmake
variables that define package-specific users and groups. Packages
that have user-settable variables for users and groups, e.g. apache
and APACHE_{USER,GROUP}, courier-mta and COURIER_{USER,GROUP},
etc. should list these variables in PKG_USERS_VARS and PKG_GROUPS_VARS
so that unprivileged.mk can know to set them to ${UNPRIVILEGED_USER}
and ${UNPRIVILEGED_GROUP}.
(2) Modify packages to use PKG_GROUPS_VARS and PKG_USERS_VARS.
Thoughts?
Cheers,
-- Johnny Lam <jlam@pkgsrc.org>
--C7zPtVaVf+AK4Oqc
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=diff
Index: ./audio/icecast/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/icecast/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- ./audio/icecast/Makefile 22 Feb 2007 19:26:05 -0000 1.41
+++ ./audio/icecast/Makefile 15 Jun 2007 23:18:09 -0000
@@ -24,6 +24,8 @@
ICECAST_USER?= icecast
ICECAST_GROUP?= icecast
+PKG_USERS_VARS+= ICECAST_USER
+PKG_GROUPS_VARS+= ICECAST_GROUP
PKG_GROUPS= ${ICECAST_GROUP}
PKG_USERS= ${ICECAST_USER}:${ICECAST_GROUP}
Index: ./audio/mt-daapd/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/mt-daapd/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- ./audio/mt-daapd/Makefile 17 Feb 2007 16:39:23 -0000 1.4
+++ ./audio/mt-daapd/Makefile 15 Jun 2007 23:18:09 -0000
@@ -24,6 +24,9 @@
PKG_GROUPS= ${MTDAAPD_GROUP}
BUILD_DEFS+= VARBASE MTDAAPD_USER
+PKG_USERS_VARS+= MTDAAPD_USER
+PKG_GROUPS_VARS+= MTDAAPD_GROUP
+
CONF_FILES_PERMS= ${EGDIR}/mt-daapd.conf ${PKG_SYSCONFDIR}/mt-daapd.conf \
${MTDAAPD_USER} ${MTDAAPD_GROUP} 0660
Index: ./audio/ubs/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/ubs/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- ./audio/ubs/Makefile 22 Feb 2007 19:26:07 -0000 1.13
+++ ./audio/ubs/Makefile 15 Jun 2007 23:18:09 -0000
@@ -24,6 +24,8 @@
UBS_BASEDIR?= /var/spool/ubs
UBS_USER?= ubs
UBS_GROUP?= ubs
+PKG_USERS_VARS+= UBS_USER
+PKG_GROUPS_VARS+= UBS_GROUP
PKG_GROUPS= ${UBS_GROUP}
PKG_USERS= ${UBS_USER}:${UBS_GROUP}
Index: ./chat/anope/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/chat/anope/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- ./chat/anope/Makefile 9 Apr 2007 09:40:23 -0000 1.2
+++ ./chat/anope/Makefile 15 Jun 2007 23:18:09 -0000
@@ -17,6 +17,9 @@
FILES_SUBST+= ANOPE_USER=${ANOPE_USER:Q}
FILES_SUBST+= ANOPE_GROUP=${ANOPE_GROUP:Q}
+PKG_USERS_VARS+= ANOPE_USER
+PKG_GROUPS_VARS+= ANOPE_GROUP
+
.include "../../mk/bsd.prefs.mk"
PKG_USERS= ${ANOPE_USER}:${ANOPE_GROUP}::anope\ user:${PREFIX}/lib/anope:${NOLOGIN}
Index: ./chat/ircd-hybrid/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/chat/ircd-hybrid/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- ./chat/ircd-hybrid/Makefile 1 Feb 2007 23:19:56 -0000 1.34
+++ ./chat/ircd-hybrid/Makefile 15 Jun 2007 23:18:09 -0000
@@ -41,6 +41,9 @@
PKG_GROUPS= ${IRCD_HYBRID_IRC_GROUP}
PKG_USERS= ${IRCD_HYBRID_IRC_USER}:${IRCD_HYBRID_IRC_GROUP}
+PKG_USERS_VARS+= IRCD_HYBRID_IRC_USER
+PKG_GROUPS_VARS+= IRCD_HYBRID_IRC_GROUP
+
SUBST_CLASSES+= paths
SUBST_MESSAGE.paths= Fixing hardcoded paths.
SUBST_STAGE.paths= post-patch
Index: ./chat/ircu/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/chat/ircu/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- ./chat/ircu/Makefile 15 Jun 2007 14:15:40 -0000 1.27
+++ ./chat/ircu/Makefile 15 Jun 2007 23:18:09 -0000
@@ -29,6 +29,9 @@
IRCD_USER?= ircd
IRCD_GROUP?= ircd
+PKG_USERS_VARS+= IRCD_USER
+PKG_GROUPS_VARS+= IRCD_GROUP
+
DATADIR= ${VARBASE}/ircd
OWN_DIRS_PERMS= ${DATADIR} ${IRCD_USER} ${IRCD_GROUP} 0700
EGDIR= ${PREFIX}/share/examples/ircd
Index: ./chat/jabberd/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/chat/jabberd/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- ./chat/jabberd/Makefile 8 Oct 2006 21:58:47 -0000 1.27
+++ ./chat/jabberd/Makefile 15 Jun 2007 23:18:10 -0000
@@ -42,6 +42,9 @@
PKG_GROUPS= ${JABBERD_GROUP}
PKG_USERS= ${JABBERD_USER}:${JABBERD_GROUP}
+PKG_USERS_VARS+= JABBERD_USER
+PKG_GROUPS_VARS+= JABBERD_GROUP
+
FILES_SUBST+= JABBERD_USER=${JABBERD_USER:Q}
FILES_SUBST+= JABBERD_GROUP=${JABBERD_GROUP:Q}
FILES_SUBST+= JABBERD_SPOOLDIR=${JABBERD_SPOOLDIR:Q}
Index: ./chat/jabberd2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/chat/jabberd2/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- ./chat/jabberd2/Makefile 12 Jun 2007 15:26:07 -0000 1.37
+++ ./chat/jabberd2/Makefile 15 Jun 2007 23:18:10 -0000
@@ -50,6 +50,8 @@
FILES_SUBST+= JABBERD_GROUP=${JABBERD_GROUP:Q}
FILES_SUBST+= JABBERD_PIDDIR=${JABBERD_PIDDIR:Q}
FILES_SUBST+= JABBERD_LOGDIR=${JABBERD_LOGDIR:Q}
+PKG_USERS_VARS+= JABBERD_USER
+PKG_GROUPS_VARS+= JABBERD_GROUP
PKG_GROUPS= ${JABBERD_GROUP}
PKG_USERS= ${JABBERD_USER}:${JABBERD_GROUP}
Index: ./chat/mu-conference/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/chat/mu-conference/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- ./chat/mu-conference/Makefile 5 Feb 2006 23:08:25 -0000 1.15
+++ ./chat/mu-conference/Makefile 15 Jun 2007 23:18:10 -0000
@@ -26,6 +26,7 @@
BUILD_DEFS+= JABBERD_USER JABBERD_LOGDIR JABBERD_PIDDIR
JABBERD_USER?= jabberd
+PKG_USERS_VARS+= JABBERD_USER
FILES_SUBST+= JABBERD_PIDDIR=${JABBERD_PIDDIR:Q}
FILES_SUBST+= JABBERD_USER=${JABBERD_USER:Q}
Index: ./chat/silc-server/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/chat/silc-server/Makefile,v
retrieving revision 1.56
diff -u -r1.56 Makefile
--- ./chat/silc-server/Makefile 3 Jun 2007 22:40:25 -0000 1.56
+++ ./chat/silc-server/Makefile 15 Jun 2007 23:18:10 -0000
@@ -24,6 +24,8 @@
SILCD_GROUP?= silcd
PKG_GROUPS= ${SILCD_GROUP}
PKG_USERS= ${SILCD_USER}:${SILCD_GROUP}
+PKG_USERS_VARS+= SILCD_USER
+PKG_GROUPS_VARS+= SILCD_GROUP
PKG_SYSCONFSUBDIR?= ${PKGBASE}
Index: ./chat/unrealircd/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/chat/unrealircd/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- ./chat/unrealircd/Makefile 13 May 2007 21:15:58 -0000 1.18
+++ ./chat/unrealircd/Makefile 15 Jun 2007 23:18:10 -0000
@@ -78,6 +78,9 @@
${UIRCD_HOME:Q}/unrealircd.conf \
${UIRCD_USER} ${UIRCD_GROUP} 0660
+PKG_USERS_VARS+= UIRCD_USER
+PKG_GROUPS_VARS+= UIRCD_GROUP
+
PKG_GROUPS= ${UIRCD_GROUP:Q}
PKG_USERS= ${UIRCD_USER:Q}:${UIRCD_GROUP:Q}
Index: ./comms/asterisk/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/comms/asterisk/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- ./comms/asterisk/Makefile 26 Apr 2007 09:43:15 -0000 1.37
+++ ./comms/asterisk/Makefile 15 Jun 2007 23:18:11 -0000
@@ -21,6 +21,8 @@
#ASTERISK_GROUP?= asterisk
#PKG_GROUPS= ${ASTERISK_GROUP}
#PKG_USERS= ${ASTERISK_USER}:${ASTERISK_GROUP}
+#PKG_GROUPS_VARS+= ASTERISK_GROUP
+#PKG_USERS_VARS+= ASTERISK_USER
# Various path settings for Asterisk
PKG_SYSCONFSUBDIR= asterisk
Index: ./comms/minicom/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/comms/minicom/Makefile,v
retrieving revision 1.54
diff -u -r1.54 Makefile
--- ./comms/minicom/Makefile 15 Jun 2007 18:23:49 -0000 1.54
+++ ./comms/minicom/Makefile 15 Jun 2007 23:18:11 -0000
@@ -24,6 +24,7 @@
EGDIR= ${PREFIX}/share/examples/minicom
UUCP_USER?= uucp # shared with net/uucp
+PKG_USERS_VARS+= UUCP_USER
PKG_GROUPS= dialer
PKG_USERS= ${UUCP_USER}:dialer
Index: ./comms/xisp/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/comms/xisp/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- ./comms/xisp/Makefile 15 Dec 2006 20:32:53 -0000 1.27
+++ ./comms/xisp/Makefile 15 Jun 2007 23:18:11 -0000
@@ -13,6 +13,7 @@
COMMENT= User-friendly X11 interface to pppd/chat
PKG_GROUPS= ${DIALER_GROUP}
+PKG_GROUPS_VARS+= DIALER_GROUP
BUILD_DEFS+= DIALER_GROUP
MAKE_ENV+= DIALER_GROUP="${DIALER_GROUP}"
MAKE_ENV+= VARBASE=${VARBASE:Q}
Index: ./databases/gnats/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/gnats/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- ./databases/gnats/Makefile 16 Jun 2006 09:32:33 -0000 1.29
+++ ./databases/gnats/Makefile 15 Jun 2007 23:18:11 -0000
@@ -36,6 +36,9 @@
PKG_GROUPS= ${GNATS_GROUP}
PKG_USERS= ${GNATS_USER}:${GNATS_GROUP}
+PKG_GROUPS_VARS+= GNATS_GROUP
+PKG_USERS_VARS+= GNATS_USER
+
PKG_GECOS.${GNATS_USER}= GNATS database owner
PKG_HOME.${GNATS_USER}= ${GNATS_HOME}
PKG_SHELL.${GNATS_USER}= ${SH}
Index: ./databases/mysql4-client/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/databases/mysql4-client/Makefile.common,v
retrieving revision 1.57
diff -u -r1.57 Makefile.common
--- ./databases/mysql4-client/Makefile.common 23 May 2007 08:11:48 -0000 1.57
+++ ./databases/mysql4-client/Makefile.common 15 Jun 2007 23:18:11 -0000
@@ -22,6 +22,9 @@
MYSQL_GROUP?= mysql
MYSQL_DATADIR?= ${VARBASE}/mysql
+PKG_USERS_VARS+= MYSQL_USER
+PKG_GROUPS_VARS+= MYSQL_GROUP
+
# MYSQL_CHARSET default character set
# MYSQL_EXTRA_CHARSET additional character set to be compiled in.
#
Index: ./databases/mysql5-client/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/databases/mysql5-client/Makefile.common,v
retrieving revision 1.21
diff -u -r1.21 Makefile.common
--- ./databases/mysql5-client/Makefile.common 21 May 2007 04:39:59 -0000 1.21
+++ ./databases/mysql5-client/Makefile.common 15 Jun 2007 23:18:12 -0000
@@ -22,6 +22,9 @@
MYSQL_GROUP?= mysql
MYSQL_DATADIR?= ${VARBASE}/mysql
+PKG_USERS_VARS+= MYSQL_USER
+PKG_GROUPS_VARS+= MYSQL_GROUP
+
# MYSQL_CHARSET default character set
# MYSQL_EXTRA_CHARSET additional character set to be compiled in.
#
Index: ./databases/openldap/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/databases/openldap/Makefile.common,v
retrieving revision 1.8
diff -u -r1.8 Makefile.common
--- ./databases/openldap/Makefile.common 10 Jan 2007 18:15:36 -0000 1.8
+++ ./databases/openldap/Makefile.common 15 Jun 2007 23:18:12 -0000
@@ -44,6 +44,9 @@
SLURPD_USER?= slurpd
LDAP_GROUP?= ldap
+PKG_GROUPS_VARS+= LDAP_GROUP
+PKG_USERS_VARS+= SLAPD_USER SLURPD_USER
+
# the internal avl_* prototypes conflict with those in <sys/avl.h> which
# is included by another system header file on Solaris, so subst them.
.if ${OPSYS} == "SunOS"
Index: ./databases/phpmyadmin/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/phpmyadmin/Makefile,v
retrieving revision 1.59
diff -u -r1.59 Makefile
--- ./databases/phpmyadmin/Makefile 15 Jun 2007 14:18:38 -0000 1.59
+++ ./databases/phpmyadmin/Makefile 15 Jun 2007 23:18:12 -0000
@@ -32,6 +32,9 @@
PKG_USERS= ${APACHE_USER}:${APACHE_GROUP}
BUILD_DEFS+= APACHE_USER APACHE_GROUP
+PKG_USERS_VARS+= APACHE_USER
+PKG_GROUPS_VARS+= APACHE_GROUP
+
EXDIR= ${PREFIX}/share/examples/phpmyadmin
PMCONFFILE= ${PKG_SYSCONFDIR}/config.inc.php
PMDIR= ${PREFIX}/share/phpmyadmin
Index: ./databases/postgresql80-server/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/postgresql80-server/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- ./databases/postgresql80-server/Makefile 8 May 2007 15:58:38 -0000 1.24
+++ ./databases/postgresql80-server/Makefile 15 Jun 2007 23:18:12 -0000
@@ -60,6 +60,9 @@
FILES_SUBST+= PGHOME=${PGHOME:Q}
BUILD_DEFS+= PGUSER PGGROUP PGHOME
+PKG_GROUPS_VARS+= PGGROUP
+PKG_USERS_VARS+= PGUSER
+
PKG_GROUPS= ${PGGROUP}
PKG_USERS= ${PGUSER}:${PGGROUP}
PKG_GECOS.${PGUSER}= PostgreSQL database administrator
Index: ./databases/postgresql81-server/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/postgresql81-server/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- ./databases/postgresql81-server/Makefile 8 Jan 2007 18:55:39 -0000 1.7
+++ ./databases/postgresql81-server/Makefile 15 Jun 2007 23:18:12 -0000
@@ -61,6 +61,9 @@
FILES_SUBST+= PGHOME=${PGHOME}
BUILD_DEFS+= PGUSER PGGROUP PGHOME
+PKG_GROUPS_VARS+= PGGROUP
+PKG_USERS_VARS+= PGUSER
+
PKG_GROUPS= ${PGGROUP}
PKG_USERS= ${PGUSER}:${PGGROUP}
PKG_GECOS.${PGUSER}= PostgreSQL database administrator
Index: ./databases/postgresql82-server/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/postgresql82-server/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- ./databases/postgresql82-server/Makefile 9 Dec 2006 15:34:40 -0000 1.1.1.1
+++ ./databases/postgresql82-server/Makefile 15 Jun 2007 23:18:13 -0000
@@ -61,6 +61,9 @@
FILES_SUBST+= PGHOME=${PGHOME}
BUILD_DEFS+= PGUSER PGGROUP PGHOME
+PKG_GROUPS_VARS+= PGGROUP
+PKG_USERS_VARS+= PGUSER
+
PKG_GROUPS= ${PGGROUP}
PKG_USERS= ${PGUSER}:${PGGROUP}
PKG_GECOS.${PGUSER}= PostgreSQL database administrator
Index: ./databases/sqlitemanager/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/sqlitemanager/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- ./databases/sqlitemanager/Makefile 16 Jun 2006 10:58:08 -0000 1.4
+++ ./databases/sqlitemanager/Makefile 15 Jun 2007 23:18:13 -0000
@@ -15,6 +15,7 @@
NO_BUILD= yes
BUILD_DEFS+= APACHE_USER
+PKG_USERS_VARS+= APACHE_USER
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share
Index: ./devel/RTx-Shredder/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/RTx-Shredder/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- ./devel/RTx-Shredder/Makefile 1 May 2006 09:42:13 -0000 1.1.1.1
+++ ./devel/RTx-Shredder/Makefile 15 Jun 2007 23:18:13 -0000
@@ -15,6 +15,8 @@
.include "../../devel/rt3/dirs.mk"
+PKG_USERS_VARS+= APACHE_USER
+
OWN_DIRS_PERMS+= ${RT_VAR_DIR}/data/RTx-Shredder ${APACHE_USER} ${APACHE_GROUP} 0770
PLIST_SUBST+= RT_SHARE_DIR=share/rt3
Index: ./devel/bugzilla/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/bugzilla/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- ./devel/bugzilla/Makefile 15 Jun 2007 14:20:10 -0000 1.24
+++ ./devel/bugzilla/Makefile 15 Jun 2007 23:18:13 -0000
@@ -33,6 +33,9 @@
BUILD_DEFS+= BZ_WEB_GROUP SENDMAIL APACHE_USER APACHE_GROUP CVS
+PKG_USERS_VARS+= APACHE_USER
+PKG_GROUPS_VARS+= BZ_WEB_GROUP APACHE_GROUP
+
MESSAGE_SUBST+= BZDIR=${BZDIR:Q} PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
BZDIR= ${PREFIX}/share/bugzilla
Index: ./devel/cvsd/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/cvsd/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- ./devel/cvsd/Makefile 17 Feb 2007 20:59:47 -0000 1.5
+++ ./devel/cvsd/Makefile 15 Jun 2007 23:18:13 -0000
@@ -24,6 +24,8 @@
PKG_USERS= ${CVSD_USER}:${CVSD_GROUP}
PKG_GECOS.${CVSD_USER}= CVS wrapper
PKG_GROUPS= ${CVSD_GROUP}
+PKG_GROUPS_VARS+= CVSD_GROUP
+PKG_USERS_VARS+= CVSD_USER
pre-install:
${INSTALL_DATA_DIR} ${EGDIR}
Index: ./devel/distcc/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/distcc/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- ./devel/distcc/Makefile 12 Oct 2006 17:25:18 -0000 1.30
+++ ./devel/distcc/Makefile 15 Jun 2007 23:18:13 -0000
@@ -17,6 +17,8 @@
DISTCC_GROUP?= distcc
PKG_GROUPS= ${DISTCC_GROUP}
PKG_USERS= ${DISTCC_USER:Q}:${DISTCC_GROUP:Q}
+PKG_GROUPS_VARS+= DISTCC_GROUP
+PKG_USERS_VARS+= DISTCC_USER
DISTCC_PIDDIR?= ${VARBASE}/run/distccd
OWN_DIRS_PERMS= ${DISTCC_PIDDIR} ${DISTCC_USER:Q} ${DISTCC_GROUP:Q} 0750
Index: ./devel/mantis/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/mantis/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- ./devel/mantis/Makefile 15 Jun 2007 18:08:25 -0000 1.26
+++ ./devel/mantis/Makefile 15 Jun 2007 23:18:13 -0000
@@ -27,6 +27,7 @@
APACHE_USER?= www
BUILD_DEFS+= APACHE_USER
+PKG_USERS_VARS+=APACHE_USER
MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
MANTIS_HOME= ${PREFIX}/share/mantis
Index: ./devel/monotone-server/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/monotone-server/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- ./devel/monotone-server/Makefile 13 May 2007 10:45:37 -0000 1.31
+++ ./devel/monotone-server/Makefile 15 Jun 2007 23:18:13 -0000
@@ -42,6 +42,9 @@
PKG_GROUPS= ${MONOTONE_GROUP}
PKG_USERS= ${MONOTONE_USER}:${MONOTONE_GROUP}
+PKG_GROUPS_VARS+= MONOTONE_GROUP
+PKG_USERS_VARS+= MONOTONE_USER
+
.include "../../mk/bsd.prefs.mk"
PKG_GECOS.${MONOTONE_USER}= Monotone dedicated server
Index: ./devel/p4d/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/p4d/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- ./devel/p4d/Makefile 31 Aug 2006 08:37:53 -0000 1.10
+++ ./devel/p4d/Makefile 15 Jun 2007 23:18:13 -0000
@@ -21,6 +21,9 @@
PKG_GROUPS?= ${P4GROUP}
PKG_USERS?= ${P4USER}:${P4GROUP}
+PKG_GROUPS_VARS+= P4GROUP
+PKG_USERS_VARS+= P4USER
+
PKG_GECOS.${P4USER}?= Perforce Server
PKG_HOME.${P4USER}?= ${P4ROOT}
Index: ./devel/rt-mysql/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/devel/rt-mysql/Makefile.common,v
retrieving revision 1.14
diff -u -r1.14 Makefile.common
--- ./devel/rt-mysql/Makefile.common 22 Feb 2007 19:26:25 -0000 1.14
+++ ./devel/rt-mysql/Makefile.common 15 Jun 2007 23:18:16 -0000
@@ -24,6 +24,9 @@
RT_WEB_USER?= nobody
RT_WEB_GROUP?= nobody
+PKG_GROUPS_VARS+= RT_GROUP RT_WEB_GROUP
+PKG_USERS_VARS+= RT_DB_USER RT_WEB_USER
+
PKGDIR= ${.CURDIR}/../../devel/rt-mysql
DISTINFO_FILE= ${PKGDIR}/distinfo
FILESDIR= ${PKGDIR}/files
Index: ./devel/rt3/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/rt3/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- ./devel/rt3/Makefile 19 May 2007 14:05:45 -0000 1.24
+++ ./devel/rt3/Makefile 15 Jun 2007 23:18:16 -0000
@@ -107,6 +107,8 @@
PKG_SYSCONFSUBDIR= rt3
PKG_GROUPS= ${RT_GROUP}
+PKG_GROUPS_VARS+= RT_GROUP APACHE_GROUP
+PKG_USERS_VARS+= APACHE_USER
CONFIGURE_ARGS+= --enable-layout=pkgsrc
CONFIGURE_ARGS+= --with-rt-group=${RT_GROUP:Q}
Index: ./devel/rt3/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/rt3/options.mk,v
retrieving revision 1.3
diff -u -r1.3 options.mk
--- ./devel/rt3/options.mk 1 Oct 2006 18:44:57 -0000 1.3
+++ ./devel/rt3/options.mk 15 Jun 2007 23:18:16 -0000
@@ -17,4 +17,5 @@
# Other options
RT_GROUP?= rt
+PKG_GROUPS_VARS+= RT_GROUP
BUILD_DEFS+= RT_GROUP
Index: ./inputmethod/canna/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/canna/Makefile.common,v
retrieving revision 1.16
diff -u -r1.16 Makefile.common
--- ./inputmethod/canna/Makefile.common 5 Jul 2006 04:48:28 -0000 1.16
+++ ./inputmethod/canna/Makefile.common 15 Jun 2007 23:18:16 -0000
@@ -24,6 +24,9 @@
CANNA_SPOOL= ${VARBASE}/spool/canna
CANNA_MODE= 0755
+PKG_GROUPS_VARS+= CANNA_GROUP
+PKG_USERS_VARS+= CANNA_USER
+
# XXX IPv6 support. To be done.
#BUILD_DEFS+= USE_INET6
#.include "../../mk/bsd.prefs.mk"
Index: ./inputmethod/ja-freewnn-lib/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/ja-freewnn-lib/Makefile.common,v
retrieving revision 1.12
diff -u -r1.12 Makefile.common
--- ./inputmethod/ja-freewnn-lib/Makefile.common 5 Jul 2006 06:53:13 -0000 1.12
+++ ./inputmethod/ja-freewnn-lib/Makefile.common 15 Jun 2007 23:18:16 -0000
@@ -21,6 +21,8 @@
SEDSCRIPT+= -e 's|\(WNNOWNER = \).*|\1${WNNOWNER}|'
SEDSCRIPT+= -e 's|\([JCKT]\)\(WNNDICDIR = \).*|\1\2${IMDICTDIR}/wnn/$$(\1WNNLANG)|'
+PKG_USERS_VARS+= WNNOWNER FREEWNN_USER
+
.if defined(WNN_TARGET) && (${WNN_TARGET} == "SERVER")
MAKE_ENV+= "WNN_TARGET=SERVER"
SEDSCRIPT+= -e 's|$$([CK]*WNNJLIBSRC)/lib\([ck]*wnn\).a|-l\1|'
Index: ./inputmethod/ja-freewnn-server-bin/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/ja-freewnn-server-bin/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- ./inputmethod/ja-freewnn-server-bin/Makefile 5 Jul 2006 06:53:13 -0000 1.15
+++ ./inputmethod/ja-freewnn-server-bin/Makefile 15 Jun 2007 23:18:16 -0000
@@ -29,5 +29,8 @@
PKG_GROUPS= ${FREEWNN_GROUP}
PKG_USERS= ${FREEWNN_USER}:${FREEWNN_GROUP}
+PKG_GROUPS_VARS+= FREEWNN_GROUP
+PKG_USERS_VARS+= FREEWNN_USER
+
.include "../../inputmethod/ja-freewnn-lib/buildlink3.mk"
.include "../../inputmethod/ja-freewnn-lib/Makefile.common"
Index: ./inputmethod/sj3-server-bin/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/sj3-server-bin/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- ./inputmethod/sj3-server-bin/Makefile 5 Jul 2006 04:55:24 -0000 1.14
+++ ./inputmethod/sj3-server-bin/Makefile 15 Jun 2007 23:18:16 -0000
@@ -31,6 +31,9 @@
PKG_GROUPS+= ${SJ3GROUP}
PKG_USERS+= ${SJ3OWNER}:${SJ3GROUP}
+PKG_GROUPS_VARS+= SJ3GROUP
+PKG_USERS_VARS+= SJ3USER
+
MAKE_DIRS+= ${IMDICTDIR}
OWN_DIRS+= ${IMDICTDIR}/sj3
OWN_DIRS_PERMS+= ${IMDICTDIR}/sj3/user ${SJ3OWNER} ${SJ3GROUP} 0755
Index: ./mail/clamav/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/clamav/Makefile,v
retrieving revision 1.74
diff -u -r1.74 Makefile
--- ./mail/clamav/Makefile 15 Jun 2007 22:31:39 -0000 1.74
+++ ./mail/clamav/Makefile 15 Jun 2007 23:18:16 -0000
@@ -41,6 +41,9 @@
PKG_GROUPS+= ${CLAMAV_GROUP}
PKG_USERS+= ${CLAMAV_USER}:${CLAMAV_GROUP}
+PKG_GROUPS_VARS+= CLAMAV_GROUP
+PKG_USERS_VARS+= CLAMAV_USER
+
EGDIR= ${PREFIX}/share/examples/clamav
FILES_SUBST+= CLAMAV_DBDIR=${CLAMAV_DBDIR:Q}
Index: ./mail/clamsmtp/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/clamsmtp/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- ./mail/clamsmtp/Makefile 15 Jun 2007 09:47:06 -0000 1.32
+++ ./mail/clamsmtp/Makefile 15 Jun 2007 23:18:16 -0000
@@ -27,6 +27,7 @@
INSTALLATION_DIRS= share/examples/${PKGBASE}
BUILD_DEFS+= CLAMAV_USER
+PKG_USERS_VARS+= CLAMAV_USER
post-install:
${INSTALL_DATA} ${WRKSRC}/doc/clamsmtpd.conf ${EGDIR}
Index: ./mail/courier-mta/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/mail/courier-mta/Makefile.common,v
retrieving revision 1.3
diff -u -r1.3 Makefile.common
--- ./mail/courier-mta/Makefile.common 7 Jun 2007 07:50:57 -0000 1.3
+++ ./mail/courier-mta/Makefile.common 15 Jun 2007 23:18:16 -0000
@@ -23,6 +23,9 @@
COURIER_DIR_PERMS= ${COURIER_USER} ${COURIER_GROUP} 0755
COURIER_SCRIPT_PERMS= ${COURIER_USER} ${COURIER_GROUP} 0755
+PKG_GROUPS_VARS+= COURIER_GROUP
+PKG_USERS_VARS+= COURIER_USER
+
FILES_SUBST+= COURIER_STATEDIR=${COURIER_STATEDIR:Q}
.include "../../security/courier-authlib/Makefile.common"
Index: ./mail/courier-mta/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mail/courier-mta/options.mk,v
retrieving revision 1.3
diff -u -r1.3 options.mk
--- ./mail/courier-mta/options.mk 15 Jun 2007 21:59:23 -0000 1.3
+++ ./mail/courier-mta/options.mk 15 Jun 2007 23:18:16 -0000
@@ -103,6 +103,9 @@
PKG_USERS+= ${UUCP_USER}:${UUCP_GROUP}
PLIST_SRC+= ${PKGDIR}/PLIST.uucp
+PKG_GROUPS_VARS+= UUCP_GROUP
+PKG_USERS_VARS+= UUCP_USER
+
CONF_FILES_PERMS+= ${EGDIR}/module.uucp \
${PKG_SYSCONFDIR}/module.uucp \
${COURIER_FILE_PERMS}
Index: ./mail/cyrus-imapd/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/cyrus-imapd/Makefile,v
retrieving revision 1.71
diff -u -r1.71 Makefile
--- ./mail/cyrus-imapd/Makefile 8 Jun 2007 13:11:55 -0000 1.71
+++ ./mail/cyrus-imapd/Makefile 15 Jun 2007 23:18:17 -0000
@@ -23,6 +23,8 @@
CYRUS_USER?= cyrus
CYRUS_GROUP?= mail
+PKG_GROUPS_VARS+= CYRUS_GROUP
+PKG_USERS_VARS+= CYRUS_USER
BUILD_DEFS+= CYRUS_USER CYRUS_GROUP
FILES_SUBST+= CYRUS_USER=${CYRUS_USER:Q}
FILES_SUBST+= CYRUS_GROUP=${CYRUS_GROUP:Q}
Index: ./mail/cyrus-imapd21/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/cyrus-imapd21/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- ./mail/cyrus-imapd21/Makefile 4 Oct 2006 21:47:16 -0000 1.42
+++ ./mail/cyrus-imapd21/Makefile 15 Jun 2007 23:18:17 -0000
@@ -25,6 +25,8 @@
CYRUS_USER?= cyrus
CYRUS_GROUP?= mail
+PKG_GROUPS_VARS+= CYRUS_GROUP
+PKG_USERS_VARS+= CYRUS_USER
BUILD_DEFS+= CYRUS_USER CYRUS_GROUP
FILES_SUBST+= CYRUS_USER=${CYRUS_USER:Q}
FILES_SUBST+= CYRUS_GROUP=${CYRUS_GROUP:Q}
Index: ./mail/dovecot/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/dovecot/Makefile,v
retrieving revision 1.96
diff -u -r1.96 Makefile
--- ./mail/dovecot/Makefile 16 May 2007 07:34:46 -0000 1.96
+++ ./mail/dovecot/Makefile 15 Jun 2007 23:18:17 -0000
@@ -29,6 +29,8 @@
DOVECOT_GROUP?= dovecot
PKG_GROUPS= ${DOVECOT_GROUP}
PKG_USERS= ${DOVECOT_USER}:${DOVECOT_GROUP}
+PKG_GROUPS_VARS+= DOVECOT_GROUP
+PKG_USERS_VARS+= DOVECOT_USER
PKG_GECOS.${DOVECOT_USER}= Dovecot IMAP/POP3 user
Index: ./mail/dspam/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/dspam/Makefile,v
retrieving revision 1.56
diff -u -r1.56 Makefile
--- ./mail/dspam/Makefile 7 May 2007 09:29:54 -0000 1.56
+++ ./mail/dspam/Makefile 15 Jun 2007 23:18:17 -0000
@@ -59,6 +59,9 @@
DSPAM_WWWUSER?= ${APACHE_USER}
DSPAM_WWWGROUP?= ${APACHE_GROUP}
+PKG_GROUPS_VARS+= DSPAM_GROUP DSPAM_WWWGROUP
+PKG_USERS_VARS+= DSPAM_USER DSPAM_WWWUSER
+
CONFIGURE_ARGS+= --with-signature-life=${DSPAM_SIGNATURE_LIFE:Q}
CONFIGURE_ARGS+= --with-dspam-home=${DSPAM_HOME:Q} \
--with-dspam-home-owner=${DSPAM_USER:Q} \
Index: ./mail/exim/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/exim/Makefile,v
retrieving revision 1.83
diff -u -r1.83 Makefile
--- ./mail/exim/Makefile 8 Jun 2007 13:11:56 -0000 1.83
+++ ./mail/exim/Makefile 15 Jun 2007 23:18:18 -0000
@@ -28,6 +28,9 @@
PKG_GROUPS= ${EXIM_GROUP}
PKG_USERS= ${EXIM_USER}:${EXIM_GROUP}
+PKG_GROUPS_VARS+= EXIM_GROUP
+PKG_USERS_VARS+= EXIM_USER
+
PKG_GECOS.${EXIM_USER}= Exim mail server user
PKG_HOME.${EXIM_USER}= ${VARBASE}/mail
PKG_SHELL.${EXIM_USER}= ${NOLOGIN}
Index: ./mail/exim3/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/exim3/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- ./mail/exim3/Makefile 24 Mar 2007 19:21:26 -0000 1.34
+++ ./mail/exim3/Makefile 15 Jun 2007 23:18:18 -0000
@@ -31,6 +31,9 @@
PKG_GROUPS= ${EXIM_GROUP}
PKG_USERS= ${EXIM_USER}:${EXIM_GROUP}
+PKG_GROUPS_VARS+= EXIM_GROUP
+PKG_USERS_VARS+= EXIM_USER
+
PKG_UID.${EXIM_USER}?= 8
PKG_GECOS.${EXIM_USER}= Exim mail server user
PKG_HOME.${EXIM_USER}= ${VARBASE}/mail
Index: ./mail/freepops/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/freepops/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- ./mail/freepops/Makefile 12 Jun 2007 22:38:52 -0000 1.3
+++ ./mail/freepops/Makefile 15 Jun 2007 23:18:18 -0000
@@ -47,6 +47,8 @@
PKG_GECOS.${FREEPOPSD_USER}= freepopsd POP3 user
FILES_SUBST+= FREEPOPSD_USER=${FREEPOPSD_USER:Q}
FILES_SUBST+= FREEPOPSD_GROUP=${FREEPOPSD_GROUP:Q}
+PKG_GROUPS_VARS+= FREEPOPSD_GROUP
+PKG_USERS_VARS+= FREEPOPSD_USER
.include "../../security/openssl/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
Index: ./mail/gld/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/gld/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- ./mail/gld/Makefile 18 Apr 2007 17:06:16 -0000 1.22
+++ ./mail/gld/Makefile 15 Jun 2007 23:18:18 -0000
@@ -25,6 +25,8 @@
PKG_USERS= ${GLD_USER}:${GLD_GROUP}
PKG_GECOS.${GLD_USER}= Greylisting Daemon user
BUILD_DEFS+= GLD_USER GLD_GROUP
+PKG_GROUPS_VARS+= GLD_GROUP
+PKG_USERS_VARS+= GLD_USER
SUBST_CLASSES+= gld users
SUBST_STAGE.gld= post-patch
Index: ./mail/imp/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/imp/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- ./mail/imp/Makefile 18 Mar 2007 12:15:48 -0000 1.41
+++ ./mail/imp/Makefile 15 Jun 2007 23:18:18 -0000
@@ -26,6 +26,8 @@
PAXDIRS= lib locale po scripts templates themes
BUILD_DEFS+= APACHE_USER
+PKG_USERS_VARS+= APACHE_USER
+
MESSAGE_SUBST+= IMPDIR=${IMPDIR:Q}
MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
Index: ./mail/ingo/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/ingo/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- ./mail/ingo/Makefile 18 Mar 2007 12:09:33 -0000 1.8
+++ ./mail/ingo/Makefile 15 Jun 2007 23:18:18 -0000
@@ -33,6 +33,8 @@
SUBST_SED.files= -e "s|@INGODIR@|${INGODIR}|g"
SUBST_MESSAGE.files= Fixing configuration files.
+PKG_USERS_VARS+= APACHE_USER
+
CONF_FILES= ${EGDIR}/ingo.conf ${PKG_SYSCONFDIR}/ingo.conf
CONF_FILES_PERMS+= ${INGODIR}/config/conf.xml.dist \
${INGODIR}/config/conf.xml \
Index: ./mail/mailman/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/mailman/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- ./mail/mailman/Makefile 28 Mar 2007 20:55:58 -0000 1.47
+++ ./mail/mailman/Makefile 15 Jun 2007 23:18:18 -0000
@@ -35,6 +35,9 @@
PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
PLIST_SUBST+= MAILMAN_CGIEXT=${MAILMAN_CGIEXT:S/none//}
+PKG_GROUPS_VARS+= MAILMAN_GROUP MAILMAN_CGIGROUP MAILMAN_MAILGROUP
+PKG_USERS_VARS+= MAILMAN_USER
+
PKG_GROUPS= ${MAILMAN_GROUP}
PKG_USERS= ${MAILMAN_USER}:${MAILMAN_GROUP}
Index: ./mail/majordomo/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/majordomo/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- ./mail/majordomo/Makefile 22 Feb 2007 19:26:41 -0000 1.28
+++ ./mail/majordomo/Makefile 15 Jun 2007 23:18:18 -0000
@@ -26,6 +26,9 @@
MAJORDOMO_USER?= majordom
MAJORDOMO_GROUP?= majordom
+PKG_GROUPS_VARS+= MAJORDOMO_GROUP
+PKG_USERS_VARS+= MAJORDOMO_USER
+
MESSAGE_SUBST+= HOME=${MAJORDOMO_HOMEDIR} \
MAJORDOMO_USER=${MAJORDOMO_USER} \
MAJORDOMO_GROUP=${MAJORDOMO_GROUP}
Index: ./mail/mimedefang/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/mimedefang/Makefile,v
retrieving revision 1.36
diff -u -r1.36 Makefile
--- ./mail/mimedefang/Makefile 14 Mar 2007 11:21:33 -0000 1.36
+++ ./mail/mimedefang/Makefile 15 Jun 2007 23:18:18 -0000
@@ -30,6 +30,9 @@
PKG_GROUPS= ${DEFANG_GROUP}
PKG_USERS= ${DEFANG_USER}:${DEFANG_GROUP}
+PKG_GROUPS_VARS+= DEFANG_GROUP
+PKG_USERS_VARS+= DEFANG_USER
+
BUILD_DEFS+= PKG_SYSCONFSUBDIR DEFANG_SPOOLDIR
BUILD_DEFS+= DEFANG_USER DEFANG_GROUP VARBASE
Index: ./mail/nullmailer/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/nullmailer/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- ./mail/nullmailer/Makefile 24 Mar 2007 06:49:02 -0000 1.27
+++ ./mail/nullmailer/Makefile 15 Jun 2007 23:18:20 -0000
@@ -23,6 +23,8 @@
NULLMAILER_USER?= nullmail
PKG_GROUPS= ${NULLMAILER_GROUP}
PKG_USERS= ${NULLMAILER_USER}:${NULLMAILER_GROUP}
+PKG_GROUPS_VARS+= NULLMAILER_GROUP
+PKG_USERS_VARS+= NULLMAILER_USER
MAKE_ENV+= NULLMAILER_GROUP=${NULLMAILER_GROUP:Q}
MAKE_ENV+= NULLMAILER_USER=${NULLMAILER_USER:Q}
Index: ./mail/popa3d/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/popa3d/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- ./mail/popa3d/Makefile 7 Jan 2007 09:13:59 -0000 1.47
+++ ./mail/popa3d/Makefile 15 Jun 2007 23:18:20 -0000
@@ -18,6 +18,9 @@
PKG_GROUPS= ${POPA3D_GROUP}
PKG_USERS= ${POPA3D_USER}:${POPA3D_GROUP}
+PKG_GROUPS_VARS+= POPA3D_GROUP
+PKG_USERS_VARS+= POPA3D_USER
+
RCD_SCRIPTS= popa3d
FILES_SUBST+= POPA3D_USER=${POPA3D_USER:Q}
Index: ./mail/postgrey/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/postgrey/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- ./mail/postgrey/Makefile 8 Jun 2007 12:25:04 -0000 1.19
+++ ./mail/postgrey/Makefile 15 Jun 2007 23:18:20 -0000
@@ -32,6 +32,8 @@
RCD_SCRIPTS= postgrey
PKG_GROUPS= ${POSTGREY_GROUP}
PKG_USERS= ${POSTGREY_USER}:${POSTGREY_GROUP}
+PKG_GROUPS_VARS+= POSTGREY_GROUP
+PKG_USERS_VARS+= POSTGREY_USER
PKG_GECOS.${POSTGREY_USER}= Postgrey Daemon User
Index: ./mail/prayer/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/prayer/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- ./mail/prayer/Makefile 8 Jun 2007 12:25:04 -0000 1.30
+++ ./mail/prayer/Makefile 15 Jun 2007 23:18:20 -0000
@@ -18,6 +18,9 @@
BUILD_DEFS+= PRAYER_USER PRAYER_GROUP VARBASE
+PKG_GROUPS_VARS+= PRAYER_GROUP
+PKG_USERS_VARS+= PRAYER_USER
+
MAKE_ENV+= EGDIR=${EGDIR:Q}
MAKE_ENV+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
MAKE_ENV+= BUILDLINK_PREFIX.db4="${BUILDLINK_PREFIX.db4}"
Index: ./mail/qpopper/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/qpopper/Makefile,v
retrieving revision 1.58
diff -u -r1.58 Makefile
--- ./mail/qpopper/Makefile 24 Mar 2007 19:21:27 -0000 1.58
+++ ./mail/qpopper/Makefile 15 Jun 2007 23:18:20 -0000
@@ -28,6 +28,8 @@
BUILD_DEFS+= QPOPPER_USER QPOPPER_GROUP
BUILD_DEFS+= QPOPPER_APOP_AUTH
+PKG_GROUPS_VARS+= QPOPPER_GROUP
+PKG_USERS_VARS+= QPOPPER_USER
.if defined(QPOPPER_SPOOL_DIR)
CONFIGURE_ARGS+= --enable-spool-dir=${QPOPPER_SPOOL_DIR:Q}
Index: ./mail/roundcube/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/roundcube/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- ./mail/roundcube/Makefile 5 Jun 2007 20:25:26 -0000 1.4
+++ ./mail/roundcube/Makefile 15 Jun 2007 23:18:20 -0000
@@ -19,6 +19,9 @@
PKG_SYSCONFSUBDIR?= httpd
+PKG_GROUPS_VARS+= APACHE_GROUP
+PKG_USERS_VARS+= APACHE_USER
+
BUILD_DEFS+= APACHE_USER APACHE_GROUP VARBASE
RCDIR= ${PREFIX}/share/roundcube
EGDIR= ${PREFIX}/share/examples/roundcube
Index: ./mail/squirrelmail/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/squirrelmail/Makefile,v
retrieving revision 1.88
diff -u -r1.88 Makefile
--- ./mail/squirrelmail/Makefile 22 May 2007 11:13:27 -0000 1.88
+++ ./mail/squirrelmail/Makefile 15 Jun 2007 23:18:20 -0000
@@ -23,6 +23,9 @@
REPLACE_PERL+= config/conf.pl
BUILD_DEFS+= APACHE_GROUP APACHE_USER VARBASE
+PKG_GROUPS_VARS+= APACHE_GROUP
+PKG_USERS_VARS+= APACHE_USER
+
.include "options.mk"
PKG_SYSCONFSUBDIR?= httpd
Index: ./mail/sympa/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/sympa/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- ./mail/sympa/Makefile 15 Jun 2007 18:15:19 -0000 1.28
+++ ./mail/sympa/Makefile 15 Jun 2007 23:18:20 -0000
@@ -94,6 +94,9 @@
PKG_HOME.${SYMPA_USER}= ${SYMPA_VARBASE}
+PKG_GROUPS_VARS+= SYMPA_GROUP
+PKG_USERS_VARS+= SYMPA_USER
+
.for d in sympa sympa/create_list_templates sympa/general_task_models \
sympa/scenari sympa/task_models sympa/templates sympa/wws_templates
OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/${d} ${SYMPA_USER} ${SYMPA_GROUP} 755
Index: ./mail/turba/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/turba/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- ./mail/turba/Makefile 18 Mar 2007 12:14:05 -0000 1.20
+++ ./mail/turba/Makefile 15 Jun 2007 23:18:20 -0000
@@ -28,6 +28,8 @@
PKG_SYSCONFSUBDIR?= httpd
+PKG_USERS_VARS+= APACHE_USER
+
SUBST_CLASSES+= files
SUBST_STAGE.files= post-build
SUBST_FILES.files= turba.conf.dist
Index: ./misc/jitterbug/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/misc/jitterbug/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- ./misc/jitterbug/Makefile 31 Jan 2007 00:04:12 -0000 1.29
+++ ./misc/jitterbug/Makefile 15 Jun 2007 23:18:21 -0000
@@ -49,6 +49,9 @@
.endif
JB_EMAIL?= ${JB_LOCALMAIL}@${JB_FQHOSTNAME}
+PKG_GROUPS_VARS+= JB_GROUP
+PKG_USERS_VARS+= JB_USER
+
HAS_CONFIGURE= yes
CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
Index: ./mk/unprivileged.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/unprivileged.mk,v
retrieving revision 1.11
diff -u -r1.11 unprivileged.mk
--- ./mk/unprivileged.mk 6 Jun 2007 12:41:53 -0000 1.11
+++ ./mk/unprivileged.mk 15 Jun 2007 23:18:21 -0000
@@ -17,7 +17,15 @@
# Specifies the user name (or uid) that will be used to install
# files.
-.if (defined(UNPRIVILEGED) && !empty(UNPRIVILEGED:M[Yy][Ee][Ss])) || ${_USE_DESTDIR} == "user-destdir"
+_UNPRIVILEGED= # empty
+.if (defined(UNPRIVILEGED) && !empty(UNPRIVILEGED:M[Yy][Ee][Ss])
+_UNPRIVILEGED+= unprivileged
+.endif
+.if (${_USE_DESTDIR} == "user-destdir")
+_UNPRIVILEGED+= user-destdir
+.endif
+
+.if !empty(_UNPRIVILEGED)
# Guess which user/group has to be used.
. if !defined(UNPRIVILEGED_USER) || empty(UNPRIVILEGED_USER)
@@ -27,7 +35,8 @@
UNPRIVILEGED_GROUP!= ${ID} -n -g
. endif
-. if ${_USE_DESTDIR} == "user-destdir" && (!defined(UNPRIVILEGED) || empty(UNPRIVILEGED:M[Yy][Ee][Ss]))
+. if empty(_UNPRIVILEGED:Munprivileged) && !empty(_UNPRIVILEGED:Muser-destdir)
+# Only do following for privileged, user-destdir builds.
_SU_ROOT_USER:= ${ROOT_USER}
REAL_ROOT_USER:= ${ROOT_USER}
REAL_ROOT_GROUP:= ${ROOT_GROUP}
@@ -53,9 +62,31 @@
# when overwriting files if they are not writable.
BINMODE= 755
NONBINMODE= 644
+
+. if !empty(_UNPRIVILEGED:Munprivileged) && empty(_UNPRIVILEGED:Muser-destdir)
+# Only do the following for unprivileged, normal builds.
+
+# PKG_USERS_VARS is a list of variables that hold bare user names, e.g
+# APACHE_USER, etc.
+#
+# PKG_GROUPS_VARS is a list of variables that hold bare group names, e.g
+# UUCP_GROUP, etc.
+#
+PKG_USERS_VARS?= # empty
+PKG_GROUPS_VARS?= # empty
+
+# Override per-package, custom users and groups.
+. for _var_ in ${PKG_USERS_VARS}
+${_var_}= ${UNPRIVILEGED_USER}
+. endfor
+. for _var_ in ${PKG_GROUPS_VARS}
+${_var_}= ${UNPRIVILEGED_GROUP}
+. endfor
+. endif
+
.endif
-.if (defined(UNPRIVILEGED) && !empty(UNPRIVILEGED:M[Yy][Ee][Ss]))
+.if !empty(_UNPRIVILEGED:Munprivileged)
# As a regular user, creation of other users and groups won't work, so
# disable this step by default.
PKG_CREATE_USERGROUP= NO
@@ -67,5 +98,4 @@
# Do not attempt to modify /etc/shells as a regular user.
PKG_REGISTER_SHELLS= NO
-
.endif
Index: ./net/bind9/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/bind9/Makefile,v
retrieving revision 1.89
diff -u -r1.89 Makefile
--- ./net/bind9/Makefile 12 Jun 2007 14:08:37 -0000 1.89
+++ ./net/bind9/Makefile 15 Jun 2007 23:18:21 -0000
@@ -29,6 +29,9 @@
# include at the bottom to use OpenSSL shipped with BIND9.
CONFIGURE_ARGS+=--with-openssl=${SSLBASE:Q}
+PKG_GROUPS_VARS+= BIND_GROUP
+PKG_USERS_VARS+= BIND_USER
+
PKG_GROUPS= ${BIND_GROUP}
PKG_USERS= ${BIND_USER}:${BIND_GROUP}
Index: ./net/freeradius/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/freeradius/Makefile,v
retrieving revision 1.59
diff -u -r1.59 Makefile
--- ./net/freeradius/Makefile 14 Apr 2007 10:16:47 -0000 1.59
+++ ./net/freeradius/Makefile 15 Jun 2007 23:18:22 -0000
@@ -33,6 +33,8 @@
RADIUS_GROUP?= radius
PKG_GROUPS= ${RADIUS_USER}
PKG_USERS= ${RADIUS_USER}:${RADIUS_GROUP}
+PKG_GROUPS_VARS+= RADIUS_GROUP
+PKG_USERS_VARS+= RADIUS_USER
OWN_DIRS_PERMS+= ${VARBASE}/run/radiusd \
${RADIUS_USER} ${RADIUS_GROUP} 0750
OWN_DIRS_PERMS+= ${VARBASE}/log/radiusd \
Index: ./net/gofish/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/gofish/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- ./net/gofish/Makefile 22 Feb 2007 19:26:53 -0000 1.8
+++ ./net/gofish/Makefile 15 Jun 2007 23:18:22 -0000
@@ -24,6 +24,9 @@
GOPHER_UID= 30
GOPHER_GID= 30
+PKG_GROUPS_VARS+= GOPHER_GROUP
+PKG_USERS_VARS+= GOPHER_USER
+
PKG_GROUPS= ${GOPHER_GROUP}
PKG_USERS= ${GOPHER_USER}:${GOPHER_GROUP}
PKG_GID.${GOPHER_GROUP}= ${GOPHER_GID}
Index: ./net/hobbitclient/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/hobbitclient/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- ./net/hobbitclient/Makefile 29 May 2007 04:58:06 -0000 1.5
+++ ./net/hobbitclient/Makefile 15 Jun 2007 23:18:22 -0000
@@ -37,6 +37,9 @@
PKG_GECOS.${BBUSER}= Hobbit monitor
PKG_HOME.${BBUSER}= ${BBTOPDIR}
+PKG_GROUPS_VARS+= BBGROUP
+PKG_USERS_VARS+= BBUSER
+
CONFIGURE_ARGS+="--client"
CONFIGURE_ENV+= TARGET=hobbit
Index: ./net/hobbitmon/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/hobbitmon/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- ./net/hobbitmon/Makefile 21 Jul 2006 16:20:42 -0000 1.18
+++ ./net/hobbitmon/Makefile 15 Jun 2007 23:18:22 -0000
@@ -34,6 +34,9 @@
PKG_GECOS.${BBUSER}= Hobbit monitor
PKG_HOME.${BBUSER}= ${BBTOPDIR}
+PKG_GROUPS_VARS+= BBGROUP
+PKG_USERS_VARS+= BBUSER
+
EVAL_PREFIX+= PREFIX.fping=fping
CONFIGURE_ENV+= TARGET=hobbit
Index: ./net/howl/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/howl/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- ./net/howl/Makefile 23 Apr 2006 00:12:39 -0000 1.15
+++ ./net/howl/Makefile 15 Jun 2007 23:18:22 -0000
@@ -18,6 +18,8 @@
PKG_USERS+= ${HOWL_USER:Q}:${HOWL_GROUP:Q}
PKG_GECOS.${HOWL_USER}= Zeroconf user
+PKG_GROUPS_VARS+= HOWL_GROUP
+PKG_USERS_VARS+= HOWL_USER
BUILD_DEFS+= HOWL_GROUP HOWL_USER
FILES_SUBST+= HOWL_GROUP=${HOWL_GROUP:Q}
Index: ./net/ja-samba/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/ja-samba/Makefile,v
retrieving revision 1.49
diff -u -r1.49 Makefile
--- ./net/ja-samba/Makefile 14 Oct 2006 08:07:06 -0000 1.49
+++ ./net/ja-samba/Makefile 15 Jun 2007 23:18:22 -0000
@@ -26,6 +26,9 @@
SAMBA_USER?= samba
SAMBA_GROUP?= samba
+PKG_GROUPS_VARS+= SAMBA_GROUP
+PKG_USERS_VARS+= SAMBA_USER
+
SAMBA_ETCDIR?= ${PKG_SYSCONFDIR}
SAMBA_LIBDIR?= ${PREFIX}/lib/samba
SAMBA_LOCKDIR?= ${SAMBA_VARDIR}/db/samba
Index: ./net/kismet/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/kismet/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- ./net/kismet/Makefile 17 Jan 2007 23:47:22 -0000 1.6
+++ ./net/kismet/Makefile 15 Jun 2007 23:18:23 -0000
@@ -26,6 +26,8 @@
KISMET_GROUP?= kismet
PKG_GROUPS= ${KISMET_GROUP}
PKG_USERS= ${KISMET_USER}:${KISMET_GROUP}::Kismet\ user:${VARBASE}/log/kismet
+PKG_GROUPS_VARS+= KISMET_GROUP
+PKG_USERS_VARS+= KISMET_USER
BUILD_DEFS+= KISMET_USER KISMET_GROUP VARBASE
PKG_SYSCONFSUBDIR= ${PKGBASE}
Index: ./net/lambdamoo/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/lambdamoo/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- ./net/lambdamoo/Makefile 20 Jun 2006 22:15:58 -0000 1.20
+++ ./net/lambdamoo/Makefile 15 Jun 2007 23:18:23 -0000
@@ -24,6 +24,9 @@
PKG_HOME.${LAMBDAMOO_USER}= ${LAMBDAMOO_HOME}
PKG_SHELL.${LAMBDAMOO_USER}= ${SH}
+PKG_GROUPS_VARS+= LAMBDAMOO_GROUP
+PKG_USERS_VARS+= LAMBDAMOO_USER
+
FILES_SUBST+= LAMBDAMOO_HOME=${LAMBDAMOO_HOME:Q}
WRKSRC= ${WRKDIR}/MOO-1.8.1
Index: ./net/mldonkey/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/mldonkey/Makefile,v
retrieving revision 1.44
diff -u -r1.44 Makefile
--- ./net/mldonkey/Makefile 16 Feb 2007 06:42:33 -0000 1.44
+++ ./net/mldonkey/Makefile 15 Jun 2007 23:18:23 -0000
@@ -5,6 +5,9 @@
RCD_SCRIPTS= mldonkey
+PKG_GROUPS_VARS+= MLDONKEY_GROUP
+PKG_USERS_VARS+= MLDONKEY_USER
+
BUILD_DEFS+= MLDONKEY_GROUP MLDONKEY_HOME MLDONKEY_USER
BUILD_DEFS+= VARBASE
Index: ./net/mydns-pgsql/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/net/mydns-pgsql/Makefile.common,v
retrieving revision 1.12
diff -u -r1.12 Makefile.common
--- ./net/mydns-pgsql/Makefile.common 23 Apr 2006 00:12:39 -0000 1.12
+++ ./net/mydns-pgsql/Makefile.common 15 Jun 2007 23:18:23 -0000
@@ -18,6 +18,8 @@
MYDNS_GROUP?= mydns
MYDNS_PERMS= ${ROOT_USER} ${ROOT_GROUP} 600
+PKG_GROUPS_VARS+= MYDNS_GROUP
+PKG_USERS_VARS+= MYDNS_USER
BUILD_DEFS+= MYDNS_USER MYDNS_GROUP
SUBST_CLASSES+= user
Index: ./net/nagios-base/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/net/nagios-base/Makefile.common,v
retrieving revision 1.4
diff -u -r1.4 Makefile.common
--- ./net/nagios-base/Makefile.common 22 Feb 2007 19:26:55 -0000 1.4
+++ ./net/nagios-base/Makefile.common 15 Jun 2007 23:18:23 -0000
@@ -7,6 +7,9 @@
NAGIOSADM_USER?= nagadmin
NAGIOSADM_GROUP?= ${NAGIOSADM_USER}
+PKG_GROUPS_VARS+= NAGIOS_GROUP NAGIOSADM_GROUP
+PKG_USERS_VARS+= NAGIOS_USER NAGIOSADM_USER
+
BUILD_DEFS+= NAGIOS_USER NAGIOS_GROUP
BUILD_DEFS+= NAGIOSADM_USER NAGIOSADM_GROUP
Index: ./net/nagios-nrpe/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/nagios-nrpe/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- ./net/nagios-nrpe/Makefile 24 Mar 2007 19:21:30 -0000 1.7
+++ ./net/nagios-nrpe/Makefile 15 Jun 2007 23:18:23 -0000
@@ -25,6 +25,9 @@
PKG_USERS+= ${NAGIOS_USER}:${NAGIOS_GROUP}
PKG_GECOS.${NAGIOS_USER}= Nagios Runtime User
+PKG_GROUPS_VARS+= NAGIOS_GROUP
+PKG_USERS_VARS+= NAGIOS_USER
+
CONFIGURE_ARGS+= --with-nrpe-user=${NAGIOS_USER:Q}
CONFIGURE_ARGS+= --with-nrpe-group=${NAGIOS_GROUP:Q}
Index: ./net/nagios-nsca/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/net/nagios-nsca/Makefile.common,v
retrieving revision 1.3
diff -u -r1.3 Makefile.common
--- ./net/nagios-nsca/Makefile.common 22 Feb 2007 19:26:56 -0000 1.3
+++ ./net/nagios-nsca/Makefile.common 15 Jun 2007 23:18:23 -0000
@@ -7,6 +7,8 @@
NAGIOSADM_USER?= nagadmin
NAGIOSADM_GROUP?= ${NAGIOSADM_USER}
+PKG_GROUPS_VARS+= NAGIOS_GROUP NAGIOSADM_GROUP
+PKG_USERS_VARS+= NAGIOS_USER NAGIOSADM_USER
USE_X11= YES
GNU_CONFIGURE= YES
Index: ./net/netdisco/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/netdisco/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- ./net/netdisco/Makefile 16 Dec 2006 15:25:41 -0000 1.17
+++ ./net/netdisco/Makefile 15 Jun 2007 23:18:23 -0000
@@ -81,6 +81,9 @@
NETDISCOGROUP?= netdisco
BUILD_DEFS+= NETDISCOUSER NETDISCOGROUP
+PKG_GROUPS_VARS+= NETDISCOGROUP
+PKG_USERS_VARS+= NETDISCOUSER
+
PKG_GROUPS= ${NETDISCOGROUP}
PKG_USERS= ${NETDISCOUSER:Q}:${NETDISCOGROUP:Q}
Index: ./net/netsaint-base/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/net/netsaint-base/Makefile.common,v
retrieving revision 1.13
diff -u -r1.13 Makefile.common
--- ./net/netsaint-base/Makefile.common 6 Feb 2007 18:28:23 -0000 1.13
+++ ./net/netsaint-base/Makefile.common 15 Jun 2007 23:18:24 -0000
@@ -9,6 +9,9 @@
NETSTADM_USER?= netstadm
NETSTADM_GROUP?= ${NETSTADM_USER}
+PKG_GROUPS_VARS+= NETSAINT_GROUP NETSTADM_GROUP
+PKG_USERS_VARS+= NETSAINT_USER NETSTADM_USER
+
PKG_GROUPS+= ${NETSAINT_GROUP}
PKG_GROUPS+= ${NETSTADM_GROUP}
Index: ./net/pygopherd/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/pygopherd/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- ./net/pygopherd/Makefile 28 Mar 2007 13:25:12 -0000 1.13
+++ ./net/pygopherd/Makefile 15 Jun 2007 23:18:24 -0000
@@ -18,6 +18,9 @@
EXAMPLEDIR= ${PREFIX}/share/examples/pygopherd
RUNTIMEDIR= ${VARBASE}/gopher
+PKG_GROUPS_VARS+= GOPHER_GROUP
+PKG_USERS_VARS+= GOPHER_USER
+
GOPHER_USER= gopher
GOPHER_GROUP= gopher
PKG_GROUPS= ${GOPHER_GROUP}
Index: ./net/rbldnsd/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/rbldnsd/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- ./net/rbldnsd/Makefile 24 Mar 2007 19:21:30 -0000 1.2
+++ ./net/rbldnsd/Makefile 15 Jun 2007 23:18:24 -0000
@@ -25,6 +25,9 @@
PKG_USERS= ${RBLDNSD_USER}:${RBLDNSD_GROUP}
PKG_HOME.${RBLDNSD_USER}= ${RBLDNSD_DIR}
+PKG_GROUPS_VARS+= RBLDNSD_GROUP
+PKG_USERS_VARS+= RBLDNSD_USER
+
FILES_SUBST+= RBLDNSD_USER=${RBLDNSD_USER} RBLDNSD_GROUP=${RBLDNSD_GROUP}
RCD_SCRIPTS= rbldnsd
Index: ./net/snort/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/snort/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- ./net/snort/Makefile 18 May 2007 22:20:09 -0000 1.30
+++ ./net/snort/Makefile 15 Jun 2007 23:18:24 -0000
@@ -24,6 +24,8 @@
EGDIR= ${PREFIX}/share/examples/snort
PKG_GROUPS= ${SNORT_GROUP}
PKG_USERS= ${SNORT_USER}:${SNORT_GROUP}
+PKG_GROUPS_VARS+= SNORT_GROUP
+PKG_USERS_VARS+= SNORT_USER
FILES_SUBST+= SNORT_USER=${SNORT_USER:Q} SNORT_GROUP=${SNORT_GROUP:Q}
BUILD_DEFS+= VARBASE
OWN_DIRS_PERMS= ${VARBASE}/log/snort ${SNORT_USER} ${SNORT_GROUP} 700
Index: ./net/spread/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/spread/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- ./net/spread/Makefile 29 Dec 2005 06:22:04 -0000 1.20
+++ ./net/spread/Makefile 15 Jun 2007 23:18:24 -0000
@@ -17,6 +17,9 @@
CONFIGURE_ARGS+= --includedir=${PREFIX:Q}/include/spread
MAKE_FLAGS+= LD=${CC:Q}
+PKG_GROUPS_VARS+= SPREAD_GROUP
+PKG_USERS_VARS+= SPREAD_USER
+
SPREAD_USER= spread
SPREAD_GROUP= spread
Index: ./net/teamspeak-server/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/teamspeak-server/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- ./net/teamspeak-server/Makefile 12 Jun 2007 14:39:22 -0000 1.3
+++ ./net/teamspeak-server/Makefile 15 Jun 2007 23:18:24 -0000
@@ -49,6 +49,8 @@
TSGROUP?= teamspeak
TSHOME?= ${HOMEBASE}/${TSUSER}
+PKG_GROUPS_VARS+= TSGROUP
+PKG_USERS_VARS+= TSUSER
BUILD_DEFS+= TSUSER TSGROUP TSHOME
PKG_GROUPS= ${TSGROUP}
Index: ./net/tor/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/tor/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- ./net/tor/Makefile 26 Apr 2007 20:04:37 -0000 1.41
+++ ./net/tor/Makefile 15 Jun 2007 23:18:24 -0000
@@ -20,6 +20,9 @@
TOR_GROUP?= tor
PKG_HOME?= /var/chroot/tor
+PKG_GROUPS_VARS+= TOR_GROUP
+PKG_USERS_VARS+= TOR_USER
+
RCD_SCRIPTS= tor
PKG_GROUPS= ${TOR_GROUP}
PKG_USERS= ${TOR_USER}:${TOR_GROUP}::Torifier:${PKG_HOME}
Index: ./net/userppp/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/userppp/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- ./net/userppp/Makefile 4 Mar 2006 21:30:25 -0000 1.21
+++ ./net/userppp/Makefile 15 Jun 2007 23:18:24 -0000
@@ -35,4 +35,6 @@
PKG_GROUPS= ${USERPPP_GROUP}
+PKG_GROUPS_VARS+= USERPPP_GROUP
+
.include "../../mk/bsd.pkg.mk"
Index: ./net/uucp/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/uucp/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- ./net/uucp/Makefile 15 Jun 2007 18:15:20 -0000 1.7
+++ ./net/uucp/Makefile 15 Jun 2007 23:18:24 -0000
@@ -20,6 +20,9 @@
CONFIGURE_ENV+= PWD_PROGRAM=${TOOLS_PWD_CMD:Q}
CONFIGURE_ENV+= RMDIR_PROGRAM=${TOOLS_RMDIR:Q}
+PKG_GROUPS_VARS+= UUCP_GROUP
+PKG_USERS_VARS+= UUCP_USER
+
UUCP_GROUP?= daemon
UUCP_USER?= uucp
PKG_GROUPS= ${UUCP_GROUP}
Index: ./net/vsftpd/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/vsftpd/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- ./net/vsftpd/Makefile 7 Jan 2007 09:14:07 -0000 1.26
+++ ./net/vsftpd/Makefile 15 Jun 2007 23:18:24 -0000
@@ -15,6 +15,9 @@
BUILD_TARGET= vsftpd
RCD_SCRIPTS= vsftpd
+PKG_GROUPS_VARS+= VSFTPD_GROUP
+PKG_USERS_VARS+= VSFTPD_USER
+
VSFTPD_USER?= vsftpd
VSFTPD_GROUP?= vsftpd
PKG_GROUPS= ${VSFTPD_GROUP}
Index: ./news/inn/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/news/inn/Makefile,v
retrieving revision 1.83
diff -u -r1.83 Makefile
--- ./news/inn/Makefile 14 Oct 2006 08:08:28 -0000 1.83
+++ ./news/inn/Makefile 15 Jun 2007 23:18:24 -0000
@@ -42,6 +42,9 @@
CONFIGURE_ENV+= GZIP=${TOOLS_GZIP_CMD:Q}
USE_TOOLS+= awk egrep gzip perl:run sed sh sort yacc
+PKG_GROUPS_VARS+= INN_GROUP
+PKG_USERS_VARS+= INN_USER
+
PKG_GROUPS= ${INN_GROUP}
PKG_USERS= ${INN_USER}:${INN_GROUP}
PKG_GECOS.${INN_USER}= Internet\ News
Index: ./news/leafnode/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/news/leafnode/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- ./news/leafnode/Makefile 15 Oct 2006 20:06:59 -0000 1.35
+++ ./news/leafnode/Makefile 15 Jun 2007 23:18:24 -0000
@@ -30,6 +30,8 @@
PKG_HOME.${LEAFNODE_USER}= ${LEAFNODE_DATA_DIR}
PKG_SHELL.${LEAFNODE_USER}= ${SH}
+PKG_GROUPS_VARS+= LEAFNODE_GROUP
+PKG_USERS_VARS+= LEAFNODE_USER
BUILD_DEFS+= USE_INET6
FILES_SUBST+= LEAFNODE_SPOOL=${LEAFNODE_SPOOL:Q}
Index: ./parallel/sge/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/parallel/sge/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- ./parallel/sge/Makefile 8 Jun 2007 12:25:05 -0000 1.24
+++ ./parallel/sge/Makefile 15 Jun 2007 23:18:25 -0000
@@ -40,6 +40,8 @@
SGE_GROUP?= sgeadmin
PKG_GROUPS= ${SGE_GROUP}
PKG_USERS= ${SGE_USER}:${SGE_GROUP}::Sun\ Grid\ Engine\ Administrator
+PKG_GROUPS_VARS+= SGE_GROUP
+PKG_USERS_VARS+= SGE_USER
EVAL_PREFIX+= PKGSRC_SSL_PREFIX=openssl
Index: ./print/cups/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups/Makefile,v
retrieving revision 1.123
diff -u -r1.123 Makefile
--- ./print/cups/Makefile 15 Jun 2007 18:15:20 -0000 1.123
+++ ./print/cups/Makefile 15 Jun 2007 23:18:25 -0000
@@ -91,6 +91,8 @@
FILES_SUBST+= CUPS_USER=${CUPS_USER:Q}
FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP:Q}
+PKG_GROUPS_VARS+= CUPS_GROUP
+PKG_USERS_VARS+= CUPS_USER
BUILD_DEFS+= CUPS_USER CUPS_GROUP
DOCDIR= ${PREFIX}/share/doc/cups
Index: ./security/amavisd-new/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/amavisd-new/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- ./security/amavisd-new/Makefile 1 Jun 2007 04:41:07 -0000 1.31
+++ ./security/amavisd-new/Makefile 15 Jun 2007 23:18:25 -0000
@@ -47,6 +47,8 @@
EGDIR= ${PREFIX}/share/examples/amavisd-new
MESSAGE_SRC= ${PKGDIR}/MESSAGE
+PKG_GROUPS_VARS+= AMAVIS_GROUP
+PKG_USERS_VARS+= AMAVIS_USER
BUILD_DEFS+= AMAVIS_USER AMAVIS_GROUP AMAVIS_DIR AMAVIS_QUARANTINE
FILES_SUBST+= AMAVIS_USER=${AMAVIS_USER:Q}
FILES_SUBST+= AMAVIS_GROUP=${AMAVIS_GROUP:Q}
Index: ./security/base/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/base/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- ./security/base/Makefile 18 May 2007 23:27:22 -0000 1.13
+++ ./security/base/Makefile 15 Jun 2007 23:18:26 -0000
@@ -35,6 +35,9 @@
USE_TOOLS+= perl:run
REPLACE_PERL+= scripts/base_maintenance.pl
+PKG_GROUPS_VARS+= WWW_GROUP
+PKG_USERS_VARS+= WWW_USER
+
CONF_FILES= ${EGDIR}/base.conf ${PKG_SYSCONFDIR}/base.conf
CONF_FILES_PERMS= ${EGDIR}/base_conf.php ${BASE_DIR}/base_conf.php \
Index: ./security/courier-authlib/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/security/courier-authlib/Makefile.common,v
retrieving revision 1.9
diff -u -r1.9 Makefile.common
--- ./security/courier-authlib/Makefile.common 28 Apr 2006 14:41:23 -0000 1.9
+++ ./security/courier-authlib/Makefile.common 15 Jun 2007 23:18:26 -0000
@@ -10,6 +10,9 @@
PKG_GROUPS= ${COURIER_GROUP}
PKG_USERS= ${COURIER_USER}:${COURIER_GROUP}
+PKG_GROUPS_VARS+= COURIER_GROUP
+PKG_USERS_VARS+= COURIER_USER
+
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-mailuser=${COURIER_USER:Q}
CONFIGURE_ARGS+= --with-mailgroup=${COURIER_GROUP:Q}
Index: ./security/cyrus-sasl/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/cyrus-sasl/Makefile,v
retrieving revision 1.54
diff -u -r1.54 Makefile
--- ./security/cyrus-sasl/Makefile 22 Feb 2007 19:27:07 -0000 1.54
+++ ./security/cyrus-sasl/Makefile 15 Jun 2007 23:18:26 -0000
@@ -55,6 +55,8 @@
CYRUS_GROUP?= mail
FILES_SUBST+= CYRUS_USER=${CYRUS_USER:Q}
FILES_SUBST+= ROOT_USER=${ROOT_USER:Q}
+PKG_GROUPS_VARS+= CYRUS_GROUP
+PKG_USERS_VARS+= CYRUS_USER
BUILD_DEFS+= CYRUS_USER CYRUS_GROUP
PKG_GROUPS= ${CYRUS_GROUP}
Index: ./security/dirmngr/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/dirmngr/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- ./security/dirmngr/Makefile 12 May 2007 11:19:18 -0000 1.28
+++ ./security/dirmngr/Makefile 15 Jun 2007 23:18:26 -0000
@@ -19,6 +19,8 @@
DIRMNGR_GROUP?= dirmngr
PKG_GROUPS= ${DIRMNGR_GROUP}
PKG_USERS= ${DIRMNGR_USER}:${DIRMNGR_GROUP}
+PKG_GROUPS_VARS+= DIRMNGR_GROUP
+PKG_USERS_VARS+= DIRMNGR_USER
PKG_HOME.${DIRMNGR_USER}= ${VARBASE}/dirmngr
Index: ./security/libprelude/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/libprelude/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- ./security/libprelude/Makefile 5 Jun 2007 05:37:00 -0000 1.22
+++ ./security/libprelude/Makefile 15 Jun 2007 23:18:26 -0000
@@ -16,6 +16,9 @@
PRELUDE_USER?= _prelude
PRELUDE_GROUP?= _prelude
+PKG_GROUPS_VARS+= PRELUDE_GROUP
+PKG_USERS_VARS+= PRELUDE_USER
+
BUILD_DEFS+= PRELUDE_USER PRELUDE_GROUP VARBASE
USE_PKGLOCALEDIR= yes
Index: ./security/openssh+gssapi/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/openssh+gssapi/Makefile,v
retrieving revision 1.38
diff -u -r1.38 Makefile
--- ./security/openssh+gssapi/Makefile 22 Feb 2007 19:27:08 -0000 1.38
+++ ./security/openssh+gssapi/Makefile 15 Jun 2007 23:18:26 -0000
@@ -44,6 +44,9 @@
PLIST_SRC= # empty
MESSAGE_SRC= ${.CURDIR}/MESSAGE
+PKG_GROUPS_VARS+= OPENSSH_GROUP
+PKG_USERS_VARS+= OPENSSH_USER
+
PKG_GROUPS= ${OPENSSH_GROUP}
PKG_USERS= ${OPENSSH_USER}:${OPENSSH_GROUP}
Index: ./security/openssh/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/openssh/Makefile,v
retrieving revision 1.179
diff -u -r1.179 Makefile
--- ./security/openssh/Makefile 18 Mar 2007 12:38:44 -0000 1.179
+++ ./security/openssh/Makefile 15 Jun 2007 23:18:27 -0000
@@ -30,6 +30,8 @@
# retain the following line, for IPv6-ready pkgsrc webpage
BUILD_DEFS+= USE_INET6
+PKG_GROUPS_VARS+= OPENSSH_GROUP
+PKG_USERS_VARS+= OPENSSH_USER
BUILD_DEFS+= OPENSSH_CHROOT OPENSSH_GROUP OPENSSH_USER
BUILD_DEFS+= VARBASE
Index: ./security/pks/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/pks/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- ./security/pks/Makefile 23 Apr 2006 00:12:42 -0000 1.25
+++ ./security/pks/Makefile 15 Jun 2007 23:18:27 -0000
@@ -18,6 +18,9 @@
GNU_CONFIGURE= YES
+PKG_GROUPS_VARS+= PKS_GROUP
+PKG_USERS_VARS+= PKS_USER
+
PKS_USER= pks
PKS_GROUP= pks
PKS_SERVER?= localhost
Index: ./security/prelude-lml/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/prelude-lml/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- ./security/prelude-lml/Makefile 5 Jun 2007 05:37:34 -0000 1.16
+++ ./security/prelude-lml/Makefile 15 Jun 2007 23:18:27 -0000
@@ -16,6 +16,9 @@
PRELUDE_USER?= _prelude
PRELUDE_GROUP?= _prelude
+PKG_GROUPS_VARS+= PRELUDE_GROUP
+PKG_USERS_VARS+= PRELUDE_USER
+
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
Index: ./security/prelude-manager/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/prelude-manager/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- ./security/prelude-manager/Makefile 5 Jun 2007 05:37:34 -0000 1.19
+++ ./security/prelude-manager/Makefile 15 Jun 2007 23:18:27 -0000
@@ -26,6 +26,9 @@
PRELUDE_GROUP?= _prelude
PRELUDE_HOME?= /var/spool/prelude-manager
+PKG_GROUPS_VARS+= PRELUDE_GROUP
+PKG_USERS_VARS+= PRELUDE_USER
+
PKG_GROUPS= ${PRELUDE_GROUP}
PKG_USERS= ${PRELUDE_USER}:${PRELUDE_GROUP}
Index: ./security/py-prewikka/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/py-prewikka/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- ./security/py-prewikka/Makefile 5 Jun 2007 05:37:35 -0000 1.20
+++ ./security/py-prewikka/Makefile 15 Jun 2007 23:18:27 -0000
@@ -40,6 +40,9 @@
PKG_GECOS.${PREWIKKA_USER}= Prelude-IDS console
PKG_HOME.${PREWIKKA_USER}= ${PREWIKKA_HOME}
+PKG_GROUPS_VARS+= PREWIKKA_GROUP
+PKG_USERS_VARS+= PREWIKKA_USER
+
SUBST_CLASSES+= code
SUBST_STAGE.code= post-patch
SUBST_FILES.code= runPrewikka.c
Index: ./sysutils/amanda-common/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/amanda-common/Makefile.common,v
retrieving revision 1.24
diff -u -r1.24 Makefile.common
--- ./sysutils/amanda-common/Makefile.common 5 Jan 2007 12:47:27 -0000 1.24
+++ ./sysutils/amanda-common/Makefile.common 15 Jun 2007 23:18:27 -0000
@@ -24,6 +24,8 @@
AMANDA_TMP?= /tmp/amanda
AMANDA_VAR?= ${VARBASE}/amanda
+PKG_GROUPS_VARS+= AMANDA_GROUP
+PKG_USERS_VARS+= AMANDA_USER
BUILD_DEFS+= AMANDA_USER AMANDA_GROUP AMANDA_SMB
BUILD_DEFS+= AMANDA_TMP AMANDA_VAR VARBASE
Index: ./sysutils/bacula/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/bacula/Makefile.common,v
retrieving revision 1.38
diff -u -r1.38 Makefile.common
--- ./sysutils/bacula/Makefile.common 16 Apr 2007 16:10:42 -0000 1.38
+++ ./sysutils/bacula/Makefile.common 15 Jun 2007 23:18:28 -0000
@@ -18,6 +18,9 @@
BACULA_DIR_USER?= bacula-dir
BACULA_SD_USER?= bacula-sd
+PKG_GROUPS_VARS+= BACULA_GROUP
+PKG_USERS_VARS+= BACULA_DIR_USER BACULA_SD_USER
+
PKG_SYSCONFSUBDIR?= bacula
BACULA_PIDDIR?= ${VARBASE}/run
BACULA_WORKINGDIR?= ${VARBASE}/spool/bacula
Index: ./sysutils/dbus/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/dbus/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- ./sysutils/dbus/Makefile 17 Jan 2007 02:46:59 -0000 1.23
+++ ./sysutils/dbus/Makefile 15 Jun 2007 23:18:28 -0000
@@ -66,6 +66,8 @@
RCD_SCRIPTS= dbus
+PKG_GROUPS_VARS+= DBUS_GROUP
+PKG_USERS_VARS+= DBUS_USER
BUILD_DEFS+= DBUS_USER DBUS_GROUP
PKG_GROUPS= ${DBUS_GROUP}
Index: ./sysutils/munin-node/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/munin-node/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- ./sysutils/munin-node/Makefile 5 Dec 2006 14:53:32 -0000 1.8
+++ ./sysutils/munin-node/Makefile 15 Jun 2007 23:18:28 -0000
@@ -21,6 +21,9 @@
WRKSRC= ${WRKDIR}/${DISTNAME:S:_:-:}
+PKG_GROUPS_VARS+= MUNIN_GROUP
+PKG_USERS_VARS+= MUNIN_USER
+
MUNIN_GROUP?= munin
MUNIN_USER?= munin
Index: ./sysutils/munin-server/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/munin-server/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- ./sysutils/munin-server/Makefile 5 Dec 2006 14:53:32 -0000 1.7
+++ ./sysutils/munin-server/Makefile 15 Jun 2007 23:18:28 -0000
@@ -25,6 +25,9 @@
WRKSRC= ${WRKDIR}/${DISTNAME:S:_:-:}
CHECK_PORTABILITY_SKIP+= node/node.d/*
+PKG_GROUPS_VARS+= MUNIN_GROUP
+PKG_USERS_VARS+= MUNIN_USER
+
MUNIN_GROUP?= munin
MUNIN_USER?= munin
Index: ./sysutils/ups-nut/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/ups-nut/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- ./sysutils/ups-nut/Makefile 16 Aug 2006 13:15:54 -0000 1.47
+++ ./sysutils/ups-nut/Makefile 15 Jun 2007 23:18:28 -0000
@@ -14,6 +14,8 @@
NUT_USER?= nut
NUT_GROUP?= nut
+PKG_GROUPS_VARS+= NUT_GROUP
+PKG_USERS_VARS+= NUT_USER
BUILD_DEFS+= NUT_STATEDIR NUT_USER NUT_GROUP
FILES_SUBST+= NUT_CONFDIR=${NUT_CONFDIR:Q}
Index: ./time/kronolith/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/time/kronolith/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- ./time/kronolith/Makefile 18 Mar 2007 12:11:28 -0000 1.9
+++ ./time/kronolith/Makefile 15 Jun 2007 23:18:28 -0000
@@ -35,6 +35,8 @@
SUBST_SED.files= -e "s|@KRONOLITHDIR@|${KRONOLITHDIR}|g"
SUBST_MESSAGE.files= Fixing configuration files.
+PKG_USERS_VARS+= APACHE_USER
+
CONF_FILES= ${EGDIR}/kronolith.conf ${PKG_SYSCONFDIR}/kronolith.conf
CONF_FILES_PERMS+= ${KRONOLITHDIR}/config/conf.xml.dist \
${KRONOLITHDIR}/config/conf.xml \
Index: ./www/ap2-suphp/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/ap2-suphp/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- ./www/ap2-suphp/Makefile 29 May 2007 22:17:19 -0000 1.9
+++ ./www/ap2-suphp/Makefile 15 Jun 2007 23:18:28 -0000
@@ -20,6 +20,7 @@
CONFIGURE_ARGS+= --with-logfile=${VARBASE}/httpd/suphp_log
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+PKG_USERS_VARS+= APACHE_USER
BUILD_DEFS+= APACHE_USER VARBASE
EGDIR= ${PREFIX}/share/examples/suphp
Index: ./www/apache/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/apache/Makefile,v
retrieving revision 1.189
diff -u -r1.189 Makefile
--- ./www/apache/Makefile 23 Jan 2007 15:45:43 -0000 1.189
+++ ./www/apache/Makefile 15 Jun 2007 23:18:29 -0000
@@ -58,6 +58,8 @@
APACHE_USER?= www
APACHE_GROUP?= www
+PKG_USERS_VARS+= APACHE_USER
+PKG_GROUPS_VARS+= APACHE_GROUP
BUILD_DEFS+= APACHE_USER APACHE_GROUP
CONFIGURE_ARGS+= --server-uid=${APACHE_USER:Q}
Index: ./www/apache2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/apache2/Makefile,v
retrieving revision 1.113
diff -u -r1.113 Makefile
--- ./www/apache2/Makefile 10 Jun 2007 06:14:18 -0000 1.113
+++ ./www/apache2/Makefile 15 Jun 2007 23:18:29 -0000
@@ -93,6 +93,8 @@
APACHE_GROUP?= www
PKG_GROUPS= ${APACHE_GROUP}
PKG_USERS= ${APACHE_USER}:${APACHE_GROUP}
+PKG_GROUPS_VARS+= APACHE_GROUP
+PKG_USERS_VARS+= APACHE_USER
BUILD_DEFS+= APACHE_USER APACHE_GROUP
PKG_SYSCONFVAR= apache
Index: ./www/apache2/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/apache2/options.mk,v
retrieving revision 1.6
diff -u -r1.6 options.mk
--- ./www/apache2/options.mk 22 Feb 2007 19:27:19 -0000 1.6
+++ ./www/apache2/options.mk 15 Jun 2007 23:18:29 -0000
@@ -6,6 +6,7 @@
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Msuexec)
+PKG_USERS_VARS+= APACHE_USER
BUILD_DEFS+= VARBASE APACHE_USER APACHE_SUEXEC_PATH
BUILD_DEFS+= APACHE_SUEXEC_DOCROOT APACHE_SUEXEC_LOGFILE
Index: ./www/apache22/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/apache22/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- ./www/apache22/Makefile 8 Jun 2007 12:25:06 -0000 1.13
+++ ./www/apache22/Makefile 15 Jun 2007 23:18:29 -0000
@@ -105,6 +105,8 @@
APACHE_GROUP?= www
PKG_GROUPS= ${APACHE_GROUP}
PKG_USERS= ${APACHE_USER}:${APACHE_GROUP}
+PKG_GROUPS_VARS+= APACHE_GROUP
+PKG_USERS_VARS+= APACHE_USER
BUILD_DEFS+= APACHE_USER APACHE_GROUP
PKG_SYSCONFVAR= apache
Index: ./www/apache22/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/apache22/options.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 options.mk
--- ./www/apache22/options.mk 8 Dec 2006 23:31:52 -0000 1.1.1.1
+++ ./www/apache22/options.mk 15 Jun 2007 23:18:29 -0000
@@ -6,6 +6,7 @@
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Msuexec)
+PKG_USERS_VARS+= APACHE_USER
BUILD_DEFS+= VARBASE APACHE_USER APACHE_SUEXEC_PATH
BUILD_DEFS+= APACHE_SUEXEC_DOCROOT APACHE_SUEXEC_LOGFILE
Index: ./www/awstats/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/awstats/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- ./www/awstats/Makefile 20 Feb 2007 18:29:49 -0000 1.32
+++ ./www/awstats/Makefile 15 Jun 2007 23:18:29 -0000
@@ -27,6 +27,9 @@
APACHE_GROUP?= www
BUILD_DEFS+= APACHE_USER APACHE_GROUP VARBASE
+PKG_GROUPS_VARS+= APACHE_GROUP
+PKG_USERS_VARS+= APACHE_USER
+
# OWN_DIRS= ${VARBASE}/awstats
OWN_DIRS_PERMS+= ${VARBASE}/awstats ${APACHE_USER} ${APACHE_GROUP} 0700
PKG_SYSCONFSUBDIR= awstats
Index: ./www/drupal/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/drupal/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- ./www/drupal/Makefile 9 Apr 2007 19:30:48 -0000 1.21
+++ ./www/drupal/Makefile 15 Jun 2007 23:18:30 -0000
@@ -16,6 +16,9 @@
PAX_DIRS= includes misc modules scripts themes
BUILD_DEFS+= APACHE_USER APACHE_GROUP
+PKG_GROUPS_VARS+= APACHE_GROUP
+PKG_USERS_VARS+= APACHE_USER
+
OWN_DIRS+= ${DRUPAL}/sites/default
OWN_DIRS_PERMS+= ${DRUPAL}/files ${APACHE_USER} ${APACHE_GROUP} 0750
Index: ./www/geeklog/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/geeklog/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- ./www/geeklog/Makefile 20 May 2007 15:56:44 -0000 1.15
+++ ./www/geeklog/Makefile 15 Jun 2007 23:18:30 -0000
@@ -16,7 +16,8 @@
VER= 1.4.1
NO_BUILD= YES
-BUILD_DEFS+= APACHE_GROUP GEEKLOG_SITEBASE
+PKG_GROUPS_VARS+= APACHE_GROUP
+BUILD_DEFS+= APACHE_GROUP GEEKLOG_SITEBASE
GEEKLOG_SYS= emailgeeklogstories language plugins readme sql system
GEEKLOG_TMPL_SUB= backend images/articles images/library \
Index: ./www/horde/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/horde/Makefile,v
retrieving revision 1.49
diff -u -r1.49 Makefile
--- ./www/horde/Makefile 18 Mar 2007 12:24:13 -0000 1.49
+++ ./www/horde/Makefile 15 Jun 2007 23:18:30 -0000
@@ -36,6 +36,7 @@
PAXDIRS= js lib locale po scripts services templates themes util admin
SENDMAIL?= /usr/sbin/sendmail
BUILD_DEFS+= APACHE_USER
+PKG_USERS_VARS+=APACHE_USER
PKG_SYSCONFSUBDIR?= httpd
MESSAGE_SUBST+= HORDEDIR=${HORDEDIR:Q}
Index: ./www/iasp/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/iasp/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- ./www/iasp/Makefile 22 Feb 2006 20:37:45 -0000 1.14
+++ ./www/iasp/Makefile 15 Jun 2007 23:18:30 -0000
@@ -26,6 +26,9 @@
PKG_USERS= ${IASP_USER}:${IASP_GROUP}
PKG_GROUPS= ${IASP_GROUP}
+PKG_GROUPS_VARS+= IASP_GROUP
+PKG_USERS_VARS+= IASP_USER
+
WRKSRC= ${WRKDIR}/${IASP_DIR}
REQD_DIRS= ${IASP_DESTDIR}
OWN_DIRS_PERMS= ${IASP_DESTDIR}/logs ${IASP_USER} ${IASP_GROUP} 0750
Index: ./www/privoxy/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/privoxy/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- ./www/privoxy/Makefile 24 Nov 2006 18:26:06 -0000 1.30
+++ ./www/privoxy/Makefile 15 Jun 2007 23:18:30 -0000
@@ -14,6 +14,8 @@
PRIVOXY_USER?= privoxy
PRIVOXY_GROUP?= privoxy
+PKG_GROUPS_VARS+= PRIVOXY_GROUP
+PKG_USERS_VARS+= PRIVOXY_USER
BUILD_DEFS+= PRIVOXY_USER PRIVOXY_GROUP
PKG_SYSCONFSUBDIR?= privoxy
Index: ./www/screws/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/screws/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- ./www/screws/Makefile 3 Nov 2006 21:29:45 -0000 1.17
+++ ./www/screws/Makefile 15 Jun 2007 23:18:30 -0000
@@ -12,6 +12,9 @@
USE_TOOLS+= perl:run
+PKG_GROUPS_VARS+= SCREWS_GROUP
+PKG_USERS_VARS+= SCREWS_USER
+
BUILD_DEFS+= SCREWS_USER SCREWS_GROUP
PKG_USERS= ${SCREWS_USER}:${SCREWS_GROUP}
Index: ./www/squid/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/squid/Makefile,v
retrieving revision 1.192
diff -u -r1.192 Makefile
--- ./www/squid/Makefile 13 May 2007 16:45:44 -0000 1.192
+++ ./www/squid/Makefile 15 Jun 2007 23:18:31 -0000
@@ -30,6 +30,9 @@
PLIST_SRC= ${WRKDIR}/PLIST
RCD_SCRIPTS= squid
+PKG_GROUPS_VARS+= SQUID_GROUP
+PKG_USERS_VARS+= SQUID_USER
+
PKG_GROUPS= ${SQUID_GROUP}
PKG_USERS= ${SQUID_USER}:${SQUID_GROUP}
Index: ./www/squirm/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/squirm/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- ./www/squirm/Makefile 2 Oct 2006 17:12:19 -0000 1.1.1.1
+++ ./www/squirm/Makefile 15 Jun 2007 23:18:31 -0000
@@ -20,6 +20,8 @@
SQUID_GROUP?= squid
PKG_USERS+= ${SQUID_USER}:${SQUID_GROUP}
PKG_GROUPS+= ${SQUID_GROUP}
+PKG_USERS_VARS+= SQUID_USER
+PKG_GROUPS_VARS+= SQUID_GROUP
BUILD_DEFS+= SQUID_USER SQUID_GROUP VARBASE
PKG_SYSCONFSUBDIR= squirm
Index: ./www/tinyproxy/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/tinyproxy/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- ./www/tinyproxy/Makefile 19 Sep 2006 08:31:18 -0000 1.22
+++ ./www/tinyproxy/Makefile 15 Jun 2007 23:18:31 -0000
@@ -23,6 +23,8 @@
TINYPROXY_GROUP?= tinyproxy
PKG_GROUPS= ${TINYPROXY_GROUP}
PKG_USERS= ${TINYPROXY_USER}:${TINYPROXY_GROUP}
+PKG_GROUPS_VARS+= TINYPROXY_GROUP
+PKG_USERS_VARS+= TINYPROXY_USER
FILES_SUBST+= TINYPROXY_USER=${TINYPROXY_USER:Q}
FILES_SUBST+= TINYPROXY_GROUP=${TINYPROXY_GROUP:Q}
Index: ./www/zope29/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/zope29/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- ./www/zope29/Makefile 1 Apr 2007 15:29:45 -0000 1.11
+++ ./www/zope29/Makefile 15 Jun 2007 23:18:31 -0000
@@ -35,6 +35,8 @@
# Do not change anything below this line.
+PKG_USERS_VARS+= ZOPE_USER
+
.if defined(INSTANCENAME)
ZOPEINSTANCENAME= ${INSTANCENAME}
.endif
Index: ./www/zope3/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/www/zope3/Makefile.common,v
retrieving revision 1.2
diff -u -r1.2 Makefile.common
--- ./www/zope3/Makefile.common 6 May 2006 22:38:27 -0000 1.2
+++ ./www/zope3/Makefile.common 15 Jun 2007 23:18:31 -0000
@@ -9,4 +9,7 @@
ZOPE3_GROUP?= zope3
ZOPE3_USER?= zope3
+PKG_GROUPS_VARS+= ZOPE3_GROUP
+PKG_USERS_VARS+= ZOPE3_USER
+
.include "../../lang/python/application.mk"
--C7zPtVaVf+AK4Oqc--