Update for NetBSD, mostly by Soren S. Jorvang <soren@t.dk>

5 files changed, 24 insertions, 27 deletions

diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 150b2824753..dfa695fee50 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,9 +1,10 @@
 # New ports collection makefile for:    sudo
 # Version required:     1.5.3
-# Date created:         Sun Aug 13 12:36:14 CDT 1995
-# Whom:                 erich@rrnet.com
+# Date created:         Sun Dec 14 23:01:32 MET 1997
+# Whom:                 soren@t.dk
 #
-# $Id: Makefile,v 1.1.1.1 1997/12/14 23:27:00 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 1997/12/14 23:38:21 hubertf Exp $
+# FreeBSD Id: Makefile,v 1.9 1997/11/12 03:24:41 obrien Exp
 #
 
 DISTNAME=	cu-sudo.v1.5.3
@@ -20,4 +21,7 @@ WRKSRC=		${WRKDIR}/sudo.v1.5.3
 MAN5=		sudoers.5
 MAN8=		sudo.8 visudo.8
 
+post-install:
+	cd ${WRKSRC} ; cp sample.sudoers ${PREFIX}/etc/sudoers.example
+
 .include <bsd.port.mk>
diff --git a/security/sudo/patches/patch-ab b/security/sudo/patches/patch-ab
index 9930c0de3e0..150181d7f95 100644
--- a/security/sudo/patches/patch-ab
+++ b/security/sudo/patches/patch-ab
@@ -1,10 +1,11 @@
---- ./Makefile.in.org	Sun Aug 25 10:29:31 1996
-+++ ./Makefile.in	Wed Oct 16 00:43:03 1996
-@@ -214,6 +214,7 @@
- 	else \
- 	    $(INSTALL) -o $(install_uid) -g $(install_gid) -m 0440 $(srcdir)/sudoers $(sudoersdir)/sudoers; \
- 	fi
-+	$(INSTALL) -o $(install_uid) -g $(install_gid) -m 0440 $(srcdir)/sudoers $(sudoersdir)/sudoers.sample
+--- check.c.orig        Sat Nov 29 23:32:37 1997
++++ check.c     Sat Nov 29 23:32:51 1997
+@@ -733,7 +733,7 @@
+        (void) fclose(user_skey->keyfile);
  
- install-man:
- 	$(INSTALL) -o $(install_uid) -g $(install_gid) -m 0444 $(srcdir)/sudo.$(mantype) $(mandir8)/sudo.$(mansect8)
+     /* get the skey part of the prompt */
+-    if ((rval = skeychallenge(user_skey, user_name, challenge)) != 0) {
++    if ((rval = skeychallenge(user_skey, user_name, challenge, sizeof(challenge))) != 0) {
+ #ifdef OTP_ONLY
+        (void) fprintf(stderr,
+                       "%s: You do not exist in the s/key database.\n",
diff --git a/security/sudo/patches/patch-ac b/security/sudo/patches/patch-ac
index 253990f28d8..056fb254bd7 100644
--- a/security/sudo/patches/patch-ac
+++ b/security/sudo/patches/patch-ac
@@ -10,7 +10,7 @@
  .PP
  \fBsudo\fR determines who is an authorized user by consulting the
 -file \fI/etc/sudoers\fR.  By giving \fBsudo\fR the \f(CW-v\fR flag a user
-+file \fI/usr/local/etc/sudoers\fR.  By giving \fBsudo\fR the \f(CW-v\fR flag a user
++file \fI/usr/pkg/etc/sudoers\fR.  By giving \fBsudo\fR the \f(CW-v\fR flag a user
  can update the time stamp without running a \fIcommand.\fR
  The password prompt itself will also time out if the password is
  not entered with N minutes (again, this is defined at installation
@@ -19,7 +19,7 @@
  .PP
  .Vb 1
 -\& /etc/sudoers           file of authorized users.
-+\& /usr/local/etc/sudoers           file of authorized users.
++\& /usr/pkg/etc/sudoers           file of authorized users.
  .Ve
  .SH "ENVIRONMENT VARIABLES"
  .IX Header "ENVIRONMENT VARIABLES"
@@ -95,7 +95,7 @@
  .Vb 2
 -\& /etc/sudoers           file of authorized users.
 -\& /etc/netgroup          list of network groups.
-+\& /usr/local/etc/sudoers     file of authorized users.
++\& /usr/pkg/etc/sudoers     file of authorized users.
 +\& /etc/netgroup              list of network groups.
  .Ve
  .SH "SEE ALSO"
@@ -108,8 +108,8 @@
  .Vb 2
 -\& /etc/sudoers           file of authorized users.
 -\& /etc/stmp              lock file for visudo.
-+\& /usr/local/etc/sudoers     file of authorized users.
-+\& /usr/local/etc/stmp        lock file for visudo.
++\& /usr/pkg/etc/sudoers     file of authorized users.
++\& /usr/pkg/etc/stmp        lock file for visudo.
  .Ve
  .SH "ENVIRONMENT VARIABLES"
  .IX Header "ENVIRONMENT VARIABLES"
diff --git a/security/sudo/pkg/INSTALL b/security/sudo/pkg/INSTALL
deleted file mode 100755
index b633da87b27..00000000000
--- a/security/sudo/pkg/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-if [ $2 != "POST-INSTALL" ]; then
-  exit 0
-fi
-if [ -e ${PKG_PREFIX}/etc/sudoers ]; then
-  echo "Will not overwrite existing ${PKG_PREFIX}/etc/sudoers file."
-else
-  cp -p ${PKG_PREFIX}/etc/sudoers.sample ${PKG_PREFIX}/etc/sudoers
-fi
diff --git a/security/sudo/pkg/PLIST b/security/sudo/pkg/PLIST
index 7a4482cb579..5af9bb69165 100644
--- a/security/sudo/pkg/PLIST
+++ b/security/sudo/pkg/PLIST
@@ -1,6 +1,7 @@
 bin/sudo
 sbin/visudo
-etc/sudoers.sample
+etc/sudoers
+etc/sudoers.example
 man/man5/sudoers.5.gz
 man/man8/sudo.8.gz
 man/man8/visudo.8.gz