* Change some instances of ROOT_USER and ROOT_GROUP to BINOWN and BINGRP

  in SPECIAL_PERMS usage.

* Consistently use 4555 for setuid and 2555 for setgid programs.

14 files changed, 39 insertions, 39 deletions

diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index ff8f32df6f6..eff9d048621 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2007/02/22 19:26:14 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2007/06/15 18:15:06 jlam Exp $
 
 DISTNAME=	minicom-2.1
 PKGREVISION=	2
@@ -25,7 +25,7 @@ EGDIR=			${PREFIX}/share/examples/minicom
 
 PKG_GROUPS=		dialer
 PKG_USERS=		uucp:dialer
-SPECIAL_PERMS=		${PREFIX}/bin/minicom uucp dialer 4755
+SPECIAL_PERMS=		${PREFIX}/bin/minicom uucp dialer 4555
 OWN_DIRS_PERMS=		${PKG_SYSCONFDIR} uucp dialer 0755
 CONF_FILES_PERMS=	${EGDIR}/minicom.users ${PKG_SYSCONFDIR}/minicom.users \
 			uucp dialer 0644
diff --git a/editors/emacs/Makefile.common b/editors/emacs/Makefile.common
index 702f14428d7..49271e332db 100644
--- a/editors/emacs/Makefile.common
+++ b/editors/emacs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2007/06/15 01:39:32 markd Exp $
+# $NetBSD: Makefile.common,v 1.16 2007/06/15 18:15:15 jlam Exp $
 
 MASTER_SITES=	${MASTER_SITE_GNU:=emacs/}
 MAINTAINER=	markd@NetBSD.org
@@ -38,7 +38,7 @@ SUBST_SED.test_equal=		-e 's/ == / = /g'
 MAKE_DIRS_PERMS+=	${VARBASE}/games/emacs ${GAMEOWN:Q} ${GAMEGRP} ${GAMEDIRMODE:Q}
 CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/snake-scores ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEDATAMODE:Q}
 CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/tetris-scores ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEDATAMODE:Q}
-SPECIAL_PERMS+=		${PREFIX}/libexec/emacs/22.1/i386--netbsdelf/update-game-score ${GAMEOWN:Q} ${GAMEGRP:Q} 4711
+SPECIAL_PERMS+=		${PREFIX}/libexec/emacs/22.1/i386--netbsdelf/update-game-score ${GAMEOWN:Q} ${GAMEGRP:Q} 4555
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile
index 6afdef4de76..cd47ad6e0eb 100644
--- a/mail/cucipop/Makefile
+++ b/mail/cucipop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2007/01/07 09:13:57 rillig Exp $
+# $NetBSD: Makefile,v 1.28 2007/06/15 18:15:17 jlam Exp $
 #
 
 DISTNAME=	cucipop-1.31
@@ -20,7 +20,7 @@ MAKE_ENV+=	ROOT_USER=${ROOT_USER:Q}
 MAKE_ENV+=	ROOT_GROUP=${ROOT_GROUP:Q}
 
 REQD_DIRS+=	${PREFIX}/share/cucipop/bulletins
-SPECIAL_PERMS+=	${PREFIX}/sbin/cucipop ${ROOT_USER} ${ROOT_GROUP} 2755
+SPECIAL_PERMS+=	${PREFIX}/sbin/cucipop ${ROOT_USER} ${ROOT_GROUP} 2555
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cucipop
 PKG_SUPPORTED_OPTIONS=	db inet6
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index b622fc7d8de..17747709287 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2007/02/22 19:26:41 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2007/06/15 18:15:18 jlam Exp $
 
 DISTNAME=	maildrop-2.0.2
 CATEGORIES=	security
@@ -45,7 +45,7 @@ CONFIGURE_ARGS+=	--disable-authlib
 
 REQD_DIRS=	${DOCDIR}
 SPECIAL_PERMS=	bin/lockmail ${REAL_ROOT_USER} ${COURIER_GROUP} 755
