From 45233ac07a4c6f9e80f4f9350cbb54ee23d8bd54 Mon Sep 17 00:00:00 2001 From: jlam Date: Wed, 4 Jul 2007 20:54:31 +0000 Subject: Make it easier to build and install packages "unprivileged", where the owner of all installed files is a non-root user. This change affects most packages that require special users or groups by making them use the specified unprivileged user and group instead. (1) Add 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. --- chat/anope/Makefile | 5 ++++- chat/i2cbd/Makefile | 3 ++- chat/ircd-hybrid/Makefile | 8 +++++--- chat/ircu/Makefile | 5 ++++- chat/jabberd/Makefile | 8 +++++--- chat/jabberd2/Makefile | 6 ++++-- chat/mu-conference/Makefile | 5 +++-- chat/silc-server/Makefile | 4 +++- chat/unrealircd/Makefile | 9 ++++++--- 9 files changed, 36 insertions(+), 17 deletions(-) (limited to 'chat') diff --git a/chat/anope/Makefile b/chat/anope/Makefile index 7ad742aafec..943d6a32891 100644 --- a/chat/anope/Makefile +++ b/chat/anope/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2007/04/09 09:40:23 adrianp Exp $ +# $NetBSD: Makefile,v 1.3 2007/07/04 20:54:32 jlam Exp $ DISTNAME= anope-1.7.18 CATEGORIES= net @@ -17,6 +17,9 @@ RCD_SCRIPTS= anope 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} diff --git a/chat/i2cbd/Makefile b/chat/i2cbd/Makefile index 18ce015f01a..7576ef8a990 100644 --- a/chat/i2cbd/Makefile +++ b/chat/i2cbd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2007/03/24 19:21:19 joerg Exp $ +# $NetBSD: Makefile,v 1.25 2007/07/04 20:54:32 jlam Exp $ # DISTNAME= i2cbd-2.0_BETA5 @@ -15,6 +15,7 @@ COMMENT= Next generation Internet Citizens Band chat server BUILD_DEFS+= ICBD_OWNER ICBD_OWNER?= ${ROOT_USER} +PKG_USERS_VARS+= ICBD_OWNER PLIST_SUBST+= ICBD_OWNER=${ICBD_OWNER:Q} PKG_SYSCONFSUBDIR= icbd diff --git a/chat/ircd-hybrid/Makefile b/chat/ircd-hybrid/Makefile index 1abdc758a22..06d3168ed48 100644 --- a/chat/ircd-hybrid/Makefile +++ b/chat/ircd-hybrid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2007/02/01 23:19:56 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2007/07/04 20:54:32 jlam Exp $ DISTNAME= ircd-hybrid-7.2.2 PKGREVISION= 1 @@ -15,8 +15,7 @@ CONFLICTS+= ircu-[0-9]* GNU_CONFIGURE= YES BUILD_DEFS+= IRCD_HYBRID_SYSLOG_FACILITY IRCD_HYBRID_NICLEN \ IRCD_HYBRID_TOPICLEN IRCD_HYBRID_MAXCONN \ - IRCD_HYBRID_SYSLOG_EVENTS IRCD_HYBRID_IRC_USER \ - IRCD_HYBRID_IRC_GROUP VARBASE + IRCD_HYBRID_SYSLOG_EVENTS VARBASE .include "../../mk/bsd.prefs.mk" @@ -41,6 +40,9 @@ FILES_SUBST+= VARBASE=${VARBASE:Q} 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 diff --git a/chat/ircu/Makefile b/chat/ircu/Makefile index f8034d897c4..0bff8021baf 100644 --- a/chat/ircu/Makefile +++ b/chat/ircu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2007/06/15 14:15:40 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2007/07/04 20:54:32 jlam Exp $ # DISTNAME= ircu2.10.12.10 @@ -29,6 +29,9 @@ PKG_SYSCONFSUBDIR= ircd 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 diff --git a/chat/jabberd/Makefile b/chat/jabberd/Makefile index f1fadd64c51..e9c00cd3b8c 100644 --- a/chat/jabberd/Makefile +++ b/chat/jabberd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2006/10/08 21:58:47 rillig Exp $ +# $NetBSD: Makefile,v 1.28 2007/07/04 20:54:32 jlam Exp $ # DISTNAME= jabber-1.4.2 @@ -35,13 +35,15 @@ INCDIR= ${PREFIX}/include/jabberd # some systems don't have u_intN_t CPPFLAGS+= -Du_int8_t=uint8_t -BUILD_DEFS+= JABBERD_USER JABBERD_GROUP \ - JABBERD_LOGDIR JABBERD_SPOOLDIR \ +BUILD_DEFS+= JABBERD_LOGDIR JABBERD_SPOOLDIR \ JABBERD_PIDDIR 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} diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile index 59ae770dad8..5516039f2fc 100644 --- a/chat/jabberd2/Makefile +++ b/chat/jabberd2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2007/06/12 15:26:07 xtraeme Exp $ +# $NetBSD: Makefile,v 1.38 2007/07/04 20:54:33 jlam Exp $ # DISTNAME= jabberd-2.1.6 @@ -39,7 +39,7 @@ REPLACE_PERL+= tools/*.pl JABBERD_DBDIR?= ${VARBASE}/db/jabberd -BUILD_DEFS+= VARBASE JABBERD_USER JABBERD_GROUP +BUILD_DEFS+= VARBASE BUILD_DEFS+= JABBERD_LOGDIR JABBERD_PIDDIR JABBERD_DBDIR PKG_SYSCONFSUBDIR= jabberd @@ -50,6 +50,8 @@ FILES_SUBST+= JABBERD_USER=${JABBERD_USER:Q} 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} diff --git a/chat/mu-conference/Makefile b/chat/mu-conference/Makefile index e9c44c48ca1..a25dae3a978 100644 --- a/chat/mu-conference/Makefile +++ b/chat/mu-conference/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:25 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2007/07/04 20:54:33 jlam Exp $ # DISTNAME= mu-conference-0.6.0 @@ -24,8 +24,9 @@ RCD_SCRIPTS= muc .include "../../mk/bsd.prefs.mk" -BUILD_DEFS+= JABBERD_USER JABBERD_LOGDIR JABBERD_PIDDIR +BUILD_DEFS+= 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} diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile index 88496a0e270..ac44c3029e5 100644 --- a/chat/silc-server/Makefile +++ b/chat/silc-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2007/06/03 22:40:25 wiz Exp $ +# $NetBSD: Makefile,v 1.57 2007/07/04 20:54:33 jlam Exp $ # DISTNAME= silc-server-1.0.4 @@ -24,6 +24,8 @@ SILCD_USER?= silcd 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} diff --git a/chat/unrealircd/Makefile b/chat/unrealircd/Makefile index 09c25897265..3b6c82f2d5e 100644 --- a/chat/unrealircd/Makefile +++ b/chat/unrealircd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2007/05/13 21:15:58 adrianp Exp $ +# $NetBSD: Makefile,v 1.19 2007/07/04 20:54:33 jlam Exp $ DISTNAME= Unreal3.2.6 PKGNAME= unrealircd-3.2.6 @@ -54,8 +54,8 @@ IRCD_DOCS= ${PREFIX:Q}/share/doc/unrealircd IRCD_SHARE= ${PREFIX:Q}/share/unrealircd IRCD_EG= ${PREFIX:Q}/share/examples/unrealircd -BUILD_DEFS+= UIRCD_SENDQ UIRCD_LISTEN UIRCD_BUFFER UIRCD_USER UIRCD_HOST -BUILD_DEFS+= UIRCD_HOME UIRCD_NICKHIST UIRCD_FDSIZE UIRCD_GROUP VARBASE +BUILD_DEFS+= UIRCD_SENDQ UIRCD_LISTEN UIRCD_BUFFER UIRCD_HOST +BUILD_DEFS+= UIRCD_HOME UIRCD_NICKHIST UIRCD_FDSIZE VARBASE PTHREAD_OPTS+= require @@ -78,6 +78,9 @@ CONF_FILES_PERMS= ${IRCD_EG:Q}/example.conf \ ${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} -- cgit v1.2.3