summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2006-06-04 14:56:37 +0000
committerjoerg <joerg@pkgsrc.org>2006-06-04 14:56:37 +0000
commitd1f92fbbf31260c3cc029521bf900b36b1a1e6ef (patch)
tree7a3b9921bf989b82b37a53f027ca6bc44f218b3c
parent4faa907ed6259bbc83fa2c70bc410f14fedcf9cb (diff)
downloadpkgsrc-d1f92fbbf31260c3cc029521bf900b36b1a1e6ef.tar.gz
Remove OPENSSH_GID and OPENSSH_UID, it happened to work before,
since those are the values in NetBSD. In reality, they haven't been used for ages though.
-rw-r--r--mk/defaults/mk.conf12
-rw-r--r--security/openssh+gssapi/Makefile4
-rw-r--r--security/openssh/Makefile4
3 files changed, 3 insertions, 17 deletions
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 010fd217153..d659744b993 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.119 2006/05/13 03:44:23 minskim Exp $
+# $NetBSD: mk.conf,v 1.120 2006/06/04 14:56:37 joerg Exp $
#
# This file provides default values for variables that may be overridden
@@ -1334,21 +1334,11 @@ OPENSSH_USER?= sshd
# Possible: any user name
# Default: sshd
-OPENSSH_UID?= 16
-# The unprivileged UID for OpenSSH with privilege separation.
-# Possible: any uid
-# Default: 16
-
OPENSSH_GROUP?= sshd
# The group of the OPENSSH_USER for OpenSSH with privilege separation.
# Possible: any group name
# Default: sshd
-OPENSSH_GID?= 16
-# The GID of the OPENSSH_USER for OpenSSH with privilege separation.
-# Possible: any gid
-# Default: sshd
-
P4USER?= perforce
# The unprivileged user for the Perforce server.
# Possible: any user name
diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile
index b497766a8f4..64af3d18869 100644
--- a/security/openssh+gssapi/Makefile
+++ b/security/openssh+gssapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/05/09 17:58:33 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2006/06/04 14:56:37 joerg Exp $
# NOTE: This package is modeled on ../openssh, but does not share
# files with it as that package may update faster than the gssapi
@@ -47,8 +47,6 @@ MESSAGE_SRC= ${.CURDIR}/MESSAGE
PKG_GROUPS= ${OPENSSH_GROUP}
PKG_USERS= ${OPENSSH_USER}:${OPENSSH_GROUP}
-PKG_GID.${OPENSSH_GROUP}= ${OPENSSH_GID}
-PKG_UID.${OPENSSH_USER}= ${OPENSSH_UID}
PKG_GECOS.${OPENSSH_USER}= sshd privsep pseudo-user
PKG_HOME.${OPENSSH_USER}= ${OPENSSH_CHROOT}
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 4951ff5e00d..be64925d94b 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.168 2006/05/09 17:58:33 jlam Exp $
+# $NetBSD: Makefile,v 1.169 2006/06/04 14:56:37 joerg Exp $
DISTNAME= openssh-4.3p1
PKGNAME= openssh-4.3.1
@@ -51,8 +51,6 @@ LIBS+= -lbind -ldb -lcrypt
PKG_GROUPS= ${OPENSSH_GROUP}
PKG_USERS= ${OPENSSH_USER}:${OPENSSH_GROUP}
-PKG_GID.${OPENSSH_GROUP}= ${OPENSSH_GID}
-PKG_UID.${OPENSSH_USER}= ${OPENSSH_UID}
PKG_GECOS.${OPENSSH_USER}= sshd privsep pseudo-user
PKG_HOME.${OPENSSH_USER}= ${OPENSSH_CHROOT}