-SPECIAL_PERMS+=	bin/maildrop ${REAL_ROOT_USER} ${COURIER_GROUP} 4755
+SPECIAL_PERMS+=	bin/maildrop ${REAL_ROOT_USER} ${COURIER_GROUP} 4555
 
 .include "../../devel/sysexits/buildlink3.mk"
 
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 122c9a8663a..3e3c59b3890 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2007/04/12 03:42:21 schmonz Exp $
+# $NetBSD: Makefile,v 1.55 2007/06/15 18:15:19 jlam Exp $
 #
 
 DISTNAME=		netqmail-1.05
@@ -99,7 +99,7 @@ PKG_HOME.${user}=	${QMAILDIR}
 .endfor
 PKG_HOME.alias=		${QMAILDIR}/alias
 
-SPECIAL_PERMS+=		${PREFIX}/bin/qmail-queue qmailq qmail 4711
+SPECIAL_PERMS+=		${PREFIX}/bin/qmail-queue qmailq qmail 4555
 
 # extract the qmail tarball that was inside the netqmail distfile
 post-extract:
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index d2a8868cdae..ab0e4133631 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2007/06/07 07:50:57 schmonz Exp $
+# $NetBSD: Makefile,v 1.52 2007/06/15 18:15:19 jlam Exp $
 
 DISTNAME=	sqwebmail-5.1.2
 PKGREVISION=	1
@@ -99,7 +99,7 @@ CONF_FILES_PERMS+=	${PREFIX}/share/courier/sqwebmail/${_file_}	\
 			${COURIER_SCRIPT_PERMS}
 .endfor
 SPECIAL_PERMS=		${LIBEXECDIR}/sqwebpasswd			\
-			${COURIER_USER} ${COURIER_GROUP} 2755
+			${COURIER_USER} ${COURIER_GROUP} 2555
 
 RCD_SCRIPTS=		sqwebmail
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 sbin
diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index 36927b2f9fa..61b1374a19f 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2007/04/20 18:52:34 bouyer Exp $
+# $NetBSD: Makefile,v 1.28 2007/06/15 18:15:19 jlam Exp $
 #
 
 DISTNAME=	sympa-5.2.4
@@ -112,14 +112,14 @@ OWN_DIRS_PERMS+=	${SYMPA_SPOOL}/outgoing ${SYMPA_USER} ${SYMPA_GROUP} 770
 OWN_DIRS_PERMS+=	${SYMPA_SPOOL}/task ${SYMPA_USER} ${SYMPA_GROUP} 770
 OWN_DIRS_PERMS+=	${SYMPA_SPOOL}/tmp ${SYMPA_USER} ${SYMPA_GROUP} 770
 
-SPECIAL_PERMS+=		${SYMPA_BIN}/aliaswrapper ${ROOT_USER} ${SYMPA_GROUP} 4750
-SPECIAL_PERMS+=		${SYMPA_BIN}/bouncequeue ${SYMPA_USER} ${SYMPA_GROUP} 4755
-SPECIAL_PERMS+=		${SYMPA_BIN}/queue ${SYMPA_USER} ${SYMPA_GROUP} 4755
-SPECIAL_PERMS+=		${SYMPA_BIN}/virtualwrapper ${ROOT_USER} ${SYMPA_GROUP} 4750
+SPECIAL_PERMS+=		${SYMPA_BIN}/aliaswrapper ${ROOT_USER} ${SYMPA_GROUP} 4550
+SPECIAL_PERMS+=		${SYMPA_BIN}/bouncequeue ${SYMPA_USER} ${SYMPA_GROUP} 4555
+SPECIAL_PERMS+=		${SYMPA_BIN}/queue ${SYMPA_USER} ${SYMPA_GROUP} 4555
+SPECIAL_PERMS+=		${SYMPA_BIN}/virtualwrapper ${ROOT_USER} ${SYMPA_GROUP} 4550
 
 # Which pkgsrc platforms support set-uid scripts?
-#SPECIAL_PERMS+=	${SYMPA_BIN}/sympa_soap_server.fcgi ${SYMPA_USER} ${SYMPA_GROUP} 6755
-#SPECIAL_PERMS+=	${SYMPA_BIN}/wwsympa.fcgi ${SYMPA_USER} ${SYMPA_GROUP} 6755
+#SPECIAL_PERMS+=	${SYMPA_BIN}/sympa_soap_server.fcgi ${SYMPA_USER} ${SYMPA_GROUP} 6555
+#SPECIAL_PERMS+=	${SYMPA_BIN}/wwsympa.fcgi ${SYMPA_USER} ${SYMPA_GROUP} 6555
 
 MESSAGE_SUBST+=	SYMPA_BIN=${SYMPA_BIN}
 
diff --git a/net/uucp/Makefile b/net/uucp/Makefile
index 8fb03d787ff..7b8cc5ab366 100644
--- a/net/uucp/Makefile
+++ b/net/uucp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/03/16 20:02:04 christos Exp $
+# $NetBSD: Makefile,v 1.7 2007/06/15 18:15:20 jlam Exp $
 
 DISTNAME=	uucp-1.07
 PKGREVISION=	3
@@ -28,13 +28,13 @@ PKG_USERS=	${UUCP_USER}:${UUCP_GROUP}
 INFO_FILES=	# PLIST
 
 # UUCP installs many set-uid "uucp" binaries.
-SPECIAL_PERMS+=	bin/cu ${UUCP_USER} ${ROOT_GROUP} 4555
-SPECIAL_PERMS+=	bin/uucp ${UUCP_USER} ${ROOT_GROUP} 4555
-SPECIAL_PERMS+=	bin/uuname ${UUCP_USER} ${ROOT_GROUP} 4555
-SPECIAL_PERMS+=	bin/uustat ${UUCP_USER} ${ROOT_GROUP} 4555
-SPECIAL_PERMS+=	bin/uux ${UUCP_USER} ${ROOT_GROUP} 4555
-SPECIAL_PERMS+=	sbin/uucico ${UUCP_USER} ${ROOT_GROUP} 4555
-SPECIAL_PERMS+=	sbin/uuxqt ${UUCP_USER} ${ROOT_GROUP} 4555
+SPECIAL_PERMS+=	bin/cu ${UUCP_USER} ${BINGRP} 4555
+SPECIAL_PERMS+=	bin/uucp ${UUCP_USER} ${BINGRP} 4555
+SPECIAL_PERMS+=	bin/uuname ${UUCP_USER} ${BINGRP} 4555
+SPECIAL_PERMS+=	bin/uustat ${UUCP_USER} ${BINGRP} 4555
+SPECIAL_PERMS+=	bin/uux ${UUCP_USER} ${BINGRP} 4555
+SPECIAL_PERMS+=	sbin/uucico ${UUCP_USER} ${BINGRP} 4555
+SPECIAL_PERMS+=	sbin/uuxqt ${UUCP_USER} ${BINGRP} 4555
 
 SENDMAIL?=	/usr/sbin/sendmail
 
diff --git a/net/wmnet/Makefile b/net/wmnet/Makefile
index f41d7c344b8..dd05678d6af 100644
--- a/net/wmnet/Makefile
+++ b/net/wmnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/03/14 15:49:15 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2007/06/15 18:15:20 jlam Exp $
 
 DISTNAME=	wmnet-1.06
 PKGREVISION=	5
@@ -21,7 +21,7 @@ MAKE_FLAGS+=	MANPATH=${PREFIX}/${PKGMANDIR}
 
 .if !empty(UNPRIVILEGED:M[Yy][Ee][Ss])
 MAKE_FLAGS+=	INSTPGMFLAGS=""
-SPECIAL_PERMS+=	bin/wmnet ${ROOT_USER} kmem 2555
+SPECIAL_PERMS+=	bin/wmnet ${BINOWN} kmem 2555
 .endif
 
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 8e123104afb..2f69d549a69 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.122 2007/06/06 11:14:27 markd Exp $
+# $NetBSD: Makefile,v 1.123 2007/06/15 18:15:20 jlam Exp $
 #
 # The CUPS author is very good about taking back changes into the main
 # CUPS distribution.  The correct place to send patches or bug-fixes is:
@@ -105,7 +105,7 @@ PKG_USERS=		${CUPS_USER}:${CUPS_GROUP}
 PKG_GECOS.${CUPS_USER}=	Common UNIX Printing System user
 PKG_SHELL.${CUPS_USER}=	${SH}
 
-SPECIAL_PERMS=		${PREFIX}/bin/lppasswd ${CUPS_USER} ${CUPS_GROUP} 4755
+SPECIAL_PERMS=		${PREFIX}/bin/lppasswd ${CUPS_USER} ${CUPS_GROUP} 4555
 CONF_FILES=		${EGDIR}/cupsd.conf ${CUPS_CONFDIR}/cupsd.conf
 CONF_FILES+=		${EGDIR}/mime.convs ${CUPS_CONFDIR}/mime.convs
 CONF_FILES+=		${EGDIR}/mime.types ${CUPS_CONFDIR}/mime.types
diff --git a/sysutils/gkrellm-server/Makefile b/sysutils/gkrellm-server/Makefile
index 82f77df99e4..b141c03beac 100644
--- a/sysutils/gkrellm-server/Makefile
+++ b/sysutils/gkrellm-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/10/01 15:14:28 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2007/06/15 18:15:21 jlam Exp $
 
 .include "../../sysutils/gkrellm/Makefile.common"
 
@@ -14,7 +14,7 @@ CONF_FILES=		${PREFIX:Q}/share/examples/gkrellm-server/gkrellmd.conf ${PREFIX:Q}
 .include "../../mk/bsd.prefs.mk"
 
 .if (${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly")
-SPECIAL_PERMS+=		${PREFIX:Q}/bin/gkrellmd ${ROOT_USER} kmem 2711
+SPECIAL_PERMS+=		${PREFIX:Q}/bin/gkrellmd ${BINOWN} kmem 2555
 .endif
 
 NOT_FOR_PLATFORM=	IRIX-*-*
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index 38cd5453f5e..768fa6ba05e 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2007/05/03 20:21:27 cube Exp $
+# $NetBSD: Makefile,v 1.57 2007/06/15 18:15:21 jlam Exp $
 .include "Makefile.common"
 
 GKRELLM_PKGBASE=	gkrellm
@@ -15,7 +15,7 @@ USE_TOOLS+=		pkg-config
 # NetBSD 3.99.1 and above don't have to be installed setgid.
 .if (${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "DragonFly" || \
     (${OPSYS} == "NetBSD" && (!empty(OS_VERSION:M[123]*) && empty(OS_VERSION:M3.99.*))))
-SPECIAL_PERMS+=		${PREFIX}/bin/gkrellm ${ROOT_USER} kmem 2711
+SPECIAL_PERMS+=		${PREFIX}/bin/gkrellm ${BINOWN} kmem 2555
 .endif
 
 NOT_FOR_PLATFORM=	IRIX-*-*
diff --git a/sysutils/torsmo/Makefile b/sysutils/torsmo/Makefile
index f8ffb65ea5a..f73d5d97aa8 100644
--- a/sysutils/torsmo/Makefile
+++ b/sysutils/torsmo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/02/19 19:50:47 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/06/15 18:15:21 jlam Exp $
 
 DISTNAME=	torsmo-0.18
 CATEGORIES=	sysutils
@@ -19,7 +19,7 @@ DOCDIR=		${PREFIX}/share/doc/torsmo
 
 .if (${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" \
 			  || ${OPSYS} == "OpenBSD" || ${OPSYS} == "Linux")
-SPECIAL_PERMS+=	bin/torsmo ${ROOT_USER} kmem 2555
+SPECIAL_PERMS+=	bin/torsmo ${BINOWN} kmem 2555
 .endif
 
 do-install:
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 1c8f11c76db..6e76f001e56 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.129 2007/06/08 12:35:37 markd Exp $
+# $NetBSD: Makefile,v 1.130 2007/06/15 18:15:21 jlam Exp $
 
 DISTNAME=	kdebase-${_KDE_VERSION}
 PKGREVISION=	1
@@ -106,7 +106,7 @@ PLIST_SUBST+=		HAVE_JOYSTICK="@comment "
 ICONDIR=		share/icons
 
 .if ${OPSYS} == "NetBSD"
-SPECIAL_PERMS+=	${PREFIX}/bin/ksysguardd	${ROOT_USER} kmem 2755
+SPECIAL_PERMS+=	${PREFIX}/bin/ksysguardd	${BINOWN} kmem 2555
 .endif
 
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "SunOS"